bug修复，新增一个系统

src/api/index.js

@@ -16,7 +16,7 @@ export default {
   previewData: `data/data/preview`,
   lookupTableFile: `occupationlab/python/table/data/lookupTableFile`,
   downloadData:`${config.host}data/data/download`,
-  fileupload: `${config.host}occupationlab/oss/manage/fileupload`,
+  fileuploadOss: `${config.host}oss/manage/fileupload`,
   getDetailById: 'occupationlab/occupationlab/assessment/getDetailById',
   pageStuAssessment: 'occupationlab/occupationlab/assessment/pageStuAssessment',
   modelClassList: `nakadai/nakadai/model/reference/modelClassList`,
@@ -32,4 +32,5 @@ export default {
   updateReport: `occupationlab/occupationlab/achievement/updateReport`,
   exportLabReport: `occupationlab/occupationlab/achievement/exportLabReport`,
   reportDetail: `occupationlab/occupationlab/achievement/reportDetail`,
+  getCompetition: `competition/competition/management/getCompetition`,
 }

src/components/TestPanel.vue

@@ -19,9 +19,9 @@
               style="flex: 1"
             >
               <el-option
-                v-for="item in projectList"
+                v-for="(item, i) in projectList"
                 :key="item.projectId"
-                :label="item.projectName"
+                :label="i + 1 + '. ' + item.projectName"
                 :value="item.projectId"
               ></el-option>
             </el-select>
@@ -193,9 +193,9 @@ export default {
       this.competitionId ?
         2 :
         0 
-    if(this.assessmentId){ // 考核（考核才会从外面带进来assessmentId，练习是默认显示第一个项目)
+    if (this.assessmentId) { // 考核（考核才会从外面带进来assessmentId，练习是默认显示第一个项目，竞赛会带进来competitionId)
       this.getAssList()
-    }else{ // 练习
+    } else { // 练习
       // 获取项目列表
       this.getList().then(() => {
         let cache = localStorage.getItem('codeCache') // 获取本地缓存
@@ -206,6 +206,12 @@ export default {
           this.getCache()
         }
       }).catch(res => {})
+      if (this.competitionId) {
+        clearInterval(this.statusTimer)
+        this.statusTimer = setInterval(_ => {
+          this.getCompetitionStatus()
+        }, 1000)
+      }
     }
   },
   methods: {
@@ -278,8 +284,11 @@ export default {
           this.$emit('tell', projectId, systemId, this.points)
           const isPrac = this.projectPermissions == 0 // 是否是练习
           this.text = isPrac ? '已用' : '剩余'
-          this.countVal = isPrac ? 0 : (new Date(this.endTime).getTime() - Date.now()) / 1000 // 如果是考核，取考核的结束时间减去当前时间去做倒计时，练习则直接给0做计时
+          // 竞赛不需要
-          this.startCount()
+          if (!this.competitionId) {
+            this.countVal = isPrac ? 0 : (new Date(this.endTime).getTime() - Date.now()) / 1000 // 如果是考核，取考核的结束时间减去当前时间去做倒计时，练习则直接给0做计时
+            this.startCount()
+          }
           resolve()
         }).catch(err => {
           reject()
@@ -318,7 +327,7 @@ export default {
           }).catch(res => {})
           // 查询考核状态定时器
           this.statusTimer = setInterval(_ => {
-            this.getStatus()
+            this.getAssStatus()
           }, 1000)
         }
       }).catch(res => {})
@@ -425,8 +434,8 @@ export default {
         })
       }
     },
-    // 定时查询考核状态（只有考核才需要定时查，查到考核如果结束后，直接提交考核）
+    // 定时查询考核状态（查到考核如果结束后，直接提交考核）
-    getStatus() {
+    getAssStatus() {
       // 未提交才需要查询状态
       this.isSubmit || this.$get(this.api.getDetailById, {
         id: this.assessmentId
@@ -442,6 +451,28 @@ export default {
         }
       }).catch(res => {})
     },
+    // 定时查询竞赛状态（查到竞赛如果结束后，直接提交竞赛）
+    getCompetitionStatus() {
+      // 未提交才需要查询状态
+      this.isSubmit || this.$post(`${this.api.getCompetition}?competitionId=${this.competitionId}`).then(({ competition }) => {
+        const stages = competition.competitionStage
+        if (stages) {
+          const stage = stages.find(e => e.stageId == this.stageId)
+          const endTime = new Date(stage.endTime).getTime()
+          const now = Date.now()
+          // 如果已经结束
+          if (now >= new Date(stage.endTime)) {
+            clearInterval(this.statusTimer)
+            this.$alert('竞赛时间已到，系统已自动交卷', '提示', {
+              confirmButtonText: '确定'
+            })
+            this.submit()
+          } else { // 没结束，则显示倒计时（竞赛才需要通过定时调接口来显示倒计时，因为中台可以修改结束时间，所以需要时刻获取最新的结束时间）
+            this.counter((endTime - now) / 1000)
+          }
+        }
+      }).catch(res => {})
+    },
     // 项目选择回调
     selectProject(){
       this.isSelected = true
@@ -514,7 +545,8 @@ export default {
       const timeSum = Math.ceil((date.getTime() - entryTime.getTime()) / 60000) // 计算实验用时（分钟），向上取整
       const submitTime = util.formatDate('yyyy-MM-dd hh:mm:ss', date)
       const projectId = this.projectId
-      const projectName = this.projectList.find(e => e.projectId == projectId).projectName // 获取项目名称
+      const pro = this.projectList.find(e => e.projectId == projectId)
+      const projectName = pro ? pro.projectName : '' // 获取项目名称
       this.reloadCount()
       // 判分点参数
       const attributesReqList = []

src/components/codemirror.vue

@@ -674,7 +674,7 @@ export default {
 }
 /deep/.answer-wrap{
   &.client {
-    // user-select: none;
+    user-select: none;
   }
   pre{
     width: 100%;

src/components/quill/index.vue

@@ -4,12 +4,12 @@
 
         <el-upload
             :headers="headers"
-            :action="this.api.fileupload"
+            :action="this.api.fileuploadOss"
             :before-upload="beforeUpload"
             :on-success="editorUploadSuccess"
             style="display: none"
         >
-            <el-button class="editorUpload" type="primary">点击上传</el-button>
+            <el-button :id="'editorUpload' + index" type="primary">点击上传</el-button>
         </el-upload>
     </div>
 </template>
@@ -52,9 +52,15 @@ export default {
          */
         elseRead: {
             type: String, default: "false"
-        }
+        },
+        // 当前富文本的索引。一个页面引入多个富文本的时候会无法获取到对应的实例，所以通过在父级存储实例的方式来保存
+        index: {
+            type: Number,
+            default: 0
+        },
     },
     data() {
+        const that = this
         return {
             headers: {
                 token: Cookie.get('admin-token')
@@ -72,7 +78,7 @@ export default {
                             "image": function(value) {
                                 if (value) {
                                     // 调用iview图片上传
-                                    document.querySelector(".editorUpload").click();
+                                    document.querySelector("#editorUpload" + that.index).click();
                                 } else {
                                     this.Quill.format("image", false);
                                 }

src/config/index.js

@@ -10,7 +10,7 @@ let host = location.origin + '/'
 let bankPath = `${location.origin}/banksystem` // 银行系统
 // 121.37.12.51 | 192.168.31.151
 if (isDev) {
-  host = 'http://192.168.31.51:9000/'
+  // host = 'http://192.168.31.51:9000/'
   // host = 'http://192.168.31.116:9000/'
   host = 'http://121.37.12.51:9000/'
   // host = 'https://occupationlab.com/'

src/main.js

@@ -33,6 +33,8 @@ if (systemId.includes(',')) {
     import('@/styles/theme/theme13.scss')
   } else if (systemId == 16) {
     import('@/styles/theme/theme13.scss')
+  } else if (systemId == 17) {
+    import('@/styles/theme/theme10.scss')
   }
 }
 import api from './api';

src/styles/theme/theme4.scss

@@ -28,12 +28,9 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts';
 .submit {
     background: $--color-primary url(../../assets/images/system/4/btn.png) 0 0/100% 100% no-repeat !important;
 }
-.el-table th {
-    background-color: $--color-primary !important;
-}
 .el-table {
     th {
-        background-color: $--color-primary !important;
+        background-color: #000 !important;
     }
     .el-table__row--striped td {
         background-color: #d2f1f4 !important;

src/views/Report.vue

@@ -131,7 +131,7 @@
                       <img src="@/assets/images/report5.png" alt="">
                       实验总结与体会
                   </h6>
-                  <quill v-show="editing" :border="true" v-model="infoData.summarize" :height="150" />
+                  <quill v-show="editing" :border="true" v-model="infoData.summarize" :height="150" :index="1" />
                   <div v-show="!editing" class="pre-wrap" v-html="infoData.summarize"></div>
               </div>
           </div>
@@ -215,6 +215,11 @@ export default {
                 e.answer += `${i + 1}.${n.userAnswer}`
               })
             })
+          } else { // python系统显示图片（从userScores里取）
+            list.forEach(e => {
+              const item = this.userScores.find(n => n.judgmentId == e.judgmentId)
+              if (item && item.runThePictureList) e.runThePictureList = item.runThePictureList
+            })
           }
           this.expData = list
         },