diff --git a/src/components/Discover/Conformance/ConformanceSidebar.vue b/src/components/Discover/Conformance/ConformanceSidebar.vue
index 325f0bc..2cf53eb 100644
--- a/src/components/Discover/Conformance/ConformanceSidebar.vue
+++ b/src/components/Discover/Conformance/ConformanceSidebar.vue
@@ -17,7 +17,13 @@
{{ isShowBar ? 'keyboard_double_arrow_right' : 'keyboard_double_arrow_left' }}
-
selectConformanceTask: {{ selectConformanceTask }}
selectConformanceStartAndEnd: {{ selectConformanceStartAndEnd }}
selectConformanceStart: {{ selectConformanceStart }}
@@ -26,6 +32,7 @@selectConformanceTo: {{ selectConformanceTo }}
listSeq: {{ listSeq }}
isSubmit: {{ isSubmit }}
+isSubmitTask: {{ isSubmitTask }}
isSubmitListSeq: {{ isSubmitListSeq }}
isSubmitStartAndEnd: {{ isSubmitStartAndEnd }}
@@ -108,7 +115,7 @@ export default { * @param {boolean} massage true | false 清空選單選項, 選擇的結果 */ reset() { - // Results page Cover Plate + // Results page Cover Plate(遮罩為 ture) this.$emitter.emit('coverPlate', true); // Have activity this.isSubmitTask = null; @@ -134,7 +141,7 @@ export default { isMode = 'directly-follows'; break; case 'Eventually follows': - isMode = 'a'; + isMode = 'eventually-follows'; break; case 'Short loop(s)': isMode = 'b'; @@ -154,6 +161,9 @@ export default { tasks: this.selectConformanceTask, }; this.isSubmitTask = this.selectConformanceTask; + // 其他 isSubmitData 為 null + this.isSubmitStartAndEnd = null; + this.isSubmitListSeq = []; } }else if(this.selectedRuleType === 'Activity sequence') { // Activity Sequence 選 Start & End 的行為 if(this.selectedActivitySequence === 'Start & End'){ @@ -164,7 +174,13 @@ export default { starts_with: this.selectConformanceStartAndEnd[0], ends_with: this.selectConformanceStartAndEnd[1], }; - this.isSubmitStartAndEnd = this.selectConformanceStartAndEnd; + this.isSubmitStartAndEnd = [ + {category: 'Start', task: this.selectConformanceStartAndEnd[0]}, + {category: 'End', task: this.selectConformanceStartAndEnd[1]}, + ]; + // 其他 isSubmitData 為 null + this.isSubmitTask = null; + this.isSubmitListSeq = []; } }else if(this.selectedActivitySequence === 'Sequence'){ // Activity Sequence 選 Sequence 的行為 if(this.listSeq.length < 2) return this.$toast.error('Select two or more.'); @@ -174,6 +190,8 @@ export default { task_seq: this.listSeq, }; this.isSubmitListSeq = this.listSeq; + this.isSubmitTask = null; + this.isSubmitStartAndEnd = null; } } }; diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceSelectResult.vue b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceSelectResult.vue index b5b1778..020b4d3 100644 --- a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceSelectResult.vue +++ b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceSelectResult.vue @@ -1,10 +1,10 @@