diff --git a/src/components/Discover/Conformance/ConformanceSidebar.vue b/src/components/Discover/Conformance/ConformanceSidebar.vue index 1ad0df3..e7b3e9b 100644 --- a/src/components/Discover/Conformance/ConformanceSidebar.vue +++ b/src/components/Discover/Conformance/ConformanceSidebar.vue @@ -26,9 +26,6 @@ > -
diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ActRadio.vue b/src/components/Discover/Conformance/ConformanceSidebar/ActRadio.vue index 5046e1a..982d4cf 100644 --- a/src/components/Discover/Conformance/ConformanceSidebar/ActRadio.vue +++ b/src/components/Discover/Conformance/ConformanceSidebar/ActRadio.vue @@ -5,8 +5,8 @@

Sort

- - + +
@@ -26,6 +26,7 @@ export default { category: this.category, task: this.selectedRadio, }); + this.$emit('selected-task', this.selectedRadio); } }, created() { diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceRadioGroup.vue b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceRadioGroup.vue index 6ea214b..76a3b61 100644 --- a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceRadioGroup.vue +++ b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceRadioGroup.vue @@ -12,7 +12,7 @@

Activity Sequence

- +
@@ -28,7 +28,7 @@

Process Scope

- +
@@ -36,7 +36,7 @@

Activity Sequence

- +
@@ -44,7 +44,7 @@

Activity Sequence

- +
@@ -107,9 +107,18 @@ export default { this.selectedActSeqFromTo = 'From'; this.$emitter.emit('isRadioChange', true); // Radio 切換時,資料要清空 }, - changeSeqRadio() { + changeRadioSeq() { this.$emitter.emit('isRadioSeqChange',true); - } + }, + changeRadioProcessScope() { + this.$emitter.emit('isRadioProcessScopeChange', true); + }, + changeRadioActSeqMore() { + this.$emitter.emit('isRadioActSeqMoreChange', true); + }, + changeRadioActSeqFromTo() { + this.$emitter.emit('isRadioActSeqFromToChange', true); + }, } } diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue index 309f397..697e8a1 100644 --- a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue +++ b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue @@ -3,48 +3,47 @@ -
- - +
+ +
- - -
- - + + +
+ +
- - -
- - + + +
+ +
- - -
- - + + +
+ +
- - -
- - + + +
+ +
- - -
- - + + +
+ +
- diff --git a/src/stores/conformance.js b/src/stores/conformance.js index 13cda5c..bf03184 100644 --- a/src/stores/conformance.js +++ b/src/stores/conformance.js @@ -20,6 +20,9 @@ export default defineStore('conformanceStore', { allConformanceTask: [], allConformanceStart: [], allConformanceEnd: [], + allProcessingTime: {}, + allWaitingTime: {}, + allCycleTime: {}, allConformanceTempReportData: null, allIssueTraces: null, allTaskSeq: null, @@ -33,7 +36,6 @@ export default defineStore('conformanceStore', { selectedProcessScope: 'End to end', // radio selectedActSeqMore: 'All', // radio selectedActSeqFromTo: 'From', // radio - // selectConformanceTask: null, // select task infinite404: null, }), getters: { @@ -49,6 +51,60 @@ export default defineStore('conformanceStore', { conformanceEnd: state => { return state.allConformanceEnd; }, + cfmPtEteWhole: state => { + return state.allProcessingTime.end_to_end.whole; + }, + cfmPtEteStart: state => { + return state.allProcessingTime.end_to_end.starts_with; + }, + cfmPtEteEnd: state => { + return state.allProcessingTime.end_to_end.ends_with; + }, + cfmPtEteSE: state => { + return state.allProcessingTime.end_to_end.start_end; + }, + cfmPtPStart: state => { + return state.allProcessingTime.partial.starts_with; + }, + cfmPtPEnd: state => { + return state.allProcessingTime.partial.ends_with; + }, + cfmPtPSE: state => { + return state.allProcessingTime.partial.start_end; + }, + cfmWtEteWhole: state => { + return state.allWaitingTime.end_to_end.whole; + }, + cfmWtEteStart: state => { + return state.allWaitingTime.end_to_end.starts_with; + }, + cfmWtEteEnd: state => { + return state.allWaitingTime.end_to_end.ends_with; + }, + cfmWtEteSE: state => { + return state.allWaitingTime.end_to_end.start_end; + }, + cfmWtPStart: state => { + return state.allWaitingTime.partial.starts_with; + }, + cfmWtPEnd: state => { + return state.allWaitingTime.partial.ends_with; + }, + cfmWtPSE: state => { + return state.allWaitingTime.partial.start_end; + }, + cfmCtEteWhole: state => { + return state.allCycleTime.end_to_end.whole; + }, + cfmCtEteStart: state => { + return state.allCycleTime.end_to_end.starts_with; + }, + cfmCtEteEnd: state => { + return state.allCycleTime.end_to_end.ends_with; + }, + cfmCtEteSE: state => { + return state.allCycleTime.end_to_end.start_end; + }, conformanceTempReportData: state => { return state.allConformanceTempReportData; }, @@ -124,6 +180,9 @@ export default defineStore('conformanceStore', { this.allConformanceTask = response.data.tasks; this.allConformanceStart = response.data.sources; this.allConformanceEnd = response.data.sinks; + this.allProcessingTime = response.data.processing_time; + this.allWaitingTime = response.data.waiting_time; + this.allCycleTime = response.data.cycle_time; } catch(error) { await delay(); loading.isLoading = true;