From 3668825847e23d949d6e7d7872af58ac0bf3af35 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 15 Aug 2024 16:55:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=9B=E4=BA=8B=E9=80=89=E6=8B=A9=E8=AF=95?=
 =?UTF-8?q?=E5=8D=B7=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                            |   2 +-
 src/assets/css/main.css                |   6 +
 src/const/testPaper.js                 |  34 +++
 src/utils/api.js                       |   4 +
 src/views/match/add/set.vue            | 276 +++++++++++++-----
 src/views/match/add/step3.vue          |  30 +-
 src/views/match/add/template.vue       | 235 +++++++++++++++
 src/views/match/manage/matchReport.vue | 389 +++++++++++--------------
 src/views/match/manage/matchSignup.vue |   8 +-
 9 files changed, 689 insertions(+), 295 deletions(-)
 create mode 100644 src/const/testPaper.js
 create mode 100644 src/views/match/add/template.vue

diff --git a/src/App.vue b/src/App.vue
index c12e90f..3d95200 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="app">
-    <el-radio-group v-if="Setting.isDev" v-model="ip" @change="ipChange">
+    <el-radio-group v-if="Setting.isDev" class="ip" v-model="ip" @change="ipChange">
       <el-radio :label="0">刘榕ip</el-radio>
       <el-radio :label="1">陈赓ip</el-radio>
       <el-radio :label="2">测试服ip</el-radio>
diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index 9472cc2..2ea57f5 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -19,6 +19,12 @@ body {
     font-size: 14px;
 }
 
+.ip {
+  z-index: 1;
+  position: fixed;
+  top: 0;
+  left: 0;
+}
 a {
     text-decoration: none;
 }
diff --git a/src/const/testPaper.js b/src/const/testPaper.js
new file mode 100644
index 0000000..d4a89d7
--- /dev/null
+++ b/src/const/testPaper.js
@@ -0,0 +1,34 @@
+export default {
+  difficults: [
+    {
+      id: 1,
+      name: '简单'
+    },
+    {
+      id: 2,
+      name: '普通'
+    },
+    {
+      id: 3,
+      name: '较难'
+    },
+    {
+      id: 4,
+      name: '难'
+    },
+  ],
+  paperTypes: [
+    {
+      id: 0,
+      name: '练习'
+    },
+    {
+      id: 1,
+      name: '考核'
+    },
+    {
+      id: 2,
+      name: '竞赛'
+    },
+  ],
+}
diff --git a/src/utils/api.js b/src/utils/api.js
index 366fd13..bc10dfb 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -340,6 +340,10 @@ export default {
   checkTeamStatus: `competition/teamAbnormalInformation/checkTeamStatus`,
   queryAbnormalTeam: `competition/teamAbnormalInformation/queryAbnormalTeam`,
   viewEventAllocationInformation: `competition/competitionAutomaticAllocationRecord/viewEventAllocationInformation`,
+  getCompetitionProjectByMiddleGround: `occupationlab/occupationlab/projectManage/getCompetitionProjectByMiddleGround`,
+  libraryList: `exam/exam/paperLibrary/libraryList`,
+  examPaperList: `exam/exam/paper/examPaperList`,
+  copyExamPaper: `exam/exam/paper/copyExamPaper`,
 
   // 赛事内容
   addCompetitionContent: `competition/competition/content/addCompetitionContent`,
diff --git a/src/views/match/add/set.vue b/src/views/match/add/set.vue
index 03e3416..714c678 100644
--- a/src/views/match/add/set.vue
+++ b/src/views/match/add/set.vue
@@ -24,57 +24,120 @@
         </div>
       </div>
     </el-card>
-    <el-card shadow="hover" class="mgr20 m-b-20">
-      <div>
-        <p class="m-b-20">系统</p>
-        <div class="inline-input">
-          <el-select v-model="systemId" placeholder="请选择系统" @change="getProject">
-            <el-option v-for="(item, i) in systems" :key="i" :label="item.systemName" :value="item.systemId">
-            </el-option>
-          </el-select>
+
+    <!-- 理论系统 -->
+    <template v-if="isTheory">
+      <!-- 理论系统选择试卷库，非理论则选择系统 -->
+      <el-card shadow="hover" class="mgr20 m-b-20">
+        <div>
+          <p class="m-b-20">试卷库</p>
+          <div class="inline-input">
+            <el-select v-model="libraryId" placeholder="请选择试卷库" @change="getProject">
+              <el-option v-for="(item, i) in paperLibraries" :key="i" :label="item.libraryName" :value="item.libraryId">
+              </el-option>
+            </el-select>
+          </div>
         </div>
-      </div>
-    </el-card>
-    <el-card shadow="hover" class="m-b-20">
-      <div class="flex-between m-b-20">
-        <span>实训项目</span>
-        <div style="display: inline-flex;">
-          <div>
-            <el-input placeholder="请输入项目名称" prefix-icon="el-icon-search" v-model.trim="keyword" clearable></el-input>
+      </el-card>
+
+      <el-card shadow="hover" class="m-b-20">
+        <div class="flex-between m-b-20">
+          <span>理论试卷</span>
+          <div style="display: inline-flex;">
+            <div>
+              <el-input placeholder="请输入试卷名称" prefix-icon="el-icon-search" v-model.trim="keyword" clearable></el-input>
+            </div>
           </div>
-          <el-button style="margin-left: 5px" type="primary" round @click="toProject">自定义实验项目</el-button>
         </div>
-      </div>
-      <!-- 实训项目表格 -->
-      <el-table :data="projects" class="table" stripe header-align="center">
-        <el-table-column width="60" label="选择" align="center">
-          <template slot-scope="scope">
-            <el-radio v-model="form.projectId" :label="scope.row.projectId">&nbsp;</el-radio>
-          </template>
-        </el-table-column>
-        <el-table-column prop="projectName" label="项目名称" align="center"></el-table-column>
-        <el-table-column prop="auth" label="项目权限" align="center">
-          <template slot-scope="scope">
-            {{ permissionsKeys[scope.row.permissions] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="founder" label="创建人" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.founder ? '老师创建' : '系统内置' }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
-        <!-- <el-table-column label="操作" align="center">
+        <p v-if="form.originPaperName" style="margin-bottom: 20px">已选试卷：{{ form.originPaperName }}</p>
+        <el-table :data="projects" class="table" stripe header-align="center">
+          <el-table-column width="60" label="选择" align="center">
+            <template slot-scope="scope">
+              <el-radio v-model="form.paperId" :label="scope.row.paperId">&nbsp;</el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
+          <el-table-column prop="name" label="试卷名称" min-width="140" align="center"></el-table-column>
+          <el-table-column prop="questionCount" label="试题总数" align="center" min-width="70"></el-table-column>
+          <el-table-column prop="score" label="总分" align="center" min-width="70"></el-table-column>
+          <el-table-column prop="difficult" label="试卷难度" align="center" min-width="70" sortable="custom">
+            <template slot-scope="scope">{{ difficults.find(e => e.id === scope.row.difficult) ? difficults.find(e =>
+              e.id === scope.row.difficult).name : '' }}</template>
+          </el-table-column>
+          <el-table-column prop="suggestTime" label="建议用时" align="center" min-width="70">
+            <template slot-scope="scope">{{ scope.row.suggestTime }}min</template>
+          </el-table-column>
+          <el-table-column prop="classificationPath" label="试卷分类" align="center" min-width="70"
+            show-overflow-tooltip></el-table-column>
+          <el-table-column label="建议用途" align="center" min-width="70">
+            <template slot-scope="scope">{{ paperTypes.find(e => e.id === scope.row.paperType) ? paperTypes.find(e =>
+              e.id === scope.row.paperType).name : '' }}</template>
+          </el-table-column>
+          <el-table-column prop="updateTime" label="最近编辑时间" align="center" width="170"></el-table-column>
+          <el-table-column prop="createUser" label="最近编辑人" align="center" width="110"></el-table-column>
+        </el-table>
+        <div class="pagination">
+          <el-pagination background :page-size="pageSize" @current-change="handleCurrentChange"
+            layout="total,prev, pager, next" :total="total"></el-pagination>
+        </div>
+      </el-card>
+    </template>
+
+
+    <template v-else>
+      <el-card shadow="hover" class="mgr20 m-b-20">
+        <div>
+          <p class="m-b-20">系统</p>
+          <div class="inline-input">
+            <el-select v-model="systemId" placeholder="请选择系统" @change="getProject">
+              <el-option v-for="(item, i) in systems" :key="i" :label="item.systemName" :value="item.systemId">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+      </el-card>
+
+      <el-card shadow="hover" class="m-b-20">
+        <div class="flex-between m-b-20">
+          <span>实训项目</span>
+          <div style="display: inline-flex;">
+            <div>
+              <el-input placeholder="请输入项目名称" prefix-icon="el-icon-search" v-model.trim="keyword" clearable></el-input>
+            </div>
+            <el-button style="margin-left: 5px" type="primary" round @click="toProject">自定义实验项目</el-button>
+          </div>
+        </div>
+        <!-- 实训项目表格 -->
+        <el-table :data="projects" class="table" stripe header-align="center">
+          <el-table-column width="60" label="选择" align="center">
+            <template slot-scope="scope">
+              <el-radio v-model="form.projectId" :label="scope.row.projectId">&nbsp;</el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column prop="projectName" label="项目名称" align="center"></el-table-column>
+          <el-table-column prop="auth" label="项目权限" align="center">
+            <template slot-scope="scope">
+              {{ permissionsKeys[scope.row.permissions] }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="founder" label="创建人" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.founder ? '老师创建' : '系统内置' }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
+          <!-- <el-table-column label="操作" align="center">
                   <template slot-scope="scope">
                       <el-button type="text" @click="showProject(scope.row)">查看</el-button>
                   </template>
               </el-table-column>  -->
-      </el-table>
-      <div class="pagination">
-        <el-pagination background :page-size="pageSize" @current-change="handleCurrentChange"
-          layout="total,prev, pager, next" :total="total"></el-pagination>
-      </div>
-    </el-card>
+        </el-table>
+        <div class="pagination">
+          <el-pagination background :page-size="pageSize" @current-change="handleCurrentChange"
+            layout="total,prev, pager, next" :total="total"></el-pagination>
+        </div>
+      </el-card>
+    </template>
 
     <div style="text-align: center">
       <el-button @click="back">返回</el-button>
@@ -86,22 +149,36 @@
 <script>
 import util from "@/libs/util";
 import { Loading } from 'element-ui'
+import TestPaperConst from '@/const/testPaper'
 export default {
   props: ['form', 'step1'],
   data () {
     return {
+      difficults: TestPaperConst.difficults,
+      paperTypes: TestPaperConst.paperTypes,
       loadIns: null,
       systems: [],
+      paperLibraries: [],
+      testPapers: [],
       keyword: '',
       projects: [],
       page: 1,
       pageSize: 5,
       total: 0,
+      libraryId: '',
       systemId: '',
+      paperId: '',
+      paperName: '',
       permissionsKeys: ['练习', '考核', '竞赛'],
-      timeInvalid: false
+      timeInvalid: false,
     };
   },
+  computed: {
+    // 是否理论考试
+    isTheory () {
+      return this.form.method === 1
+    },
+  },
   watch: {
     // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
     form: {
@@ -118,7 +195,7 @@ export default {
     }
   },
   mounted () {
-    this.getCourse()
+    this.isTheory ? this.getLibrary() : this.getCourse()
   },
   methods: {
     // 获取课程
@@ -137,30 +214,61 @@ export default {
         this.getProject()
       }
     },
+    // 查询试卷库
+    async getLibrary () {
+      try {
+        const res = await this.$post(this.api.libraryList, {
+          pageNum: 1,
+          pageSize: 10000,
+          type: 1
+        })
+        const { records } = res.pageList
+        if (records.length) {
+          this.paperLibraries = records
+          this.libraryId = records[0].libraryId
+          this.loadIns = Loading.service()
+          this.getProject()
+        }
+      } finally { }
+    },
 
-    // 查询项目
-    getProject () {
-      this.$post(this.api.getProjectAssessmentByCompetition, {
-        pageNum: this.page,
-        pageSize: this.pageSize,
-        projectName: this.keyword,
-        systemId: this.systemId,
-        permissions: 2
-      }).then(({ data }) => {
-        this.projects = data.records
-        this.total = data.total
-        this.loadIns.close()
-      }).catch(err => {
+    // 查询项目/试卷
+    async getProject () {
+      try {
+        // 理论查询试卷
+        if (this.isTheory) {
+          const res = await this.$post(this.api.examPaperList, {
+            pageNum: this.page,
+            pageSize: this.pageSize,
+            type: 1,
+            keyWord: this.keyword,
+            libraryId: this.libraryId
+          })
+          this.projects = res.pageList.records
+          this.total = res.pageList.total
+        } else {
+          // 实训查询项目
+          const { data } = await this.$post(this.api.getCompetitionProjectByMiddleGround, {
+            pageNum: this.page,
+            pageSize: this.pageSize,
+            projectName: this.keyword,
+            systemId: this.systemId,
+            permissions: 2
+          })
+          this.projects = data.records
+          this.total = data.total
+        }
+      } finally {
         this.loadIns.close()
-      });
+      }
     },
     initData () {
-      this.page = 1;
-      this.getProject();
+      this.page = 1
+      this.getProject()
     },
     handleCurrentChange (val) {
-      this.page = val;
-      this.getProject();
+      this.page = val
+      this.getProject()
     },
     // 自定义项目
     toProject () {
@@ -203,16 +311,44 @@ export default {
       if (!form.time.length) return util.warningMsg('请选择比赛时间')
       const { playStartTime, playEndTime } = this.step1
       if (new Date(form.time[0]) < new Date(playStartTime) || new Date(form.time[1]) > new Date(playEndTime)) return util.warningMsg('设置的阶段比赛时间必须要在第一步设置的竞赛时间范围内，请重新设置。')
-      if (!form.cid) return util.warningMsg('请选择课程')
-      if (!form.projectId) return util.warningMsg('请选择项目')
-      const { systemId, systemName, projectName } = this.projects.find(e => e.projectId == form.projectId)
-      if (systemId) form.systemId = systemId
-      if (projectName) form.projectName = projectName
-      if (systemName) form.systemName = systemName
+
+      // 理论试卷存试卷库等
+      if (this.isTheory) {
+        if (!this.libraryId) return util.warningMsg('请选择试卷库')
+        if (!form.paperId) return util.warningMsg('请选择试卷')
+
+        form.libraryId = this.libraryId
+        const curPaper = this.projects.find(e => e.paperId === form.paperId)
+        if (curPaper) form.paperName = curPaper.name
+      } else {
+        if (!form.cid) return util.warningMsg('请选择课程')
+        if (!form.projectId) return util.warningMsg('请选择项目')
+        const { systemId, systemName, projectName } = this.projects.find(e => e.projectId == form.projectId)
+        if (systemId) form.systemId = systemId
+        if (projectName) form.projectName = projectName
+        if (systemName) form.systemName = systemName
+      }
       form.startTime = form.time[0]
       form.endTime = form.time[1]
+
+      this.handlePaper()
       this.$emit('hideSet', this.form)
     },
+    // 复制试卷
+    async handlePaper () {
+      const { form } = this
+      // 老的试卷名称不等于新的试卷名称，则复制一份试卷，再把新的试卷id替换掉
+      if (form.paperName !== form.originPaperName) {
+        const res = await this.$post(this.api.copyExamPaper, {
+          associatedID: form.stageId,
+          paperId: form.paperId,
+          typeId: 1
+        })
+        if (res.examPaper) {
+          form.paperId = res.examPaper.paperId
+        }
+      }
+    },
     // 返回
     back () {
       this.$emit('update:form', this.$parent.curOriginForm)
diff --git a/src/views/match/add/step3.vue b/src/views/match/add/step3.vue
index f13381c..53caff1 100644
--- a/src/views/match/add/step3.vue
+++ b/src/views/match/add/step3.vue
@@ -22,6 +22,7 @@
                 </el-alert>
               </div>
             </el-form-item>
+            <!-- 其他赛事 -->
             <template v-if="item.method === 2">
               <el-form-item class="req" label="比赛地点">
                 <el-input v-model="item.offlineAddress" style="width: 80%"></el-input>
@@ -70,12 +71,19 @@
               </el-form-item>
             </template>
             <template v-else>
-              <el-form-item class="req" prop="cid" label="课程系统">
-                {{ item.systemName }}
-              </el-form-item>
-              <el-form-item class="req" prop="assessmentId" label="已选择考核">
-                {{ item.projectName }}
-              </el-form-item>
+              <template v-if="item.method === 0">
+                <el-form-item class="req" prop="cid" label="课程系统">
+                  {{ item.systemName }}
+                </el-form-item>
+                <el-form-item class="req" prop="assessmentId" label="已选择考核">
+                  {{ item.projectName }}
+                </el-form-item>
+              </template>
+              <template v-else>
+                <el-form-item class="req" label="已选择试卷">
+                  {{ item.paperName }}
+                </el-form-item>
+              </template>
               <el-form-item class="req" prop="resultAnnouncementTime" label="比赛地点">
                 <div class="line">
                   <el-checkbox v-model="item.onlineButton">线上</el-checkbox>
@@ -151,6 +159,7 @@ export default {
         stageId: '',
         startTime: '',
         systemId: '',
+        paperId: '',
         offlineAddress: '',
         offlineButton: 0,
         onlineAddress: '',
@@ -237,8 +246,10 @@ export default {
           form.method = e.method
           form.stageId = e.stageId
           form.stageName = e.stageName
+          if (form.paperName) form.originPaperName = form.paperName // 先保存原始的试卷名称，发布的时候，如果试卷名称有改变， 则调复制试卷接口
           this.form.push(form)
         })
+
         this.resumeData()
         this.$nextTick(() => {
           this.updateTime = 0
@@ -401,11 +412,16 @@ export default {
             Util.errorMsg('设置的阶段比赛时间必须要在第一步设置的竞赛时间范围内，请重新设置。')
             break
           }
-          if (e.method !== 2 && !e.cid) {
+          if (e.method === 0 && !e.cid) {
             invalid = 1
             Util.errorMsg('请选择课程')
             break
           }
+          if (e.method === 1 && !e.paperId) {
+            invalid = 1
+            Util.errorMsg('请选择试卷')
+            break
+          }
           if (e.method === 2) { // 线下
             if (!e.offlineAddress) {
               invalid = 1
diff --git a/src/views/match/add/template.vue b/src/views/match/add/template.vue
new file mode 100644
index 0000000..5ee81a4
--- /dev/null
+++ b/src/views/match/add/template.vue
@@ -0,0 +1,235 @@
+<template>
+  <!-- 理论考试选择试卷 -->
+  <div>
+    <el-dialog title="请选择试卷" :visible.sync="listVisible" width="1200px" :close-on-click-modal="false"
+      @closed="closeDia">
+      <div class="tool">
+        <ul class="filter">
+          <li>
+            <label>搜索</label>
+            <el-input style="width: 250px;" placeholder="请输入模板名称" prefix-icon="el-icon-search" v-model="filter.keyWord"
+              clearable />
+          </li>
+        </ul>
+        <div>
+          <el-button type="primary" @click="add">新增模板</el-button>
+        </div>
+      </div>
+
+      <el-table :data="projects" class="table" stripe header-align="center">
+        <el-table-column width="60" label="选择" align="center">
+          <template slot-scope="scope">
+            <el-radio v-model="scope.row.paperId" :label="scope.row.paperId">&nbsp;</el-radio>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
+        <el-table-column prop="name" label="试卷名称" min-width="140" align="center"></el-table-column>
+        <el-table-column prop="questionCount" label="试题总数" align="center" min-width="70"></el-table-column>
+        <el-table-column prop="score" label="总分" align="center" min-width="70"></el-table-column>
+        <el-table-column prop="difficult" label="试卷难度" align="center" min-width="70" sortable="custom">
+          <template slot-scope="scope">{{ difficults.find(e => e.id === scope.row.difficult) ? difficults.find(e =>
+            e.id === scope.row.difficult).name : '' }}</template>
+        </el-table-column>
+        <el-table-column prop="suggestTime" label="建议用时" align="center" min-width="70">
+          <template slot-scope="scope">{{ scope.row.suggestTime }}min</template>
+        </el-table-column>
+        <el-table-column prop="classificationPath" label="试卷分类" align="center" min-width="70"
+          show-overflow-tooltip></el-table-column>
+        <el-table-column label="建议用途" align="center" min-width="70">
+          <template slot-scope="scope">{{ paperTypes.find(e => e.id === scope.row.paperType) ? paperTypes.find(e =>
+            e.id === scope.row.paperType).name : '' }}</template>
+        </el-table-column>
+        <el-table-column prop="updateTime" label="最近编辑时间" align="center" width="170"></el-table-column>
+        <el-table-column prop="createUser" label="最近编辑人" align="center" width="110"></el-table-column>
+      </el-table>
+      <div class="pagination">
+        <el-pagination background :page-size="pageSize" @current-change="handleCurrentChange"
+          layout="total,prev, pager, next" :total="total"></el-pagination>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="selectQuesVisible = false">取消</el-button>
+        <el-button type="primary" :loading="submiting" @click="submit">确定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import Setting from '@/setting'
+import Util from '@/libs/util'
+import _ from 'lodash'
+export default {
+  props: ['visible'],
+  data () {
+    return {
+      arabicToChinese: Util.arabicToChinese,
+      listVisible: false,
+      searchTimer: null,
+      questionTypes: [
+        {
+          name: '单选题'
+        },
+        {
+          name: '多选题'
+        },
+        {
+          name: '判断题'
+        },
+        {
+          name: '填空题'
+        },
+        {
+          name: '问答题'
+        },
+      ],
+
+      filter: {
+        keyWord: '',
+      },
+      list: [],
+      page: 1,
+      pageSize: 10,
+      total: 0,
+      submiting: false,
+
+    };
+  },
+  watch: {
+    'filter.keyWord': function (val) {
+      clearTimeout(this.searchTimer)
+      this.searchTimer = setTimeout(this.initData, 500)
+    },
+    visible () {
+      this.listVisible = this.visible
+      this.visible && this.getList()
+    }
+  },
+  mounted () {
+    this.originForm = _.cloneDeep(this.form)
+  },
+  methods: {
+    // 获取试卷列表
+    async getList () {
+      try {
+        const res = await this.$post(this.api.examPaperList, {
+          pageNum: this.page,
+          pageSize: this.pageSize,
+          type: 1,
+          keyWord: this.keyword,
+          libraryId: this.systemId
+        })
+        this.projects = res.pageList.records
+        this.total = res.pageList.total
+      } catch (e) { }
+    },
+    // 切换页码
+    currentChange (val) {
+      this.page = val
+      this.getList()
+    },
+    initData () {
+      this.page = 1
+      this.getList()
+    },
+    // 新增
+    add () {
+      this.form = _.cloneDeep(this.originForm)
+      this.detailVisible = true
+    },
+    // 试卷大纲添加行
+    addLine (i) {
+      this.form.paperOutline.splice(i + 1, 0, {
+        examQuestions: [],
+        outlineName: '',
+        questionNum: '',
+        questionType: '',
+        targetScore: '',
+      })
+    },
+    // 试卷大纲移除行
+    delLine (i) {
+      this.form.paperOutline.length > 1 && this.form.paperOutline.splice(i, 1)
+    },
+    // 使用模板
+    async useTemplate (row) {
+      const data = await this.getDetail(row.templateId)
+      this.$parent.form.paperOutline = data.paperOutline
+      this.listVisible = false
+    },
+    // 获取详情
+    async getDetail (id) {
+      const res = await this.$get(this.api.templateDetails, {
+        id
+      })
+      return res.template
+    },
+    // 编辑
+    async edit (row) {
+      this.detailVisible = true
+      const data = await this.getDetail(row.templateId)
+      this.form = data
+    },
+    // 删除
+    async del (row) {
+      try {
+        await this.$confirm(`确认要删除【${row.templateName}】吗？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+          closeOnClickModal: false,
+        })
+        await this.$post(this.api.deleteTemplate, {
+          ids: [row.templateId]
+        })
+        Util.successMsg('删除成功')
+        this.getList()
+      } catch (e) { }
+    },
+    // 提交
+    async submit () {
+      if (this.submiting) return false
+      const { form } = this
+      if (!form.templateName) return Util.warningMsg('请输入模板名称')
+      let invalid = 0
+      for (const e of form.paperOutline) {
+        if (!e.questionType) {
+          Util.warningMsg('请选择题型')
+          invalid = 1
+          break
+        }
+        if (!e.questionNum) {
+          Util.warningMsg('请输入目标题数')
+          invalid = 1
+          break
+        }
+        if (!e.targetScore) {
+          Util.warningMsg('请输入目标分值')
+          invalid = 1
+          break
+        }
+      }
+      if (invalid) return false
+      this.submiting = true
+      form.createSource = 1
+      form.questionNum = this.questionNum
+      form.totalScore = this.totalScore
+      form.outlineNum = form.paperOutline.length
+      form.questionType = [...new Set(form.paperOutline.map(e => e.questionType))].join('、')
+      try {
+        await this.$post(this.api.saveExamPaperTemplate, form)
+        Util.successMsg('保存成功')
+        this.detailVisible = false
+        this.submiting = false
+        this.getList()
+      } catch (e) {
+        this.submiting = false
+      }
+    },
+    // 弹框关闭回调
+    closeDia () {
+      this.$emit('update:visible', false)
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/match/manage/matchReport.vue b/src/views/match/manage/matchReport.vue
index 1d8b461..0540c99 100644
--- a/src/views/match/manage/matchReport.vue
+++ b/src/views/match/manage/matchReport.vue
@@ -1,204 +1,137 @@
 <template>
   <div class="wrap">
-    <el-card shadow="hover"
-             class="m-b-20">
-      <el-page-header @back="$router.back()"
-                      content="查看报告"></el-page-header>
+    <el-card shadow="hover" class="m-b-20">
+      <el-page-header @back="$router.back()" content="查看报告"></el-page-header>
     </el-card>
 
-    <div class="content"
-         v-loading="loading">
+    <div class="content" v-loading="loading">
       <div class="text-right">
-        <el-button type="primary"
-                   @click="exportPage">导出报告</el-button>
+        <el-button type="primary" @click="exportPage">导出报告</el-button>
       </div>
       <h6 class="r-title">标准实验报告</h6>
       <div class="info">
         <h6 class="l-title">
-          <img src="@/assets/img/info1.png"
-               alt="">
+          <img src="@/assets/img/info1.png" alt="">
           基本信息
         </h6>
-        <ul :class="['info-list', {edit: editing}]">
+        <ul :class="['info-list', { edit: editing }]">
           <li>
             <label>学生姓名：</label>
-            <el-input v-if="editing"
-                      v-model="infoData.userName"
-                      disabled></el-input>
+            <el-input v-if="editing" v-model="infoData.userName" disabled></el-input>
             <span v-else>{{ infoData.userName }}</span>
           </li>
           <li>
             <label>学生学号：</label>
-            <el-input v-if="editing"
-                      v-model="infoData.workNumber"
-                      disabled></el-input>
+            <el-input v-if="editing" v-model="infoData.workNumber" disabled></el-input>
             <span v-else>{{ infoData.workNumber }}</span>
           </li>
           <li>
             <label>实验时间：</label>
-            <el-input v-if="editing"
-                      v-model="infoData.submitTime"
-                      disabled></el-input>
+            <el-input v-if="editing" v-model="infoData.submitTime" disabled></el-input>
             <span v-else>{{ infoData.submitTime }}</span>
           </li>
           <li>
             <label>实验成绩：</label>
-            <el-input v-if="editing"
-                      v-model="infoData.score"
-                      disabled></el-input>
-            <div v-else
-                 class="score-wrap">
+            <el-input v-if="editing" v-model="infoData.score" disabled></el-input>
+            <div v-else class="score-wrap">
               <em>{{ infoData.score }}</em>
-              <img src="@/assets/img/point.png"
-                   alt="">
+              <img src="@/assets/img/point.png" alt="">
             </div>
           </li>
           <li>
             <label>学生班级：</label>
-            <el-input v-if="editing"
-                      v-model="infoData.className"></el-input>
+            <el-input v-if="editing" v-model="infoData.className"></el-input>
             <span v-else>{{ infoData.className }}</span>
           </li>
           <li>
             <label>指导老师：</label>
-            <el-input v-if="editing"
-                      v-model="infoData.instructor"></el-input>
+            <el-input v-if="editing" v-model="infoData.instructor"></el-input>
             <span v-else>{{ infoData.instructor }}</span>
           </li>
           <li>
             <label>实验学时：</label>
-            <el-input v-if="editing"
-                      v-model="infoData.period"></el-input>
+            <el-input v-if="editing" v-model="infoData.period"></el-input>
             <span v-else>{{ infoData.period }}</span>
           </li>
         </ul>
         <div class="m-b-20">
           <h6 class="l-title">
-            <img src="@/assets/img/report2.png"
-                 alt="">
+            <img src="@/assets/img/report2.png" alt="">
             实验项目名称
           </h6>
-          <el-input v-if="editing"
-                    v-model="form.projectName"
-                    type="textarea"></el-input>
-          <div v-else
-               class="pre-wrap"
-               v-html="form.projectName"></div>
+          <el-input v-if="editing" v-model="form.projectName" type="textarea"></el-input>
+          <div v-else class="pre-wrap" v-html="form.projectName"></div>
         </div>
         <div class="m-b-20">
           <h6 class="l-title">
-            <img src="@/assets/img/report3.png"
-                 alt="">
+            <img src="@/assets/img/report3.png" alt="">
             实验目的
           </h6>
-          <div :class="['pre-wrap', {edit: editing}]"
-               v-html="form.purpose"></div>
+          <div :class="['pre-wrap', { edit: editing }]" v-html="form.purpose"></div>
         </div>
         <div class="m-b-20">
           <h6 class="l-title">
-            <img src="@/assets/img/report4.png"
-                 alt="">
+            <img src="@/assets/img/report4.png" alt="">
             实验数据
           </h6>
-          <el-table :data="expData"
-                    class="table"
-                    border
-                    stripe
-                    header-align="center">
-            <el-table-column type="index"
-                             label="序号"
-                             align="center"
-                             width="60">
+          <el-table :data="expData" class="table" border stripe header-align="center">
+            <el-table-column type="index" label="序号" align="center" width="60">
               <template slot-scope="scope">
                 {{ scope.$index + 1 }}
               </template>
             </el-table-column>
-            <el-table-column prop="judgmentName"
-                             label="判分点"
-                             width="270"
-                             align="center"></el-table-column>
-            <el-table-column v-if='project'
-                             prop="judgmentName"
-                             label="考核点"
-                             align="center"
-                             width="150">
+            <el-table-column prop="judgmentName" label="判分点" width="270" align="center"></el-table-column>
+            <el-table-column v-if='project' prop="judgmentName" label="考核点" align="center" width="150">
               <template slot-scope="scope">
-                <div v-for="(item, index) in scope.row.lcRuleRecords"
-                     :key="index">
+                <div v-for="(item, index) in scope.row.lcRuleRecords" :key="index">
                   <span>
-                    <span>{{index+1}}. </span>{{item.name}}
+                    <span>{{ index + 1 }}. </span>{{ item.name }}
                   </span>
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="ruleAnswer"
-                             label="参考答案"
-                             style='word-wrap: break-word'>
+            <el-table-column prop="ruleAnswer" label="参考答案" style='word-wrap: break-word'>
               <template slot-scope="scope">
                 <div v-if='scope.row.lcRuleRecords'>
-                  <div v-for="(item, index) in scope.row.lcRuleRecords"
-                       :key="index">
+                  <div v-for="(item, index) in scope.row.lcRuleRecords" :key="index">
                     <span>
-                      <span>{{index+1}}. </span>{{item.ruleAnswer}}
+                      <span>{{ index + 1 }}. </span>{{ item.ruleAnswer }}
                     </span>
                   </div>
                 </div>
-                <div v-else
-                     v-html="scope.row.referenceAnswer"></div>
+                <div v-else v-html="scope.row.referenceAnswer"></div>
               </template>
             </el-table-column>
-            <el-table-column prop="userAnswer"
-                             label="学生答案">
+            <el-table-column prop="userAnswer" label="学生答案">
               <template slot-scope="scope">
                 <div v-if='scope.row.lcRuleRecords'>
-                  <div v-for="(item, index) in scope.row.lcRuleRecords"
-                       :key="index">
+                  <div v-for="(item, index) in scope.row.lcRuleRecords" :key="index">
                     <span v-if='item.userAnswer'>
-                      <span>{{index+1}}. </span>{{item.userAnswer}}
+                      <span>{{ index + 1 }}. </span>{{ item.userAnswer }}
                     </span>
                     <span v-else>
-                      <span>{{index+1}}. </span>未填写
+                      <span>{{ index + 1 }}. </span>未填写
                     </span>
                   </div>
                 </div>
-                <div v-else
-                     v-html='scope.row.answer'
-                     style='white-space: pre-wrap'></div>
+                <div v-else v-html='scope.row.answer' style='white-space: pre-wrap'></div>
                 <template v-if="scope.row.runThePictureList">
-                  <img v-for="(img, i) in scope.row.runThePictureList"
-                       :key="i"
-                       width="200"
-                       class="result-pic"
-                       :src="img"
-                       alt="">
+                  <img v-for="(img, i) in scope.row.runThePictureList" :key="i" width="200" class="result-pic"
+                    :src="img" alt="">
                 </template>
               </template>
             </el-table-column>
-            <el-table-column prop="quesScore"
-                             label="分值"
-                             :key="6"
-                             width="80"
-                             align="center"></el-table-column>
-            <el-table-column prop="score"
-                             label="得分"
-                             width="80"
-                             align="center"></el-table-column>
+            <el-table-column prop="quesScore" label="分值" :key="6" width="80" align="center"></el-table-column>
+            <el-table-column prop="score" label="得分" width="80" align="center"></el-table-column>
           </el-table>
         </div>
         <div class="m-b-20">
           <h6 class="l-title">
-            <img src="@/assets/img/report5.png"
-                 alt="">
+            <img src="@/assets/img/report5.png" alt="">
             实验总结与体会
           </h6>
-          <quill v-if="editing"
-                 :border="true"
-                 v-model="form.summarize"
-                 :minHeight="150"
-                 :height="150" />
-          <div v-else
-               class="pre-wrap"
-               v-html="form.summarize"></div>
+          <quill v-if="editing" :border="true" v-model="form.summarize" :minHeight="150" :height="150" />
+          <div v-else class="pre-wrap" v-html="form.summarize"></div>
         </div>
       </div>
     </div>
@@ -318,132 +251,160 @@ export default {
 
 <style lang="scss" scoped>
 .wrap {
-    padding: 12px 300px 20px;
+  padding: 12px 300px 20px;
 }
+
 .text-right {
-    text-align: right;
+  text-align: right;
 }
+
 code,
 kbd,
 samp {
-    font-family: 'PingFang SC', 'Helvetica Neue', Helvetica, 'microsoft yahei', arial, STHeiTi, sans-serif;
-    word-wrap: break-word;
-    white-space: pre-wrap;
+  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;
+  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;
 }
+
 .content {
-    padding: 16px 40px;
-    background: #fff;
-    .r-title {
-        margin-bottom: 40px;
-        font-size: 24px;
-        text-align: center;
-        color: #333;
-    }
-    .info {
-        padding: 20px 16px;
-        border: 1px solid #e1e6f2;
+  padding: 16px 40px;
+  background: #fff;
+
+  .r-title {
+    margin-bottom: 40px;
+    font-size: 24px;
+    text-align: center;
+    color: #333;
+  }
+
+  .info {
+    padding: 20px 16px;
+    border: 1px solid #e1e6f2;
+  }
+
+  .l-title {
+    display: flex;
+    align-items: center;
+    padding: 5px 8px;
+    margin-bottom: 12px;
+    font-size: 14px;
+    color: #333;
+    background-color: #f7f5ff;
+  }
+
+  .info-list {
+    display: flex;
+    flex-wrap: wrap;
+    padding: 10px 0 0 20px;
+
+    li {
+      display: inline-flex;
+      width: 23%;
+      padding: 0 10px;
+      margin-bottom: 34px;
     }
-    .l-title {
-        display: flex;
+
+    &.edit {
+      li {
         align-items: center;
-        padding: 5px 8px;
-        margin-bottom: 12px;
-        font-size: 14px;
-        color: #333;
-        background-color: #f7f5ff;
+      }
     }
-    .info-list {
-        display: flex;
-        flex-wrap: wrap;
-        padding: 10px 0 0 20px;
-        li {
-            display: inline-flex;
-            width: 23%;
-            padding: 0 10px;
-            margin-bottom: 34px;
-        }
-        &.edit {
-            li {
-                align-items: center;
-            }
-        }
-        label {
-            font-size: 14px;
-            color: #333;
-            white-space: nowrap;
-        }
-        span {
-            min-width: 150px;
-            padding: 0 10px 3px;
-            border-bottom: 1px solid #e1e6f2;
-        }
-        /deep/.el-input {
-            width: 174px;
-        }
+
+    label {
+      font-size: 14px;
+      color: #333;
+      white-space: nowrap;
     }
-    .score-wrap {
-        position: relative;
-        min-width: 150px;
-        border-bottom: 1px solid #e1e6f2;
-        em {
-            position: absolute;
-            top: -12px;
-            left: 30px;
-            font-family: din;
-            font-size: 30px;
-            font-weight: 600;
-            color: #0b1d30;
-        }
-        img {
-            position: absolute;
-            bottom: -15px;
-            left: 0;
-        }
+
+    span {
+      min-width: 150px;
+      padding: 0 10px 3px;
+      border-bottom: 1px solid #e1e6f2;
     }
-    /deep/.el-textarea .el-textarea__inner,
-    .pre-wrap {
-        min-height: 72px;
-        padding: 10px 16px;
-        font-size: 14px;
-        color: #333;
-        &.edit {
-            color: #abb3c6;
-            border: 1px solid #cacfdb;
-            border-radius: 4px;
-            background-color: #f6f7f9;
-        }
+
+    /deep/.el-input {
+      width: 174px;
     }
-    /deep/ .table th {
-        background-color: #e5dfff !important;
-        .cell {
-            line-height: 35px;
-            color: #fff;
-        }
+  }
+
+  .score-wrap {
+    position: relative;
+    min-width: 150px;
+    border-bottom: 1px solid #e1e6f2;
+
+    em {
+      position: absolute;
+      top: -12px;
+      left: 30px;
+      font-family: din;
+      font-size: 30px;
+      font-weight: 600;
+      color: #0b1d30;
+    }
+
+    img {
+      position: absolute;
+      bottom: -15px;
+      left: 0;
+    }
+  }
+
+  /deep/.el-textarea .el-textarea__inner,
+  .pre-wrap {
+    min-height: 72px;
+    padding: 10px 16px;
+    font-size: 14px;
+    color: #333;
+
+    &.edit {
+      color: #abb3c6;
+      border: 1px solid #cacfdb;
+      border-radius: 4px;
+      background-color: #f6f7f9;
     }
+  }
+
+  /deep/ .table th {
+    background-color: #e5dfff !important;
+
+    .cell {
+      line-height: 35px;
+      color: #fff;
+    }
+  }
 }
+
 .result-pic {
-    margin: 10px 0;
+  margin: 10px 0;
 }
+
 @media (max-width: 1650px) {
-    .wrap {
-        padding: 12px 200px 20px;
-    }
+  .wrap {
+    padding: 12px 200px 20px;
+  }
 }
+
 @media (max-width: 1430px) {
-    .wrap {
-        padding: 12px 100px 20px;
-    }
+  .wrap {
+    padding: 12px 100px 20px;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/match/manage/matchSignup.vue b/src/views/match/manage/matchSignup.vue
index b7488cc..715c847 100644
--- a/src/views/match/manage/matchSignup.vue
+++ b/src/views/match/manage/matchSignup.vue
@@ -69,11 +69,13 @@
       </el-table-column>
       <el-table-column label="操作" align="center" width="270">
         <template slot-scope="scope">
-          <el-button v-auth="'/match:管理:报名人员:编辑'" type="text" @click="edit(scope.row)">编辑</el-button>
-          <el-button type="text" @click="del(scope.row)">删除</el-button>
+          <template v-if="!scope.row.isDel">
+            <el-button v-auth="'/match:管理:报名人员:编辑'" type="text" @click="edit(scope.row)">编辑</el-button>
+            <el-button type="text" @click="del(scope.row)">删除</el-button>
+          </template>
           <template v-if="info.releaseType">
             <el-button v-auth="'/match:管理:报名人员:参赛信息与成绩'" type="text" @click="toInfo(scope.row)">参赛信息与成绩</el-button>
-            <el-switch v-auth="'/match:管理:报名人员:禁用'" v-model="scope.row.isDisable"
+            <el-switch v-if="!scope.row.isDel" 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)"></el-switch>
           </template>