fix

src/components/Header.vue

@@ -5,6 +5,12 @@
            @click="goHome"
            src="../assets/img/logo.png">
     </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="header-right">
       <div class="header-user-con">
         <div class="user"
@@ -28,7 +34,9 @@ import Setting from '@/setting'
 export default {
   data () {
     return {
-      userName: ''
+      Setting,
+      userName: '',
+      ip: localStorage.getItem('nakadaiIp') ? +localStorage.getItem('nakadaiIp') : 0,
     };
   },
   mounted () {
@@ -104,6 +112,11 @@ export default {
         Setting.isPro && this.heartbeatDetection()
       }).catch(err => { })
     },
+
+    ipChange (val) {
+      localStorage.setItem('nakadaiIp', val)
+      location.reload()
+    },
   },
 };
 </script>

src/setting.js

@@ -9,12 +9,13 @@ let jumpPath = `${location.origin}/judgmentPoint/`
 let sandPath = `http://121.37.12.51/sandbox` // 沙盘地址
 let host = `${location.origin}/`
 if (isDev) {
+  console.log("🚀 ~ localStorage.getItem('nakadaiIp'):",localStorage.getItem('nakadaiIp'))
   jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统
   // jumpPath = 'https://judgment.huorantech.cn/'
 	sandPath = `http://${location.hostname}:9520`
   host = 'http://121.37.12.51/'
   // host = 'https://huorantech.cn/'
-  host = 'http://192.168.31.217:9000/'
+  host = localStorage.getItem('nakadaiIp') == 1 ? 'http://192.168.31.51:9000/' : 'http://192.168.31.217:9000/'
 } else if (isPro) {
 	sandPath = `https://izhixinyun.com/sandbox`
   jumpPath = 'https://judgment.huorantech.cn/'

src/views/match/list/index.vue

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

src/views/match/manage/matchSignup.vue

@@ -605,7 +605,7 @@ export default {
       this.form = JSON.parse(JSON.stringify(row))
     },
     del (row) {
-      this.$confirm(!this.info.completeCompetitionSetup.competitionType || row.captain === '否' ? '此删除操作不可逆，是否确认删除选中项？' : '删除队长后，该团队下所有成员都会同步移除报名，是否确认删除？', "提示", {
+      this.$confirm(!this.info.completeCompetitionSetup.competitionType || row.captain === '否' ? '删除后该参赛人员已有的成绩会一并删除，成绩排名将会受影响，是否确定要删除？' : '删除队长后，该团队下所有成员都会同步移除报名，已有的成绩也会一并删除，成绩排名将会受影响，是否确认删除？', "提示", {
         type: "warning"
       }).then(() => {
         this.$post(this.api.batchDeleteApplicants, { registrationVOS: [row] }).then(res => {
@@ -852,7 +852,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/views/system/taskLog.vue

@@ -17,24 +17,33 @@
                        show-overflow-tooltip></el-table-column>
       <el-table-column prop="ip"
                        label="ip"
+                       min-width="90"
                        align="center"></el-table-column>
       <el-table-column prop="userId"
                        label="userId"
+                       min-width="60"
                        align="center"></el-table-column>
       <el-table-column prop="userName"
                        label="用户名"
+                       min-width="60"
                        align="center"></el-table-column>
       <el-table-column prop="schoolName"
                        label="学校"
+                       min-width="90"
                        align="center"></el-table-column>
       <el-table-column prop="method"
                        label="路径"
-                       align="center"></el-table-column>
+                       min-width="90"
+                       align="center"
+                       show-overflow-tooltip></el-table-column>
       <el-table-column prop="params"
                        label="参数"
-                       align="center"></el-table-column>
+                       min-width="300"
+                       align="center"
+                       show-overflow-tooltip></el-table-column>
       <el-table-column prop="createTime"
                        label="操作时间"
+                       width="150"
                        align="center"></el-table-column>
     </el-table>
     <div class="pagination">

src/views/theoreticalCourse/preview/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!--  课程预览  -->
-  <div>
+  <div class="wrap">
     <el-card shadow="hover"
              class="m-b-20">
       <div class="flex-between">
@@ -9,9 +9,6 @@
       </div>
     </el-card>
 
-    <el-card shadow="hover"
-             class="m-b-20"
-             style="background: none;">
     <div class="flex">
       <div class="cover"
            :class="{'is-word': showMask1}">
@@ -66,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">
@@ -94,8 +104,28 @@
                   <div v-for="(section,i) in item.subsectionList"
                        :key="i"
                        @click="preview(section, item.name)">
-                      <p class="sectionName"
+                    <p class="sectionName ellipsis"
-                         :class="{active: curLink === `${item.name}${section.name}`}">{{ section.name }}</p>
+                       :class="{active: curLink === `${item.name}${section.name}`}">
+                      <img v-if="section.fileType === 'pptx'"
+                           src="@/assets/img/exts/ppt.png"
+                           alt="">
+                      <img v-else-if="section.fileType === 'mp4'"
+                           src="@/assets/img/exts/video.png"
+                           alt="">
+                      <img v-else-if="section.fileType === 'doc' || section.fileType === 'docx'"
+                           src="@/assets/img/exts/word.png"
+                           alt="">
+                      <img v-else-if="section.fileType === 'txt'"
+                           src="@/assets/img/exts/txt.png"
+                           alt="">
+                      <img v-else-if="section.fileType === 'pdf'"
+                           src="@/assets/img/exts/pdf.png"
+                           alt="">
+                      <img v-else
+                           src="@/assets/img/exts/pic.png"
+                           alt="">
+                      {{ section.name }}
+                    </p>
                   </div>
                 </div>
               </div>
@@ -104,7 +134,6 @@
         </div>
       </div>
     </div>
-    </el-card>
   </div>
 </template>
 
@@ -193,6 +222,8 @@ export default {
       this.pdfSrc = "";
       this.iframeSrc = "";
       if (this.transferType(row.fileType) == "视频") {
+        // 阿里云视频点播
+        if (row.fileId) {
           this.$get(`${this.api.getPlayAuth}/${row.fileId}`).then(res => {
             this.playAuth = res.data.playAuth;
             this.$nextTick(() => {
@@ -210,15 +241,17 @@ export default {
               }
             });
 
-        }).catch(res => {
+          }).catch(res => { });
-        });
+        } else {
+          this.videoSrc = row.fileUrl
+        }
       } else if (this.transferType(row.fileType) == "图片") {
         this.coverUrl = row.fileUrl;
       } else if (row.fileType == "pdf") {
         this.pdfSrc = row.fileUrl;
         this.pdfVisible = true;
       } else {
-        this.$get(`${this.api.getSubsection}?subsectionId=${row.id}`).then(res => {
+        this.$get(`${this.api.getSubsectionTheoretical}?subsectionId=${row.id}`).then(res => {
           if (row.fileType == "pptx") {
             this.isPPT = true;
             this.isWord = false;
@@ -286,30 +319,42 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.wrap {
+    padding: 0 200px;
+}
 $height: 700px;
 .video_wid,
 .cover {
     position: relative;
     width: 76%;
-    max-width: 1400px;
     height: $height !important;
     border: 0;
 }
-
+.page {
+    /deep/.des {
+        overflow: auto;
+        div,
+        p,
+        span {
+            font-family: PingFangSC-Regular !important;
+        }
+    }
+}
+.l-title {
+    font-size: 17px;
+}
 .cover {
+    background-color: #252528;
     img {
         border-radius: 8px;
     }
-
     &.is-word {
         overflow: hidden;
     }
 }
-
 .fileIframe {
     height: $height !important;
 }
-
 .video_wid,
 .inner {
     width: 100%;
@@ -317,49 +362,56 @@ $height: 700px;
     border: 0;
     overflow: auto;
 }
-
 .cover.is-word {
     .inner {
         height: calc(100% + 38px) !important;
         margin-top: -38px;
     }
 }
-
 .video_wid:focus {
     outline: none;
 }
-
 .catalog {
-    flex: 1;
+    width: 296px;
-    margin-left: 40px;
+    padding: 16px;
+    margin-left: 12px;
+    background-color: #252528;
 }
-
 .list {
-    height: $height;
+    height: calc(700px - 82px);
     overflow-y: auto;
-    padding: 24px 16px;
-    background: #fff;
-
     .title {
-        margin-bottom: 8px;
+        margin-bottom: 11px;
-        color: rgba(0, 0, 0, 0.85);
+        color: #fff;
-        font-size: 20px;
+        font-size: 16px;
+    }
+    .pro-title {
+        margin-bottom: 5px;
+        color: #fff;
+        font-size: 12px;
+    }
+    /deep/.el-progress-bar {
+        width: 92%;
+    }
+    /deep/.el-progress__text {
+        color: #fff;
     }
-
     .desc-wrap {
         position: relative;
-
         .desc {
-            font-size: 14px;
+            font-size: 12px;
-            color: rgba(0, 0, 0, 0.65);
+            color: #fff;
             line-height: 22px;
-
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 2;
+            text-overflow: ellipsis;
+            overflow: hidden;
             &.active {
                 display: block;
                 overflow: visible;
             }
         }
-
         .arrow {
             position: absolute;
             bottom: 2px;
@@ -368,61 +420,80 @@ $height: 700px;
             justify-content: space-between;
             width: 46px;
             background-color: #fff;
-
             span {
                 font-size: 14px;
                 color: rgba(0, 0, 0, 0.65);
             }
-
             img {
                 width: 16px;
                 cursor: pointer;
             }
-
             &.active {
                 span {
                     opacity: 0;
                 }
-
                 img {
                     transform: rotate(180deg);
                 }
             }
         }
     }
-
     .chapters {
         margin-top: 16px;
         max-height: calc(100% - 53px);
         overflow: auto;
     }
-
     .chapter {
         margin-bottom: 20px;
-
+    }
     .chapterName {
-            color: rgba(0, 0, 0, 0.85);
+        color: #fff;
-            font-size: 16px;
+        font-size: 14px;
     }
-
     .section {
         padding: 5px 15px;
-            margin-top: 8px;
+        margin-top: 12px;
-            background: rgba(0, 0, 0, 0.02);
+        background-color: #121214;
-
+    }
     .sectionName {
-                margin: 10px 0;
+        position: relative;
-                font-size: 14px;
+        display: flex;
-                color: rgba(0, 0, 0, 0.65);
+        align-items: center;
+        padding-right: 15px;
+        margin: 12px 0;
+        font-size: 12px;
+        color: #999;
         cursor: pointer;
+        img {
+            margin-right: 8px;
+        }
+        .icon {
+            position: absolute;
+            right: 0;
+            font-size: 14px;
+            color: #00c935;
+        }
+        .circle {
+            width: 14px;
+            height: 14px;
+            border-radius: 50%;
+            border: 1px solid #ccc;
+        }
         &.active {
-                    color: #9278ff;
+            color: #fff;
+        }
     }
 }
+.buy {
+    text-align: center;
+    .tips {
+        margin-bottom: 10px;
+        font-size: 14px;
     }
+    img {
+        width: 85%;
     }
 }
-
 .el-image-viewer__wrapper {
     transform: translateY(-10px);
     transition: transform 0.5s;
@@ -431,23 +502,19 @@ $height: 700px;
         transform: translateY(0);
     }
 }
-
 .el-image-viewer__close {
     z-index: 2000;
     top: 15px;
     right: 15px;
-
     &.doc-close {
         i {
             color: #000 !important;
         }
     }
 }
-
 .list::-webkit-scrollbar {
     width: 4px;
 }
-
 .list::-webkit-scrollbar-thumb {
     border-radius: 10px;
     background: rgba(0, 0, 0, 0.06);
@@ -458,7 +525,6 @@ $height: 700px;
     position: absolute;
     background-color: rgb(57, 58, 61);
 }
-
 .word-mask {
     z-index: 9;
     position: absolute;
@@ -467,7 +533,6 @@ $height: 700px;
     width: 100%;
     background-color: rgb(243, 242, 241);
 }
-
 .word-mask1 {
     z-index: 9;
     position: absolute;
@@ -476,13 +541,11 @@ $height: 700px;
     width: 100%;
     background-color: #185abd;
 }
-
 .word-mask2 {
     z-index: 9;
     position: absolute;
     background-color: transparent;
 }
-
 .excel-mask1 {
     z-index: 9;
     position: absolute;
@@ -491,29 +554,14 @@ $height: 700px;
     width: 60%;
     background-color: #107c41;
 }
-
-/deep/ .pdf-dia {
-    border-radius: 0 !important;
-
-    .el-dialog__header {
-        display: none;
-    }
-
-    .el-dialog__body {
-        padding: 0;
-    }
-
-    .el-dialog__headerbtn {
-        top: 10px;
-
-        .el-dialog__close {
-            color: #fff;
-            font-size: 16px;
-        }
-    }
-}
-
 .pdf {
+    position: relative;
+    .full {
+        position: absolute;
+        top: 7px;
+        right: 10px;
+        cursor: pointer;
+    }
     .arrow {
         padding: 10px 0;
         display: flex;
@@ -522,14 +570,12 @@ $height: 700px;
         font-size: 16px;
         color: #fff;
         background-color: #333;
-
         .turn {
             margin: 0 10px;
             font-size: 18px;
             cursor: pointer;
         }
     }
-
     .pdf-wrap {
         width: 80%;
         margin: 0 auto;