...

src/modules/marking/views/MarkWorkOverview.vue

@@ -366,6 +366,9 @@ export default {
         .get(DATA_PROCESS_API + "/markWorks?status=1")
         .then(response => {
           this.markWorkList = response.data;
+          if (this.$route.query && this.$route.query.markId) {
+            this.markWorkSearchForm.markId = parseInt(this.$route.query.markId);
+          }
         });
     },
     getCourses() {
@@ -401,6 +404,7 @@ export default {
         });
         return false;
       }
+      console.log("ssss" + this.formSearch.courseCode);
       this.quertTemp["markId"] = this.markWorkSearchForm.markId;
       this.quertTemp["courseCode"] = this.formSearch.courseCode;
       this.quertTemp["examId"] = this.examId;
@@ -578,31 +582,15 @@ export default {
       var formData = this.$route.query;
       if (formData && formData.markId) {
         this.workId = formData.markId;
-        for (var attr in formData) {
-          var value = formData[attr];
-          if (value && value != "null") {
-            if (!isNaN(value)) {
-              if (~~value == value) {
-                value = parseInt(value);
-              } else {
-                value = parseFloat(value);
-              }
-            }
-            if (attr === "markId") {
-              this.markWorkSearchForm[attr] = value;
-            } else {
-              console.log("formSearch", this.formSearch);
-              this.formSearch[attr] = value;
-            }
-          }
-        }
+        this.markWorkSearchForm.markId = parseInt(formData.markId);
+        this.formSearch.courseCode = formData.courseCode;
         this.currentPage = parseInt(formData.currentPage);
         this.pageSize = parseInt(formData.pageSize);
         this.examId = parseInt(formData.examId);
         this.markWorkName = formData.markWorkName;
         this.doPie();
-        this.searchSetting();
         this.getCourses();
+        this.searchSetting();
       }
     }
   },