From b32e1b3b6159c1050e042f91abf6031d33ea1e76 Mon Sep 17 00:00:00 2001 From: chiayin Date: Thu, 19 Oct 2023 11:01:21 +0800 Subject: [PATCH] Conformance Filter: done. --- .../ConformanceSidebar/ResultDot.vue | 1 - .../Discover/Conformance/StatusBar.vue | 14 ++++++-- src/stores/allMapData.js | 2 +- src/stores/conformance.js | 33 +++++++++---------- 4 files changed, 29 insertions(+), 21 deletions(-) diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ResultDot.vue b/src/components/Discover/Conformance/ConformanceSidebar/ResultDot.vue index c126954..0c3568f 100644 --- a/src/components/Discover/Conformance/ConformanceSidebar/ResultDot.vue +++ b/src/components/Discover/Conformance/ConformanceSidebar/ResultDot.vue @@ -19,7 +19,6 @@ export default { watch: { timeResultData: { handler(newValue) { - // console.log(newValue); this.data = newValue; }, immediate: true, diff --git a/src/components/Discover/Conformance/StatusBar.vue b/src/components/Discover/Conformance/StatusBar.vue index c0adc83..75ed8e8 100644 --- a/src/components/Discover/Conformance/StatusBar.vue +++ b/src/components/Discover/Conformance/StatusBar.vue @@ -91,9 +91,9 @@ import getMoment from 'moment'; export default { setup() { const allMapDataStore = AllMapDataStore(); - const { logId, stats } = storeToRefs(allMapDataStore); + const { logId, stats, createFilterId } = storeToRefs(allMapDataStore); - return { logId, stats, allMapDataStore }; + return { logId, stats, createFilterId, allMapDataStore }; }, data() { return { @@ -149,6 +149,16 @@ export default { }, async mounted() { if(this.$route.params.type === 'log') this.logId = this.$route.params.fileId; + switch (this.$route.params.type) { + case 'log': + this.logId = this.$route.params.fileId; + break; + case 'filter': + this.createFilterId = this.$route.params.fileId; + break; + default: + break; + } await this.allMapDataStore.getAllMapData(); await this.getStatData(); this.isPanel = false; // 預設不打開 diff --git a/src/stores/allMapData.js b/src/stores/allMapData.js index 9fce240..74f2bd7 100644 --- a/src/stores/allMapData.js +++ b/src/stores/allMapData.js @@ -154,7 +154,7 @@ export default defineStore('allMapDataStore', { }); return this.allCase; } catch(error) { - if(error.response.status === 404) this.infinite404 = 404; + if(error.response.status === 404) return this.infinite404 = 404; apiError(error, 'Failed to load the Trace Detail.'); }; }, diff --git a/src/stores/conformance.js b/src/stores/conformance.js index ce0c2e0..c0db755 100644 --- a/src/stores/conformance.js +++ b/src/stores/conformance.js @@ -179,14 +179,13 @@ export default defineStore('conformanceStore', { * fetch Log Conformance Parameters api for Rule Settings. */ async getConformanceParams() { - const logId = this.conformanceLogId; - const filterId = this.conformanceFilterId; + let logId = this.conformanceLogId; + let filterId = this.conformanceFilterId; let api = ''; // 先判斷 filter 檔，再判斷 log 檔。 if(filterId !== null) api = `/api/filter-checks/params?filter_id=${filterId}`; else api = `/api/log-checks/params?log_id=${logId}`; - console.log('getConformanceParams', api); try { const response = await this.$axios.get(api); @@ -204,8 +203,8 @@ export default defineStore('conformanceStore', { * Creates a new temporary check for a log. */ async addConformanceCheckId(data) { - const logId = this.conformanceLogId; - const filterId = this.conformanceFilterId; + let logId = this.conformanceLogId; + let filterId = this.conformanceFilterId; let api = ''; // 先判斷 filter 檔，再判斷 log 檔。 @@ -224,8 +223,8 @@ export default defineStore('conformanceStore', { * Get the Temporary Log Conformance Report */ async getConformanceReport() { - const logTempCheckId = this.conformanceLogTempCheckId; - const filterTempCheckId = this.conformanceFilterTempCheckId; + let logTempCheckId = this.conformanceLogTempCheckId; + let filterTempCheckId = this.conformanceFilterTempCheckId; let api = ''; // 先判斷 filter 檔，再判斷 log 檔。 @@ -243,8 +242,8 @@ export default defineStore('conformanceStore', { * Get the detail of a temporary log conformance issue. */ async getConformanceIssue(issueNo) { - const logTempCheckId = this.conformanceLogTempCheckId; - const filterTempCheckId = this.conformanceFilterTempCheckId + let logTempCheckId = this.conformanceLogTempCheckId; + let filterTempCheckId = this.conformanceFilterTempCheckId let api = ''; // 先判斷 filter 檔，再判斷 log 檔。 @@ -262,8 +261,8 @@ export default defineStore('conformanceStore', { * Get the Trace Details of a Temporary Log Conformance lssue. */ async getConformanceTraceDetail(issueNo, traceId, start) { - const logTempCheckId = this.conformanceLogTempCheckId; - const filterTempCheckId = this.conformanceFilterTempCheckId + let logTempCheckId = this.conformanceLogTempCheckId; + let filterTempCheckId = this.conformanceFilterTempCheckId let api = ''; // 先判斷 filter 檔，再判斷 log 檔。 @@ -276,7 +275,7 @@ export default defineStore('conformanceStore', { this.allCases = response.data.cases; return response.data.cases; } catch(error) { - if(error.response.status === 404) this.infinite404 = 404; + if(error.response.status === 404) return this.infinite404 = 404; apiError(error, 'Failed to Get the detail of a temporary log conformance issue.'); }; }, @@ -284,8 +283,8 @@ export default defineStore('conformanceStore', { * Get the Details of a Temporary Log Conformance Loop. */ async getConformanceLoop(loopNo) { - const logTempCheckId = this.conformanceLogTempCheckId; - const filterTempCheckId = this.conformanceFilterTempCheckId + let logTempCheckId = this.conformanceLogTempCheckId; + let filterTempCheckId = this.conformanceFilterTempCheckId let api = ''; // 先判斷 filter 檔，再判斷 log 檔。 @@ -303,8 +302,8 @@ export default defineStore('conformanceStore', { * Get the Trace Details of a Temporary Log Conformance Loops. */ async getConformanceLoopsTraceDetail(loopNo, traceId, start) { - const logTempCheckId = this.conformanceLogTempCheckId; - const filterTempCheckId = this.conformanceFilterTempCheckId + let logTempCheckId = this.conformanceLogTempCheckId; + let filterTempCheckId = this.conformanceFilterTempCheckId let api = ''; // 先判斷 filter 檔，再判斷 log 檔。 @@ -317,7 +316,7 @@ export default defineStore('conformanceStore', { this.allLoopCases = response.data.cases; return response.data.cases; } catch(error) { - if(error.response.status === 404) this.infinite404 = 404; + if(error.response.status === 404) return this.infinite404 = 404; apiError(error, 'Failed to Get the detail of a temporary log conformance loop.'); }; },