fix

src/layouts/header/index.vue

@@ -165,6 +165,8 @@ export default {
         Bus.$emit('matchSocket')
       } else if (content == 2) {
         Bus.$emit('activitySocket')
+      } else if (content.includes('3-')) { // 考核：3-考核id
+        Bus.$emit('assSocket')
       } else if (content == 4) {
         Bus.$emit('modelSocket')
       } else {

src/pages/ass/list/index.vue

@@ -202,6 +202,7 @@
 import { mapState, mapActions } from "vuex";
 import Setting from "@/setting";
 import util from "@/libs/util";
+import Bus from '@/libs/bus'
 
 export default {
   name: "ass",
@@ -310,6 +311,12 @@ export default {
     }
   },
   mounted () {
+    // websocket实时刷新
+    Bus.$on('assSocket', () => {
+      this.getData()
+    })
+
+
     // 页面离开的时候销毁手机和邮箱验证码定时器
     this.$once("hook:beforeDestroy", function () {
       this.sss = 0
@@ -498,10 +505,10 @@ export default {
       util.cookies.set("token", token)
       util.cookies.set("assessmentId", this.assessmentId)
       util.cookies.set("classId", classId)
-      util.cookies.set("className", classItem ? encodeURIComponent(classItem.className) : '')
+      util.cookies.set("className", classItem ? classItem.className : '')
       util.cookies.set("projectId", this.projectId)
       util.cookies.set("courseId", this.cid)
-      util.cookies.set("curriculumName", escape(row.sysName));
+      util.cookies.set("curriculumName", encodeURIComponent(row.sysName));
       util.cookies.set("startTime", row.startTime)
       util.cookies.set("stopTime", row.stopTime)
       util.cookies.set("systemId", this.systemId);

src/pages/match/details/index.vue

@@ -83,8 +83,8 @@
                 <p>比赛时间：{{ rule.startTime && rule.startTime + ' ~ ' + rule.endTime }}</p>
                 <p>比赛方式：{{ methods.find(e => e.id == rule.method) && methods.find(e => e.id == rule.method).name }}</p>
                 <p v-if="rule.method != 2">课程系统：{{ rule.systemName }}</p>
-                <p v-if="rule.onlineButton && rule.method != 2">线下地点：{{ rule.onlineAddress }}</p>
-                <p v-if="rule.offlineButton">比赛地点：{{ rule.offlineAddress }}</p>
+                <p v-if="rule.onlineButton && rule.method != 2">线上地点：{{ rule.onlineAddress }}</p>
+                <p v-if="rule.offlineButton">线下地点：{{ rule.offlineAddress }}</p>
                 <template v-if="rule.method === 2">
                   <p>比赛地点：{{ rule.offlineAddress }}</p>
                   <p>比赛内容：{{ rule.contentDescription }}</p>
@@ -624,7 +624,8 @@
                width="600px"
                @close="stageClose">
       <template v-if="curStage && curStage.competitionStageContentSetting">
-        <div v-if="curStage.competitionStageContentSetting.systemLink">
+        <div v-if="curStage.competitionStageContentSetting.systemLink"
+             class="m-b-20">
           <span class="fs-14">进入比赛：</span>
           <el-button type="danger"
                      style="font-size: 13px"
@@ -768,6 +769,7 @@ export default {
         whetherSignUp: 1
       },
       curStage: null,
+      choosing: false,
       originInfo: {},
       info: {
         isCaption: 0,
@@ -897,99 +899,99 @@ export default {
       let signUpEndTime = new Date(this.core.dateCompatible(form.signUpEndTime)) // 报名结束时间
       let playStartTime = new Date(this.core.dateCompatible(form.playStartTime)) // 比赛开始时间
       let playEndTime = new Date(this.core.dateCompatible(form.playEndTime)) // 比赛结束时间
-      // this.timer = setInterval(() => {
-      const now = new Date()
-      if (now < signUpStartTime) { // 报名没开始
-        status = 0
-        total = signUpStartTime - now
-      } else if (now > signUpStartTime && now < signUpEndTime) { // 报名进行中
-        // 1已报名，2立即报名(没登录的情况下，直接显示立即报名，登录了则取报名信息，有则已报名，无则立即报名)
-        status = this.token ?
-          (form.competitionRegistration ?
-            1 :
-            2) :
-          2
-        total = signUpEndTime - now
-      } else if (now > signUpEndTime && now < playStartTime) { // 报名结束了,但比赛没开始
-        status = 3
-        total = playStartTime - now
-      } else if (now > playStartTime && now < playEndTime) { // 比赛进行中
-        // 如果是完整比赛
-        if (form.releaseType) {
-          // 进行中的赛事，则遍历每个阶段的开始结束时间，看阶段比赛是否开始
-          let curStage = null
-          const stages = form.competitionStage
-          if (stages) {
-            this.playingStages = []
-            form.competitionRegistration && stages.forEach(e => {
-              if (now >= new Date(e.startTime) && now <= new Date(e.endTime) && (e.method !== 2 || this.offlineCanEntry(e))) this.playingStages.push(e)
-            })
-            let endText = ''
-            for (const i in stages) {
-              const e = stages[i]
-              const startTime = new Date(e.startTime)
-              const endTime = new Date(e.endTime)
-              if (now < startTime) { // 阶段比赛未开始，不显示进入比赛按钮
-                endText = '阶段开始'
-                total = startTime - now
-                break
-              } else if (now >= startTime && now <= endTime) { // 阶段比赛进行中，显示进入比赛按钮
-                // 非线下赛事
-                if (e.method !== 2) {
-                  if (form.competitionRegistration) { // 报名了才能进入比赛
-                    this.statusList[4] = e.count ? '已提交' : '进入' + e.stageName
-                    curStage = e
-                  } else if (!this.token) {
+      this.timer = setInterval(() => {
+        const now = new Date()
+        if (now < signUpStartTime) { // 报名没开始
+          status = 0
+          total = signUpStartTime - now
+        } else if (now > signUpStartTime && now < signUpEndTime) { // 报名进行中
+          // 1已报名，2立即报名(没登录的情况下，直接显示立即报名，登录了则取报名信息，有则已报名，无则立即报名)
+          status = this.token ?
+            (form.competitionRegistration ?
+              1 :
+              2) :
+            2
+          total = signUpEndTime - now
+        } else if (now > signUpEndTime && now < playStartTime) { // 报名结束了,但比赛没开始
+          status = 3
+          total = playStartTime - now
+        } else if (now > playStartTime && now < playEndTime) { // 比赛进行中
+          // 如果是完整比赛
+          if (form.releaseType) {
+            // 进行中的赛事，则遍历每个阶段的开始结束时间，看阶段比赛是否开始
+            let curStage = null
+            const stages = form.competitionStage
+            if (stages) {
+              this.playingStages = []
+              form.competitionRegistration && stages.forEach(e => {
+                if (now >= new Date(e.startTime) && now <= new Date(e.endTime) && (e.method !== 2 || this.offlineCanEntry(e))) this.playingStages.push(e)
+              })
+              let endText = ''
+              for (const i in stages) {
+                const e = stages[i]
+                const startTime = new Date(e.startTime)
+                const endTime = new Date(e.endTime)
+                if (now < startTime) { // 阶段比赛未开始，不显示进入比赛按钮
+                  endText = '阶段开始'
+                  total = startTime - now
+                  break
+                } else if (now >= startTime && now <= endTime) { // 阶段比赛进行中，显示进入比赛按钮
+                  // 非线下赛事
+                  if (e.method !== 2) {
+                    if (form.competitionRegistration) { // 报名了才能进入比赛
+                      this.statusList[4] = e.count ? '已提交' : '进入' + e.stageName
+                      curStage = e
+                    } else if (!this.token) {
+                      this.statusList[4] = '进入' + e.stageName
+                      curStage = e
+                    }
+                  } else if (this.offlineCanEntry(e)) { // 线下(输入了系统链接或者上传文件选择了是，才需要显示进入按钮)
+                    // 当系统链接为空，且上传文件为否时，无需展示入口
+                    // 当系统链接不为空，且上传文件为否时，点击入口，直接跳转到链接页面，无需弹窗
+                    // 当上传文件为是时，点击入口需弹窗，共两种样式
                     this.statusList[4] = '进入' + e.stageName
                     curStage = e
                   }
-                } else if (this.offlineCanEntry(e)) { // 线下(输入了系统链接或者上传文件选择了是，才需要显示进入按钮)
-                  // 当系统链接为空，且上传文件为否时，无需展示入口
-                  // 当系统链接不为空，且上传文件为否时，点击入口，直接跳转到链接页面，无需弹窗
-                  // 当上传文件为是时，点击入口需弹窗，共两种样式
-                  this.statusList[4] = '进入' + e.stageName
-                  curStage = e
+                  endText = '阶段结束'
+                  total = endTime - now
+                  break
+                } else if (stages[i + 1] && now > endTime && now < new Date(stages[i + 1].startTime)) { // 过了该阶段的结束时间，但是没到下个阶段的开始时间，不显示进入比赛按钮
+                  endText = '阶段开始'
+                  total = new Date(stages[i + 1].startTime) - now
+                  break
+                } else if (i === stages.length - 1) { // 当前时间在比赛开始结束时间之间，并且是最后一个阶段结束时间之后
+                  this.$set(form, 'stageName', '')
+                  endText = '竞赛结束'
+                  total = playEndTime - now
+                  break
                 }
-                endText = '阶段结束'
-                total = endTime - now
-                break
-              } else if (stages[i + 1] && now > endTime && now < new Date(stages[i + 1].startTime)) { // 过了该阶段的结束时间，但是没到下个阶段的开始时间，不显示进入比赛按钮
-                endText = '阶段开始'
-                total = new Date(stages[i + 1].startTime) - now
-                break
-              } else if (i === stages.length - 1) { // 当前时间在比赛开始结束时间之间，并且是最后一个阶段结束时间之后
-                this.$set(form, 'stageName', '')
-                endText = '竞赛结束'
-                total = playEndTime - now
-                break
               }
+              this.endList[4] = endText
             }
-            this.endList[4] = endText
+            if (!this.choosing) this.curStage = curStage
+          } else { // 仅发布信息
+            total = playEndTime - now
           }
-          this.curStage = curStage
-        } else { // 仅发布信息
-          total = playEndTime - now
+          status = 4
+        } else if (now > playEndTime) { // 比赛结束
+          status = 5
         }
-        status = 4
-      } else if (now > playEndTime) { // 比赛结束
-        status = 5
-      }
-      this.status = status
-      total = total / 1000
-      --total
-      if (total > 86400) { // 超过一天则显示天数
-        // clearInterval(this.timer)
-        this.end = Math.floor(total / 86400) + '天'
-      } else if (total > 0) { // 一天之内，显示时分秒
-        let hours = Math.floor(total / (60 * 60))
-        let minutes = Math.floor(total % (60 * 60) / 60)
-        let seconds = Math.floor(total % (60 * 60) % 60)
-        time = `${this.core.formateTime(hours)}:${this.core.formateTime(minutes)}:${this.core.formateTime(seconds)}`
-        if (total > 0) this.end = time
-      } else if (this.status === 5) { // 竞赛结束，清除定时器
-        clearInterval(this.timer)
-      }
-      // }, 1000)
+        this.status = status
+        total = total / 1000
+        --total
+        if (total > 86400) { // 超过一天则显示天数
+          // clearInterval(this.timer)
+          this.end = Math.floor(total / 86400) + '天'
+        } else if (total > 0) { // 一天之内，显示时分秒
+          let hours = Math.floor(total / (60 * 60))
+          let minutes = Math.floor(total % (60 * 60) / 60)
+          let seconds = Math.floor(total % (60 * 60) % 60)
+          time = `${this.core.formateTime(hours)}:${this.core.formateTime(minutes)}:${this.core.formateTime(seconds)}`
+          if (total > 0) this.end = time
+        } else if (this.status === 5) { // 竞赛结束，清除定时器
+          clearInterval(this.timer)
+        }
+      }, 1000)
     },
     // 该阶段是否符合线下能进入比赛的条件
     offlineCanEntry (stage) {
@@ -1468,7 +1470,7 @@ export default {
         });
 
         this.uploading = false
-        const url = 'http://huoran.oss-cn-shenzhen.aliyuncs.com/' + name
+        const url = 'https://huoran.oss-cn-shenzhen.aliyuncs.com/' + name
         this.fileList = [{
           name: name,
           url
@@ -1517,12 +1519,14 @@ export default {
     },
     // 阶段弹框关闭回调
     stageClose () {
+      this.choosing = false
       this.fileList = []
       this.getData()
     },
 
     // 选择要进入的阶段
     chooseStage (e) {
+      this.choosing = true
       this.curStage = e
       this.signup()
     },
@@ -1650,6 +1654,7 @@ export default {
       util.cookies.set('curriculumName', encodeURIComponent(form.systemName))
       util.cookies.set('systemId', form.systemId)
       util.cookies.set('isSubmit', '', -1)
+      util.cookies.set('className', '', -1)
       util.cookies.set('competitionId', this.form.id)
       util.cookies.set('stageId', form.stageId)
       util.cookies.set('teamId', this.form.competitionRegistration.teamId)

src/pages/match/list/index.vue

@@ -270,7 +270,8 @@
                width="600px"
                @close="stageClose">
       <template v-if="curStageItem && curStageItem.competitionStageContentSetting">
-        <div v-if="curStageItem.competitionStageContentSetting.systemLink">
+        <div v-if="curStageItem.competitionStageContentSetting.systemLink"
+             class="m-b-20">
           <span class="fs-14">进入比赛：</span>
           <el-button type="danger"
                      style="font-size: 13px"
@@ -800,7 +801,7 @@ export default {
         });
 
         this.uploading = false
-        const url = 'http://huoran.oss-cn-shenzhen.aliyuncs.com/' + name
+        const url = 'https://huoran.oss-cn-shenzhen.aliyuncs.com/' + name
         this.fileList = [{
           name: name,
           url
@@ -1027,6 +1028,7 @@ export default {
       util.cookies.set('fromManager', '', -1)
       util.cookies.set('isSubmit', '', -1)
       util.cookies.set('language', '', -1)
+      util.cookies.set('className', '', -1)
       // 8个python子系统都跳这个地址，子系统会通过cookie里的systemId识别展示哪套系统
       location.href = process.env.NODE_ENV === 'development' ?
         `http://${location.hostname}:8085/#/` :

src/pages/station/preview/index.vue

@@ -64,6 +64,18 @@
           <div class="video_wid"
                id="player"></div>
         </div>
+        <div class="inner"
+             v-else-if="videoSrc">
+          <video class="video"
+                 width="100%"
+                 height="100%"
+                 autoplay
+                 controls>
+            <source :src="videoSrc"
+                    type="video/mp4">
+            您的浏览器不支持 video 标签。
+          </video>
+        </div>
       </div>
       <div class="catalog">
         <el-button v-if="!overdue"
@@ -373,6 +385,8 @@
             <span class="point">{{ item.highestScore }}分</span>
           </div>
         </div>
+        <p v-else
+           class="none">暂无数据</p>
       </div>
     </div>
 
@@ -489,6 +503,7 @@ export default {
       currentPage: 0, // pdf文件页码
       pageCount: 0, // pdf文件总页数
       fileType: "pdf", // 文件类型
+      videoSrc: '',
       desShrink: false,
       projectVisible: false,
       projects: [],
@@ -802,37 +817,42 @@ export default {
       // 如果没过期，则正常预览，否则显示购买弹框
       if (this.overdue || showDia) {
         this.curLink = `${chapterName}${row.name}`; // 章节名称+小节名称，小节名称有重复的情况，如果只用小节名称判断，会有同时选中多个的情况
-        this.playauth = ''
+        this.playAuth = ''
         this.coverUrl = ''
         this.pdfSrc = ''
         this.iframeSrc = ''
+        this.videoSrc = ''
         this.isPPT = false
         this.isWord = false
         this.isExcel = false
         if (this.transferType(row.fileType) == "视频") {
-          this.$get(`${this.api.getPlayAuth}/${row.fileId}`).then(res => {
-            this.playAuth = res.data.playAuth;
-            // 如果已经产生了实例，则销毁重新创建，不然播放器会播放上一个视频
-            if (this.player) {
-              this.player.dispose()
-              this.player = null
-            }
-            this.$nextTick(() => {
+          // 阿里云视频点播
+          if (row.fileId) {
+            this.$get(`${this.api.getPlayAuth}/${row.fileId}`).then(res => {
+              this.playAuth = res.data.playAuth;
+              // 如果已经产生了实例，则销毁重新创建，不然播放器会播放上一个视频
               if (this.player) {
-                this.player.replayByVidAndPlayAuth(row.fileId, this.playAuth);
-              } else {
-                this.player = new Aliplayer({
-                  id: "player",
-                  width: "100%",
-                  autoplay: false,
-                  vid: row.fileId,
-                  playauth: this.playAuth,
-                  encryptType: 1 //当播放私有加密流时需要设置。
-                });
+                this.player.dispose()
+                this.player = null
               }
-            });
-          }).catch(res => {
-          });
+              this.$nextTick(() => {
+                if (this.player) {
+                  this.player.replayByVidAndPlayAuth(row.fileId, this.playAuth);
+                } else {
+                  this.player = new Aliplayer({
+                    id: "player",
+                    width: "100%",
+                    autoplay: false,
+                    vid: row.fileId,
+                    playauth: this.playAuth,
+                    encryptType: 1 //当播放私有加密流时需要设置。
+                  });
+                }
+              });
+            }).catch(res => { });
+          } else {
+            this.videoSrc = row.fileUrl
+          }
         } else if (this.transferType(row.fileType) == "图片") {
           this.coverUrl = row.fileUrl
         } else if (row.fileType == "pdf") {
@@ -948,6 +968,7 @@ export default {
       util.cookies.set('fromManager', '', -1)
       util.cookies.set('competitionId', '', -1)
       util.cookies.set('language', '', -1)
+      util.cookies.set('className', '', -1)
       // 8个python子系统都跳这个地址，子系统会通过cookie里的systemId识别展示哪套系统
       location.href = process.env.NODE_ENV === 'development' ?
         `http://${location.hostname}:8085/#/` :
@@ -1397,6 +1418,12 @@ $height: 700px;
         font-weight: 600;
         color: #007eff;
     }
+    .none {
+        margin-top: 10px;
+        text-align: center;
+        font-size: 12px;
+        color: #727272;
+    }
 }
 @media (max-width: 1700px) {
     .wrap {