赛事复制等

src/setting.js

@@ -10,11 +10,11 @@ let sandPath = `https://izhixinyun.com/sandbox` // 沙盘地址
 let host = `${location.origin}/`
 if (isDev) {
   jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统
-  jumpPath = 'https://judgment.huorantech.cn/'
+  // 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 = 'http://192.168.31.217:9000/'
 } else if (isPro) {
   jumpPath = 'https://judgment.huorantech.cn/'
 }

src/utils/api.js

@@ -321,6 +321,7 @@ export default {
     detailsOfCompetitionStage: `competition/competition/management/detailsOfCompetitionStage`,
     entryInformation: `competition/competition/team/entryInformation`,
     getRedisCacheCompetition: `competition/competition/management/getRedisCache`,
+    copyCompetition: `competition/competition/management/copyCompetition`,
     
     // 赛事内容
     addCompetitionContent: `competition/competition/content/addCompetitionContent`,
@@ -368,6 +369,8 @@ export default {
     enquireAboutSchoolStudents: `users/users/userAccount/enquireAboutSchoolStudents`,
     cancelParticipant: `competition/competition/teamParticipant/cancelParticipant`,
     schoolsInCompetitionArea: `competition/competition/range/schoolsInCompetitionArea`,
+    batchImportTeamData: `${host}competition/competition/registration/batchImportTeamData`,
+    exportFailure: `${host}competition/competition/registration/exportFailure`,
     // 赛事公告
     addAnnouncement: `competition/competition/announcement/addAnnouncement`,
     amendmentAnnouncement: `competition/competition/announcement/amendmentAnnouncement`,

src/views/match/list/index.vue

@@ -142,9 +142,11 @@
                        width="160"></el-table-column>
       <el-table-column label="操作"
                        align="center"
-                       width="260">
+                       width="280">
         <template slot-scope="scope">
-          <el-button v-if="scope.row.playingStages && scope.row.playingStages.length"
+          <el-button type="text"
+                     @click="copy(scope.row)">复制</el-button>
+          <el-button v-if="scope.row.publishStatus && scope.row.playingStages && scope.row.playingStages.length"
                      type="text"
                      @click="editEndTime(scope.row)"
                      v-auth>修改结束时间</el-button>
@@ -406,6 +408,16 @@ export default {
     add () {
       this.$router.push("/addMatch");
     },
+    // 复制
+    copy (row) {
+      this.$confirm('确定要复制吗', "提示", {
+        type: "warning"
+      }).then(async () => {
+        await this.$post(`${this.api.copyCompetition}?competitionId=${row.id}`)
+        util.successMsg('复制成功')
+        this.getData()
+      }).catch(() => { })
+    },
     // 修改结束时间
     editEndTime (row) {
       this.modifyVisible = true

src/views/match/manage/matchArchList.vue

@@ -15,8 +15,8 @@
       <div class="stat">
         <div class="nums">
           <div class="item">
-            <p class="name">实验总人数</p>
+            <p class="name">已参加/应参加人数</p>
-            <p class="val">{{ totalNumber }}</p>
+            <p class="val">{{ isNaN(statData.totalNumber) ? '' : statData.attendance + '/' + statData.totalNumber }}</p>
           </div>
           <div class="item">
             <p class="name">实验平均分</p>
@@ -110,22 +110,26 @@
                            width="90"
                            align="center">
             <template slot-scope="scope">
-              {{ scope.row.timeSum }}min
+              {{ scope.row.timeSum ? scope.row.timeSum + 'min' : '--' }}
             </template>
           </el-table-column>
           <el-table-column prop="submitTime"
                            label="提交时间"
                            min-width="150"
                            align="center">
+            <template slot-scope="scope">
+              {{ scope.row.submitTime || '--' }}
+            </template>
           </el-table-column>
           <el-table-column label="操作"
                            align="center"
                            width="160">
             <template slot-scope="scope">
+              <el-button :disabled="!scope.row.reportId"
+                         type="text"
+                         @click="show(scope.row)">{{ scope.row.reportId ? '查看成绩报告' : '未参加' }}</el-button>
               <el-button v-if="scope.row.reportId"
                          type="text"
-                         @click="show(scope.row)">查看成绩报告</el-button>
-              <el-button type="text"
                          @click="handleDelete(scope.row)">删除</el-button>
             </template>
           </el-table-column>
@@ -286,7 +290,6 @@ export default {
       page1: 1,
       total1: 0,
 
-      totalNumber: 0, // 总人数
       avgScore: 0, // 平均分
       importVisible: false,
       uploadList: [],
@@ -356,7 +359,6 @@ export default {
           this.list = page.records
           this.statData = data
           this.avgScore = (+data.avgScore).toFixed(2)
-          this.totalNumber = data.totalNumber
           this.getChart()
         }).catch(res => { })
       }
@@ -613,6 +615,7 @@ export default {
 
         .item {
             width: 300px;
+            min-height: 145px;
             padding: 30px 30px;
             margin: 0 10px;
             box-sizing: border-box;