fix

src/pages/achievement/info/course.vue

@@ -556,7 +556,7 @@ export default {
     toReport (row) {
       this.$store.commit('achievement/setRow', this.curRow)
       // 考核跳实验报告，练习跳项目维度的成绩详情
-      this.$router.push(this.curTab == 1 ? `show?reportId=${row.reportId}` : `project?id=${row.projectId}&projectName=${row.projectName}&classId=${this.curRow.classId || ''}&workNumber=${row.workNumber || row.userName}&mallId=${this.id}`)
+      this.$router.push(this.curTab == 1 ? `show?reportId=${row.reportId}` : `project?id=${row.projectId}&projectName=${row.projectName}&classId=${this.curRow.classId || ''}&workNumber=${row.workNumber || row.userName}&mallId=${this.id}&fromCourse=1`)
     },
     getChart () { // 初始化折线图
       const data = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]

src/pages/achievement/info/project.vue

@@ -671,7 +671,11 @@ export default {
       echarts.init(document.querySelector(`#chart1`)).setOption(option)
     },
     back () {
+      if (this.$route.query.fromCourse) {
+        this.$router.back()
+      } else {
         location.href = this.$store.state.achievement.referrer
+      }
     },
   }
 };

src/pages/match/add/step3.vue

@@ -250,6 +250,8 @@ export default {
                   url: n
                 })
               })
+            } else {
+              form.competitionStageContentSetting.fileList = []
             }
             form.competitionStageContentSetting.competitionId = this.id
             form.competitionStageContentSetting.stageId = e.stageId

src/pages/match/manage/matchArchList.vue

@@ -131,14 +131,20 @@
                 {{ scope.row.submitTime || '--' }}
               </template>
             </el-table-column>
+            <el-table-column label="状态"
+                             width="100"
+                             align="center">
+              <template slot-scope="scope">
+                {{ scope.row.reportId || method == 2 ? '已参加' : '未参加' }}
+              </template>
+            </el-table-column>
             <el-table-column label="操作"
                              align="center"
                              width="160">
               <template slot-scope="scope">
-                <el-button v-if="method != 2"
+                <el-button v-if="method != 2 && scope.row.reportId"
-                           :disabled="!scope.row.reportId"
                            type="text"
-                           @click="show(scope.row)">{{ scope.row.reportId ? '查看成绩报告' : '未参加' }}</el-button>
+                           @click="show(scope.row)">查看成绩报告</el-button>
                 <el-button v-if="scope.row.reportId"
                            type="text"
                            @click="handleDelete(scope.row)">删除</el-button>
@@ -236,7 +242,8 @@
     <el-dialog title="批量导入"
                :visible.sync="importVisible"
                width="24%"
-               :close-on-click-modal="false">
+               :close-on-click-modal="false"
+               @close="cancelUpload">
       <div style="text-align: center">
         <template v-if="!uploadFaild">
           <div style="margin-bottom: 10px;">
@@ -555,6 +562,7 @@ export default {
       this.uploading = false
       this.uploadFaild = false
       if (res.status === 200) {
+        this.initData()
         const { data } = res
         if (data.exportCode) {
           this.faildData = data
@@ -586,7 +594,7 @@ export default {
     },
     cancelUpload () {
       this.uploading = false
-      this.$refs.upload.abort()
+      if (this.$refs.upload) this.$refs.upload.abort()
       this.keyword = ''
       this.initData()
       this.importVisible = false

src/pages/match/manage/matchInfo.vue

@@ -22,6 +22,7 @@
             <th width="150">团队邀请码：</th>
             <td>
               <el-input :disabled="!editing"
+                        maxlength="6"
                         v-model="info.team.invitationCode"></el-input>
             </td>
           </tr>

src/pages/match/manage/matchRank.vue

@@ -730,6 +730,7 @@ export default {
       this.uploadFaild = false
       this.uploaded = 0
       if (res.status === 200) {
+        this.getRank()
         const { data } = res
         if (data.exportCode) {
           this.faildData = data
@@ -737,7 +738,6 @@ export default {
         } else {
           this.uploaded = 1
           this.importVisible = false
-          this.getRank()
           util.successMsg(data.tip, 3000)
           // util.successMsg('请检查数据后，点击发布排名以发布数据！')
         }

src/pages/match/manage/matchSignup.vue

@@ -293,6 +293,7 @@
           <el-upload ref="upload"
                      name="file"
                      accept=".xls,.xlsx"
+                     class="import-file"
                      :before-upload="beforeUpload"
                      :on-remove="handleRemove"
                      :on-error="uploadError"
@@ -303,11 +304,13 @@
 											competitionId: id,
 											platformId: 1
 										}"
+                     :disabled="uploading"
                      :on-exceed="handleExceed"
                      :action="info.completeCompetitionSetup.competitionType ? this.api.batchImportTeamData : this.api.batchImportPersonalData"
                      :file-list="uploadList"
                      :headers="headers">
             <el-button type="primary"
+                       :loading="uploading"
                        class="ml20">上传文件<i class="el-icon-upload2 el-icon--right"></i></el-button>
             <div slot="tip"
                  class="el-upload__tip">建议文件数据在5000条以内，导入5000名学生大致需要10分钟</div>
@@ -475,6 +478,7 @@ export default {
     getInfo () {
       this.$post(`${this.api.getCompetition}?competitionId=${this.id}`).then(({ competition }) => {
         this.info = competition
+        this.getSchool()
         // 非本校内则查询接口获取学校列表
         if (competition.competitionScope) {
           this.getClient()
@@ -578,9 +582,9 @@ export default {
     cancelUpload () {
       this.uploading = false
       this.$refs.upload.abort()
+      this.keyword = ''
       this.init()
       this.importVisible = false
-      this.keyword = ''
     },
     // 新增
     add () {
@@ -759,6 +763,11 @@ export default {
       }
       this.teamVisible = true
     },
+    // 学生所属院校固定查询所有学校
+    async getSchool () {
+      const { list } = await this.$get(this.api.querySchoolData)
+      this.schools = list
+    },
     // 获取客户
     async getClient () {
       if (this.info.competitionScope === 2) {
@@ -781,10 +790,6 @@ export default {
           this.clients = list
         }).catch(res => { })
       }
-      // 学生所属院校固定查询所有学校
-      this.$get(this.api.querySchoolData).then(({ list }) => {
-        this.schools = list
-      }).catch(res => { })
     },
     // 获取团队列表
     getTeam () {
@@ -884,4 +889,11 @@ export default {
     font-size: 12px;
     color: #e90000;
 }
+/deep/.import-file {
+    .el-progress__text,
+    .el-progress,
+    .el-upload-list__item-status-label {
+        display: none !important;
+    }
+}
 </style>

src/pages/student/list/index.vue

@@ -98,7 +98,8 @@
       </el-dialog>
 
     </div>
-    <div class="page flex-1 m-l-20">
+    <div class="page flex-1 m-l-20"
+         style="max-width: calc(100% - 320px)">
       <h6 class="p-title">筛选</h6>
       <div class="tool">
         <ul class="filter">

src/pages/system/list/staff.vue

@@ -661,8 +661,8 @@ export default {
         border-right: 1px solid rgba(0, 0, 0, 0.06);
     }
     .right {
-        width: calc(100% - 374px);
+        flex: 1;
-        padding: 24px;
+        padding: 24px 0;
     }
 }
 .el-input__inner {