fix

src/assets/css/main.css

@@ -491,3 +491,32 @@ li {
 .edui-default {
   line-height: normal;
 }
+.html-parse {
+  table {
+    display: table;
+    margin-bottom: 10px;
+    border-collapse: collapse;
+
+    th,
+    td {
+      padding: 5px 10px;
+      border: 1px solid #DDD;
+    }
+  }
+
+  ol {
+    padding-left: 30px;
+
+    li {
+      list-style-type: decimal;
+    }
+  }
+
+  ul {
+    padding-left: 30px;
+
+    li {
+      list-style-type: disc;
+    }
+  }
+}

src/views/match/add/step3.vue

@@ -81,8 +81,13 @@
               </template>
               <template v-else>
                 <el-form-item class="req" label="已选择试卷">
-                  {{ item.paperName }}
+                  <div class="flex">
-                  <el-button v-if="item.paperName" type="primary" size="mini" @click="previewPaper(item)">预览</el-button>
+                    {{ 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 class="req" prop="resultAnnouncementTime" label="比赛地点">

src/views/match/manage/theoryArchList.vue

@@ -45,15 +45,8 @@
             <el-input size="small" placeholder="请输入学校/学生姓名" prefix-icon="el-icon-search" v-model="keyword" clearable
               style="width: 300px"></el-input>
           </div>
-          <div v-if="!active">
+          <el-button type="primary" :loading="exporting" @click="exportData">{{ exporting ? '正在导出' : '批量导出'
-            <el-button v-if="method == 2" type="primary" @click="batchImport">上传成绩</el-button>
+            }}</el-button>
-            <el-button type="primary" :loading="exporting" @click="exportData">{{ exporting ? '正在导出' : '批量导出'
-              }}</el-button>
-          </div>
-          <div v-else>
-            <el-button type="primary" :loading="exporting1" @click="exportData1">{{ exporting1 ? '正在导出' : '批量导出'
-              }}</el-button>
-          </div>
         </div>
         <el-table :data="list" class="table" :key="1" ref="table" stripe header-align="center"
           @selection-change="handleSelectionChange" row-key="id">
@@ -256,6 +249,7 @@ export default {
             competitionId: this.id,
             isNakadai: 1,
             stageId: this.stageId,
+            participatingState: this.active,
           }, {
             headers: this.headers,
             responseType: 'blob'
@@ -265,31 +259,22 @@ export default {
         }
       }
     },
-    // 导出(有勾选：就导勾选中的；没有勾选：就导全部)
+    async handleDelete (row) { // 删除
-    exportData1 () {
+      await this.$confirm(`<p>确认要删除【${row.userName}】的成绩记录吗？</p><p style="color: #f56c6c;">删除后成绩数据不可恢复，自动变为未提交</p>`, '提示', {
-      this.exporting1 = true
+        confirmButtonText: '确定',
-      let list = this.list1
+        cancelButtonText: '取消',
-      if (this.multipleSelection1.length) {
+        type: 'warning',
-        list = this.multipleSelection1
+        closeOnClickModal: false,
-      }
+        dangerouslyUseHTMLString: true,
-      Zip('批量导出', list, () => {
-        this.exporting1 = false
       })
-    },
+
-    handleDelete (row) { // 删除
+      await this.$post(this.api.batchDeleteContestGrade, {
-      this.$confirm("确定要删除吗？", "提示", {
+        ids: [this.method == 2 ? row.scoreId : row.reportId],
-        type: "warning"
+        competitionId: this.id,
-      }).then(() => {
+        stageId: this.stageId
-        this.$post(this.api.batchDeleteContestGrade, {
+      })
-          ids: [this.method == 2 ? row.scoreId : row.reportId],
+      util.successMsg("删除成功")
-          competitionId: this.id,
+      this.getData()
-          stageId: this.stageId
-        }).then(res => {
-          util.successMsg("删除成功");
-          this.getData();
-        }).catch(res => {
-        });
-      }).catch(() => { });
     },
     delAllData () { // 批量删除
       const list = this.multipleSelection
@@ -433,6 +418,8 @@ export default {
     },
     // tab回调
     tabChange (i) {
+      this.multipleSelection = []
+      this.$refs.table.clearSelection()
       this.active = i
       this.initData()
     },

src/views/match/manage/theoryReport.vue

@@ -112,7 +112,7 @@
           <ul v-if="paper" class="ques-wrap" id="quesWrap">
             <li v-for="(item, i) in paper" :key="i">
               <div class="outline">
-                {{ arabicToChinese(i + 1) }}、{{ item.questionTypeName }}（本题共{{ item.questionNum }}小题，共{{
+                {{ arabicToChinese(i + 1) }}、{{ item.outlineName }}（本题共{{ item.questionNum }}小题，共{{
                   item.targetScore }}分）
                 <img :class="['shrink', { active: item.shrink }]" src="@/assets/img/shrink.svg" alt=""
                   @click="item.shrink = !item.shrink">
@@ -181,7 +181,8 @@
                       </div>
                       <div v-if="ques.attachmentUrl" class="line">
                         <span class="line-label">考生上传附件：</span>
-                        <el-link class="m-r-10" type="primary">{{ ques.attachmentName }}</el-link>
+                        <el-link class="m-r-10" type="primary" @click="preview(ques.attachmentUrl)">{{
+                          ques.attachmentName }}</el-link>
                         <el-button type="primary" size="mini" round
                           @click="download(ques.attachmentName, ques.attachmentUrl)">下载</el-button>
                       </div>
@@ -217,7 +218,7 @@
               考试总结与体会
             </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>
+            <div v-else class="pre-wrap html-parse" v-html="form.summarize"></div>
           </div>
         </div>
       </div>
@@ -237,6 +238,7 @@ import QuesConst from '@/const/ques'
 import TestPaperConst from '@/const/testPaper'
 import Util from '@/libs/util'
 import _ from 'lodash'
+import axios from 'axios'
 export default {
   components: {
     PdfDia
@@ -246,6 +248,7 @@ export default {
       numToLetter: Util.numToLetter,
       arabicToChinese: Util.arabicToChinese,
       reportId: this.$route.query.reportId,
+      token: sessionStorage.getItem("token"),
       title: "实验报告",
       form: {
         className: "",
@@ -465,11 +468,14 @@ export default {
     // 导出
     async exportPage () {
       this.exporting = true
-      const res = await this.$get(this.api.exportExamPaperReport, {
+      const res = await axios.get(`${this.api.exportExamPaperReport}?reportId=${this.reportId}`, {
-        reportId: this.reportId
+        headers: {
+          token: this.token
+        },
+        responseType: 'blob'
       })
-      console.log(res)
+      const name = res.headers['content-disposition']
-      Util.downloadFileDirect(`标准实验报告.docx`, new Blob([res]))
+      Util.downloadFileDirect(name ? decodeURI(name) : '标准成绩报告.docx', new Blob([res.data]))
       this.exporting = false
     },
   }
@@ -598,7 +604,7 @@ samp {
 
     .exist {
       position: absolute;
-      left: 70px;
+      left: 95px;
       white-space: nowrap;
       color: #f00;
     }
@@ -835,20 +841,6 @@ samp {
       }
     }
 
-    .html-parse {
-      table {
-        display: table;
-        margin-bottom: 10px;
-        border-collapse: collapse;
-
-        th,
-        td {
-          padding: 5px 10px;
-          border: 1px solid #DDD;
-        }
-      }
-    }
-
     img {
       max-width: 100%;
     }