配方参数根据页面分开

src/components/formula/FormulaConfig.vue

@@ -271,7 +271,7 @@ defineExpose({
         :size="size"
         inline
       >
-        <el-form-item  label="配方名称" style="width: 93%">
+        <el-form-item label="配方名称" style="width: 93%">
           <el-input
             v-model="formData.name"
             v-prevent-keyboard
@@ -282,12 +282,12 @@ defineExpose({
           />
         </el-form-item>
         <el-form-item
-          v-for="item in formulaConfigList"
+          v-for="item in formulaConfigList.filter((data) => data.is_visible_in_formula_page)"
           :key="item.setting_id"
           :label="formulaNameMap[item.setting_id]"
           style="width: 50%"
         >
-          <template v-if="item.is_visible_in_formula_page && item.val_type === 'int'">
+          <template v-if="item.val_type === 'int'">
             <el-input
               v-model.number="formData[item.setting_id]"
               v-prevent-keyboard
@@ -295,7 +295,6 @@ defineExpose({
               type="number"
               :name="item.setting_id"
               :controls="false"
-              :disabled="!item.is_visible_in_setting_page"
               @focus="e => openKeyboard(e, item)"
             >
               <template v-if="labelUnitMap[item.setting_id]" #append>
@@ -303,7 +302,7 @@ defineExpose({
               </template>
             </el-input>
           </template>
-          <template v-if="item.is_visible_in_formula_page && item.val_type === 'float'">
+          <template v-if="item.val_type === 'float'">
             <el-input
               v-model.number="formData[item.setting_id]"
               v-prevent-keyboard
@@ -311,7 +310,6 @@ defineExpose({
               type="number"
               :name="item.setting_id"
               :controls="false"
-              :disabled="!item.is_visible_in_setting_page"
               @focus="e => openKeyboard(e, item)"
             >
               <template v-if="labelUnitMap[item.setting_id]" #append>
@@ -319,7 +317,7 @@ defineExpose({
               </template>
             </el-input>
           </template>
-          <template v-else-if="item.is_visible_in_formula_page && item.val_type === 'enum'">
+          <template v-else-if="item.val_type === 'enum'">
             <el-input
               v-model="formData[item.setting_id]"
               v-prevent-keyboard
@@ -333,8 +331,8 @@ defineExpose({
               </template>
             </el-input>
           </template>
-          <template v-else-if="item.is_visible_in_formula_page && item.val_type === 'boolean'">
-            <el-radio-group v-model="formData[item.setting_id]" :disabled="!item.is_visible_in_setting_page">
+          <template v-else-if="item.val_type === 'boolean'">
+            <el-radio-group v-model="formData[item.setting_id]">
               <el-radio :label="true">
                 是
               </el-radio>
@@ -348,7 +346,7 @@ defineExpose({
       <div :style="{ marginLeft: '33%' }">
         <slot name="formulaBtn">
           <div class="default-btn">
-            <el-button  type="primary" class="config-btn" @click="handleSubmit">
+            <el-button type="primary" class="config-btn" @click="handleSubmit">
               确定
             </el-button>
           </div>

src/components/formula/HomeFormulaConfig.vue

@@ -64,12 +64,12 @@ const size = 'default'
         />
       </el-form-item>
       <el-form-item
-        v-for="item in formulaConfigList"
+        v-for="item in formulaConfigList.filter((data) => data.is_visible_in_rt_page)"
         :key="item.setting_id"
         :label="formulaNameMap[item.setting_id]"
         style="width: 50%"
       >
-        <template v-if="item.is_visible_in_rt_page && item.val_type === 'int'">
+        <template v-if="item.val_type === 'int'">
           <el-input
             v-model.number="formData[item.setting_id]"
             v-prevent-keyboard
@@ -84,7 +84,7 @@ const size = 'default'
             </template>
           </el-input>
         </template>
-        <template v-if="item.is_visible_in_rt_page && item.val_type === 'float'">
+        <template v-if="item.val_type === 'float'">
           <el-input
             v-model.number="formData[item.setting_id]"
             v-prevent-keyboard
@@ -99,7 +99,7 @@ const size = 'default'
             </template>
           </el-input>
         </template>
-        <template v-else-if="item.is_visible_in_rt_page && item.val_type === 'enum'">
+        <template v-else-if="item.val_type === 'enum'">
           <el-input
             v-model="formData[item.setting_id]"
             v-prevent-keyboard
@@ -113,7 +113,7 @@ const size = 'default'
             </template>
           </el-input>
         </template>
-        <template v-else-if="item.is_visible_in_rt_page && item.val_type === 'boolean'">
+        <template v-else-if="item.val_type === 'boolean'">
           <el-radio-group v-model="formData[item.setting_id]" :disabled="!item.is_editable">
             <el-radio :label="true">
               是

src/components/formula/SettingFormulaConfig.vue

@@ -198,12 +198,12 @@ const size = 'default'
       inline
     >
       <el-form-item
-        v-for="item in formulaConfigList"
+        v-for="item in formulaConfigList.filter((data) => data.is_visible_in_setting_page)"
         :key="item.setting_id"
         :label="formulaNameMap[item.setting_id]"
         style="width: 50%"
       >
-        <template v-if="item.is_visible_in_setting_page && item.val_type === 'int'">
+        <template v-if="item.val_type === 'int'">
           <el-input
             v-model.number="formData[item.setting_id]"
             v-prevent-keyboard
@@ -219,7 +219,7 @@ const size = 'default'
             </template>
           </el-input>
         </template>
-        <template v-if="item.is_visible_in_setting_page && item.val_type === 'float'">
+        <template v-if="item.val_type === 'float'">
           <el-input
             v-model.number="formData[item.setting_id]"
             v-prevent-keyboard
@@ -235,7 +235,7 @@ const size = 'default'
             </template>
           </el-input>
         </template>
-        <template v-else-if="item.is_visible_in_setting_page && item.val_type === 'enum'">
+        <template v-else-if="item.val_type === 'enum'">
           <el-input
             v-model="formData[item.setting_id]"
             v-prevent-keyboard

src/libs/constant.ts

@@ -16,6 +16,9 @@ export const formulaNameMap: Record<string, any> = {
   continued_humi: '湿度',
   proportional_valve_default_value: '正负压比例',
   loglevel: '消毒等级',
+  dvalue_correct_coefficient: 'D值修正系数',
+  record_period_min: '消毒日志记录间隔',
+  record_printer_period_min: '消毒日志打印间隔',
 }
 
 // 空气压力初始化数据

src/stores/formulaStore.ts

@@ -77,6 +77,8 @@ export const useFormulaStore = defineStore('formula', () => {
     stoped_satur: '%RS',
     loglevel: 'Log',
     dvalue_correct_coefficient: '',
+    record_period_min: '秒',
+    record_printer_period_min: '分钟',
   }
   watch(
     defaultFormulaInfo,
@@ -108,9 +110,9 @@ export const useFormulaStore = defineStore('formula', () => {
    * @desc 更新配方配置数据并生成默认配方
    */
   const updateFormulaConfigData = (data: Formula.FormulaConfig[]) => {
-    const visibleConfig = data.filter(item => item.is_visible_in_formula_page)
-    formulaConfigList.value = visibleConfig
-    defaultFormulaInfo.value = mapConfigToFormula(visibleConfig)
+    // const visibleConfig = data.filter(item => item.is_visible_in_formula_page)
+    formulaConfigList.value = data
+    defaultFormulaInfo.value = mapConfigToFormula(data)
   }
 
   const getFormualDefaultData = async () => {