From a9f5dfcff8ff747fd0e10e34cc133373f480cf4e Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Tue, 30 Jan 2024 14:53:18 +0800
Subject: [PATCH] 修改知识点匹配，删除即时测报表

---
 src/views/basic/test/list.vue       | 26 ++++++++++++++++++++++----
 src/views/examinationPaper/edit.vue | 30 +++++++++++++++++++++++++-----
 2 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/src/views/basic/test/list.vue b/src/views/basic/test/list.vue
index ed15e8e..755b118 100644
--- a/src/views/basic/test/list.vue
+++ b/src/views/basic/test/list.vue
@@ -46,10 +46,11 @@
               <el-tooltip v-else effect="dark" content="答卷录分" placement="top">
                 <el-button type="primary" circle size="mini" @click="openScoreSet(scoped.row)">分</el-button>
               </el-tooltip>
-              <el-tooltip  effect="dark" content="删除" placement="top">
-                <el-button type="primary" circle size="mini" icon="el-icon-delete"
-                    @click="remove(scoped.row)"></el-button>·
-              </el-tooltip>
+              <el-popconfirm v-if="role != 'ROLE_BANZHUREN'" title="确定删除吗？"
+                @confirm="removeReport(scoped.row, scoped.$index)">
+                <el-button class="remove-test" slot="reference" type="danger" circle size="mini" icon="el-icon-delete"
+                  :loading="scoped.row.loading"></el-button>
+              </el-popconfirm>
             </template>
           </el-table-column>
         </el-table>
@@ -265,6 +266,19 @@ export default {
         },
       });
     },
+    //删除即时测考试
+    async removeReport(obj, index) {
+      this.tableData[index].loading = true;
+      const { data, status, info } = await this.$request.deleteReport({
+        id: obj.id,
+      });
+      if (status === 0) {
+        this.$message.success("删除成功！");
+        this.tableData.splice(index, 1);
+      } else {
+        this.$message.error(info);
+      }
+    },
 
     async _QueryGdClass() {
       const fetchClassList =
@@ -356,6 +370,10 @@ div::-webkit-scrollbar-thumb {
 }
 </style>
 <style lang="scss" scoped>
+.remove-test {
+  margin-left: 10px;
+}
+
 .page-container {
   position: relative;
   height: 100%;
diff --git a/src/views/examinationPaper/edit.vue b/src/views/examinationPaper/edit.vue
index 3b79a0b..61746fc 100644
--- a/src/views/examinationPaper/edit.vue
+++ b/src/views/examinationPaper/edit.vue
@@ -363,6 +363,7 @@ export default {
         answerScreenshot: "", //题目解析图片地址
         knowledge: [], //知识点
       },
+      gradeClassList: [] //学段列表
     };
   },
   computed: {
@@ -382,12 +383,18 @@ export default {
     // 知识点列表 根据学段-科目筛选
     knowledgeData: function () {
       let jsons = []
-      if (this.form.sectionName && this.form.subjectName) {
-        let sectionName = this.form.sectionName || null
-        let subjectName = this.form.subjectName || null
+      if (this.form.gradeName && this.form.subjectName) {
+        let sectionName = ""
+        this.gradeClassList?.map(item => {
+          if (this.form.gradeName == item.gradeName) {
+            sectionName = item.sectionName
+          }
+        })
+        console.log(this.gradeClassList)
+        console.log(sectionName)
         if (sectionName && Object.keys(this.knowledgeList).includes(sectionName)) {
-          if (Object.keys(this.knowledgeList[sectionName]).includes(subjectName)) {
-            jsons = this.knowledgeList[sectionName][subjectName]
+          if (Object.keys(this.knowledgeList[sectionName]).includes(this.form.subjectName)) {
+            jsons = this.knowledgeList[sectionName][this.form.subjectName]
           }
         }
       }
@@ -402,6 +409,7 @@ export default {
     this.paperType = this.$route.query.paperType || 1;
     this.form.title = this.$route.query.title || "";
     this._QueryDetail();
+    this._GradeList();
   },
   methods: {
     // v1.5
@@ -444,7 +452,19 @@ export default {
         this.$message.error(res.info);
       }
     },
+    async _GradeList() {
+      let fetchClassList =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pClassList
+          : this.$request.fetchClassList;
 
+      const { data, status, info } = await fetchClassList();
+      if (status == 0) {
+        this.gradeClassList = data.list
+      } else {
+        this.$message.error(info);
+      }
+    },
     upError(res) {
       this.$message.error("上传失败");
     },
--
libgit2 0.21.4