zhangjie 2 yıl önce
ebeveyn
işleme
c00078580e

+ 1 - 1
src/App.vue

@@ -18,7 +18,7 @@ export default {
     $route: {
       immediate: true,
       handler(val) {
-        const unSignalRoutes = ["Root", "Login", "NotFound"];
+        const unSignalRoutes = ["Root", "Login", "NotFound", "CardBuild"];
         if (val.name && unSignalRoutes.includes(val.name)) {
           this.signalWaiting = false;
           this.clearSetTs();

+ 1 - 1
src/modules/card/autoBuild/simplePaperCard.js

@@ -104,7 +104,7 @@ function getCommonQuestionStructList(
       isCommon,
       nestedQNo,
       sortNo:
-        typeNo * 10000 + detail.number * 1000 + qTypeNum * 100 + nestedQNo,
+        typeNo * 10000 + detail.detailNo * 1000 + qTypeNum * 100 + nestedQNo,
       questions,
     });
   });

+ 1 - 1
src/modules/card/elements/explain/model.js

@@ -63,7 +63,7 @@ const getFullModel = (modelProp) => {
 
     elements[index] = child;
   });
-  console.log(elements);
+  // console.log(elements);
 
   return elements;
 };

+ 1 - 1
src/modules/card/views/CardEdit.vue

@@ -208,7 +208,7 @@ export default {
           viewType: "frame",
         },
       });
-      this.cardPreviewUrl = href;
+      this.cardPreviewUrl = href + `?t=${Date.now()}`;
     },
     registWindowSubmit() {
       window.submitCardTemp = async (model, cardImages) => {

+ 4 - 2
src/modules/card/views/CardManage.vue

@@ -357,6 +357,7 @@ export default {
       if (!resData.data || !resData.data.length) return;
       this.finishTaskList = [];
       this.curTask = {};
+      this.taskList = [];
 
       const cardConfig = await this.getCardConfig();
 
@@ -367,7 +368,6 @@ export default {
           paperSimpleStruct: getPaperStructSimpleStructInfo(item.structure),
         };
       });
-      console.log(this.taskList);
       this.$refs.ProgressDialog.open();
       this.startTask();
     },
@@ -377,7 +377,8 @@ export default {
       const { href } = this.$router.resolve({
         name: "CardBuild",
       });
-      this.cardBuildUrl = href;
+      this.cardBuildUrl = href + `?t=${Date.now()}`;
+      // console.log(this.cardBuildUrl);
     },
     async getCardConfig() {
       const res = await cardConfigInfos();
@@ -426,6 +427,7 @@ export default {
             const successCount = this.finishTaskList.filter(
               (item) => item.result
             ).length;
+            delete window.cardData;
             const failCount = this.finishTaskList.length - successCount;
             this.$notify({
               message: `题卡生成完毕,成功${successCount}个,失败${failCount}个`,

+ 1 - 0
src/modules/questions/views/BluePaperStructure.vue

@@ -352,6 +352,7 @@ export default {
           courseName: "",
         };
         this.currentPage = 1;
+        this.getCourses("");
       } else {
         this.formSearch = JSON.parse(
           sessionStorage.getItem("blue_paper_stucture")

+ 1 - 1
src/modules/questions/views/CourseProperty.vue

@@ -685,7 +685,7 @@ export default {
     getCoursesForAdd(query) {
       this.courseAddSearch = true;
       this.$httpWithMsg
-        .get(QUESTION_API + "/course/query?name=" + query)
+        .get(QUESTION_API + "/course/query?name=" + query + "&enable=true")
         .then((response) => {
           this.courseAddList = response.data;
           this.courseAddSearch = false;

+ 1 - 0
src/modules/questions/views/ImportPaperInfo.vue

@@ -190,6 +190,7 @@ export default {
         "文件上传",
       ]);
     }, 200);
+    this.getCourses("");
   },
   methods: {
     searchCourseName() {

+ 1 - 0
src/modules/questions/views/PaperStructure.vue

@@ -367,6 +367,7 @@ export default {
           courseName: "",
         };
         this.currentPage = 1;
+        this.getCourses("");
       } else {
         this.formSearch = JSON.parse(sessionStorage.getItem("paper_stucture"));
         this.currentPage = parseInt(