imacat/lucia-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Issues #71: Short loop(s)、Self loop(s), ALL, Done.

Browse Source
This commit is contained in:
chiayin
2023-09-12 14:59:47 +08:00
parent 11eb320c55
commit 83a6f072b4
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/Discover/Conformance/ConformanceSidebar.vue
View File

@@ -1,5 +1,5 @@
<template> <template>
<section class="h-full shadow-[1px_0px_4px_rgba(0,0,0,0.25)] bg-neutral-100 absolute inset-y-0 left-0 z-10" :class="isShowBar?'w-full':'w-[312px]'"> <section class="h-full shadow-[1px_0px_4px_rgba(0,0,0,0.25)] bg-neutral-100 absolute inset-y-0 left-0 z-10" :class="!notShowActList ? (isShowBar ? 'w-full' : 'w-[312px]') : 'w-[312px]'">
<!-- header --> <!-- header -->
<div class="bg-neutral-200 px-4"> <div class="bg-neutral-200 px-4">
<p class="h2">Rule Settings</p> <p class="h2">Rule Settings</p>
@@ -12,7 +12,7 @@
<!-- radio group --> <!-- radio group -->
<ConformanceRadioGroup></ConformanceRadioGroup> <ConformanceRadioGroup></ConformanceRadioGroup>
<!-- show and hidden button --> <!-- show and hidden button -->
<div class="flex items-center justify-between mr-1" :class="isShowBar ? 'text-primary' : ''"> <div v-if="!notShowActList" class="flex items-center justify-between mr-1" :class="isShowBar ? 'text-primary' : ''">
<p class="h2">Activity Selector</p> <p class="h2">Activity Selector</p>
<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>
@@ -70,7 +70,7 @@
</div> </div>
</div> </div>
<!-- show bar --> <!-- show bar -->
<ConformanceShowBar :class="isShowBar?'':'hidden'" <ConformanceShowBar v-if="!notShowActList" :class="isShowBar?'':'hidden'"
:isSubmit="isSubmit" :isSubmit="isSubmit"
:isSubmitTask="isSubmitTask" :isSubmitTask="isSubmitTask"
:isSubmitStartAndEnd="isSubmitStartAndEnd" :isSubmitStartAndEnd="isSubmitStartAndEnd"
@@ -196,6 +196,11 @@ export default {
ConformanceTimeRange, ConformanceTimeRange,
ConformanceSelectResult, ConformanceSelectResult,
}, },
computed: {
notShowActList: function() {
return (this.selectedRuleType === 'Activity sequence' && this.selectedActivitySequence === 'Sequence' && (this.selectedMode === 'Short loop(s)' || this.selectedMode === 'Self loop(s)')) || (this.selectedRuleType === 'Processing time' && this.selectedProcessScope === 'End to end' && this.selectedActSeqMore === 'All') || (this.selectedRuleType === 'Waiting time' && this.selectedProcessScope === 'End to end' && this.selectedActSeqMore === 'All') || (this.selectedRuleType === 'Cycle time' && this.selectedProcessScope === 'End to end' && this.selectedActSeqMore === 'All')
}
},
methods: { methods: {
/** /**
* get min total seconds * get min total seconds
@@ -831,11 +836,6 @@ export default {
this.listSeq = []; this.listSeq = [];
}; };
}); });
this.$emitter.on('isRadioMode', (data) => {
if(data) {
if(this.selectedMode === 'Short loop(s)' || this.selectedMode === 'Self loop(s)') this.isShowBar = false;
}
})
this.$emitter.on('isRadioProcessScopeChange', (data) => { this.$emitter.on('isRadioProcessScopeChange', (data) => {
if(data) { if(data) {
this.selectDurationTime = { min: 0, max: 0}; this.selectDurationTime = { min: 0, max: 0};

5
src/components/Discover/Conformance/ConformanceSidebar/ConformanceRadioGroup.vue
View File

@@ -20,7 +20,7 @@
<div v-show="selectedRuleType === 'Activity sequence' && selectedActivitySequence === 'Sequence'"> <div v-show="selectedRuleType === 'Activity sequence' && selectedActivitySequence === 'Sequence'">
<p class="h2">Mode</p> <p class="h2">Mode</p>
<div v-for="mode in mode" :key="mode.id" class="ml-4 mb-2"> <div v-for="mode in mode" :key="mode.id" class="ml-4 mb-2">
<RadioButton v-model="selectedMode" :inputId="mode.id + mode.name" name="mode" :value="mode.name" @change="changeRadioMode" /> <RadioButton v-model="selectedMode" :inputId="mode.id + mode.name" name="mode" :value="mode.name" />
<label :for="mode.id + mode.name" class="ml-2">{{ mode.name }}</label> <label :for="mode.id + mode.name" class="ml-2">{{ mode.name }}</label>
</div> </div>
</div> </div>
@@ -110,9 +110,6 @@ export default {
changeRadioSeq() { changeRadioSeq() {
this.$emitter.emit('isRadioSeqChange',true); this.$emitter.emit('isRadioSeqChange',true);
}, },
changeRadioMode() {
this.$emitter.emit('isRadioMode', true);
},
changeRadioProcessScope() { changeRadioProcessScope() {
this.$emitter.emit('isRadioProcessScopeChange', true); this.$emitter.emit('isRadioProcessScopeChange', true);
}, },

2
src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue
View File

@@ -1,5 +1,5 @@
<template> <template>
<section class="animate-fadein w-full h-full"> <section class="animate-fadein w-full h-full" >
<!-- Have activity --> <!-- Have activity -->
<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 -->