From e467d9055077cb9a86d5f50dbd440d0413b3c110 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 23 Dec 2024 17:20:04 +0800
Subject: [PATCH] fix

---
 src/const/source.js                    |  28 +++
 src/views/course/content/source.vue    | 190 ++++++++++++------
 src/views/match/add/set.vue            | 254 +++++++++++++------------
 src/views/match/add/step3.vue          |  20 +-
 src/views/match/manage/trialReport.vue |  10 +-
 5 files changed, 310 insertions(+), 192 deletions(-)
 create mode 100644 src/const/source.js

diff --git a/src/const/source.js b/src/const/source.js
new file mode 100644
index 0000000..808667f
--- /dev/null
+++ b/src/const/source.js
@@ -0,0 +1,28 @@
+export default {
+  types: [
+    {
+      id: 1,
+      name: '演示文稿类'
+    },
+    {
+      id: 2,
+      name: '视频类'
+    },
+    {
+      id: 3,
+      name: '图形类'
+    },
+    {
+      id: 4,
+      name: '文本类'
+    },
+    {
+      id: 5,
+      name: '音频类'
+    },
+    {
+      id: 6,
+      name: '其他'
+    },
+  ],
+}
diff --git a/src/views/course/content/source.vue b/src/views/course/content/source.vue
index 2ab7cb4..c2826d8 100644
--- a/src/views/course/content/source.vue
+++ b/src/views/course/content/source.vue
@@ -1,55 +1,89 @@
 <template>
   <el-drawer title="添加系统资源" :visible.sync="sourceVisible" size="1200px" :close-on-click-modal="false"
     custom-class="source-dia" @closed="closeDia">
-    <div class="overflow">
+    <div class="overflow" v-loading="loading">
       <div class="left">
-        <el-input style="width: 300px" placeholder="请输入资源名称" prefix-icon="el-icon-search" v-model="keyword"
-          clearable></el-input>
         <div class="tabs mgb20">
           <a class="item" v-for="(item, i) in tabs" :key="i" :class="{ active: i == active }" @click="tabChange(i)">{{
             item
           }}</a>
         </div>
 
-        <div class="course">
-          <div v-for="(course, i) in course" :key="i" class="item">
-            <div class="line">
-              <i :class="`el-icon-caret-right arrow ${course.shrink ? 'active' : ''}`"
-                @click="course.shrink = !course.shrink"></i>
-              <el-checkbox class="check" v-model="course.check" @change="checkCourse(course)"></el-checkbox>
-              <img v-if="course.coverUrl" class="cover" :src="course.coverUrl" alt="">
-              <span class="course-name">{{ course.curriculumName }}</span>
-            </div>
-            <div v-if="course.shrink" class="chapters">
-              <!-- 章节 -->
-              <div v-for="(chapter, j) in course.chapters" :key="j" class="">
-                <div class="line">
-                  <i :class="`el-icon-caret-right arrow ${chapter.shrink ? 'active' : ''}`"
-                    @click="chapter.shrink = !chapter.shrink"></i>
-                  <el-checkbox class="check" v-model="chapter.check" @change="checkChapter(chapter, course)">{{
-                    chapter.name
-                  }}</el-checkbox>
-                </div>
+        <template v-if="active !== 'tab3'">
+          <el-input class="mgb10" style="width: 300px" placeholder="请输入资源名称" prefix-icon="el-icon-search"
+            v-model="keyword" clearable></el-input>
+
+          <div class="course">
+            <div v-for="(course, i) in course" :key="i" class="item">
+              <div class="line">
+                <i :class="`el-icon-caret-right arrow ${course.shrink ? 'active' : ''}`"
+                  @click="course.shrink = !course.shrink"></i>
+                <el-checkbox class="check" v-model="course.check" @change="checkCourse(course)"></el-checkbox>
+                <img v-if="course.coverUrl" class="cover" :src="course.coverUrl" alt="">
+                <span class="course-name">{{ course.curriculumName }}</span>
+              </div>
+              <div v-if="course.shrink" class="chapters">
+                <!-- 章节 -->
+                <div v-for="(chapter, j) in course.chapters" :key="j" class="">
+                  <div class="line">
+                    <i :class="`el-icon-caret-right arrow ${chapter.shrink ? 'active' : ''}`"
+                      @click="chapter.shrink = !chapter.shrink"></i>
+                    <el-checkbox class="check" v-model="chapter.check" @change="checkChapter(chapter, course)">{{
+                      chapter.name
+                    }}</el-checkbox>
+                  </div>
 
-                <!-- 小节 -->
-                <div v-if="chapter.shrink" class="sections">
-                  <div v-for="(section, k) in chapter.subsections" :key="k" class="line">
-                    <el-checkbox class="check" v-model="section.check" @change="checkSection(section, chapter)">
-                      <img v-if="section.fileType === 'pptx'" src="@/assets/img/exts/ppt.png" alt="">
-                      <img v-else-if="section.fileType === 'mp4'" src="@/assets/img/exts/video.png" alt="">
-                      <img v-else-if="section.fileType === 'doc' || section.fileType === 'docx'"
-                        src="@/assets/img/exts/word.png" alt="">
-                      <img v-else-if="section.fileType === 'xlsx' || section.fileType === 'xls'"
-                        src="@/assets/img/exts/excel.png" alt="">
-                      <img v-else-if="section.fileType === 'txt'" src="@/assets/img/exts/txt.png" alt="">
-                      <img v-else-if="section.fileType === 'pdf'" src="@/assets/img/exts/pdf.png" alt="">
-                      <img v-else src="@/assets/img/exts/pic.png" alt="">
-                      {{ section.name }}</el-checkbox>
+                  <!-- 小节 -->
+                  <div v-if="chapter.shrink" class="sections">
+                    <div v-for="(section, k) in chapter.subsections" :key="k" class="line">
+                      <el-checkbox class="check" v-model="section.check" @change="checkSection(section, chapter)">
+                        <img v-if="section.fileType === 'pptx'" src="@/assets/img/exts/ppt.png" alt="">
+                        <img v-else-if="section.fileType === 'mp4'" src="@/assets/img/exts/video.png" alt="">
+                        <img v-else-if="section.fileType === 'doc' || section.fileType === 'docx'"
+                          src="@/assets/img/exts/word.png" alt="">
+                        <img v-else-if="section.fileType === 'xlsx' || section.fileType === 'xls'"
+                          src="@/assets/img/exts/excel.png" alt="">
+                        <img v-else-if="section.fileType === 'txt'" src="@/assets/img/exts/txt.png" alt="">
+                        <img v-else-if="section.fileType === 'pdf'" src="@/assets/img/exts/pdf.png" alt="">
+                        <img v-else src="@/assets/img/exts/pic.png" alt="">
+                        {{ section.name }}</el-checkbox>
+                    </div>
                   </div>
                 </div>
               </div>
             </div>
           </div>
+        </template>
+
+        <!-- 文件素材 -->
+        <div v-else class="materials">
+          <div class="types">
+            <div class="flex-center m-b-10">
+              <p class="addhr_tag"></p>
+              <span>资源类型</span>
+            </div>
+            <ul class="lines">
+              <li v-for="(item, i) in sourceType" :key="i" class="line">
+                <el-checkbox v-model="item.check" :label="item.name"
+                  @change="val => typeChange(val, item)"></el-checkbox>
+              </li>
+            </ul>
+          </div>
+
+          <div class="sources">
+            <div class="flex-center m-b-10">
+              <p class="addhr_tag"></p>
+              <span>资源列表</span>
+            </div>
+            <el-input placeholder="请输入资源名称" prefix-icon="el-icon-search" v-model="checkedKeyword" clearable></el-input>
+            <ul class="lines">
+              <el-checkbox v-if="sources.length" v-model="checkAll" label="全选" @change="checkAllChange"></el-checkbox>
+              <li v-for="(item, i) in sources" :key="i" class="line">
+                <el-checkbox v-model="item.check" :label="item.name"
+                  @change="val => sourceChange(val, item)"></el-checkbox>
+              </li>
+            </ul>
+          </div>
         </div>
       </div>
       <div class="right">
@@ -98,6 +132,7 @@
 import Setting from '@/setting'
 import Util from '@/libs/util'
 import _ from 'lodash'
+import SourceConst from '@/const/source'
 export default {
   props: ['visible'],
   data () {
@@ -109,6 +144,9 @@ export default {
         tab2: '精品课程',
         tab3: '文件素材',
       },
+      sourceType: SourceConst.types,
+      sources: [],
+      checkAll: false,
       keyword: '',
       searchTimer: null,
       checkedKeyword: '',
@@ -118,7 +156,7 @@ export default {
 
       checked: [],
       submiting: false,
-      loaded: 0,
+      loading: false,
     };
   },
   watch: {
@@ -142,26 +180,31 @@ export default {
     },
     // 课程列表
     async getCourse () {
-      const { list } = await this.$post(`${this.api[this.active === 'tab1' ? 'curriculumTree' : 'boutiqueCurriculumTree']}?name=${this.keyword}`)
-      if (list.length) {
-        const all = []
-        list.forEach(e => {
-          e.shrink = false
-          e.check = false
-          e.chapters.forEach(n => {
-            n.shrink = false
-            n.check = false
-            all.push(...n.subsections)
-            n.subsections.forEach(m => {
-              m.check = false
+      try {
+        this.loading = true
+        const { list } = await this.$post(`${this.api[this.active === 'tab1' ? 'curriculumTree' : 'boutiqueCurriculumTree']}?name=${this.keyword}`)
+        if (list.length) {
+          const all = []
+          list.forEach(e => {
+            e.shrink = false
+            e.check = false
+            e.chapters.forEach(n => {
+              n.shrink = false
+              n.check = false
+              all.push(...n.subsections)
+              n.subsections.forEach(m => {
+                m.check = false
+              })
             })
           })
-        })
-        list[0].shrink = true
-        list[0].chapters[0].shrink = true
-        this.allSections = all
+          list[0].shrink = true
+          list[0].chapters[0].shrink = true
+          this.allSections = all
+        }
+        this.course = list
+      } finally {
+        this.loading = false
       }
-      this.course = list
     },
     initData () {
       this.page = 1;
@@ -227,6 +270,21 @@ export default {
       }
       chapter.check = chapter.subsections.every(e => e.check)
     },
+    // 资源类型选择回调
+    typeChange (val, item) {
+
+    },
+    // 资源全选回调
+    checkAllChange (val, systemId) {
+      // this.systemChange(val, { systemId })
+      // this.systems.map(e => {
+      //   if (e.systemId == systemId) e.check = val
+      // })
+    },
+    // 资源列表选择回调
+    sourceChange (val, item) {
+
+    },
 
     // 批量移除
     async batchDelChecked (val) {
@@ -341,8 +399,7 @@ export default {
 
   .left {
     width: 700px;
-    padding: 0 20px;
-    padding: 15px;
+    padding: 0 15px;
     border-right: 1px solid #eee;
     box-sizing: border-box;
 
@@ -457,5 +514,26 @@ export default {
       cursor: pointer;
     }
   }
+
+  .materials {
+    display: flex;
+    gap: 20px;
+  }
+
+  .types {
+    width: 250px;
+    padding: 10px;
+    background-color: #f9f9f9;
+    box-sizing: border-box;
+
+    .line {
+      margin-bottom: 5px;
+    }
+  }
+
+  .sources {
+    flex: 1;
+    padding: 10px;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/match/add/set.vue b/src/views/match/add/set.vue
index 449c0f9..c184d1d 100644
--- a/src/views/match/add/set.vue
+++ b/src/views/match/add/set.vue
@@ -34,120 +34,117 @@
         </el-radio-group>
 
         <div class="inline-input">
-          <el-select v-model="libraryId" placeholder="请选择试卷库" @change="getProject">
+          <!-- 理论 && 选择课程 -->
+          <el-select v-if="isTheory && !courseSystem" 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>
+
+          <!-- 实训 && 选择课程 -->
+          <el-cascader v-else-if="!isTheory && !courseSystem" ref="cur" v-model="mallIds" :options="curs"
+            :props="{ checkStrictly: true, value: 'id' }" popper-class="course-cas" @expand-change="curChange"
+            @change="curChange"></el-cascader>
+
+          <!-- 实训 && 选择系统 -->
+          <el-select v-else-if="!isTheory && courseSystem" v-model="systemId" placeholder="请选择系统" @change="getProject">
+            <el-option v-for="(item, i) in services" :key="i" :label="item.systemName" :value="item.systemId">
+            </el-option>
+          </el-select>
         </div>
       </div>
     </el-card>
 
     <!-- 理论系统 -->
-    <template v-if="isTheory">
-      <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-card v-if="isTheory" 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>
-        <p v-if="form.paperName" style="margin-bottom: 20px">
-          已选试卷：{{ form.paperName }}
-          <el-button type="primary" size="mini" @click="previewPaper(form)">预览</el-button>
-        </p>
-        <el-table :data="projects" class="table" 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" @change="paperChange">&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-column label="操作" align="center" width="80">
-            <template slot-scope="scope">
-              <el-button type="text" @click="previewPaper(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>
-    </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-cascader ref="cur" v-model="mallIds" :options="curs" :props="{ checkStrictly: true, value: 'id' }"
-              popper-class="course-cas" @expand-change="curChange" @change="curChange"></el-cascader>
-          </div>
-        </div>
-      </el-card>
+      </div>
+      <p v-if="form.paperName" style="margin-bottom: 20px">
+        已选试卷：{{ form.paperName }}
+        <el-button type="primary" size="mini" @click="previewPaper(form)">预览</el-button>
+      </p>
+      <el-table :data="projects" class="table" 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" @change="paperChange">&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-column label="操作" align="center" width="80">
+          <template slot-scope="scope">
+            <el-button type="text" @click="previewPaper(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-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>
+    <el-card v-else 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>
-        <!-- 实训项目表格 -->
-        <el-table :data="projects" class="table" 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">
+      </div>
+      <!-- 实训项目表格 -->
+      <el-table :data="projects" class="table" 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>
-    </template>
+      </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>
 
     <div style="text-align: center">
       <el-button @click="back">返回</el-button>
@@ -158,7 +155,7 @@
 
 <script>
 import Setting from '@/setting'
-import util from "@/libs/util";
+import Util from '@/libs/util'
 import { Loading } from 'element-ui'
 import TestPaperConst from '@/const/testPaper'
 export default {
@@ -169,9 +166,10 @@ export default {
       paperTypes: TestPaperConst.paperTypes,
       loadIns: null,
       mallIds: [],
+      systemId: '',
       curs: [],
       paperLibraries: [],
-      testPapers: [],
+      services: [],
       keyword: '',
       projects: [],
       page: 1,
@@ -214,11 +212,17 @@ export default {
     // 获取课程
     async getCourse () {
       const sid = this.$store.state.dataPer.find(e => e.permissionName === '服务配置')
-      const { serviceList } = await this.$post(this.api.queryServiceConfig, {
+      // 查询服务器列表
+      const res = await this.$post(this.api.queryServiceConfig, {
         pageNum: 1,
         pageSize: 1000,
         supplierId: sid ? sid.supplierId : ''
       })
+      const services = res.serviceList.records
+      this.services = services
+      this.systemId = services[0].systemId
+
+      // 查询产品列表
       const { page } = await this.$post(this.api.listOfGoods, {
         pageNum: 1,
         pageSize: 10000,
@@ -230,14 +234,14 @@ export default {
       const { records } = page
       const { mallId, cid, systemId } = this.form
       if (records.length) {
-        serviceList.records.map(e => {
+        services.map(e => {
           e.id = +e.systemId
           e.label = e.systemName
         })
         records.map(e => {
           e.id = +e.mallId
           e.label = e.productName
-          e.children = serviceList.records.filter(n => e.systemId && e.systemId.split(',').includes(n.systemId)) // 筛选出该课程下的系统
+          e.children = services.filter(n => e.systemId && e.systemId.split(',').includes(n.systemId)) // 筛选出该课程下的系统
         })
         this.curs = records
 
@@ -302,18 +306,24 @@ export default {
           })
           this.projects = res.pageList.records
           this.total = res.pageList.total
-        } else {
-          // 实训查询项目
-          const { data } = await this.$post(this.api.getProjectAssessmentByCompetition, {
-            pageNum: this.page,
-            pageSize: this.pageSize,
-            cid: this.form.cid,
-            projectName: this.keyword,
-            systemId: this.sysId,
-            permissions: 2,
-          })
-          this.projects = data.records
-          this.total = data.total
+        } else { // 实训
+          // 根据系统查询项目
+          if (this.courseSystem) {
+            const res = await this.$get(`${this.api.getInternalProjectBySystemId}?permissions=2&systemId=${this.systemId}&keyword=${this.keyword}`)
+            this.projects = res
+          } else {
+            // 根据课程查询项目
+            const { data } = await this.$post(this.api.getProjectAssessmentByCompetition, {
+              pageNum: this.page,
+              pageSize: this.pageSize,
+              cid: this.form.cid,
+              projectName: this.keyword,
+              systemId: this.sysId,
+              permissions: 2,
+            })
+            this.projects = data.records
+            this.total = data.total
+          }
         }
       } finally {
         this.loadIns.close()
@@ -345,7 +355,7 @@ export default {
         const { playStartTime, playEndTime } = this.step1
         if (startTime < new Date(playStartTime) || endTime > new Date(playEndTime)) {
           this.timeInvalid = true
-          return util.warningMsg('设置的阶段比赛时间必须要在第一步设置的竞赛时间范围内，请重新设置。')
+          return Util.warningMsg('设置的阶段比赛时间必须要在第一步设置的竞赛时间范围内，请重新设置。')
         }
         this.timeInvalid = false
         const { form, curStep } = this.$parent
@@ -355,7 +365,7 @@ export default {
             const time1 = new Date(form[i].startTime)
             const time2 = new Date(form[i].endTime)
             if ((startTime >= time1 && startTime <= time2) || (endTime >= time1 && endTime <= time2)) {
-              util.warningMsg('请注意，所设置的时间与已设置的阶段时间重合。')
+              Util.warningMsg('请注意，所设置的时间与已设置的阶段时间重合。')
               break
             }
           }
@@ -374,20 +384,20 @@ export default {
     // 提交
     save () {
       const { form } = this
-      if (!form.time.length) return util.warningMsg('请选择比赛时间')
+      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 (new Date(form.time[0]) < new Date(playStartTime) || new Date(form.time[1]) > new Date(playEndTime)) return Util.warningMsg('设置的阶段比赛时间必须要在第一步设置的竞赛时间范围内，请重新设置。')
       // 理论试卷存试卷库等
       if (this.isTheory) {
-        if (!this.libraryId) return util.warningMsg('请选择试卷库')
-        if (!form.paperId) return util.warningMsg('请选择试卷')
+        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('请选择项目')
+        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
diff --git a/src/views/match/add/step3.vue b/src/views/match/add/step3.vue
index 7265071..bcbefed 100644
--- a/src/views/match/add/step3.vue
+++ b/src/views/match/add/step3.vue
@@ -79,17 +79,15 @@
                   {{ item.projectName }}
                 </el-form-item>
               </template>
-              <template v-else>
-                <el-form-item class="req" label="已选择试卷">
-                  <div class="flex">
-                    {{ item.paperName }}&emsp;
-                    <el-form>
-                      <el-button v-if="item.paperName" type="primary" size="mini" :disabled="false"
-                        @click="previewPaper(item)">预览</el-button>
-                    </el-form>
-                  </div>
-                </el-form-item>
-              </template>
+              <el-form-item v-else class="req" label="已选择试卷">
+                <div class="flex">
+                  {{ item.paperName }}&emsp;
+                  <el-form>
+                    <el-button v-if="item.paperName" type="primary" size="mini" :disabled="false"
+                      @click="previewPaper(item)">预览</el-button>
+                  </el-form>
+                </div>
+              </el-form-item>
               <el-form-item class="req" prop="resultAnnouncementTime" label="比赛地点">
                 <div class="line">
                   <el-checkbox v-model="item.onlineButton">线上</el-checkbox>
diff --git a/src/views/match/manage/trialReport.vue b/src/views/match/manage/trialReport.vue
index eeee0c2..4006fcb 100644
--- a/src/views/match/manage/trialReport.vue
+++ b/src/views/match/manage/trialReport.vue
@@ -6,7 +6,7 @@
 
     <div class="content" v-loading="loading">
       <div class="text-right">
-        <el-button type="primary" @click="exportPage">导出报告</el-button>
+        <el-button type="primary" :loading="exporting" @click="exportPage">导出报告</el-button>
       </div>
       <h6 class="r-title">标准实验报告</h6>
       <div class="info">
@@ -155,7 +155,7 @@ export default {
       infoData: {},
       expData: [],
       editing: false,
-      loadIns: null,
+      exporting: false,
       loading: false,
       project: false,
       userScores: []
@@ -222,6 +222,7 @@ export default {
       this.loading = false
     },
     exportPage () {
+      this.exporting = true
       const form = Object.assign(this.form, this.infoData)
       const list = JSON.parse(JSON.stringify(this.expData))
       list.map((e, i) => {
@@ -242,7 +243,10 @@ export default {
       }).then(res => {
         console.log(res)
         util.downloadFileDirect(`实验报告.docx`, new Blob([res]))
-      }).catch(res => { })
+        this.exporting = false
+      }).catch(res => {
+        this.exporting = false
+      })
     },
   }
 };