fix

src/layouts/header/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="header">
     <div style="line-height: 60px">
-      <img v-if="isSq"
+      <img v-if="Setting.isSq"
            class="logo"
            style="max-height: 100%"
            src="/images/1.png"
@@ -11,8 +11,13 @@
            :src="logoUrl" />
       <span class="title">{{ title }}</span>
     </div>
+    <el-radio-group v-if="Setting.isDev"
+                    v-model="ip"
+                    @change="ipChange">
+      <el-radio :label="0">刘榕ip</el-radio>
+      <el-radio :label="1">陈赓ip</el-radio>
+    </el-radio-group>
     <div class="action">
-
       <el-popover placement="top"
                   :disabled="!notices.length">
         <p v-for="(item, i) in notices"
@@ -84,7 +89,7 @@ import Bus from '@/libs/bus'
 export default {
   data () {
     return {
-      isSq: Setting.isSq,
+      Setting,
       passwordVisible: false,
       passwordForm: {
         password: "",
@@ -92,7 +97,8 @@ export default {
         reNewPassword: ""
       },
       notices: [],
-      noticeTimer: null
+      noticeTimer: null,
+      ip: localStorage.getItem('localIp') ? +localStorage.getItem('localIp') : 0,
     };
   },
   computed: {
@@ -233,7 +239,12 @@ export default {
         this.passwordVisible = false;
       }).catch(err => {
       });
-    }
+    },
+
+    ipChange (val) {
+      localStorage.setItem('localIp', val)
+      location.reload()
+    },
   }
 };
 </script>

src/pages/course/preview/index.vue

@@ -63,6 +63,19 @@
           <div class="video_wid"
                id="player"></div>
         </div>
+        <div class="inner"
+             v-else-if="videoSrc">
+          <video class="video"
+                 :key="videoSrc"
+                 width="100%"
+                 height="100%"
+                 autoplay
+                 controls>
+            <source :src="videoSrc"
+                    type="video/mp4">
+            您的浏览器不支持 video 标签。
+          </video>
+        </div>
       </div>
       <div class="catalog flex-1">
         <div class="list">
@@ -208,25 +221,28 @@ export default {
       this.pdfSrc = "";
       this.iframeSrc = "";
       if (this.transferType(row.fileType) == "视频") {
-        this.$get(`${this.api.getPlayAuth}/${row.fileId}`).then(res => {
-          this.playAuth = res.data.playAuth;
-          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 => {
-        });
+        // 阿里云视频点播
+        if (row.fileId) {
+          this.$get(`${this.api.getPlayAuth}/${row.fileId}`).then(res => {
+            this.playAuth = res.data.playAuth;
+            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") {

src/pages/match/list/index.vue

@@ -314,6 +314,7 @@ export default {
     }
   },
   mounted () {
+    this.setPage(1)
     // websocket实时刷新
     Bus.$on('matchSocket', () => {
       this.getData()

src/pages/match/manage/matchSignup.vue

@@ -606,7 +606,7 @@ export default {
       this.diffSchool = row.schoolId !== this.schoolId // 编辑的学生不是跟当前用户同一个学校的话，不予编辑，变为查看
     },
     del (row) {
-      this.$confirm(!this.info.completeCompetitionSetup.competitionType || row.captain === '否' ? '此删除操作不可逆，是否确认删除选中项？' : '删除队长后，该团队下所有成员都会同步移除报名，是否确认删除？', "提示", {
+      this.$confirm(!this.info.completeCompetitionSetup.competitionType || row.captain === '否' ? '删除后该参赛人员已有的成绩会一并删除，成绩排名将会受影响，是否确定要删除？' : '删除队长后，该团队下所有成员都会同步移除报名，已有的成绩也会一并删除，成绩排名将会受影响，是否确认删除？', "提示", {
         type: "warning"
       })
         .then(() => {
@@ -856,7 +856,7 @@ export default {
     // 批量删除
     async batchDel () {
       const list = this.multipleSelection
-      const tips = list.length ? (this.info.completeCompetitionSetup.competitionType && list.find(e => e.captain === '是') ? '删除队长后，该团队下所有成员都会同步移除报名，是否确认删除？' : '此删除操作不可逆，是否确认删除选中项？') : '是否确定删除全部报名人员？'
+      const tips = list.length ? (this.info.completeCompetitionSetup.competitionType && list.find(e => e.captain === '是') ? '删除队长后，该团队下所有成员都会同步移除报名，已有的成绩也会一并删除，成绩排名将会受影响，是否确认删除？' : '删除后该参赛人员已有的成绩会一并删除，成绩排名将会受影响，是否确定要删除？') : '删除后参赛人员已有的成绩会一并删除，成绩排名将会受影响，是否确定删除全部报名人员？'
       this.$confirm(tips, "提示", {
         type: "warning"
       }).then(async () => {

src/setting.js

@@ -31,7 +31,8 @@ if (isPro) {
     uploadURL = `http://121.37.12.51/`
     host = "http://121.37.12.51/"; // 中台测试服
     // host = 'https://www.occupationlab.com/' // 正式服
-    host = "http://192.168.31.217:9000/";
+    host = "http://192.168.31.51:9000/";
+		host = localStorage.getItem('localIp') == 1 ? 'http://192.168.31.51:9000/' : 'http://192.168.31.217:9000/'
 } else if (isSq) {
 	zcPath = `10.20.100.204:8883`
 }