Issue #102: done.

This commit is contained in:
chiayin
2023-09-13 11:47:09 +08:00
parent 7e48007e4e
commit 4b0cf87414
2 changed files with 16 additions and 7 deletions

View File

@@ -64,11 +64,11 @@
<span>days.</span> <span>days.</span>
</p> </p>
<p class="pl-2 space-x-2 max-w-full" v-else> <p class="pl-2 space-x-2 max-w-full" v-else>
<span class="text-cfm-primary text-2xl font-medium">{{ data.effect.time.conforming }}</span> <span class="text-cfm-primary text-2xl font-medium inline-block">{{ data.effect.time.conforming }}</span>
<span>vs</span> <span>vs</span>
<span class="text-cfm-secondary text-2xl font-medium">{{ data.effect.time.not_conforming }}</span> <span class="text-cfm-secondary text-2xl font-medium inline-block">{{ data.effect.time.not_conforming }}</span>
<span>days,</span> <span>days,</span>
<span class="text-2xl font-medium">{{ data.effect.time.difference }}</span> <span class="text-2xl font-medium inline-block">{{ data.effect.time.difference }}</span>
<span>days of difference.</span> <span>days of difference.</span>
</p> </p>
</div> </div>
@@ -85,11 +85,11 @@
<span class="text-cfm-secondary text-2xl font-medium">{{ data.effect.tasks.not_conforming }}</span> . <span class="text-cfm-secondary text-2xl font-medium">{{ data.effect.tasks.not_conforming }}</span> .
</p> </p>
<p class="pl-2 space-x-2 max-w-full" v-else> <p class="pl-2 space-x-2 max-w-full" v-else>
<span class="text-cfm-primary text-2xl font-medium">{{ data.effect.tasks.conforming }}</span> <span class="text-cfm-primary text-2xl font-medium inline-block">{{ data.effect.tasks.conforming }}</span>
<span>vs</span> <span>vs</span>
<span class="text-cfm-secondary text-2xl font-medium">{{ data.effect.tasks.not_conforming }}</span> <span class="text-cfm-secondary text-2xl font-medium inline-block">{{ data.effect.tasks.not_conforming }}</span>
<span>activities,</span> <span>activities,</span>
<span class="text-2xl font-medium">{{ data.effect.tasks.difference }}</span> <span class="text-2xl font-medium inline-block">{{ data.effect.tasks.difference }}</span>
<span>activities of difference.</span> <span>activities of difference.</span>
</p> </p>
</div> </div>

View File

@@ -150,6 +150,7 @@ export default {
selectCfmCtEteSEStart: null, selectCfmCtEteSEStart: null,
selectCfmCtEteSEEnd: null, selectCfmCtEteSEEnd: null,
isSubmit: false, isSubmit: false,
isSubmitData: null, // 已 Apply 後,沒有重新改變規則的 Data
isSubmitTask: null, isSubmitTask: null,
isSubmitStartAndEnd: null, isSubmitStartAndEnd: null,
isSubmitListSeq: [], isSubmitListSeq: [],
@@ -201,6 +202,11 @@ export default {
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') 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')
} }
}, },
watch: {
isSubmitData: function(newValue) {
this.isSubmitData = newValue;
}
},
methods: { methods: {
/** /**
* get min total seconds * get min total seconds
@@ -256,6 +262,7 @@ export default {
* is submit select Reset * is submit select Reset
*/ */
isSubmitReset() { isSubmitReset() {
// 沒有 isSubmitData
this.isSubmitTask = null; this.isSubmitTask = null;
this.isSubmitStartAndEnd = null; this.isSubmitStartAndEnd = null;
this.isSubmitListSeq = []; this.isSubmitListSeq = [];
@@ -294,7 +301,6 @@ export default {
this.isSubmitTimeCfmCtEteStart = null; this.isSubmitTimeCfmCtEteStart = null;
this.isSubmitTimeCfmCtEteEnd = null; this.isSubmitTimeCfmCtEteEnd = null;
this.isSubmitTimeCfmCtEteSE = null; this.isSubmitTimeCfmCtEteSE = null;
}, },
/** /**
* @param {boolean} massage true | false 清空選單選項, 選擇的結果 * @param {boolean} massage true | false 清空選單選項, 選擇的結果
@@ -304,6 +310,7 @@ export default {
this.$emitter.emit('coverPlate', true); this.$emitter.emit('coverPlate', true);
// is submit select Reset // is submit select Reset
this.isSubmitReset(); this.isSubmitReset();
this.isSubmitData = null; // 已 Apply 後,沒有重新改變規則的 Data
this.isSubmit = false; this.isSubmit = false;
// 其他子元件 reset // 其他子元件 reset
@@ -723,9 +730,11 @@ export default {
default: default:
break; break;
}; };
if(JSON.stringify(data) === JSON.stringify(this.isSubmitData)) return this.$toast.error('Please set the new rule.');
this.isLoading = true; this.isLoading = true;
this.isSubmit = true; this.isSubmit = true;
this.isSubmitData = data; // 已 Apply 後,沒有重新改變規則的 Data
await this.conformanceStore.addLogConformanceTempCheckerId(data); await this.conformanceStore.addLogConformanceTempCheckerId(data);
await this.conformanceStore.getLogConformanceTempReport(); await this.conformanceStore.getLogConformanceTempReport();
this.isShowBar = false; this.isShowBar = false;