cache bug md

src/App.vue

@@ -1,7 +1,5 @@
 <template>
   <div id="app">
-    <keep-alive include="home">
-      <router-view />
-    </keep-alive>
+    <router-view />
   </div>
 </template>

src/modules/base/views/UserManage.vue

@@ -144,6 +144,7 @@ export default {
   components: { UploadButton },
   data() {
     return {
+      isInit: false,
       filter: {
         loginName: "",
         roleCode: "",
@@ -233,17 +234,11 @@ export default {
       this.getList();
     }
   },
-  beforeRouteLeave(to, from, next) {
-    if (to.name !== "UserEdit") {
-      this.$destroy();
-    }
-    next();
-  },
-  beforeRouteEnter(to, from, next) {
-    if (from.name === "UserEdit") {
-      next(vm => vm.$nextTick(() => vm.getList()));
+  activated() {
+    if (this.isInit) {
+      this.toPage(this.current);
     } else {
-      next();
+      this.isInit = true;
     }
   }
 };

src/modules/exam-center/views/CardManage.vue

@@ -205,6 +205,12 @@ export default {
     };
   },
   created() {
+    const cardFilter = this.$ls.get("cardFilter");
+    if (cardFilter) {
+      this.filter = this.$objAssign(this.filter, cardFilter);
+      this.current = cardFilter.pageNumber;
+    }
+
     const roleCode = this.$ls.get("user", { roleCode: "" }).roleCode;
     this.IS_ADMIN =
       roleCode.includes("ADMIN") || roleCode.includes("SUPER_ADMIN");
@@ -220,6 +226,7 @@ export default {
       const data = await cardListPage(datas);
       this.cards = data.records;
       this.total = data.total;
+      this.$ls.set("cardFilter", datas);
       // cardStatus '处理节点，0：设计题卡，1：提交印刷，2：已完成
     },
     toPage(page) {

src/modules/exam-center/views/DoneTask.vue

@@ -70,6 +70,7 @@ export default {
   name: "done-task",
   data() {
     return {
+      isInit: false,
       filter: {
         examId: ""
       },
@@ -122,17 +123,11 @@ export default {
       });
     }
   },
-  beforeRouteLeave(to, from, next) {
-    if (to.name !== "DoneTaskDetail") {
-      this.$destroy();
-    }
-    next();
-  },
-  beforeRouteEnter(to, from, next) {
-    if (from.name === "DoneTaskDetail") {
-      next(vm => vm.$nextTick(() => vm.getList()));
+  activated() {
+    if (this.isInit) {
+      this.toPage(this.current);
     } else {
-      next();
+      this.isInit = true;
     }
   }
 };

src/modules/exam-center/views/ExamManage.vue

@@ -166,6 +166,7 @@ export default {
   name: "exam-manage",
   data() {
     return {
+      isInit: false,
       filter: {
         examId: "",
         printStatus: "",
@@ -326,19 +327,11 @@ export default {
       });
     }
   },
-  beforeRouteLeave(to, from, next) {
-    const nextRouters = ["ExamRomeDetail", "ExamAdd", "ExamEdit"];
-    if (!nextRouters.includes(to.name)) {
-      this.$destroy();
-    }
-    next();
-  },
-  beforeRouteEnter(to, from, next) {
-    const nextRouters = ["ExamAdd", "ExamEdit"];
-    if (nextRouters.includes(from.name)) {
-      next(vm => vm.$nextTick(() => vm.getList()));
+  activated() {
+    if (this.isInit) {
+      this.toPage(this.current);
     } else {
-      next();
+      this.isInit = true;
     }
   }
 };

src/modules/exam-center/views/ExamRomeDetail.vue

@@ -109,6 +109,7 @@ export default {
   name: "exam-room-detail",
   data() {
     return {
+      isInit: false,
       filter: {
         examId: this.$route.params.examId,
         examSite: "",
@@ -175,11 +176,12 @@ export default {
       });
     }
   },
-  beforeRouteLeave(to, from, next) {
-    if (to.name !== "ExamRomeStudentDetail") {
-      this.$destroy();
+  activated() {
+    if (this.isInit) {
+      this.toPage(this.current);
+    } else {
+      this.isInit = true;
     }
-    next();
   }
 };
 </script>

src/modules/exam-center/views/ExamTaskAudit.vue

@@ -101,6 +101,7 @@ export default {
   name: "exam-task-audit",
   data() {
     return {
+      isInit: false,
       filter: {
         status: "",
         examId: ""
@@ -162,17 +163,11 @@ export default {
       });
     }
   },
-  beforeRouteLeave(to, from, next) {
-    if (to.name !== "ExamTaskAuditEdit") {
-      this.$destroy();
-    }
-    next();
-  },
-  beforeRouteEnter(to, from, next) {
-    if (from.name === "ExamTaskAuditEdit") {
-      next(vm => vm.$nextTick(() => vm.getList()));
+  activated() {
+    if (this.isInit) {
+      this.toPage(this.current);
     } else {
-      next();
+      this.isInit = true;
     }
   }
 };

src/modules/exam-center/views/TodoExam.vue

@@ -78,6 +78,7 @@ export default {
   name: "todo-exam",
   data() {
     return {
+      isInit: false,
       filter: {
         examId: ""
       },
@@ -128,19 +129,11 @@ export default {
       });
     }
   },
-  beforeRouteLeave(to, from, next) {
-    const nextRouters = ["TopicTaskEdit"];
-    if (!nextRouters.includes(to.name)) {
-      this.$destroy();
-    }
-    next();
-  },
-  beforeRouteEnter(to, from, next) {
-    const nextRouters = ["TopicTaskEdit"];
-    if (nextRouters.includes(from.name)) {
-      next(vm => vm.$nextTick(() => vm.getList()));
+  activated() {
+    if (this.isInit) {
+      this.toPage(this.current);
     } else {
-      next();
+      this.isInit = true;
     }
   }
 };

src/modules/exam-center/views/TopicTaskManage.vue

@@ -196,6 +196,7 @@ export default {
   name: "topic-task-manage",
   data() {
     return {
+      isInit: false,
       filter: {
         examId: "",
         courseCode: "",
@@ -319,19 +320,11 @@ export default {
       });
     }
   },
-  beforeRouteLeave(to, from, next) {
-    const nextRouters = ["TopicTaskAdd", "TopicTaskEdit"];
-    if (!nextRouters.includes(to.name)) {
-      this.$destroy();
-    }
-    next();
-  },
-  beforeRouteEnter(to, from, next) {
-    const nextRouters = ["TopicTaskAdd", "TopicTaskEdit"];
-    if (nextRouters.includes(from.name)) {
-      next(vm => vm.$nextTick(() => vm.getList()));
+  activated() {
+    if (this.isInit) {
+      this.toPage(this.current);
     } else {
-      next();
+      this.isInit = true;
     }
   }
 };

src/modules/exam-center/views/WaitTask.vue

@@ -77,6 +77,7 @@ export default {
   name: "wait-task",
   data() {
     return {
+      isInit: false,
       filter: {
         examId: ""
       },
@@ -89,6 +90,11 @@ export default {
     };
   },
   created() {
+    const waitFilter = this.$ls.get("waitFilter");
+    if (waitFilter) {
+      this.filter.examId = waitFilter.examId;
+      this.current = waitFilter.pageNumber;
+    }
     this.init();
   },
   methods: {
@@ -107,6 +113,7 @@ export default {
       const data = result || { records: [], total: 0 };
       this.tasks = data.records;
       this.total = data.total;
+      this.$ls.set("waitFilter", datas);
     },
     toPage(page) {
       this.current = page;
@@ -134,17 +141,11 @@ export default {
       });
     }
   },
-  beforeRouteLeave(to, from, next) {
-    if (to.name !== "WaitTaskDetail") {
-      this.$destroy();
-    }
-    next();
-  },
-  beforeRouteEnter(to, from, next) {
-    if (from.name === "WaitTaskDetail") {
-      next(vm => vm.$nextTick(() => vm.getList()));
+  activated() {
+    if (this.isInit) {
+      this.toPage(this.current);
     } else {
-      next();
+      this.isInit = true;
     }
   }
 };

src/plugins/mixins.js

@@ -8,7 +8,7 @@ export default {
       this.toPage && this.toPage(page);
     },
     goback() {
-      window.history.back();
+      this.$router.go(-1);
     },
     getRouterPath(location) {
       const { href } = this.$router.resolve(location);

src/views/Home.vue

@@ -198,7 +198,6 @@ export default {
         "exam-manage",
         "exam-room-detail",
         "exam-task-audit",
-        "card-manage",
         "user-manage",
         "topic-task-manage",
         "todo-exam"
@@ -374,12 +373,6 @@ export default {
       this.switchNav(subNo);
       this.showMenu();
     }
-  },
-  beforeRouteLeave(to, from, next) {
-    if (to.name === "Login") {
-      this.$destroy();
-    }
-    next();
   }
 };
 </script>