fix

src/pages/achievement/info/course.vue

@@ -495,6 +495,10 @@ export default {
           data,
           type: "line",
           areaStyle: {},
+          label: {
+            show: true,
+            position: 'top'
+          },
           color: ["#8191fd"]
         }]
       })

src/pages/achievement/info/project.vue

@@ -472,6 +472,10 @@ export default {
           data,
           type: "line",
           areaStyle: {},
+          label: {
+            show: true,
+            position: 'top'
+          },
           color: ["#8191fd"]
         }]
       })

src/pages/match/add/index.vue

@@ -184,6 +184,7 @@ export default {
           // 处于第三步 && 编辑
           this.editing = 0
           this.step = 1
+          this.$parent.initTabs && this.$parent.initTabs()
         } else {
           // 新增
           this.$router.push(`/match`)

src/pages/match/add/step2.vue

@@ -322,7 +322,8 @@ export default {
         let changeLimit = 0
         for (const i in form.competitionStageList) {
           const e = form.competitionStageList[i]
-          if (e.teamNumLimit !== originForm.competitionStageList[i].teamNumLimit || e.customNumber !== originForm.competitionStageList[i].customNumber) {
+          const originStage = originForm.competitionStageList[i]
+          if (!originStage || e.teamNumLimit !== originStage.teamNumLimit || e.customNumber !== originStage.customNumber) {
             changeLimit = 1
             break
           }

src/pages/match/manage/index.vue

@@ -53,7 +53,6 @@ export default {
         tab3: "竞赛进展",
         tab4: "公告通知",
         tab5: "报名人员",
-        tab6: '查看异常团队'
       },
       pass: 0
     };
@@ -112,7 +111,12 @@ export default {
       tab3 || this.$delete(this.tabs, 'tab3')
       tab4 || this.$delete(this.tabs, 'tab4')
       tab5 || this.$delete(this.tabs, 'tab5')
-      res.competition.completeCompetitionSetup.competitionType || this.$delete(this.tabs, 'tab6')
+
+      if (res.competition.completeCompetitionSetup.competitionType) {
+        this.tabs.tab6 || this.$set(this.tabs, 'tab6', '查看异常团队')
+      } else {
+        this.tabs.tab6 && this.$delete(this.tabs, 'tab6')
+      }
 
       const type = this.$route.query.tab
       const keys = Object.keys(this.tabs)

src/pages/match/manage/matchArchList.vue

@@ -340,6 +340,10 @@ export default {
           data: data.map(e => e.count),
           type: "line",
           areaStyle: {},
+          label: {
+            show: true,
+            position: 'top'
+          },
           color: ["#8191fd"]
         }]
       });

src/pages/match/manage/matchSignup.vue

@@ -23,9 +23,11 @@
               '取消' : '' }}自动分配阶段成员</el-button>
           <el-tooltip placement="top">
             <div slot="content">
-              <p style="margin-bottom: 5px;">报名结束前，设置的自动分配将在报名结束时触发一次系统自动分配（取消则不触发）</p>
+              <p>报名结束前，设置的自动分配将在报名结束时触发一次系统自动分配（取消则不触发）</p>
-              <p>报名结束后，也可以手动点击自动分配按钮来立即触发系统自动分配，并且点击一次就触发一次</p>
+              <p style="margin: 5px 0;">报名结束后，也可以手动点击自动分配按钮来立即触发系统自动分配，并且点击一次就触发一次</p>
-              <p>注：自动分配仅对触发时已报名的人员进行。对于分配后才报名的人员，如需自动分配，则需手动再次触发自动分配</p>
+              <p>注：</p>
+              <p style="margin: 5px 0;">&emsp;&emsp;1. 自动分配仅对触发时已报名的人员进行。对于分配后才报名的人员，如需自动分配，则需手动再次触发自动分配</p>
+              <p>&emsp;&emsp;2. 若已有学生提交了成绩报告，则无法启用自动分配功能</p>
             </div>
             <i class="el-icon-question"
               style="margin: 0 10px 0 5px;font-size: 16px;color: #8f8f8f;cursor: pointer;"></i>

src/pages/match/manage/theoryReport.vue

@@ -464,44 +464,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.wrap {
-  padding: 10px;
-}
-
-.text-right {
-  text-align: right;
-}
-
 .text-red {
   color: #f00;
 }
 
-code,
-kbd,
-samp {
-  font-family: 'PingFang SC', 'Helvetica Neue', Helvetica, 'microsoft yahei', arial, STHeiTi, sans-serif;
-  word-wrap: break-word;
-  white-space: pre-wrap;
-}
-
-/deep/ pre {
-  white-space: pre-wrap;
-  /* css-3 */
-  white-space: -moz-pre-wrap;
-  /* Mozilla, since 1999 */
-  white-space: pre-wrap;
-  /* Opera 4-6 */
-  white-space: -o-pre-wrap;
-  /* Opera 7 */
-  word-wrap: break-word;
-  /* Internet Explorer 5.5+ */
-  word-break: break-all;
-  overflow: hidden;
-  font-size: 12px;
-  font-weight: 400;
-  font-family: 'PingFang SC', 'Helvetica Neue', Helvetica, 'microsoft yahei', arial, STHeiTi, sans-serif;
-}
-
 /deep/.report {
   display: flex;
 
@@ -779,7 +745,7 @@ samp {
   }
 
   .right {
-    width: calc(100% - 325px);
+    width: calc(100% - 305px);
     height: calc(100vh - 287px);
     padding: 10px;
     background-color: #fff;