diff --git a/src/api/index.js b/src/api/index.js index 41e8d61..29d9ef8 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -78,16 +78,16 @@ export default { // 线上赛事 notLoggedInBeforeStudentEvents: `occupationlab/occupationlab/enterprise/match/contest/notLoggedInBeforeStudentEvents`, - contestPageConditionQueryByOccupationlabStu: `occupationlab/occupationlab/match/contest/contestPageConditionQueryByOccupationlabStu`, - contestPageConditionQueryByOccupationlab: `occupationlab/occupationlab/match/contest/onlineCompetitionByStudent`, - listOfRegisteredEvents: `occupationlab/occupationlab/match/contest/listOfRegisteredEvents`, - addApplicant: `occupationlab/occupationlab/match/applicant/addApplicant`, // 添加报名人员 - getContestProgress: `occupationlab/occupationlab/match/contest-progress/getContestProgress`, // 根据赛事id查询竞赛进展 - getContest: `occupationlab/occupationlab/match/contest/getContest`, // 根据id查询赛事 + contestPageConditionQueryByOccupationlabStu: `occupationlab/occupationlab/enterprise/match/contest/contestPageConditionQueryByOccupationlabStu`, + contestPageConditionQueryByOccupationlab: `occupationlab/occupationlab/enterprise/match/contest/onlineCompetitionByStudent`, + listOfRegisteredEvents: `occupationlab/occupationlab/enterprise/match/contest/listOfRegisteredEvents`, + addApplicant: `occupationlab/occupationlab/enterprise/match/applicant/addApplicant`, // 添加报名人员 + getContestProgress: `occupationlab/occupationlab/enterprise/match/contest-progress/getContestProgress`, // 根据赛事id查询竞赛进展 + getContest: `occupationlab/occupationlab/enterprise/match/contest/getContest`, // 根据id查询赛事 queryAnnouncementByContestId: `occupationlab/occupationlab/contest/announcement/queryAnnouncementByContestId`, queryAnnouncementDetails: `occupationlab/occupationlab/contest/announcement/queryAnnouncementDetails`, contestAfterLogin: `occupationlab/occupationlab/enterprise/match/contest/contestAfterLogin`, - cancelRegistration: `occupationlab/occupationlab/match/applicant/cancelRegistration`, + cancelRegistration: `occupationlab/occupationlab/enterprise/match/applicant/cancelRegistration`, // 阿里云文件/视频管理 fileDeletion: `${uploadURL}oss/manage/fileDeletion`, // 删除OSS文件 diff --git a/src/pages/course/details/index.vue b/src/pages/course/details/index.vue index 12223d0..46a2135 100644 --- a/src/pages/course/details/index.vue +++ b/src/pages/course/details/index.vue @@ -166,9 +166,10 @@ export default { document.body.appendChild(scriptTag); }, transferType(ext){ - if('jpg,jpeg,png,gif,svg,psd'.includes(ext)) return '图片' - if('mp4,3gp,mov,m4v,avi,dat,mkv,flv,vob,rmvb,rm,qlv'.includes(ext)) return '视频' - return ext + const suf = ext.toLowerCase() + if('jpg,jpeg,png,gif,svg,psd'.includes(suf)) return '图片' + if('mp4,3gp,mov,m4v,avi,dat,mkv,flv,vob,rmvb,rm,qlv'.includes(suf)) return '视频' + return suf }, preview(row, chapterName, showConfirm = 1){ // 如果没登录，直接去登录 @@ -248,7 +249,6 @@ export default { }else{ this.showMask2 = false } - console.log(33, res) this.iframeSrc = res.previewUrl }) .catch(err => { diff --git a/src/pages/course/list/index.vue b/src/pages/course/list/index.vue index 47de1bb..3fef552 100644 --- a/src/pages/course/list/index.vue +++ b/src/pages/course/list/index.vue @@ -38,6 +38,10 @@ {{ item.pageviews }} +
+ + {{ item.schoolName }} +
{{ item.courseType == 1 ? '付费' : '免费'}} diff --git a/src/pages/info/details/index.vue b/src/pages/info/details/index.vue index 8461aff..ecb5116 100644 --- a/src/pages/info/details/index.vue +++ b/src/pages/info/details/index.vue @@ -51,7 +51,7 @@ export default { methods: { getData() { this.loadIns = Loading.service() - this.$get(`${this.api.getArticle}/${this.id}`) + this.$get(`${this.api.getArticle}?articleId=${this.id}`) .then(res => { let data = res.article this.coverUrl = data.coverUrl diff --git a/src/pages/info/list/index.vue b/src/pages/info/list/index.vue index 040bb30..6459f39 100644 --- a/src/pages/info/list/index.vue +++ b/src/pages/info/list/index.vue @@ -4,6 +4,7 @@
+

{{ $route.query.name }}

{ if (e.children.length) { this.getDeepId(e.children) - } else { + } else if (!this.deepId) { this.deepId = e.id + return false } }) }, @@ -226,6 +231,11 @@ export default { justify-content: center; align-items:flex-start; } + .column-name { + padding-left: 10px; + margin-bottom: 10px; + font-size: 16px; + } .nav{ width: 156px; overflow: hidden; diff --git a/src/pages/match/list/index.vue b/src/pages/match/list/index.vue index c86915c..5684e46 100644 --- a/src/pages/match/list/index.vue +++ b/src/pages/match/list/index.vue @@ -444,224 +444,225 @@ export default { .main{ background: url(../../../assets/img/match-bg1.png) (0px 95px)/auto auto no-repeat, url(../../../assets/img/match-bg2.png) (98% bottom)/auto auto no-repeat; - .filter { - width: 100%; - padding: 0 20px; - margin-bottom: 20px; - background-color: #fff; - dl { - display: flex; - align-items: center; - margin: 20px 0; - dt { - color: #333; - font-size: 16px; - font-weight: 600; - white-space: nowrap; - } - dd { - padding: 5px 15px; - color: #6a6a6a; - font-size: 16px; - white-space: nowrap; - cursor: pointer; - border-radius: 4px; - &.active { - color: $main-color; - background-color: #e6f0ff; - } - } - } - } - .select-wrap { - display: inline-flex; - align-items: center; - margin: 0 10px; - .label { - margin-right: 10px; - white-space: nowrap; - } - .el-select { - width: 130px; - } - } - .list-inner { +} +.filter { + width: 100%; + padding: 0 20px; + margin-bottom: 20px; + background-color: #fff; + dl { display: flex; - justify-content: center; - align-items:flex-start; - } - .nav{ - width: 156px; - text-align: right; - overflow: hidden; - background-color: #fff; - li { - padding: 0 24px; + align-items: center; + margin: 20px 0; + dt { + color: #333; + font-size: 16px; + font-weight: 600; + white-space: nowrap; + } + dd { + padding: 5px 15px; + color: #6a6a6a; font-size: 16px; - color: #666; - line-height: 48px; - border-bottom: 2px solid #f3f6fa; - border-right: 2px solid transparent; + white-space: nowrap; cursor: pointer; - &:before { - content: ''; - display: inline-block; - width: 3px; - height: 3px; - margin-right: 10px; - vertical-align: middle; - border-radius: 50%; - background-color: #666; - } + border-radius: 4px; &.active { color: $main-color; - border-right-color: $main-color; - &:before { - background-color: $main-color; - } + background-color: #e6f0ff; + } + } + } +} +.select-wrap { + display: inline-flex; + align-items: center; + margin: 0 10px; + .label { + margin-right: 10px; + white-space: nowrap; + } + .el-select { + width: 130px; + } +} +.list-inner { + display: flex; + justify-content: center; + align-items:flex-start; +} +.nav{ + width: 156px; + text-align: right; + overflow: hidden; + background-color: #fff; + li { + padding: 0 24px; + font-size: 16px; + color: #666; + line-height: 48px; + border-bottom: 2px solid #f3f6fa; + border-right: 2px solid transparent; + cursor: pointer; + &:before { + content: ''; + display: inline-block; + width: 3px; + height: 3px; + margin-right: 10px; + vertical-align: middle; + border-radius: 50%; + background-color: #666; + } + &.active { + color: $main-color; + border-right-color: $main-color; + &:before { + background-color: $main-color; } } } - .list-wrap { - width: calc(100% - 180px); - margin-left: 24px; - .list { - li { +} +.list-wrap { + width: calc(100% - 180px); + margin-left: 24px; + .list { + li { + display: flex; + justify-content: space-between; + padding: 16px; + margin-bottom: 12px; + transition: all 0.3s; + cursor: pointer; + border-radius: 6px; + background-color: #fff; + .right { display: flex; - justify-content: space-between; - padding: 16px; - margin-bottom: 12px; - transition: all 0.3s; - cursor: pointer; - border-radius: 6px; - background-color: #fff; - .right { - display: flex; - flex-direction: column; - justify-content: center; - align-items: flex-end; - flex: 1; + flex-direction: column; + justify-content: center; + align-items: flex-end; + flex: 1; - .status { - padding: 0 23px; - line-height: 34px; - font-size: 14px; - color: #fff; - background-color: #52C41A; - border-radius: 4px; - &.wait { - background-color: #FAAD14; - } + .status { + padding: 0 23px; + line-height: 34px; + font-size: 14px; + color: #fff; + white-space: nowrap; + background-color: #52C41A; + border-radius: 4px; + &.wait { + background-color: #FAAD14; + } - &.signing { - background-color: $main-color; - } + &.signing { + background-color: $main-color; + } - &.signed { - background-color: #52C41A; - } - &.playing { - background-color: #f96d6d; - } + &.signed { + background-color: #52C41A; + } + &.playing { + background-color: #f96d6d; + } - &.finish { - background-color: #ccc; - } + &.finish { + background-color: #ccc; } + } - .btn { - padding: 12px 20px; - color: #fff; - background-color: #cb221c; - border-radius: 4px; - cursor: pointer; + .btn { + padding: 12px 20px; + color: #fff; + background-color: #cb221c; + border-radius: 4px; + cursor: pointer; - &:hover { - opacity: .9; - } + &:hover { + opacity: .9; + } - &.disabled { - cursor: not-allowed; - background-color: #969696; - } + &.disabled { + cursor: not-allowed; + background-color: #969696; } + } - .end-text { - margin-top: 10px; - color: rgba(0, 0, 0, .65); - font-size: 12px; - white-space: nowrap; + .end-text { + margin-top: 10px; + color: rgba(0, 0, 0, .65); + font-size: 12px; + white-space: nowrap; - em { - font-style: normal; - color: #f00; - } + em { + font-style: normal; + color: #f00; } } + } - &:hover { - .left { - .info { - .title { - color: $main-color; - } + &:hover { + .left { + .info { + .title { + color: $main-color; } } } } - .left { - display: inline-flex; - .cover { - img { - width: 220px; - height: 140px; - border-radius: 6px; - } + } + .left { + display: inline-flex; + .cover { + img { + width: 220px; + height: 140px; + border-radius: 6px; } + } - .info { - margin-left: 16px; - .title { + .info { + margin-left: 16px; + .title { + margin-bottom: 5px; + font-size: 20px; + font-weight: 500; + color: #0B1D30; + line-height: 1; + } + .metas { + font-size: 14px; + color: #666; + div { + display: flex; + align-items: center; margin-bottom: 5px; - font-size: 20px; - font-weight: 500; - color: #0B1D30; - line-height: 1; - } - .metas { - font-size: 14px; - color: #666; - div { - display: flex; - align-items: center; - margin-bottom: 5px; - &.flex-top { - align-items: flex-start; - } - } - - .label, .val { - font-size: 14px; - color: #666; - white-space: nowrap; + &.flex-top { + align-items: flex-start; } + } - .val { - max-width: 350px; - text-overflow: ellipsis; - overflow: hidden; - } + .label, .val { + font-size: 14px; + color: #666; + white-space: nowrap; + } - .a-line { - display: block; - } + .val { + max-width: 350px; + text-overflow: ellipsis; + overflow: hidden; } - .desc { - font-size: 14px; + .a-line { + display: block; } } + + .desc { + font-size: 14px; + } } } } diff --git a/src/pages/screen/index.vue b/src/pages/screen/index.vue index 44029c1..7cda31c 100644 --- a/src/pages/screen/index.vue +++ b/src/pages/screen/index.vue @@ -435,12 +435,14 @@ export default { label: { normal: { show: true, + alignTo: 'none', + lineHeight: 18, formatter: '{b} {c}' } }, data:[ - {value: data.totalNumberOfExams, name:'参考总场次'}, - {value: data.referenceNumber, name:'参考人数'}, + {value: data.totalNumberOfExams, name:'考试\n总场次'}, + {value: data.referenceNumber, name:'考试\n人数'}, ] } ] @@ -508,6 +510,7 @@ export default { grid: { left: '3%', right: '4%', + top: '30%', bottom: '3%', containLabel: true }, diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue index 660e5e8..345301e 100644 --- a/src/pages/station/preview/index.vue +++ b/src/pages/station/preview/index.vue @@ -208,9 +208,10 @@ export default { }); }, transferType(ext) { - if ("jpg,jpeg,png,gif,svg,psd".includes(ext)) return "图片"; - if ("mp4,3gp,mov,m4v,avi,dat,mkv,flv,vob,rmvb,rm,qlv".includes(ext)) return "视频"; - return ext; + const suf = ext.toLowerCase() + if('jpg,jpeg,png,gif,svg,psd'.includes(suf)) return '图片' + if('mp4,3gp,mov,m4v,avi,dat,mkv,flv,vob,rmvb,rm,qlv'.includes(suf)) return '视频' + return suf }, preview(row, chapterName) { this.curLink = `${chapterName}${row.name}`; // 章节名称+小节名称，小节名称有重复的情况，如果只用小节名称判断，会有同时选中多个的情况 diff --git a/src/styles/page/screen.scss b/src/styles/page/screen.scss index 1a85f19..75f98a7 100644 --- a/src/styles/page/screen.scss +++ b/src/styles/page/screen.scss @@ -17,8 +17,8 @@ body { .video { position: absolute; top: 0; - left: -500px; - width: 100vw; + left: -20%; + width: 150%; // height: 720px; } .wrap {