Browse Source

fix: 消毒设置默认配方保留消毒等级

master
guoapeng 2 weeks ago
parent
commit
ec2f62ac96
  1. 2
      src/components/home/HomeSetting.vue
  2. 1
      src/components/home/config.vue
  3. 33
      src/components/system/ErrorEventsModal.vue
  4. 14
      src/stores/formulaStore.ts

2
src/components/home/HomeSetting.vue

@ -229,6 +229,8 @@ const handleCancel = () => {
* @desc 重置对话框状态 * @desc 重置对话框状态
*/ */
const onClose = () => { const onClose = () => {
const formData = configRef.value?.getFormData()
formulaStore.updateSelectedFormulaDataByList(cloneDeep(formData))
disinfectFormulaVisible.value = false disinfectFormulaVisible.value = false
} }

1
src/components/home/config.vue

@ -97,6 +97,7 @@ const onChooseFormula = () => {
* @description 重置配方数据为默认配置 * @description 重置配方数据为默认配置
*/ */
const onDefaultFormula = () => { const onDefaultFormula = () => {
// formulaStore.updateSelectedFormulaDataByList()
formulaStore.initFormulaData() formulaStore.initFormulaData()
} }
</script> </script>

33
src/components/system/ErrorEventsModal.vue

@ -37,17 +37,13 @@ const getClassByType = (type: string) => {
</script> </script>
<template> <template>
<div v-if="appEvents.length" class="reconnect-modal-overlay">
<div v-if="appEvents?.length" class="reconnect-modal-overlay">
<div class="reconnect-modal-container"> <div class="reconnect-modal-container">
<h2 class="reconnect-title"> <h2 class="reconnect-title">
错误信息 错误信息
</h2> </h2>
<ul class="recipe-list"> <ul class="recipe-list">
<li
v-for="(item, index) in appEvents"
:key="index"
:class="getClassByType(item.type)"
>
<li v-for="(item, index) in appEvents" :key="index" :class="getClassByType(item.type)">
<span v-if="item.type === 'AppCheckPointCheckFailEvent'"> <span v-if="item.type === 'AppCheckPointCheckFailEvent'">
<span v-for="checkItem in item.errCheckPoints" :key="checkItem.ecode"> <span v-for="checkItem in item.errCheckPoints" :key="checkItem.ecode">
{{ checkItem.ecodeInfo }} {{ checkItem.ecodeInfo }}
@ -76,7 +72,7 @@ const getClassByType = (type: string) => {
padding: 10px; padding: 10px;
margin-bottom: 5px; margin-bottom: 5px;
border-radius: 4px; border-radius: 4px;
border: 1px solid #E6A23C;
border: 1px solid #e6a23c;
} }
.list-info { .list-info {
padding: 10px; padding: 10px;
@ -88,7 +84,7 @@ const getClassByType = (type: string) => {
padding: 10px; padding: 10px;
margin-bottom: 5px; margin-bottom: 5px;
border-radius: 4px; border-radius: 4px;
border: 1px solid #F56C6C;
border: 1px solid #f56c6c;
} }
.list-info { .list-info {
padding: 10px; padding: 10px;
@ -173,7 +169,8 @@ const getClassByType = (type: string) => {
align-items: center; align-items: center;
} }
.view-button, .delete-button {
.view-button,
.delete-button {
border: none; border: none;
padding: 4px 8px; padding: 4px 8px;
border-radius: 3px; border-radius: 3px;
@ -208,12 +205,22 @@ const getClassByType = (type: string) => {
} }
@keyframes spin { @keyframes spin {
0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); }
0% {
transform: rotate(0deg);
}
100% {
transform: rotate(360deg);
}
} }
@keyframes fadeIn { @keyframes fadeIn {
from { opacity: 0; transform: scale(0.95); }
to { opacity: 1; transform: scale(1); }
from {
opacity: 0;
transform: scale(0.95);
}
to {
opacity: 1;
transform: scale(1);
}
} }
</style> </style>

14
src/stores/formulaStore.ts

@ -64,9 +64,13 @@ export const useFormulaStore = defineStore('formula', () => {
const flip = ref(true) const flip = ref(true)
const selectedIndex = ref<number | null>(0) const selectedIndex = ref<number | null>(0)
watch(defaultFormulaInfo, (newVal) => {
watch(
defaultFormulaInfo,
(newVal) => {
currentSelectedFormulaInfo.value = cloneDeep(newVal) currentSelectedFormulaInfo.value = cloneDeep(newVal)
}, { deep: true })
},
{ deep: true },
)
// 计算属性 // 计算属性
const isDefaultFormula = computed(() => selectedFormulaInfo.value?.name === defaultFormulaInfo.value.name) const isDefaultFormula = computed(() => selectedFormulaInfo.value?.name === defaultFormulaInfo.value.name)
@ -180,7 +184,9 @@ export const useFormulaStore = defineStore('formula', () => {
formulaList.value = res.rely formulaList.value = res.rely
if (res.rely.length) { if (res.rely.length) {
console.log('selectedIndex.value--', selectedIndex.value) console.log('selectedIndex.value--', selectedIndex.value)
currentSelectedFormulaInfo.value = selectedIndex.value ? res.rely[selectedIndex.value] : res.rely[res.rely.length - 1]
currentSelectedFormulaInfo.value = selectedIndex.value
? res.rely[selectedIndex.value]
: res.rely[res.rely.length - 1]
} }
} }
else { else {
@ -197,7 +203,7 @@ export const useFormulaStore = defineStore('formula', () => {
* @desc * @desc
*/ */
const initFormulaData = () => { const initFormulaData = () => {
selectedFormulaInfo.value = null
selectedFormulaInfo.value = cloneDeep(defaultFormulaInfo.value)
resetToDefaultFormula() resetToDefaultFormula()
} }

Loading…
Cancel
Save