配置中的风机

src/components/AddPreSetting.vue

@@ -98,6 +98,20 @@
         />
       </p>
     </div>
+    <div class="row_wrap">
+      <p class="title">风机速度(%)</p>
+      <p class="num">
+        <van-field
+          type="number"
+          class="field_font"
+          :formatter="formatter12"
+          v-model="draughtFanValue"
+          :clickable="true"
+          readonly
+          @click.stop="hideClickKey(12)"
+        />
+      </p>
+    </div>
     <div class="row_wrap" @click="showLogPicker">
       <p class="title">Log等级</p>
       <div class="num">
@@ -217,6 +231,16 @@
       :show="continued_humiShow"
       @blur="continued_humiShow = false"
     />
+    <van-number-keyboard
+      theme="custom"
+      @input="val => handleInput(val, 12)"
+      close-button-text="配置"
+      @close="setDraughtFanValue"
+      v-model="draughtFanValue"
+      :title="draughtFanValue"
+      :show="draughtFanShow"
+      @blur="draughtFanShow = false"
+    />
     <LogPicker
       v-if="logVisible"
       :hiddenLogVisible="hiddenLogVisible"
@@ -260,6 +284,7 @@ const sprayLiquidConfigVal = ref('0')
 const stoped_humi = ref('0')
 const continued_humi = ref('0')
 const pre_heat_time_s = ref('0')
+const draughtFanValue = ref('0')
 
 const pre_heat_time_sShow = ref(false)
 const addLiquidConfigValShow = ref(false)
@@ -271,6 +296,7 @@ const continued_saturShow = ref(false)
 const max_humidityShow = ref(false)
 const stoped_humiShow = ref(false)
 const continued_humiShow = ref(false)
+const draughtFanShow = ref(false)
 
 const logVisible = ref(false)
 const logVal = ref('6')
@@ -291,6 +317,7 @@ const save = () => {
     continued_satur: continued_satur.value,
     stoped_humi: stoped_humi.value,
     continued_humi: continued_humi.value,
+    draughtFanValue: draughtFanValue.value,
   }
   console.log(data)
   webSocketStore.sendCommandMsg(addFormulaJSON(data))
@@ -334,6 +361,7 @@ const hideClickKey = flag => {
   stoped_saturShow.value = false
   continued_saturShow.value = false
   max_humidityShow.value = false
+  draughtFanShow.value = false
   if (flag == 1) {
     addLiquidConfigValShow.value = true
   }
@@ -364,6 +392,9 @@ const hideClickKey = flag => {
   if (flag == 10) {
     continued_humiShow.value = true
   }
+  if (flag == 12) {
+    draughtFanShow.value = true
+  }
 }
 
 const handleInput = (value, index) => {
@@ -504,6 +535,27 @@ const formatter4 = value => {
   return value.replace(/^0+/gi, '')
 }
 
+const formatter12 = value => {
+  if (parseInt(value) == 0) {
+    return '0'
+  }
+  let arr = settingStore.allSettingList.filter(
+    item => item.name == 'draughtFanValue',
+  )
+  if (arr && arr.length > 0) {
+    if (parseInt(value) > arr[0].val_upper_limit) {
+      return arr[0].val_upper_limit + ''
+    }
+    if (parseInt(value) < arr[0].val_lower_limit) {
+      return arr[0].val_lower_limit + ''
+    }
+  }
+  if (value == '') {
+    return '0'
+  }
+  return value.replace(/^0+/gi, '')
+}
+
 const formatter5 = value => {
   if (parseInt(value) == 0) {
     return '0'
@@ -702,6 +754,14 @@ const setcontinued_humiVal = () => {
   }
 }
 
+const setDraughtFanValue = () => {
+  const val = parseInt(draughtFanValue.value)
+  if (isNaN(val)) {
+    showFailToast('设置失败,请填写正确参数')
+    return
+  }
+}
+
 const setSprayLiquidVal = () => {
   const val = parseInt(sprayLiquidConfigVal.value)
   if (isNaN(val)) {

src/components/Setting/components/Device.vue

@@ -120,7 +120,7 @@
       </p>
     </div>
     <div class="row_wrap">
-      <p class="title">风机速度</p>
+      <p class="title">风机速度(%)</p>
       <p class="num">
         <van-field
           class="field_font"