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

refactor (slight, although many files)

Browse Source
This commit is contained in:
Cindy Chang
2024-06-06 09:25:26 +08:00
parent 0df045c218
commit 9539237c3d
8 changed files with 162 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -502,6 +502,9 @@ export default {
}, },
}, },
watch: { watch: {
selectCfmPtPSEStart (newValue) {
// console.log('watch selectCfmPtPSEStart', newValue);
},
isSubmittedData: function(newValue) { isSubmittedData: function(newValue) {
this.isSubmittedData = newValue; this.isSubmittedData = newValue;
}, },
@@ -1098,6 +1101,7 @@ export default {
this.isSubmitTimeCfmPtPEnd.rule = this.selectDurationTime; this.isSubmitTimeCfmPtPEnd.rule = this.selectDurationTime;
break; break;
case 'From & To': case 'From & To':
console.log('this.selectCfmPtPSEStart', this.selectCfmPtPSEStart); //TODO:
dataToSave = { dataToSave = {
start: this.selectCfmPtPSEStart, start: this.selectCfmPtPSEStart,
end: this.selectCfmPtPSEEnd, end: this.selectCfmPtPSEEnd,
@@ -1343,11 +1347,16 @@ export default {
this.selectCfmPtPEnd = data.task; this.selectCfmPtPEnd = data.task;
break; break;
case 'cfmPtPSEStart': case 'cfmPtPSEStart':
if(this.isStartSelected === true && data.task !== this.selectCfmPtPSEStart) this.selectCfmPtPSEEnd = null; if(this.isStartSelected === true && data.task !== this.selectCfmPtPSEStart) {
this.selectCfmPtPSEEnd = null;
}
console.log('TODO: data.task', data.task);
this.selectCfmPtPSEStart = data.task; this.selectCfmPtPSEStart = data.task;
break; break;
case 'cfmPtPSEEnd': case 'cfmPtPSEEnd':
if(this.isEndSelected === true && data.task !== this.selectCfmPtPSEEnd) this.selectCfmPtPSEStart = null; if(this.isEndSelected === true && data.task !== this.selectCfmPtPSEEnd) {
this.selectCfmPtPSEStart = null;
}
this.selectCfmPtPSEEnd = data.task; this.selectCfmPtPSEEnd = data.task;
break; break;
// Waiting time // Waiting time
@@ -1358,11 +1367,15 @@ export default {
this.selectCfmWtEteEnd = data.task; this.selectCfmWtEteEnd = data.task;
break; break;
case 'cfmWtEteSEStart': case 'cfmWtEteSEStart':
if(this.isStartSelected === true && data.task !== this.selectCfmWtEteSEStart) this.selectCfmWtEteSEEnd = null; if(this.isStartSelected === true && data.task !== this.selectCfmWtEteSEStart) {
this.selectCfmWtEteSEEnd = null;
}
this.selectCfmWtEteSEStart = data.task; this.selectCfmWtEteSEStart = data.task;
break; break;
case 'cfmWtEteSEEnd': case 'cfmWtEteSEEnd':
if(this.isEndSelected === true && data.task !== this.selectCfmWtEteSEEnd) this.selectCfmWtEteSEStart = null; if(this.isEndSelected === true && data.task !== this.selectCfmWtEteSEEnd) {
this.selectCfmWtEteSEStart = null;
}
this.selectCfmWtEteSEEnd = data.task; this.selectCfmWtEteSEEnd = data.task;
break; break;
case 'cfmWtPStart': case 'cfmWtPStart':

110
src/components/Discover/Conformance/ConformanceSidebar/ConformanceTimeRange.vue
View File

@@ -1,31 +1,69 @@
<template> <template>
<div class="mt-2 mb-12" v-if="selectedRuleType === 'Activity duration' || selectedRuleType === 'Waiting time' || selectedRuleType === 'Processing time' || selectedRuleType === 'Cycle time'"> <div class="mt-2 mb-12" v-if="selectedRuleType === 'Activity duration' || selectedRuleType === 'Waiting time'
|| selectedRuleType === 'Processing time' || selectedRuleType === 'Cycle time'">
<p class="h2">Time Range</p> <p class="h2">Time Range</p>
<div class=" text-sm leading-normal"> <div class=" text-sm leading-normal">
<!-- Activity duration --> <!-- Activity duration -->
<TimeRangeDuration <TimeRangeDuration
v-if="selectedRuleType === 'Activity duration'" :time="timeDuration" :select="isSubmitDurationTime" @min-total-seconds="minTotalSeconds" @max-total-seconds="maxTotalSeconds" /> v-if="selectedRuleType === 'Activity duration'" :time="timeDuration" :select="isSubmitDurationTime" @min-total-seconds="minTotalSeconds"
@max-total-seconds="maxTotalSeconds" />
<!-- Processing time --> <!-- Processing time -->
<TimeRangeDuration v-if="selectedRuleType === 'Processing time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'All'" :time="timeCfmPtEteAll" :select="isSubmitTimeCfmPtEteAll" @min-total-seconds="minTotalSeconds" @max-total-seconds="maxTotalSeconds" /> <TimeRangeDuration v-if="selectedRuleType === 'Processing time' && selectedProcessScope === 'End to end'
<TimeRangeDuration v-if="selectedRuleType === 'Processing time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'Start'" :time="timeCfmPtEteStart" :select="isSubmitTimeCfmPtEteStart" @min-total-seconds="minTotalSeconds" @max-total-seconds="maxTotalSeconds" /> && selectedActSeqMore === 'All'" :time="timeCfmPtEteAll" :select="isSubmitTimeCfmPtEteAll" @min-total-seconds="minTotalSeconds"
<TimeRangeDuration v-if="selectedRuleType === 'Processing time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'End'" :time="timeCfmPtEteEnd" :select="isSubmitTimeCfmPtEteEnd" @min-total-seconds="minTotalSeconds" @max-total-seconds="maxTotalSeconds" /> @max-total-seconds="maxTotalSeconds" />
<TimeRangeDuration v-if="selectedRuleType === 'Processing time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'Start & End'" :time="timeCfmPtEteSE" :select="isSubmitTimeCfmPtEteSE" @min-total-seconds="minTotalSeconds" @max-total-seconds="maxTotalSeconds" /> <TimeRangeDuration v-if="selectedRuleType === 'Processing time' && selectedProcessScope === 'End to end'
<TimeRangeDuration v-if="selectedRuleType === 'Processing time' && selectedProcessScope === 'Partial' && selectedActSeqFromTo === 'From'" :time="timeCfmPtPStart" :select="isSubmitTimeCfmPtPStart" @min-total-seconds="minTotalSeconds" @max-total-seconds="maxTotalSeconds" /> && selectedActSeqMore === 'Start'" :time="timeCfmPtEteStart" :select="isSubmitTimeCfmPtEteStart" @min-total-seconds="minTotalSeconds"
<TimeRangeDuration v-if="selectedRuleType === 'Processing time' && selectedProcessScope === 'Partial' && selectedActSeqFromTo === 'To'" :time="timeCfmPtPEnd" :select="isSubmitTimeCfmPtPEnd" @min-total-seconds="minTotalSeconds" @max-total-seconds="maxTotalSeconds" /> @max-total-seconds="maxTotalSeconds" />
<TimeRangeDuration v-if="selectedRuleType === 'Processing time' && selectedProcessScope === 'Partial' && selectedActSeqFromTo === 'From & To'" :time="timeCfmPtPSE" :select="isSubmitTimeCfmPtPSE" @min-total-seconds="minTotalSeconds" @max-total-seconds="maxTotalSeconds" /> <TimeRangeDuration v-if="selectedRuleType === 'Processing time' && selectedProcessScope === 'End to end'
&& selectedActSeqMore === 'End'" :time="timeCfmPtEteEnd" :select="isSubmitTimeCfmPtEteEnd" @min-total-seconds="minTotalSeconds"
@max-total-seconds="maxTotalSeconds" />
<TimeRangeDuration v-if="selectedRuleType === 'Processing time' && selectedProcessScope === 'End to end'
&& selectedActSeqMore === 'Start & End'" :time="timeCfmPtEteSE" :select="isSubmitTimeCfmPtEteSE" @min-total-seconds="minTotalSeconds"
@max-total-seconds="maxTotalSeconds" />
<TimeRangeDuration v-if="selectedRuleType === 'Processing time' && selectedProcessScope === 'Partial'
&& selectedActSeqFromTo === 'From'" :time="timeCfmPtPStart" :select="isSubmitTimeCfmPtPStart" @min-total-seconds="minTotalSeconds"
@max-total-seconds="maxTotalSeconds" />
<TimeRangeDuration v-if="selectedRuleType === 'Processing time' && selectedProcessScope === 'Partial'
&& selectedActSeqFromTo === 'To'" :time="timeCfmPtPEnd" :select="isSubmitTimeCfmPtPEnd" @min-total-seconds="minTotalSeconds"
@max-total-seconds="maxTotalSeconds" />
<TimeRangeDuration v-if="selectedRuleType === 'Processing time' && selectedProcessScope === 'Partial'
&& selectedActSeqFromTo === 'From & To'" :time="timeCfmPtPSE" :select="isSubmitTimeCfmPtPSE" @min-total-seconds="minTotalSeconds"
@max-total-seconds="maxTotalSeconds" />
<!-- Waiting time --> <!-- Waiting time -->
<TimeRangeDuration v-if="selectedRuleType === 'Waiting time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'All'" :time="timeCfmWtEteAll" :select="isSubmitTimeCfmWtEteAll" @min-total-seconds="minTotalSeconds" @max-total-seconds="maxTotalSeconds" /> <TimeRangeDuration v-if="selectedRuleType === 'Waiting time' && selectedProcessScope === 'End to end'
<TimeRangeDuration v-if="selectedRuleType === 'Waiting time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'Start'" :time="timeCfmWtEteStart" :select="isSubmitTimeCfmWtEteStart" @min-total-seconds="minTotalSeconds" @max-total-seconds="maxTotalSeconds" /> && selectedActSeqMore === 'All'" :time="timeCfmWtEteAll" :select="isSubmitTimeCfmWtEteAll" @min-total-seconds="minTotalSeconds"
<TimeRangeDuration v-if="selectedRuleType === 'Waiting time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'End'" :time="timeCfmWtEteEnd" :select="isSubmitTimeCfmWtEteEnd" @min-total-seconds="minTotalSeconds" @max-total-seconds="maxTotalSeconds" /> @max-total-seconds="maxTotalSeconds" />
<TimeRangeDuration v-if="selectedRuleType === 'Waiting time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'Start & End'" :time="timeCfmWtEteSE" :select="isSubmitTimeCfmWtEteSE" @min-total-seconds="minTotalSeconds" @max-total-seconds="maxTotalSeconds" /> <TimeRangeDuration v-if="selectedRuleType === 'Waiting time' && selectedProcessScope === 'End to end'
<TimeRangeDuration v-if="selectedRuleType === 'Waiting time' && selectedProcessScope === 'Partial' && selectedActSeqFromTo === 'From'" :time="timeCfmWtPStart" :select="isSubmitTimeCfmWtPStart" @min-total-seconds="minTotalSeconds" @max-total-seconds="maxTotalSeconds" /> && selectedActSeqMore === 'Start'" :time="timeCfmWtEteStart" :select="isSubmitTimeCfmWtEteStart" @min-total-seconds="minTotalSeconds"
<TimeRangeDuration v-if="selectedRuleType === 'Waiting time' && selectedProcessScope === 'Partial' && selectedActSeqFromTo === 'To'" :time="timeCfmWtPEnd" :select="isSubmitTimeCfmWtPEnd" @min-total-seconds="minTotalSeconds" @max-total-seconds="maxTotalSeconds" /> @max-total-seconds="maxTotalSeconds" />
<TimeRangeDuration v-if="selectedRuleType === 'Waiting time' && selectedProcessScope === 'Partial' && selectedActSeqFromTo === 'From & To'" :time="timeCfmWtPSE" :select="isSubmitTimeCfmWtPSE" @min-total-seconds="minTotalSeconds" @max-total-seconds="maxTotalSeconds" /> <TimeRangeDuration v-if="selectedRuleType === 'Waiting time' && selectedProcessScope === 'End to end'
&& selectedActSeqMore === 'End'" :time="timeCfmWtEteEnd" :select="isSubmitTimeCfmWtEteEnd" @min-total-seconds="minTotalSeconds"
@max-total-seconds="maxTotalSeconds" />
<TimeRangeDuration v-if="selectedRuleType === 'Waiting time' && selectedProcessScope === 'End to end'
&& selectedActSeqMore === 'Start & End'" :time="timeCfmWtEteSE" :select="isSubmitTimeCfmWtEteSE" @min-total-seconds="minTotalSeconds"
@max-total-seconds="maxTotalSeconds" />
<TimeRangeDuration v-if="selectedRuleType === 'Waiting time' && selectedProcessScope === 'Partial'
&& selectedActSeqFromTo === 'From'" :time="timeCfmWtPStart" :select="isSubmitTimeCfmWtPStart" @min-total-seconds="minTotalSeconds"
@max-total-seconds="maxTotalSeconds" />
<TimeRangeDuration v-if="selectedRuleType === 'Waiting time' && selectedProcessScope === 'Partial'
&& selectedActSeqFromTo === 'To'" :time="timeCfmWtPEnd" :select="isSubmitTimeCfmWtPEnd" @min-total-seconds="minTotalSeconds"
@max-total-seconds="maxTotalSeconds" />
<TimeRangeDuration v-if="selectedRuleType === 'Waiting time' && selectedProcessScope === 'Partial'
&& selectedActSeqFromTo === 'From & To'" :time="timeCfmWtPSE" :select="isSubmitTimeCfmWtPSE" @min-total-seconds="minTotalSeconds"
@max-total-seconds="maxTotalSeconds" />
<!-- Cycle time --> <!-- Cycle time -->
<TimeRangeDuration v-if="selectedRuleType === 'Cycle time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'All'" :time="timeCfmCtEteAll" :select="isSubmitTimeCfmCtEteAll" @min-total-seconds="minTotalSeconds" @max-total-seconds="maxTotalSeconds" /> <TimeRangeDuration v-if="selectedRuleType === 'Cycle time' && selectedProcessScope === 'End to end'
<TimeRangeDuration v-if="selectedRuleType === 'Cycle time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'Start'" :time="timeCfmCtEteStart" :select="isSubmitTimeCfmCtEteStart" @min-total-seconds="minTotalSeconds" @max-total-seconds="maxTotalSeconds" /> && selectedActSeqMore === 'All'" :time="timeCfmCtEteAll" :select="isSubmitTimeCfmCtEteAll" @min-total-seconds="minTotalSeconds"
<TimeRangeDuration v-if="selectedRuleType === 'Cycle time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'End'" :time="timeCfmCtEteEnd" :select="isSubmitTimeCfmCtEteEnd" @min-total-seconds="minTotalSeconds" @max-total-seconds="maxTotalSeconds" /> @max-total-seconds="maxTotalSeconds" />
<TimeRangeDuration v-if="selectedRuleType === 'Cycle time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'Start & End'" :time="timeCfmCtEteSE" :select="isSubmitTimeCfmCtEteSE" @min-total-seconds="minTotalSeconds" @max-total-seconds="maxTotalSeconds" /> <TimeRangeDuration v-if="selectedRuleType === 'Cycle time' && selectedProcessScope === 'End to end'
&& selectedActSeqMore === 'Start'" :time="timeCfmCtEteStart" :select="isSubmitTimeCfmCtEteStart" @min-total-seconds="minTotalSeconds"
@max-total-seconds="maxTotalSeconds" />
<TimeRangeDuration v-if="selectedRuleType === 'Cycle time' && selectedProcessScope === 'End to end'
&& selectedActSeqMore === 'End'" :time="timeCfmCtEteEnd" :select="isSubmitTimeCfmCtEteEnd" @min-total-seconds="minTotalSeconds"
@max-total-seconds="maxTotalSeconds" />
<TimeRangeDuration v-if="selectedRuleType === 'Cycle time' && selectedProcessScope === 'End to end'
&& selectedActSeqMore === 'Start & End'" :time="timeCfmCtEteSE" :select="isSubmitTimeCfmCtEteSE" @min-total-seconds="minTotalSeconds"
@max-total-seconds="maxTotalSeconds" />
</div> </div>
</div> </div>
</template> </template>
@@ -37,11 +75,29 @@ import ConformanceStore from '@/stores/conformance.js';
export default { export default {
setup() { setup() {
const conformanceStore = ConformanceStore(); const conformanceStore = ConformanceStore();
const { selectedRuleType, selectedActivitySequence, selectedMode, selectedProcessScope, selectedActSeqMore, selectedActSeqFromTo, conformanceAllTasks, conformanceTask, cfmSeqStart, cfmSeqEnd, cfmPtEteStart, cfmPtEteEnd, cfmPtEteSE, cfmPtPStart, cfmPtPEnd, cfmPtPSE, cfmWtEteStart, cfmWtEteEnd, cfmWtEteSE, cfmWtPStart, cfmWtPEnd, cfmWtPSE, cfmCtEteStart, cfmCtEteEnd, cfmCtEteSE, cfmPtEteWhole, cfmWtEteWhole, cfmCtEteWhole } = storeToRefs(conformanceStore); const { selectedRuleType, selectedActivitySequence, selectedMode, selectedProcessScope,
selectedActSeqMore, selectedActSeqFromTo, conformanceAllTasks, conformanceTask,
cfmSeqStart, cfmSeqEnd, cfmPtEteStart, cfmPtEteEnd, cfmPtEteSE, cfmPtPStart,
cfmPtPEnd, cfmPtPSE, cfmWtEteStart, cfmWtEteEnd, cfmWtEteSE, cfmWtPStart,
cfmWtPEnd, cfmWtPSE, cfmCtEteStart, cfmCtEteEnd, cfmCtEteSE, cfmPtEteWhole,
cfmWtEteWhole, cfmCtEteWhole
} = storeToRefs(conformanceStore);
return { selectedRuleType, selectedActivitySequence, selectedMode, selectedProcessScope, selectedActSeqMore, selectedActSeqFromTo, conformanceAllTasks, conformanceTask, cfmSeqStart, cfmSeqEnd, cfmPtEteStart, cfmPtEteEnd, cfmPtEteSE, cfmPtPStart, cfmPtPEnd, cfmPtPSE, cfmWtEteStart, cfmWtEteEnd, cfmWtEteSE, cfmWtPStart, cfmWtPEnd, cfmWtPSE, cfmCtEteStart, cfmCtEteEnd, cfmCtEteSE, cfmPtEteWhole, cfmWtEteWhole, cfmCtEteWhole } return { selectedRuleType, selectedActivitySequence, selectedMode, selectedProcessScope,
selectedActSeqMore, selectedActSeqFromTo, conformanceAllTasks, conformanceTask,
cfmSeqStart, cfmSeqEnd, cfmPtEteStart, cfmPtEteEnd, cfmPtEteSE, cfmPtPStart,
cfmPtPEnd, cfmPtPSE, cfmWtEteStart, cfmWtEteEnd, cfmWtEteSE, cfmWtPStart,
cfmWtPEnd, cfmWtPSE, cfmCtEteStart, cfmCtEteEnd, cfmCtEteSE, cfmPtEteWhole,
cfmWtEteWhole, cfmCtEteWhole
};
}, },
props: ['isSubmitDurationTime', 'isSubmitTimeCfmPtEteAll', 'isSubmitTimeCfmPtEteStart', 'isSubmitTimeCfmPtEteEnd', 'isSubmitTimeCfmPtEteSE', 'isSubmitTimeCfmPtPStart', 'isSubmitTimeCfmPtPEnd', 'isSubmitTimeCfmPtPSE', 'isSubmitTimeCfmWtEteAll', 'isSubmitTimeCfmWtEteStart', 'isSubmitTimeCfmWtEteEnd', 'isSubmitTimeCfmWtEteSE', 'isSubmitTimeCfmWtPStart', 'isSubmitTimeCfmWtPEnd', 'isSubmitTimeCfmWtPSE', 'isSubmitTimeCfmCtEteAll', 'isSubmitTimeCfmCtEteStart', 'isSubmitTimeCfmCtEteEnd', 'isSubmitTimeCfmCtEteSE'], props: ['isSubmitDurationTime', 'isSubmitTimeCfmPtEteAll', 'isSubmitTimeCfmPtEteStart',
'isSubmitTimeCfmPtEteEnd', 'isSubmitTimeCfmPtEteSE', 'isSubmitTimeCfmPtPStart',
'isSubmitTimeCfmPtPEnd', 'isSubmitTimeCfmPtPSE', 'isSubmitTimeCfmWtEteAll',
'isSubmitTimeCfmWtEteStart', 'isSubmitTimeCfmWtEteEnd', 'isSubmitTimeCfmWtEteSE',
'isSubmitTimeCfmWtPStart', 'isSubmitTimeCfmWtPEnd', 'isSubmitTimeCfmWtPSE', 'isSubmitTimeCfmCtEteAll',
'isSubmitTimeCfmCtEteStart', 'isSubmitTimeCfmCtEteEnd', 'isSubmitTimeCfmCtEteSE'
],
data() { data() {
return { return {
timeDuration: null, // Activity duration timeDuration: null, // Activity duration
@@ -198,12 +254,16 @@ export default {
case 'cfmPtPSEStart': case 'cfmPtPSEStart':
this.selectCfmPtPSEStart = data.task; this.selectCfmPtPSEStart = data.task;
this.timeCfmPtPSE = {min: 0, max: 0}; this.timeCfmPtPSE = {min: 0, max: 0};
if(this.selectCfmPtPSEEnd) this.timeCfmPtPSE = this.getDurationTime(this.cfmPtPSE, 'double', data.task, this.selectCfmPtPSEEnd); if(this.selectCfmPtPSEEnd) {
this.timeCfmPtPSE = this.getDurationTime(this.cfmPtPSE, 'double', data.task, this.selectCfmPtPSEEnd);
}
break; break;
case 'cfmPtPSEEnd': case 'cfmPtPSEEnd':
this.selectCfmPtPSEEnd = data.task; this.selectCfmPtPSEEnd = data.task;
this.timeCfmPtPSE = {min: 0, max: 0}; this.timeCfmPtPSE = {min: 0, max: 0};
if(this.selectCfmPtPSEStart) this.timeCfmPtPSE = this.getDurationTime(this.cfmPtPSE, 'double', this.selectCfmPtPSEStart, data.task); if(this.selectCfmPtPSEStart) {
this.timeCfmPtPSE = this.getDurationTime(this.cfmPtPSE, 'double', this.selectCfmPtPSEStart, data.task);
}
break; break;
// Waiting time // Waiting time
case 'cfmWtEteStart': case 'cfmWtEteStart':

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

@@ -1,5 +1,5 @@
<template> <template>
<div class="flex justify-between items-center" id="cyp-timerange"> <div id="timeranges_s_e_container" class="flex justify-between items-center">
<Durationjs :max="minVuemax" :min="minVuemin" :size="'min'" :updateMax="updateMax" <Durationjs :max="minVuemax" :min="minVuemin" :size="'min'" :updateMax="updateMax"
@total-seconds="minTotalSeconds" :value="durationMin"> @total-seconds="minTotalSeconds" :value="durationMin">
</Durationjs> </Durationjs>

4
src/components/Navbar.vue
View File

@@ -145,7 +145,7 @@ export default {
this.filterName = newVal; this.filterName = newVal;
}, },
activePageComputedByRoute (newVal) { activePageComputedByRoute (newVal) {
console.log('activePageComputedByRoute newVal', newVal); // console.log('activePageComputedByRoute newVal', newVal);
} }
}, },
mounted() { mounted() {
@@ -162,7 +162,7 @@ export default {
* @param {event} event 選取 Navbar 選項後傳入的值 * @param {event} event 選取 Navbar 選項後傳入的值
*/ */
onNavItemBtnClick(event) { onNavItemBtnClick(event) {
console.log('onNavItemBtnClick'); // console.log('onNavItemBtnClick');
let type; let type;
let fileId; let fileId;
let isCheckPage; let isCheckPage;

13
src/components/durationjs.vue
View File

@@ -4,14 +4,18 @@
<div v-if="totalSeconds === 0" class="text-center"> <div v-if="totalSeconds === 0" class="text-center">
<p>0</p> <p>0</p>
</div> </div>
<div v-else class="flex justify-center items-center gap-1" id="cyp-timerange-show"> <!-- 這一段不是彈窗而是固定在畫面上的時間內容 -->
<div id="cyp-timerange-show" v-else class="flex justify-center items-center gap-1">
<p v-show="days != 0">{{ days }}d</p> <p v-show="days != 0">{{ days }}d</p>
<p v-show="hours != 0">{{ hours }}h</p> <p v-show="hours != 0">{{ hours }}h</p>
<p v-show="minutes != 0">{{ minutes }}m</p> <p v-show="minutes != 0">{{ minutes }}m</p>
<p v-show="seconds != 0">{{ seconds }}s</p> <p v-show="seconds != 0">{{ seconds }}s</p>
</div> </div>
</div> </div>
<div class="duration-container absolute left-0 top-full translate-y-2" v-show="openTimeSelect" <!-- 以下這段落是使用者點開來才會彈出的畫面 -->
<div id="dhms_input_popup_container"
class="duration-container absolute left-0 top-full translate-y-2"
v-show="openTimeSelect"
v-closable="{id: size, handler: onClose}"> v-closable="{id: size, handler: onClose}">
<div class="duration-box" v-for="(unit, index) in inputTypes" :key="unit"> <div class="duration-box" v-for="(unit, index) in inputTypes" :key="unit">
<input <input
@@ -81,7 +85,7 @@ export default {
}, },
data() { data() {
return { return {
display: 'dhms', display: 'dhms', // d: day; h: hour; m: month; s: second.
seconds: 0, seconds: 0,
minutes: 0, minutes: 0,
hours: 0, hours: 0,
@@ -211,8 +215,11 @@ export default {
* @param {event} event input 傳入的事件 * @param {event} event input 傳入的事件
*/ */
onKeyUp(event) { onKeyUp(event) {
// 正規表達式 \D 即不是 0-9 的字符
event.target.value = event.target.value.replace(/\D/g, ''); event.target.value = event.target.value.replace(/\D/g, '');
// 38：上箭頭鍵（Arrow Up）
// 40：下箭頭鍵（Arrow Down）
if (event.keyCode === 38 || event.keyCode === 40) { if (event.keyCode === 38 || event.keyCode === 40) {
this.actionUpDown(event.target, event.keyCode === 38, true); this.actionUpDown(event.target, event.keyCode === 38, true);
}; };

26
src/stores/conformance.js
View File

@@ -193,9 +193,12 @@ export default defineStore('conformanceStore', {
let api = ''; let api = '';
// 先判斷 filter 檔，再判斷 log 檔。 // 先判斷 filter 檔，再判斷 log 檔。
if(filterId !== null) api = `/api/filter-checks/params?filter_id=${filterId}`; if(filterId !== null) {
else api = `/api/log-checks/params?log_id=${logId}`; api = `/api/filter-checks/params?filter_id=${filterId}`;
}
else {
api = `/api/log-checks/params?log_id=${logId}`;
}
try { try {
const response = await this.$axios.get(api); const response = await this.$axios.get(api);
this.allConformanceTask = response.data.tasks; this.allConformanceTask = response.data.tasks;
@@ -218,13 +221,22 @@ export default defineStore('conformanceStore', {
let api = ''; let api = '';
// 先判斷 filter 檔，再判斷 log 檔。 // 先判斷 filter 檔，再判斷 log 檔。
if(filterId !== null) api = `/api/temp-filter-checks?filter_id=${filterId}`; if(filterId !== null) {
else api = `/api/temp-log-checks?log_id=${logId}`; api = `/api/temp-filter-checks?filter_id=${filterId}`;
}
else {
api = `/api/temp-log-checks?log_id=${logId}`;
}
try { try {
console.log("addConformanceCheckId() axios data", data)
const response = await this.$axios.post(api, data); const response = await this.$axios.post(api, data);
if(filterId !== null) this.conformanceFilterTempCheckId = response.data.id; if(filterId !== null) {
else this.conformanceLogTempCheckId = response.data.id; this.conformanceFilterTempCheckId = response.data.id;
}
else {
this.conformanceLogTempCheckId = response.data.id;
}
} catch(error) { } catch(error) {
apiError(error, 'Failed to add the Temporary Check for a file.'); apiError(error, 'Failed to add the Temporary Check for a file.');
} }

25
src/stores/conformanceData.js Normal file
View File

@@ -0,0 +1,25 @@
import { defineStore } from "pinia";
export default defineStore('conformanceDataStore', {
state: () => ({
dataToSave: {
start: null,
end: null,
min: null,
max: null,
type: null,
task: null,
},
}),
getters: {
},
actions: {
/**
* Set conformance input data which are fed to backend later.
* @param {object} userInputObj
*/
setConformanceData(userInputObj){
this.dataToSave = {...userInputObj};
},
},
})

2
src/stores/pageAdmin.js
View File

@@ -37,7 +37,7 @@ export default defineStore('pageAdminStore', {
}, },
/** /**
* Specify previous page state value. * Specify previous page state value.
* @param {*} prevPage * @param {string} prevPage
*/ */
setPrevioiusPage(prevPage) { setPrevioiusPage(prevPage) {
// console.log('setPrevioiusPage()', prevPage); // console.log('setPrevioiusPage()', prevPage);