diff --git a/src/components/Discover/Conformance/ConformanceSidebar.vue b/src/components/Discover/Conformance/ConformanceSidebar.vue index 9f8a958..8a86d85 100644 --- a/src/components/Discover/Conformance/ConformanceSidebar.vue +++ b/src/components/Discover/Conformance/ConformanceSidebar.vue @@ -236,7 +236,6 @@ export default { max: this.selectTimeRangeMax }; this.$emitter.emit('timeRangeMaxMin', this.selectDurationTime); - console.log('this.selectDurationTime', this.selectDurationTime); switch (this.selectedRuleType) { case 'Have activity': // Rule Type 選 Have activity 的行為 @@ -255,17 +254,17 @@ export default { case 'Activity sequence': // Rule Type 選 Activity sequence 的行為 switch (this.selectedActivitySequence) { case 'Start & End': // Activity Sequence 選 Start & End 的行為 - if(this.selectConformanceStartAndEnd === null || this.selectConformanceStartAndEnd.length === 0) return this.$toast.error('Both Start and End must be selected.'); + if(this.selectCfmSeqStart === null || this.selectCfmSeqEnd === null) return this.$toast.error('Both Start and End must be selected.'); else { data = { type: 'start-end', - starts_with: this.selectConformanceStartAndEnd[0], - ends_with: this.selectConformanceStartAndEnd[1], + starts_with: this.selectCfmSeqStart, + ends_with: this.selectCfmSeqEnd, }; this.isSubmitReset(); this.isSubmitStartAndEnd = [ - {category: 'Start', task: this.selectConformanceStartAndEnd[0]}, - {category: 'End', task: this.selectConformanceStartAndEnd[1]}, + {category: 'Start', task: this.selectCfmSeqStart}, + {category: 'End', task: this.selectCfmSeqEnd}, ]; }; break; diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue index 8b34445..b7a3956 100644 --- a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue +++ b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue @@ -238,6 +238,10 @@ export default { this.isEndSelected = null; }; }); + this.$emitter.on('reset', data => { + this.isStartSelected = data; + this.isEndSelected = data; + }); } } diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ResultCheck.vue b/src/components/Discover/Conformance/ConformanceSidebar/ResultCheck.vue index 52b342f..91a7047 100644 --- a/src/components/Discover/Conformance/ConformanceSidebar/ResultCheck.vue +++ b/src/components/Discover/Conformance/ConformanceSidebar/ResultCheck.vue @@ -24,6 +24,7 @@ export default { }, created() { this.datadata = this.select; + this.$emitter.on('reset', data => this.datadata = data); }, } diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ResultDot.vue b/src/components/Discover/Conformance/ConformanceSidebar/ResultDot.vue index d25587d..c126954 100644 --- a/src/components/Discover/Conformance/ConformanceSidebar/ResultDot.vue +++ b/src/components/Discover/Conformance/ConformanceSidebar/ResultDot.vue @@ -28,6 +28,7 @@ export default { }, created() { this.data = this.select; + this.$emitter.on('reset', data => this.data = data); }, } diff --git a/src/components/Discover/Conformance/MoreModal.vue b/src/components/Discover/Conformance/MoreModal.vue index 8791b1b..e35e515 100644 --- a/src/components/Discover/Conformance/MoreModal.vue +++ b/src/components/Discover/Conformance/MoreModal.vue @@ -99,7 +99,6 @@ export default { caseData: function() { if(this.infiniteData !== null){ const data = JSON.parse(JSON.stringify(this.infiniteData)); // 深拷貝原始 cases 的內容 - console.log(data); data.forEach(item => { item.facets.forEach((facet, index) => { item[`fac_${index}`] = facet.value; // 建立新的 key-value pair