From 734524aab27fea2b8955a4d05ebe18f8020d253b Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 21 Oct 2024 15:23:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=9B=E4=BA=8B=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/match/manage/matchArch.vue     |  2 +-
 src/views/match/manage/matchArchList.vue |  5 +++--
 src/views/match/manage/otherArchList.vue | 16 +++++++++++++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/views/match/manage/matchArch.vue b/src/views/match/manage/matchArch.vue
index 8a41f3a..262c61e 100644
--- a/src/views/match/manage/matchArch.vue
+++ b/src/views/match/manage/matchArch.vue
@@ -32,7 +32,7 @@
             <el-button v-if="scope.row.showMyReviewTask" type="text"
               @click="showReview(scope.row, '/myReview/records')">我的评阅任务</el-button>
             <el-button v-auth="'/review:分配评阅任务'" type="text"
-              @click="showReview(scope.row, '/allocationReview/records')">分配评阅任务</el-button>
+              @click="showReview(scope.row, '/allocationReview')">分配评阅任务</el-button>
           </template>
         </template>
       </el-table-column>
diff --git a/src/views/match/manage/matchArchList.vue b/src/views/match/manage/matchArchList.vue
index ccb5a14..782b7b7 100644
--- a/src/views/match/manage/matchArchList.vue
+++ b/src/views/match/manage/matchArchList.vue
@@ -79,7 +79,7 @@
           <div>
             <template v-if="active && method === 1">
               <el-button v-auth="'/review:分配评阅任务'" type="primary" size="mini"
-                @click="showReview('/allocationReview/records')">分配评阅任务</el-button>
+                @click="showReview('/allocationReview')">分配评阅任务</el-button>
               <el-button v-if="showMyReviewTask" type="primary" size="mini"
                 @click="showReview('/myReview/records')">我的评阅任务</el-button>
               <el-button type="primary" size="mini" @click="exportFiles">导出答题文件</el-button>
@@ -493,7 +493,8 @@ export default {
           // 实训导出
           res = await axios.post(this.api.batchExportReportsAsZip, {
             reportIds: ids,
-            stageId: this.stageId
+            stageId: this.stageId,
+            competitionId: this.id,
           }, {
             headers: this.headers,
             responseType: 'blob'
diff --git a/src/views/match/manage/otherArchList.vue b/src/views/match/manage/otherArchList.vue
index c1ef489..3f24cd8 100644
--- a/src/views/match/manage/otherArchList.vue
+++ b/src/views/match/manage/otherArchList.vue
@@ -50,7 +50,14 @@
               </el-select>
             </li>
             <li>
-              <el-input size="small" placeholder="请输入学校/学生姓名" prefix-icon="el-icon-search" v-model="keyword" clearable
+              <label>学校</label>
+              <el-select v-model="filter.realSchoolId" clearable filterable placeholder="请选择学校" @change="initData">
+                <el-option v-for="(item, i) in schools" :key="i" :label="item.schoolName"
+                  :value="item.schoolId"></el-option>
+              </el-select>
+            </li>
+            <li>
+              <el-input size="small" placeholder="请输入学生姓名" prefix-icon="el-icon-search" v-model="keyword" clearable
                 style="width: 300px"></el-input>
             </li>
           </ul>
@@ -213,6 +220,7 @@ export default {
       },
       provinces: [],
       cities: [],
+      schools: [],
       keyword: this.$route.query.keyword || '',
       searchTimer: null,
       list: [],
@@ -261,6 +269,7 @@ export default {
   mounted () {
     this.getData()
     this.getProvince()
+    this.getSchool()
   },
   methods: {
     async getData () {
@@ -343,6 +352,11 @@ export default {
         this.cities = list
       }
     },
+    // 获取学校
+    async getSchool () {
+      const { list } = await this.$get(this.api.querySchoolData)
+      this.schools = list
+    },
 
     // 查看成绩报告
     show (row) {