赛事复制等

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;

src/views/match/manage/matchSignup.vue

@@ -1,115 +1,211 @@
 <template>
   <!-- 报名人员 -->
-    <div class="page-content" style="padding: 24px">
+  <div class="page-content"
+       style="padding: 24px">
     <div class="tool">
       <ul class="filter">
         <li>
           <label>搜索：</label>
-                    <el-input placeholder="请输入姓名/手机号/学号" prefix-icon="el-icon-search" v-model="keyword" clearable size="mini" style="width: 250px"></el-input>
+          <el-input placeholder="请输入姓名/手机号/学号"
+                    prefix-icon="el-icon-search"
+                    v-model="keyword"
+                    clearable
+                    size="mini"
+                    style="width: 250px"></el-input>
         </li>
         <li v-if="info.releaseType">
           <label>参赛人员状态：</label>
-                    <el-select v-model="isDisable" @change="initData">
+          <el-select v-model="isDisable"
-                      <el-option v-for="(item, i) in statusList" :key="i" :label="item.name" :value="item.id"></el-option>
+                     @change="initData">
+            <el-option v-for="(item, i) in statusList"
+                       :key="i"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </li>
       </ul>
       <div>
-                <el-button type="primary" round @click="add" v-auth="'/match:管理:报名人员:新增'">新增</el-button>
+        <el-button type="primary"
-                <el-button type="primary" round @click="exportAll" v-auth="'/match:管理:报名人员:导出'">批量导出</el-button>
+                   round
+                   @click="add"
+                   v-auth="'/match:管理:报名人员:新增'">新增</el-button>
+        <el-button type="primary"
+                   round
+                   @click="exportAll"
+                   v-auth="'/match:管理:报名人员:导出'">批量导出</el-button>
       </div>
     </div>
 
-        <el-table ref="table" :data="listData" class="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="id" @sort-change="sortChange">
+    <el-table ref="table"
-            <el-table-column type="selection" width="80" align="center" :reserve-selection="true"></el-table-column>
+              :data="listData"
-            <el-table-column type="index" width="60" label="序号" align="center">
+              class="table"
+              stripe
+              header-align="center"
+              @selection-change="handleSelectionChange"
+              row-key="id"
+              @sort-change="sortChange">
+      <el-table-column type="selection"
+                       width="80"
+                       align="center"
+                       :reserve-selection="true"></el-table-column>
+      <el-table-column type="index"
+                       width="60"
+                       label="序号"
+                       align="center">
         <template slot-scope="scope">
           {{ scope.$index + (page - 1) * pageSize + 1 }}
         </template>
       </el-table-column>
-            <el-table-column prop="school" label="学校" sortable="custom">
+      <el-table-column prop="school"
+                       label="学校"
+                       sortable="custom">
       </el-table-column>
-            <el-table-column v-if="info.completeCompetitionSetup.competitionType" prop="teamName" label="团队名称" sortable="custom">
+      <el-table-column v-if="info.completeCompetitionSetup.competitionType"
+                       prop="teamName"
+                       label="团队名称"
+                       sortable="custom">
       </el-table-column>
-            <el-table-column prop="username" label="学生姓名">
+      <el-table-column prop="username"
+                       label="学生姓名">
       </el-table-column>
-            <el-table-column prop="workNumber" label="学号">
+      <el-table-column prop="workNumber"
+                       label="学号">
       </el-table-column>
-            <el-table-column prop="phone" label="手机号">
+      <el-table-column prop="phone"
+                       label="手机号">
       </el-table-column>
-            <el-table-column label="操作" align="center" width="320">
+      <el-table-column label="操作"
+                       align="center"
+                       width="320">
         <template slot-scope="scope">
-                    <el-button v-auth="'/match:管理:报名人员:编辑'" type="text" @click="edit(scope.row)">编辑</el-button>
+          <el-button v-auth="'/match:管理:报名人员:编辑'"
+                     type="text"
+                     @click="edit(scope.row)">编辑</el-button>
           <template v-if="info.releaseType">
-                      <el-button v-auth="'/match:管理:报名人员:参赛信息与成绩'" type="text" @click="toInfo(scope.row)">参赛信息与成绩</el-button>
+            <el-button v-auth="'/match:管理:报名人员:参赛信息与成绩'"
-                      <el-switch
+                       type="text"
-                          v-auth="'/match:管理:报名人员:禁用'"
+                       @click="toInfo(scope.row)">参赛信息与成绩</el-button>
+            <el-switch v-auth="'/match:管理:报名人员:禁用'"
                        v-model="scope.row.isDisable"
                        :active-text="scope.row.isDisable ? '关' : '开'"
                        :active-value="0"
                        :inactive-value="1"
                        style="margin: 0 10px 0 5px"
-                          @change="switchOff($event,scope.row,scope.$index)"
+                       @change="switchOff($event,scope.row,scope.$index)"></el-switch>
-                      ></el-switch>
           </template>
         </template>
       </el-table-column>
     </el-table>
     <div class="pagination">
-            <el-pagination background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" :current-page="page">
+      <el-pagination background
+                     layout="total, prev, pager, next"
+                     :total="total"
+                     @current-change="handleCurrentChange"
+                     :current-page="page">
       </el-pagination>
     </div>
 
-        
+    <el-dialog :title="(!isAdd ? '编辑' : '新增') + '参赛人员'"
-        <el-dialog :title="(!isAdd ? '编辑' : '新增') + '参赛人员'" :visible.sync="addVisible" width="400px" class="dialog" :close-on-click-modal="false" @close="closeAdd">
+               :visible.sync="addVisible"
-            <el-form ref="form" :model="form" :rules="rules" label-width="80px" style='margin-right: 10px;'>
+               width="400px"
-                <el-form-item v-if="!schoolDisable" prop="schoolId" label="院校">
+               class="dialog"
-                  <el-select v-model="form.schoolId" filterable style="width: 100%">
+               :close-on-click-modal="false"
-                    <el-option v-for="(item, i) in clients" :key="i" :label="item.schoolName" :value="item.schoolId"></el-option>
+               @close="closeAdd">
+      <el-form ref="form"
+               :model="form"
+               :rules="rules"
+               label-width="80px"
+               style='margin-right: 10px;'>
+        <el-form-item v-if="!schoolDisable"
+                      prop="schoolId"
+                      label="院校">
+          <el-select v-model="form.schoolId"
+                     filterable
+                     style="width: 100%">
+            <el-option v-for="(item, i) in clients"
+                       :key="i"
+                       :label="item.schoolName"
+                       :value="item.schoolId"></el-option>
           </el-select>
         </el-form-item>
-                <el-form-item prop="workNumber" label="学生学号">
+        <el-form-item prop="workNumber"
-                    <el-input v-model="form.workNumber" placeholder="请输入学生学号" @change="workNumberChange"></el-input>
+                      label="学生学号">
+          <el-input v-model="form.workNumber"
+                    placeholder="请输入学生学号"
+                    @change="workNumberChange"></el-input>
         </el-form-item>
-                <el-form-item prop="userName" label="学生姓名">
+        <el-form-item prop="userName"
-                    <el-input v-model="form.userName" placeholder="请输入学生姓名" :disabled="isAdd"></el-input>
+                      label="学生姓名">
+          <el-input v-model="form.userName"
+                    placeholder="请输入学生姓名"
+                    :disabled="isAdd"></el-input>
         </el-form-item>
         <el-form-item label="账号角色">
           学生
         </el-form-item>
-                <el-form-item v-if="info.completeCompetitionSetup.competitionType" prop="teamId" label="所属团队">
+        <el-form-item v-if="info.completeCompetitionSetup.competitionType"
+                      prop="teamId"
+                      label="所属团队">
           <div style="display: flex;align-items: center">
-                    <el-select v-model="form.teamId" :disabled="formEnable && isAdd" filterable style="width: 240px;margin-right: 10px">
+            <el-select v-model="form.teamId"
-                      <el-option v-for="(item, i) in teams" :key="i" :label="item.teamName" :value="item.teamId"></el-option>
+                       :disabled="formEnable && isAdd"
+                       filterable
+                       style="width: 240px;margin-right: 10px">
+              <el-option v-for="(item, i) in teams"
+                         :key="i"
+                         :label="item.teamName"
+                         :value="item.teamId"></el-option>
             </el-select>
-                    <el-button v-if="isAdd && !formEnable" type="text" @click="createTeam">创建团队</el-button>
+            <el-button v-if="isAdd && !formEnable"
+                       type="text"
+                       @click="createTeam">创建团队</el-button>
           </div>
         </el-form-item>
-                <el-form-item prop="phone" label="手机号">
+        <el-form-item prop="phone"
-                    <el-input v-model="form.phone" maxlength="11" placeholder="请输入手机号" :disabled="isAdd"></el-input>
+                      label="手机号">
+          <el-input v-model="form.phone"
+                    maxlength="11"
+                    placeholder="请输入手机号"
+                    :disabled="isAdd"></el-input>
         </el-form-item>
-                <el-form-item prop="email" label="邮箱">
+        <el-form-item prop="email"
-                    <el-input v-model="form.email" placeholder="请输入邮箱" :disabled="isAdd"></el-input>
+                      label="邮箱">
+          <el-input v-model="form.email"
+                    placeholder="请输入邮箱"
+                    :disabled="isAdd"></el-input>
         </el-form-item>
       </el-form>
-            <span slot="footer" class="dialog-footer">
+      <span slot="footer"
+            class="dialog-footer">
         <el-button @click="addVisible = false">取消</el-button>
-                <el-button type="primary" @click="submit">确定</el-button>
+        <el-button type="primary"
+                   @click="submit">确定</el-button>
       </span>
     </el-dialog>
 
-        <el-dialog title="创建团队" :visible.sync="teamVisible" :close-on-click-modal="false" width="300px">
+    <el-dialog title="创建团队"
+               :visible.sync="teamVisible"
+               :close-on-click-modal="false"
+               width="300px">
       <el-form class="dia-form">
         <el-form-item>
-              <el-input placeholder="请输入团队名称" maxlength="10" v-model="teamForm.teamName"></el-input>
+          <el-input placeholder="请输入团队名称"
+                    maxlength="10"
+                    v-model="teamForm.teamName"></el-input>
         </el-form-item>
         <el-form-item>
-              <el-input placeholder="请设置团队邀请码" maxlength="6" v-model="teamForm.invitationCode"></el-input>
+          <el-input placeholder="请设置团队邀请码"
+                    maxlength="6"
+                    v-model="teamForm.invitationCode"></el-input>
         </el-form-item>
       </el-form>
-          <span slot="footer" class="dialog-footer">
+      <span slot="footer"
-            <el-button size="small" type="primary" @click="teamSubmit">确定并使用</el-button>
+            class="dialog-footer">
-            <el-button size="small" @click="teamVisible = false">取消</el-button>
+        <el-button size="small"
+                   type="primary"
+                   @click="teamSubmit">确定并使用</el-button>
+        <el-button size="small"
+                   @click="teamVisible = false">取消</el-button>
       </span>
     </el-dialog>
   </div>