g

src/components/AddPreSetting.vue

@@ -139,7 +139,7 @@
 import { ref, onMounted } from 'vue'
 import SimpleKeyboard from 'cpns/SimpleKeyboard'
 import { showSuccessToast, showFailToast } from 'vant'
-import { useSettingStore, useWebSocketStore, useOperatorStore } from '@/store'
+import { useSettingStore, useWebSocketStore, useOperatorStore, useFormulaStore } from '@/store'
 import { storeToRefs } from 'pinia'
 import {
   setSettingValJSON,
@@ -151,6 +151,7 @@ import LogPicker from 'cpns/dialogs/LogPicker'
 const settingStore = useSettingStore()
 const webSocketStore = useWebSocketStore()
 const operatorStore = useOperatorStore()
+const formulaStore = useFormulaStore()
 
 const max_humidity = ref('0')
 const continued_satur = ref('0')
@@ -183,6 +184,15 @@ const save = () => {
     showFailToast('配方名称不能为空')
     return
   }
+
+  let list = formulaStore?.formulaList;
+  for (let i = 0; i < list.length; i++) {
+    if (list[i].formula_id == formula_id.value) {
+      showFailToast('配方名称已存在')
+      return
+    }
+  }
+
   const data = {
     formula_id: formula_id.value,
     loglevel: logVal.value,
@@ -620,7 +630,7 @@ const handleShowKeyBoard = () => {
   showkeyboard.value = true
 }
 
-onMounted(() => {
+onMounted(async () => {
   document.addEventListener('click', e => {
     let box = document.getElementById('keyboard_formula')
     let room = document.getElementById('id_formula')
@@ -639,6 +649,20 @@ onMounted(() => {
     }
   })
   $('#id_formula').virtualkeyboard()
+
+
+  // 设置默认值
+  let defaultSettings = await webSocketStore.call('getAllSetting');
+  defaultSettings = defaultSettings.dbval;
+  let defaultSettingKV = {};
+  defaultSettings.forEach(item => defaultSettingKV[item.name] = item.val);
+  sprayLiquidConfigVal.value = defaultSettingKV['injection_pump_speed'] || 0;
+  stoped_gs.value = defaultSettingKV['stoped_gs'] || 0;
+  continued_gs.value = defaultSettingKV['continued_gs'] || 0;
+  stoped_satur.value = defaultSettingKV['stoped_satur'] || 0;
+  continued_satur.value = defaultSettingKV['continued_satur'] || 0;
+  stoped_humi.value = defaultSettingKV['stoped_humi'] || 0;
+  continued_humi.value = defaultSettingKV['continued_humi'] || 0;
 })
 </script>
 

src/components/Setting/components/RunInfectionSetting.vue

@@ -10,171 +10,73 @@
     <div class="row_wrap">
       <p class="title">注射蠕动泵速率(g/min)</p>
       <p class="num">
-        <van-field
-          type="number"
-          class="field_font"
-          v-model="sprayLiquidConfigVal"
-          :clickable="true"
+        <my-input type="number" class="field_font" theme="custom" close-text="配置"
+          v-model:value="sprayLiquidConfigVal"
           :formatter="formatter7"
-          readonly
-          @click.stop="hideClickKey(2)"
-        />
+          @done="setSprayLiquidVal"
+        ></my-input>
       </p>
     </div>
     <div class="row_wrap">
       <p class="title">消毒停止过氧化氢浓度(ppm)</p>
       <p class="num">
-        <van-field
-          type="number"
-          class="field_font"
-          v-model="stoped_gs"
-          :clickable="true"
+        <my-input type="number" class="field_font" theme="custom" close-text="配置"
+          v-model:value="stoped_gs"
           :formatter="formatter1"
-          readonly
-          @click.stop="hideClickKey(3)"
-        />
+          @done="setStopedGsVal"
+        ></my-input>
       </p>
     </div>
     <div class="row_wrap">
       <p class="title">消毒继续过氧化氢浓度(ppm)</p>
       <p class="num">
-        <van-field
-          class="field_font"
-          type="number"
-          v-model="continued_gs"
-          :clickable="true"
+        <my-input type="number" class="field_font" theme="custom" close-text="配置"
+          v-model:value="continued_gs"
           :formatter="formatter2"
-          readonly
-          @click.stop="hideClickKey(4)"
-        />
+          @done="setcontinuedGsVal"
+        ></my-input>
       </p>
     </div>
     <div class="row_wrap">
       <p class="title">消毒停止相对湿度(%RH)</p>
       <p class="num">
-        <van-field
-          class="field_font"
-          type="number"
-          v-model="stoped_humi"
-          :clickable="true"
+        <my-input type="number" class="field_font" theme="custom" close-text="配置"
+          v-model:value="stoped_humi"
           :formatter="formatter9"
-          readonly
-          @click.stop="hideClickKey(9)"
-        />
+          @done="setstoped_humiVal"
+        ></my-input>
       </p>
     </div>
     <div class="row_wrap">
       <p class="title">消毒继续相对湿度(%RH)</p>
       <p class="num">
-        <van-field
-          class="field_font"
-          type="number"
-          v-model="continued_humi"
-          :clickable="true"
+        <my-input type="number" class="field_font" theme="custom" close-text="配置"
+          v-model:value="continued_humi"
           :formatter="formatter10"
-          readonly
-          @click.stop="hideClickKey(10)"
-        />
+          @done="setcontinued_humiVal"
+        ></my-input>
       </p>
     </div>
     <div class="row_wrap">
       <p class="title">消毒停止过氧化氢相对饱和度(%RS)</p>
       <p class="num">
-        <van-field
-          type="number"
-          class="field_font"
+        <my-input type="number" class="field_font" theme="custom" close-text="配置"
+          v-model:value="stoped_satur"
           :formatter="formatter3"
-          v-model="stoped_satur"
-          :clickable="true"
-          readonly
-          @click.stop="hideClickKey(5)"
-        />
+          @done="setstopedSaturVal"
+        ></my-input>
       </p>
     </div>
     <div class="row_wrap">
       <p class="title">消毒继续过氧化氢相对饱和度(%RS)</p>
       <p class="num">
-        <van-field
-          class="field_font"
-          type="number"
+        <my-input type="number" class="field_font" theme="custom" close-text="配置"
+          v-model:value="continued_satur"
           :formatter="formatter4"
-          v-model="continued_satur"
-          :clickable="true"
-          readonly
-          @click.stop="hideClickKey(6)"
-        />
+          @done="setContinuedSaturVal"
+        ></my-input>
       </p>
     </div>
-    <van-number-keyboard
-      v-model="sprayLiquidConfigVal"
-      @input="val => handleInput(val, 2)"
-      :title="sprayLiquidConfigVal"
-      :show="sprayLiquidConfigValShow"
-      theme="custom"
-      @close="setSprayLiquidVal"
-      close-button-text="配置"
-      @blur="sprayLiquidConfigValShow = false"
-    />
-    <van-number-keyboard
-      v-model="stoped_gs"
-      @input="val => handleInput(val, 3)"
-      :title="stoped_gs"
-      :show="stoped_gsShow"
-      theme="custom"
-      @close="setStopedGsVal"
-      close-button-text="配置"
-      @blur="stoped_gsShow = false"
-    />
-    <van-number-keyboard
-      v-model="continued_gs"
-      @input="val => handleInput(val, 4)"
-      :title="continued_gs"
-      @close="setcontinuedGsVal"
-      :show="continued_gsShow"
-      theme="custom"
-      close-button-text="配置"
-      @blur="continued_gsShow = false"
-    />
-    <van-number-keyboard
-      v-model="stoped_satur"
-      @input="val => handleInput(val, 5)"
-      :title="stoped_satur"
-      @close="setstopedSaturVal"
-      :show="stoped_saturShow"
-      theme="custom"
-      close-button-text="配置"
-      @blur="stoped_saturShow = false"
-    />
-    <van-number-keyboard
-      v-model="continued_satur"
-      @input="val => handleInput(val, 6)"
-      :title="continued_satur"
-      @close="setContinuedSaturVal"
-      :show="continued_saturShow"
-      theme="custom"
-      close-button-text="配置"
-      @blur="continued_saturShow = false"
-    />
-    <van-number-keyboard
-      @input="val => handleInput(val, 9)"
-      theme="custom"
-      close-button-text="配置"
-      @close="setstoped_humiVal"
-      v-model="stoped_humi"
-      :title="stoped_humi"
-      :show="stoped_humiShow"
-      @blur="stoped_humiShow = false"
-    />
-    <van-number-keyboard
-      theme="custom"
-      @input="val => handleInput(val, 10)"
-      close-button-text="配置"
-      @close="setcontinued_humiVal"
-      v-model="continued_humi"
-      :title="continued_humi"
-      :show="continued_humiShow"
-      @blur="continued_humiShow = false"
-    />
   </div>
 </template>
 
@@ -645,7 +547,7 @@ const setSprayLiquidVal = () => {
       color: #000000;
       display: flex;
       align-items: center;
-      .field_font {
+      :deep(.field_font) {
         font-size: 26px;
         width: 180px;
       }

src/components/UpdatePreSetting.vue

@@ -209,6 +209,15 @@ const save = () => {
     showFailToast('配方名称不能为空')
     return
   }
+
+  let list = formulaStore?.formulaList;
+  for (let i = 0; i < list.length; i++) {
+    if (list[i].formula_id == formula_id.value && list[i].id != props.formulaInfo.id) {
+      showFailToast('配方名称已存在')
+      return
+    }
+  }
+
   const data = {
     id: props.formulaInfo.id,
     formula_id: formula_id.value,