刘洋 2 жил өмнө
parent
commit
4eb412a800

+ 13 - 8
src/modules/marking/views/MarkWork.vue

@@ -182,6 +182,7 @@
           </div>
 
           <el-dialog
+            v-if="markWorkDialog"
             v-loading="loading"
             :title="examTitle"
             element-loading-text="拼命加载中"
@@ -335,11 +336,13 @@ export default {
     ...mapState({ user: (state) => state.user }),
   },
   watch: {
-    "formMarkWork.examType"() {
-      this.formMarkWork.callType = "WHOLE_SET";
+    "formMarkWork.examType"(val) {
+      if (val !== "ONLINE") {
+        this.formMarkWork.callType = "WHOLE_SET";
+      }
     },
     "formMarkWork.callType"() {
-      if (this.formMarkWork.examType) {
+      if (this.formMarkWork.examType && !this.markWorkId) {
         this.examTypeChange();
       }
     },
@@ -749,11 +752,13 @@ export default {
     resetForm() {
       if (this.markWorkId) {
         //编辑
-        this.formMarkWork = Object.assign(this.formMarkWork, {
-          remark: "",
-          name: "",
-          callType: "WHOLE_SET",
-        });
+        // this.formMarkWork = Object.assign(this.formMarkWork, {
+        //   remark: "",
+        //   name: "",
+        //   callType: "WHOLE_SET",
+        // });
+        this.formMarkWork.name = "";
+        this.formMarkWork.remark = "";
         this.$refs["formMarkWork"].clearValidate();
       } else {
         //新增

+ 25 - 6
src/modules/questions/views/ExtractPaperInfo.vue

@@ -426,6 +426,7 @@ export default {
       courseAll: [],
       isInsert: false,
       tplList: [],
+      curCourseId: "",
     };
   },
   computed: {
@@ -457,10 +458,22 @@ export default {
     "extractConfig2.randomPaperId"() {
       this.getData();
     },
+    "extractConfig.courseCode"(val) {
+      if (!val) {
+        this.extractConfig2.randomPaperId = "";
+      }
+      let id = "";
+      for (let course of this.courseList) {
+        if (this.extractConfig.courseCode == val) {
+          id = course.courseId;
+          break;
+        }
+      }
+      this.getTplList("", id);
+    },
   },
   //初始化
   async created() {
-    // await this.getTplList();
     let extractConfigId = this.$route.params.extractConfigId;
     //1.查询考试集合
     this.getExams("");
@@ -468,13 +481,16 @@ export default {
       this.isInsert = true;
       //规则ID存在,表示是修改操作
       this.getExtractConfig(extractConfigId);
-    } else {
-      this.getTplList();
     }
   },
   methods: {
     getData() {
       if (!this.tplList.length || !this.extractConfig2.randomPaperId) {
+        this.randomTplInfo.paperStructOptions = [];
+        this.randomTplInfo.paperStructType = "";
+        this.randomTplInfo.paperIds = [];
+        this.randomTplInfo.tableData = [];
+        this.randomTplInfo.difficultyDegree = "";
         return;
       }
       let item = this.tplList.find(
@@ -514,8 +530,8 @@ export default {
         });
       }
     },
-    async getTplList(id) {
-      let courseId = this.$route.query.courseId;
+    async getTplList(id, cId) {
+      let courseId = cId || this.$route.query.courseId;
       let params = {
         pageNumber: 1,
         pageSize: 10000,
@@ -534,7 +550,9 @@ export default {
         this.tplList = res.data.content || [];
         this.getData();
       } catch (e) {
-        this.$message.error("获取抽题模板失败");
+        // this.$message.error("获取抽题模板失败");
+        this.tplList = [];
+        this.getData();
       }
     },
     getCurCallType() {
@@ -606,6 +624,7 @@ export default {
         for (let course of this.courseList) {
           if (this.extractConfig.courseCode == course.courseCode) {
             id = course.courseId;
+            this.curCourseId = id;
             break;
           }
         }