Conformance: fix Activity sequence Sequence Mode rules.

This commit is contained in:
chiayin
2023-08-30 14:57:00 +08:00
parent 187ce7afcc
commit b7c04c9382
3 changed files with 31 additions and 27 deletions

View File

@@ -230,23 +230,7 @@ export default {
*/
async submit() {
let data;
let isMode = '';
switch (this.selectedMode) {
case 'Directly follows':
isMode = 'directly-follows';
break;
case 'Eventually follows':
isMode = 'eventually-follows';
break;
case 'Short loop(s)':
isMode = 'short-loops';
break;
case 'Self loop(s)':
isMode = 'self-loops';
break;
default:
break;
};
this.selectDurationTime = {
min: this.selectTimeRangeMin,
max: this.selectTimeRangeMax
@@ -284,15 +268,36 @@ export default {
};
break;
case 'Sequence': // Activity Sequence 選 Sequence 的行為
if(this.listSeq.length < 2) return this.$toast.error('Select two or more.');
else {
data = {
type: isMode,
task_seq: this.listSeq,
};
this.isSubmitReset();
this.isSubmitListSeq = this.listSeq;
switch (this.selectedMode) {
case 'Directly follows':
if(this.listSeq.length < 2) return this.$toast.error('Select two or more.');
else data = {
type: 'directly-follows',
task_seq: this.listSeq,
};
break;
case 'Eventually follows':
if(this.listSeq.length < 2) return this.$toast.error('Select two or more.');
else data = {
type: 'eventually-follows',
task_seq: this.listSeq,
};
break;
case 'Short loop(s)':
data = {
type: 'short-loops',
};
break;
case 'Self loop(s)':
data = {
type: 'self-loops',
};
break;
default:
break;
};
this.isSubmitReset();
this.isSubmitListSeq = this.listSeq;
default:
break;
}

View File

@@ -81,7 +81,6 @@ export default {
computed: {
selectCfmSeqSE: function() {
let data = [];
console.log(this.selectCfmSeqStart);
if(this.selectCfmSeqStart) data.push(this.selectCfmSeqStart);
if(this.selectCfmSeqEnd) data.push(this.selectCfmSeqEnd);
data.sort((a, b) => {

View File

@@ -8,7 +8,7 @@
<ActRadio :title="'End activity'" :select="isSubmitStartAndEnd?.[1].task" :data="cfmSeqEndData" :category="'cfmSeqEnd'" @selected-task="selectEnd" class="w-1/2" />
</div>
<!-- actSeqDrag -->
<ActSeqDrag v-if="selectedRuleType === 'Activity sequence' && selectedActivitySequence === 'Sequence'" :data="conformanceTask" :listSeq="isSubmitListSeq" :isSubmit="isSubmit"></ActSeqDrag>
<ActSeqDrag v-if="selectedRuleType === 'Activity sequence' && selectedActivitySequence === 'Sequence' && (selectedMode === 'Directly follows' || selectedMode === 'Eventually follows')" :data="conformanceTask" :listSeq="isSubmitListSeq" :isSubmit="isSubmit"></ActSeqDrag>
<!-- Activity duration -->
<ActRadio v-if="selectedRuleType === 'Activity duration'" :title="'Activities include'" :select="isSubmitDurationData?.[0]" :data="conformanceTask" />
<!-- Processing time -->