diff --git a/src/components/Discover/Conformance/ConformanceSidebar.vue b/src/components/Discover/Conformance/ConformanceSidebar.vue
index 4c77879..bc66503 100644
--- a/src/components/Discover/Conformance/ConformanceSidebar.vue
+++ b/src/components/Discover/Conformance/ConformanceSidebar.vue
@@ -24,19 +24,11 @@
:isSubmitListSeq="isSubmitListSeq"
:isSubmitDurationData="isSubmitDurationData"
>
-
+ selectDurationData:{{selectDurationData}}
+ selectDurationTime:{{selectDurationTime}}
+ isSubmitDurationData:{{isSubmitDurationData}}
@@ -122,6 +114,8 @@ export default {
// Activity sequence
this.isSubmitStartAndEnd = null;
this.isSubmitListSeq = [];
+ // Activity duration
+ this.isSubmitDurationData = null;
// isSubmit
this.isSubmit = false;
@@ -153,7 +147,7 @@ export default {
break;
};
- if(this.selectedRuleType === 'Have activity') { // Activity Sequence 選 Have activity(s) 的行為
+ if(this.selectedRuleType === 'Have activity') { // Activity Sequence 選 Have activity 的行為
if(!this.selectConformanceTask?.length) return this.$toast.error('Not selected.');
else {
data = {
@@ -164,6 +158,7 @@ export default {
// 其他 isSubmitData 為 null
this.isSubmitStartAndEnd = null;
this.isSubmitListSeq = [];
+ this.isSubmitDurationData = null;
}
}else if(this.selectedRuleType === 'Activity sequence') { // Activity Sequence 選 Start & End 的行為
if(this.selectedActivitySequence === 'Start & End'){
@@ -181,6 +176,7 @@ export default {
// 其他 isSubmitData 為 null
this.isSubmitTask = null;
this.isSubmitListSeq = [];
+ this.isSubmitDurationData = null;
}
}else if(this.selectedActivitySequence === 'Sequence'){ // Activity Sequence 選 Sequence 的行為
if(this.listSeq.length < 2) return this.$toast.error('Select two or more.');
@@ -192,8 +188,24 @@ export default {
this.isSubmitListSeq = this.listSeq;
this.isSubmitTask = null;
this.isSubmitStartAndEnd = null;
+ this.isSubmitDurationData = null;
}
}
+ }else if(this.selectedRuleType === 'Activity duration') { // Activity Sequence 選 Activity duration 的行為
+ if(!this.selectDurationData?.length) return this.$toast.error('Not selected.');
+ else {
+ data = {
+ type: 'task-duration',
+ task: this.selectDurationData[0],
+ min: this.selectDurationTime.min,
+ max: this.selectDurationTime.max,
+ };
+ this.isSubmitDurationData = this.selectDurationData;
+ // 其他 isSubmitData 為 null
+ this.isSubmitTask = null;
+ this.isSubmitStartAndEnd = null;
+ this.isSubmitListSeq = [];
+ }
};
this.isLoading = true;
diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceSelectResult.vue b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceSelectResult.vue
index 020b4d3..344a893 100644
--- a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceSelectResult.vue
+++ b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceSelectResult.vue
@@ -6,7 +6,7 @@
-
+
@@ -42,7 +42,7 @@ export default {
return { selectedRuleType, selectedActivitySequence, selectedMode, selectedProcessScope, selectedActSeqMore, selectedActSeqFromTo }
},
- props: ['isSubmit', 'isSubmitTask', 'isSubmitStartAndEnd', 'isSubmitListSeq'],
+ props: ['isSubmit', 'isSubmitTask', 'isSubmitStartAndEnd', 'isSubmitListSeq', 'isSubmitDurationData'],
components: {
ResultCheck,
ResultArrow,
@@ -121,6 +121,7 @@ export default {
this.end = data;
this.from = data;
this.to = data;
+ this.durationData = data;
});
// Radio 切換時,資料要清空
this.$emitter.on('isRadioChange', (data) => {
diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue
index 7cffd22..309f397 100644
--- a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue
+++ b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue
@@ -10,7 +10,7 @@
-
+
@@ -64,7 +64,7 @@ export default {
return { isLoading, selectedRuleType, selectedActivitySequence, selectedMode, selectedProcessScope, selectedActSeqMore, selectedActSeqFromTo, conformanceTask, conformanceStart, conformanceEnd }
},
- props: ['isSubmit', 'isSubmitTask', 'isSubmitStartAndEnd', 'isSubmitListSeq'],
+ props: ['isSubmit', 'isSubmitTask', 'isSubmitStartAndEnd', 'isSubmitListSeq', 'isSubmitDurationData'],
components: {
ActList,
ActRadio,