Conformance: feature task clear but after apply need to trued in Activity Selector.
This commit is contained in:
@@ -17,7 +17,13 @@
|
|||||||
<span class="material-symbols-outlined cursor-pointer duration-300 hover:bg-primary/50 hover:rounded" @click="isShowBar = !isShowBar">{{ isShowBar ? 'keyboard_double_arrow_right' : 'keyboard_double_arrow_left' }}</span>
|
<span class="material-symbols-outlined cursor-pointer duration-300 hover:bg-primary/50 hover:rounded" @click="isShowBar = !isShowBar">{{ isShowBar ? 'keyboard_double_arrow_right' : 'keyboard_double_arrow_left' }}</span>
|
||||||
</div>
|
</div>
|
||||||
<!-- select result -->
|
<!-- select result -->
|
||||||
<ConformanceSelectResult></ConformanceSelectResult>
|
<ConformanceSelectResult
|
||||||
|
:isSubmit="isSubmit"
|
||||||
|
:isSubmitTask="isSubmitTask"
|
||||||
|
:isSubmitStartAndEnd="isSubmitStartAndEnd"
|
||||||
|
:isSubmitListSeq="isSubmitListSeq"
|
||||||
|
:isSubmitDurationData="isSubmitDurationData"
|
||||||
|
></ConformanceSelectResult>
|
||||||
<p>selectConformanceTask: {{ selectConformanceTask }}</p>
|
<p>selectConformanceTask: {{ selectConformanceTask }}</p>
|
||||||
<p>selectConformanceStartAndEnd: {{ selectConformanceStartAndEnd }}</p>
|
<p>selectConformanceStartAndEnd: {{ selectConformanceStartAndEnd }}</p>
|
||||||
<p>selectConformanceStart: {{ selectConformanceStart }}</p>
|
<p>selectConformanceStart: {{ selectConformanceStart }}</p>
|
||||||
@@ -26,6 +32,7 @@
|
|||||||
<p>selectConformanceTo: {{ selectConformanceTo }}</p>
|
<p>selectConformanceTo: {{ selectConformanceTo }}</p>
|
||||||
<p>listSeq: {{ listSeq }}</p>
|
<p>listSeq: {{ listSeq }}</p>
|
||||||
<p>isSubmit: {{ isSubmit }}</p>
|
<p>isSubmit: {{ isSubmit }}</p>
|
||||||
|
<p>isSubmitTask: {{ isSubmitTask }}</p>
|
||||||
<p>isSubmitListSeq: {{ isSubmitListSeq }}</p>
|
<p>isSubmitListSeq: {{ isSubmitListSeq }}</p>
|
||||||
<p>isSubmitStartAndEnd: {{ isSubmitStartAndEnd }}</p>
|
<p>isSubmitStartAndEnd: {{ isSubmitStartAndEnd }}</p>
|
||||||
<!-- time range -->
|
<!-- time range -->
|
||||||
@@ -108,7 +115,7 @@ export default {
|
|||||||
* @param {boolean} massage true | false 清空選單選項, 選擇的結果
|
* @param {boolean} massage true | false 清空選單選項, 選擇的結果
|
||||||
*/
|
*/
|
||||||
reset() {
|
reset() {
|
||||||
// Results page Cover Plate
|
// Results page Cover Plate(遮罩為 ture)
|
||||||
this.$emitter.emit('coverPlate', true);
|
this.$emitter.emit('coverPlate', true);
|
||||||
// Have activity
|
// Have activity
|
||||||
this.isSubmitTask = null;
|
this.isSubmitTask = null;
|
||||||
@@ -134,7 +141,7 @@ export default {
|
|||||||
isMode = 'directly-follows';
|
isMode = 'directly-follows';
|
||||||
break;
|
break;
|
||||||
case 'Eventually follows':
|
case 'Eventually follows':
|
||||||
isMode = 'a';
|
isMode = 'eventually-follows';
|
||||||
break;
|
break;
|
||||||
case 'Short loop(s)':
|
case 'Short loop(s)':
|
||||||
isMode = 'b';
|
isMode = 'b';
|
||||||
@@ -154,6 +161,9 @@ export default {
|
|||||||
tasks: this.selectConformanceTask,
|
tasks: this.selectConformanceTask,
|
||||||
};
|
};
|
||||||
this.isSubmitTask = this.selectConformanceTask;
|
this.isSubmitTask = this.selectConformanceTask;
|
||||||
|
// 其他 isSubmitData 為 null
|
||||||
|
this.isSubmitStartAndEnd = null;
|
||||||
|
this.isSubmitListSeq = [];
|
||||||
}
|
}
|
||||||
}else if(this.selectedRuleType === 'Activity sequence') { // Activity Sequence 選 Start & End 的行為
|
}else if(this.selectedRuleType === 'Activity sequence') { // Activity Sequence 選 Start & End 的行為
|
||||||
if(this.selectedActivitySequence === 'Start & End'){
|
if(this.selectedActivitySequence === 'Start & End'){
|
||||||
@@ -164,7 +174,13 @@ export default {
|
|||||||
starts_with: this.selectConformanceStartAndEnd[0],
|
starts_with: this.selectConformanceStartAndEnd[0],
|
||||||
ends_with: this.selectConformanceStartAndEnd[1],
|
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 的行為
|
}else if(this.selectedActivitySequence === 'Sequence'){ // Activity Sequence 選 Sequence 的行為
|
||||||
if(this.listSeq.length < 2) return this.$toast.error('Select two or more.');
|
if(this.listSeq.length < 2) return this.$toast.error('Select two or more.');
|
||||||
@@ -174,6 +190,8 @@ export default {
|
|||||||
task_seq: this.listSeq,
|
task_seq: this.listSeq,
|
||||||
};
|
};
|
||||||
this.isSubmitListSeq = this.listSeq;
|
this.isSubmitListSeq = this.listSeq;
|
||||||
|
this.isSubmitTask = null;
|
||||||
|
this.isSubmitStartAndEnd = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="px-4 text-sm">
|
<div class="px-4 text-sm">
|
||||||
<!-- Have activity -->
|
<!-- Have activity -->
|
||||||
<ResultCheck v-if="selectedRuleType === 'Have activity'" :data="containstTasksData"></ResultCheck>
|
<ResultCheck v-if="selectedRuleType === 'Have activity'" :data="containstTasksData" :select="isSubmitTask"></ResultCheck>
|
||||||
<!-- Activity sequence -->
|
<!-- Activity sequence -->
|
||||||
<ResultDot v-if="selectedRuleType === 'Activity sequence' && selectedActivitySequence === 'Start & End'" :timeResultData="startEndData"></ResultDot>
|
<ResultDot v-if="selectedRuleType === 'Activity sequence' && selectedActivitySequence === 'Start & End'" :timeResultData="startEndData" :select="isSubmitStartAndEnd"></ResultDot>
|
||||||
<ResultArrow v-if="selectedRuleType === 'Activity sequence' && selectedActivitySequence === 'Sequence'" :data="listSequence"></ResultArrow>
|
<ResultArrow v-if="selectedRuleType === 'Activity sequence' && selectedActivitySequence === 'Sequence'" :data="listSequence" :select="isSubmitListSeq"></ResultArrow>
|
||||||
<!-- Activity duration -->
|
<!-- Activity duration -->
|
||||||
<ResultCheck v-if="selectedRuleType === 'Activity duration'" :title="'Activities include'" :data="durationData"></ResultCheck>
|
<ResultCheck v-if="selectedRuleType === 'Activity duration'" :title="'Activities include'" :data="durationData"></ResultCheck>
|
||||||
<!-- Processing time -->
|
<!-- Processing time -->
|
||||||
@@ -42,6 +42,7 @@ export default {
|
|||||||
|
|
||||||
return { selectedRuleType, selectedActivitySequence, selectedMode, selectedProcessScope, selectedActSeqMore, selectedActSeqFromTo }
|
return { selectedRuleType, selectedActivitySequence, selectedMode, selectedProcessScope, selectedActSeqMore, selectedActSeqFromTo }
|
||||||
},
|
},
|
||||||
|
props: ['isSubmit', 'isSubmitTask', 'isSubmitStartAndEnd', 'isSubmitListSeq'],
|
||||||
components: {
|
components: {
|
||||||
ResultCheck,
|
ResultCheck,
|
||||||
ResultArrow,
|
ResultArrow,
|
||||||
@@ -135,8 +136,6 @@ export default {
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
|||||||
@@ -4,8 +4,8 @@
|
|||||||
<ActList v-if="selectedRuleType === 'Have activity'" :data="conformanceTask" :select="isSubmitTask"></ActList>
|
<ActList v-if="selectedRuleType === 'Have activity'" :data="conformanceTask" :select="isSubmitTask"></ActList>
|
||||||
<!-- Activity sequence -->
|
<!-- Activity sequence -->
|
||||||
<div v-if="selectedRuleType === 'Activity sequence' && selectedActivitySequence === 'Start & End'" class="flex h-full">
|
<div v-if="selectedRuleType === 'Activity sequence' && selectedActivitySequence === 'Start & End'" class="flex h-full">
|
||||||
<ActRadio :title="'Start activity'" :select="isSubmitStartAndEnd?.[0]" :data="conformanceStart" :category="'Start'" />
|
<ActRadio :title="'Start activity'" :select="isSubmitStartAndEnd?.[0].task" :data="conformanceStart" :category="'Start'" />
|
||||||
<ActRadio :title="'End activity'" :select="isSubmitStartAndEnd?.[1]" :data="conformanceEnd" :category="'End'" />
|
<ActRadio :title="'End activity'" :select="isSubmitStartAndEnd?.[1].task" :data="conformanceEnd" :category="'End'" />
|
||||||
</div>
|
</div>
|
||||||
<!-- actSeqDrag -->
|
<!-- actSeqDrag -->
|
||||||
<ActSeqDrag v-if="selectedRuleType === 'Activity sequence' && selectedActivitySequence === 'Sequence'" :data="conformanceTask" :listSeq="isSubmitListSeq" :isSubmit="isSubmit"></ActSeqDrag>
|
<ActSeqDrag v-if="selectedRuleType === 'Activity sequence' && selectedActivitySequence === 'Sequence'" :data="conformanceTask" :listSeq="isSubmitListSeq" :isSubmit="isSubmit"></ActSeqDrag>
|
||||||
@@ -64,10 +64,11 @@ export default {
|
|||||||
|
|
||||||
return { isLoading, selectedRuleType, selectedActivitySequence, selectedMode, selectedProcessScope, selectedActSeqMore, selectedActSeqFromTo, conformanceTask, conformanceStart, conformanceEnd }
|
return { isLoading, selectedRuleType, selectedActivitySequence, selectedMode, selectedProcessScope, selectedActSeqMore, selectedActSeqFromTo, conformanceTask, conformanceStart, conformanceEnd }
|
||||||
},
|
},
|
||||||
props: ['isSubmit',
|
props: ['isSubmit', 'isSubmitTask', 'isSubmitStartAndEnd', 'isSubmitListSeq'],
|
||||||
'isSubmitTask', 'isSubmitStartAndEnd', 'isSubmitListSeq'],
|
|
||||||
components: {
|
components: {
|
||||||
ActList, ActRadio, ActSeqDrag
|
ActList,
|
||||||
|
ActRadio,
|
||||||
|
ActSeqDrag
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="space-y-2">
|
<div class="space-y-2">
|
||||||
<div class="flex justify-start items-center pr-4" v-for="(act, index) in data" :key="index">
|
<div class="flex justify-start items-center pr-4" v-for="(act, index) in datadata" :key="index">
|
||||||
<span class="material-symbols-outlined text-primary mr-2">
|
<span class="material-symbols-outlined text-primary mr-2">
|
||||||
check_circle
|
check_circle
|
||||||
</span>
|
</span>
|
||||||
@@ -11,6 +11,19 @@
|
|||||||
<script>
|
<script>
|
||||||
export default {
|
export default {
|
||||||
name: 'ResultCheck',
|
name: 'ResultCheck',
|
||||||
props:['data'],
|
props:['data', 'select'],
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
datadata: null,
|
||||||
|
}
|
||||||
|
},
|
||||||
|
watch: {
|
||||||
|
data: function(newValue) {
|
||||||
|
this.datadata = newValue;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
created() {
|
||||||
|
this.datadata = this.select;
|
||||||
|
},
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<ul>
|
<ul>
|
||||||
<li class="flex justify-start items-center py-1 pr-4" v-for="(act, index) in timeResultData" :key="index + act">
|
<li class="flex justify-start items-center py-1 pr-4" v-for="(act, index) in datadata" :key="index + act">
|
||||||
<span class="material-symbols-outlined disc text-sm align-middle mr-1">fiber_manual_record</span>
|
<span class="material-symbols-outlined disc text-sm align-middle mr-1">fiber_manual_record</span>
|
||||||
<span class="mr-2 block w-12">{{ act.category }}</span>
|
<span class="mr-2 block w-12">{{ act.category }}</span>
|
||||||
<span class="px-2 py-1 border border-neutral-500 w-full whitespace-nowrap break-keep text-ellipsis overflow-hidden block">{{ act.task }}</span>
|
<span class="px-2 py-1 border border-neutral-500 w-full whitespace-nowrap break-keep text-ellipsis overflow-hidden block">{{ act.task }}</span>
|
||||||
@@ -10,6 +10,19 @@
|
|||||||
<script>
|
<script>
|
||||||
export default {
|
export default {
|
||||||
name: 'ResultDot',
|
name: 'ResultDot',
|
||||||
props:['timeResultData'],
|
props:['timeResultData', 'select'],
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
datadata: null,
|
||||||
|
}
|
||||||
|
},
|
||||||
|
watch: {
|
||||||
|
timeResultData: function(newValue) {
|
||||||
|
this.datadata = newValue;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
created() {
|
||||||
|
this.datadata = this.select;
|
||||||
|
},
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
Reference in New Issue
Block a user