课程资讯等修复

src/api/index.js

@@ -78,16 +78,16 @@ export default {
 
     // 线上赛事
     notLoggedInBeforeStudentEvents: `occupationlab/occupationlab/enterprise/match/contest/notLoggedInBeforeStudentEvents`,
-    contestPageConditionQueryByOccupationlabStu: `occupationlab/occupationlab/match/contest/contestPageConditionQueryByOccupationlabStu`,
+    contestPageConditionQueryByOccupationlabStu: `occupationlab/occupationlab/enterprise/match/contest/contestPageConditionQueryByOccupationlabStu`,
-    contestPageConditionQueryByOccupationlab: `occupationlab/occupationlab/match/contest/onlineCompetitionByStudent`,
+    contestPageConditionQueryByOccupationlab: `occupationlab/occupationlab/enterprise/match/contest/onlineCompetitionByStudent`,
-    listOfRegisteredEvents: `occupationlab/occupationlab/match/contest/listOfRegisteredEvents`,
+    listOfRegisteredEvents: `occupationlab/occupationlab/enterprise/match/contest/listOfRegisteredEvents`,
-    addApplicant: `occupationlab/occupationlab/match/applicant/addApplicant`, // 添加报名人员
+    addApplicant: `occupationlab/occupationlab/enterprise/match/applicant/addApplicant`, // 添加报名人员
-    getContestProgress: `occupationlab/occupationlab/match/contest-progress/getContestProgress`, // 根据赛事id查询竞赛进展
+    getContestProgress: `occupationlab/occupationlab/enterprise/match/contest-progress/getContestProgress`, // 根据赛事id查询竞赛进展
-    getContest: `occupationlab/occupationlab/match/contest/getContest`, // 根据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文件

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 '图片'
+          const suf = ext.toLowerCase()
-            if('mp4,3gp,mov,m4v,avi,dat,mkv,flv,vob,rmvb,rm,qlv'.includes(ext)) return '视频'
+          if('jpg,jpeg,png,gif,svg,psd'.includes(suf)) return '图片'
-            return ext
+          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 => {

src/pages/course/list/index.vue

@@ -38,6 +38,10 @@
                           <i class="el-icon-view"></i>
                           {{ item.pageviews }}
                         </div>
+                        <div class="meta">
+                          <i class="el-icon-user"></i>
+                          {{ item.schoolName }}
+                        </div>
                         <span v-if="item.courseType == 0" class="type">{{ item.courseType == 1 ? '付费' : '免费'}}</span>
                       </div>
                   </li>

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

src/pages/info/list/index.vue

@@ -4,6 +4,7 @@
         <div class="main">
             <div class="center-wrap">
                 <div class="nav">
+                    <p class="column-name">{{ $route.query.name }}</p>
                     <el-menu
                         v-if="menuList.length"
                         unique-opened
@@ -97,6 +98,7 @@ export default {
             "setColumnId"
         ]),
         async getData() {
+          this.deepId = ''
           const { parentId } = this.$route.query
           this.setColumnId('')
           this.loadIns = Loading.service()
@@ -128,8 +130,9 @@ export default {
               this.getContent(historyId)
             } else {
               // 正常情况默认展示第一个分类下的文章列表
-              data.length && this.getDeepId(data[0].children)
+              data.length && this.getDeepId(data)
               const id = this.deepId
+              console.log("🚀 ~ file: index.vue ~ line 133 ~ getData ~ id", id, data)
               if (id) {
                 this.getContent(id)
                 this.defaultIndex = id + ''
@@ -144,11 +147,13 @@ export default {
         },
         // 获取最深的层级的id
         getDeepId(data) {
+          console.log("🚀 ~ file: index.vue ~ line 148 ~ getDeepId ~ data", data)
           data.map(e => {
             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;

src/pages/match/list/index.vue

@@ -444,7 +444,8 @@ 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 {
+}
+.filter {
     width: 100%;
     padding: 0 20px;
     margin-bottom: 20px;
@@ -472,8 +473,8 @@ export default {
             }
         }
     }
-    }
+}
-    .select-wrap {
+.select-wrap {
   display: inline-flex;
   align-items: center;
   margin: 0 10px;
@@ -484,13 +485,13 @@ export default {
   .el-select {
     width: 130px;
   }
-    }
+}
-    .list-inner {
+.list-inner {
     display: flex;
     justify-content: center;
     align-items:flex-start;
-    }
+}
-    .nav{
+.nav{
     width: 156px;
     text-align: right;
     overflow: hidden;
@@ -521,8 +522,8 @@ export default {
             }
         }
     }
-    }
+}
-    .list-wrap {
+.list-wrap {
     width: calc(100% - 180px);
     margin-left: 24px;
     .list {
@@ -547,6 +548,7 @@ export default {
                     line-height: 34px;
                     font-size: 14px;
                     color: #fff;
+                    white-space: nowrap;
                     background-color: #52C41A;
                     border-radius: 4px;
                     &.wait {
@@ -664,6 +666,5 @@ export default {
             }
         }
     }
-    }
 }
 </style>

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.totalNumberOfExams, name:'考试\n总场次'},
-									{value: data.referenceNumber, name:'参考人数'},
+									{value: data.referenceNumber, name:'考试\n人数'},
 								]
 							}
 						]
@@ -508,6 +510,7 @@ export default {
             grid: {
               left: '3%',
               right: '4%',
+              top: '30%',
               bottom: '3%',
               containLabel: true
             },

src/pages/station/preview/index.vue

@@ -208,9 +208,10 @@ export default {
             });
         },
         transferType(ext) {
-            if ("jpg,jpeg,png,gif,svg,psd".includes(ext)) return "图片";
+          const suf = ext.toLowerCase()
-            if ("mp4,3gp,mov,m4v,avi,dat,mkv,flv,vob,rmvb,rm,qlv".includes(ext)) return "视频";
+          if('jpg,jpeg,png,gif,svg,psd'.includes(suf)) return '图片'
-            return ext;
+          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}`; // 章节名称+小节名称，小节名称有重复的情况，如果只用小节名称判断，会有同时选中多个的情况

src/styles/page/screen.scss

@@ -17,8 +17,8 @@ body {
 .video {
   position: absolute;
   top: 0;
-  left: -500px;
+  left: -20%;
-  width: 100vw;
+  width: 150%;
   // height: 720px;
 }
 .wrap {