切换页面配方名称变化bug

重新登录配方名称变回默认bug
实时消毒等级结束消毒后不为0bug
消毒结束隐藏实时消毒等级label

src/components/home/HomeFormula.vue

@@ -8,8 +8,7 @@ import { useFormulaStore } from '@/stores/formulaStore'
 const formulaStore = useFormulaStore()
 const homeStore = useHomeStore()
 // const gasStore = useGasStore()
-const formulaInfo = ref()
-const rate = ref()
+// const rate = ref()
 const log = ref()
 // const selectChannel = (channel: string, event: any) => {
 //   FtMessageBox.warning(`请确认打开${event.target.textContent}?`).then(() => {
@@ -18,13 +17,12 @@ const log = ref()
 // }
 watchEffect(async () => {
   if (['idle', 'finished'].includes(homeStore.disinfectionState.state)) {
-    formulaInfo.value = formulaStore.selectedFormulaInfo
-    rate.value = formulaStore.selectedFormulaInfo?.injection_pump_speed
+    // rate.value = formulaStore.selectedFormulaInfo?.injection_pump_speed
     log.value = formulaStore.selectedFormulaInfo?.loglevel
   }
   else {
     const realForm = (await formulaStore.getRealtimeConfig()).rely
-    rate.value = homeStore.realRate || realForm?.injection_pump_speed
+    // rate.value = homeStore.realRate || realForm?.injection_pump_speed
     log.value = homeStore.realLog || realForm?.loglevel
   }
 })
@@ -34,9 +32,9 @@ watchEffect(async () => {
   <div class="home-right-title">
     <el-descriptions :column="1">
       <el-descriptions-item label="配方">
-        <el-tooltip :content="formulaInfo?.name || '默认'" placement="bottom-start">
+        <el-tooltip :content="formulaStore.selectedFormulaInfo?.name || '默认'" placement="bottom-start">
           <div class="text">
-            {{ formulaInfo?.name || '默认' }}
+            {{ formulaStore.selectedFormulaInfo?.name || '默认' }}
           </div>
         </el-tooltip>
       </el-descriptions-item>
@@ -58,7 +56,7 @@ watchEffect(async () => {
         </el-tag>
       </el-descriptions-item>
 
-      <el-descriptions-item label="实时消毒等级">
+      <el-descriptions-item v-if=" !['idle', 'finished'].includes(homeStore.disinfectionState.state)" label="实时消毒等级">
         <el-tag>
           <span style="color: #31cb7a; font-size: 18px; margin: 0 5px">{{
             parseInt(homeStore.disinfectionState.nlog?.toString())

src/stores/formulaStore.ts

@@ -16,39 +16,6 @@ const PRESSURE_TYPES = [
   { name: '正压', value: 'positivePressure' },
   { name: '负压', value: 'negativePressure' },
 ]
-
-// 默认配方函数
-// const createDefaultFormulaInfo = (): Formula.FormulaItem => ({
-//   continued_gs: 200,
-//   continued_humi: 60,
-//   continued_satur: 60,
-//   injection_pump_speed: 10,
-//   loglevel: 6,
-//   max_humidity: 90,
-//   pre_heat_time_s: 120,
-//   proportional_valve_default_value: 10,
-//   stoped_gs: 300,
-//   stoped_humi: 85,
-//   stoped_satur: 85,
-//   dvalue_correct_coefficient: 0
-//   name: '默认配方',
-// })
-// 清空配方函数
-// const createResetFormulaInfo = (): Formula.FormulaItem => ({
-//   continued_gs: '',
-//   continued_humi: '',
-//   continued_satur: '',
-//   injection_pump_speed: '',
-//   loglevel: '',
-//   max_humidity: '',
-//   pre_heat_time_s: '',
-//   proportional_valve_default_value: '',
-//   stoped_gs: '',
-//   stoped_humi: '',
-//   stoped_satur: '',
-//   name: '',
-// })
-
 export const useFormulaStore = defineStore('formula', () => {
   // 状态定义
   const logEnums = LOG_ITEMS
@@ -58,7 +25,7 @@ export const useFormulaStore = defineStore('formula', () => {
   // const resetFormulaInfo = ref<Formula.FormulaItem>(createResetFormulaInfo())
   const pressurOptionList = ref<string[]>(['10%', '20%', '30%', '40%', '50%', '60%', '70%', '80%', '90%', '100%'])
   const currentSelectedFormulaInfo = ref<Formula.FormulaItem>(cloneDeep(defaultFormulaInfo.value)) // 当前列表选中的配方信息
-  const selectedFormulaInfo = ref<Formula.FormulaItem | null>(defaultFormulaInfo.value) // 选中执行的配方信息
+  const selectedFormulaInfo = ref<Formula.FormulaItem | null>() // 选中执行的配方信息
   const formulaConfigList = ref<Formula.FormulaConfig[]>([])
   const formulaList = ref<Formula.FormulaItem[]>([])
   const loglevel = ref<string>('')
@@ -113,7 +80,10 @@ export const useFormulaStore = defineStore('formula', () => {
     // const visibleConfig = data.filter(item => item.is_visible_in_formula_page)
     formulaConfigList.value = data
     defaultFormulaInfo.value = mapConfigToFormula(data)
-    if (!selectedFormulaInfo.value?.name) {
+    if (!selectedFormulaInfo.value) {
+      selectedFormulaInfo.value = defaultFormulaInfo.value
+    }
+    else if (!selectedFormulaInfo.value?.name) {
       selectedFormulaInfo.value = defaultFormulaInfo.value
     }
   }
@@ -378,4 +348,4 @@ export const useFormulaStore = defineStore('formula', () => {
     getRealtimeConfig,
     setRealtimeConfig,
   }
-})
+}, { persist: true })

src/stores/homeStore.ts

@@ -1,7 +1,7 @@
 import { syncSendCmd } from 'apis/system'
 import { PARSSURE_DATA } from 'libs/constant'
 import { defineStore } from 'pinia'
-import { computed, ref } from 'vue'
+import { computed, ref, watch } from 'vue'
 
 import { DEVICE_STATES } from '@/libs/utils'
 
@@ -172,7 +172,11 @@ export const useHomeStore = defineStore('home', () => {
   const setLog = (data: any) => {
     realLog.value = data
   }
-
+  watch(() => disinfectionState.value.state, () => {
+    if (disinfectionState.value.state === 'idle' || disinfectionState.value.state === 'finished') {
+      disinfectionState.value.nlog = 0
+    }
+  })
   /**
    * @function updateHomeData
    * @param {Home.DisplayrelyMgr[]} data - 当前设备所有环境数据（仓内、探头）