feat: Conformance Save leaved page done.

src/views/Files/index.vue

@@ -74,6 +74,7 @@
   import { storeToRefs } from 'pinia';
   import filesStore from '@/stores/files.js';
   import AllMapDataStore from '@/stores/allMapData.js';
+  import LoadingStore from '@/stores/loading.js';
   import IconDataFormat from '@/components/icons/IconDataFormat.vue';
   import IconRule from '@/components/icons/IconRule.vue';
   import IconsFilter from '@/components/icons/IconsFilter.vue';
@@ -91,9 +92,11 @@
     setup() {
       const store = filesStore();
       const allMapDataStore = AllMapDataStore();
+      const loadingStore = LoadingStore();
       const { createFilterId, baseLogId } = storeToRefs(allMapDataStore);
+      const { isLoading } = storeToRefs(loadingStore);
 
-      return { store, allMapDataStore, createFilterId, baseLogId }
+      return { store, allMapDataStore, createFilterId, baseLogId, isLoading }
     },
     components: {
       IconDataFormat,
@@ -170,10 +173,12 @@
       }
     },
     mounted() {
+      this.isLoading = true;
       this.store.fetchEventLog();
       this.store.fetchFilter();
       this.store.fetchConformanceLog();
       this.store.fetchConformanceFilter();
+      this.isLoading = false;
     }
   }
 </script>

src/views/MainContainer.vue

@@ -15,10 +15,11 @@ import { storeToRefs } from 'pinia';
 import LoginStore from '@/stores/login.js';
 import LoadingStore from '@/stores/loading.js';
 import AllMapDataStore from '@/stores/allMapData.js';
+import ConformanceStore from '@/stores/conformance.js';
 import Header from "@/components/Header.vue";
 import Navbar from "@/components/Navbar.vue";
 import Loading from '@/components/Loading.vue';
-import { saveFilter, leaveFilter } from '@/module/alertModal.js';
+import { leaveFilter, leaveConformance } from '@/module/alertModal.js';
 
 export default {
   name: 'MainContainer',
@@ -26,17 +27,17 @@ export default {
     const loginStore = LoginStore();
     const loadingStore = LoadingStore();
     const allMapDataStore = AllMapDataStore();
+    const conformanceStore = ConformanceStore();
     const { checkLogin } = loginStore;
     const { tempFilterId, createFilterId,  temporaryData, postRuleData, ruleData } = storeToRefs(allMapDataStore);
+    const {  conformanceLogTempCheckId, conformanceFilterTempCheckId } = storeToRefs(conformanceStore);
 
-    return { checkLogin, loadingStore, temporaryData, tempFilterId, createFilterId, postRuleData, ruleData, allMapDataStore };
+    return { checkLogin, loadingStore, temporaryData, tempFilterId, createFilterId, postRuleData, ruleData, conformanceLogTempCheckId, conformanceFilterTempCheckId, allMapDataStore, conformanceStore };
   },
   components: {
     Header,
     Navbar,
-    Loading,
-    saveFilter,
-    leaveFilter
+    Loading
   },
   created() {
     // Save token in Headers.
@@ -53,7 +54,7 @@ export default {
       this.$emitter.emit('leaveFilter', false);
       leaveFilter(next, this.allMapDataStore.addFilterId, to.path)
     } else if((this.$route.name === 'Conformance' || this.$route.name === 'CheckConformance') && (this.conformanceLogTempCheckId || this.conformanceFilterTempCheckId)) {
-      leaveFilter(false, this.conformanceStore.addConformanceCreateCheckId, false, this.logOut)
+      leaveConformance(next, this.conformanceStore.addConformanceCreateCheckId, to.path)
     } else next();
   },
 };