From 87fc6daef65e913f8990a8f51d3896759939ce82 Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Fri, 10 Nov 2023 10:03:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/info/AirSwitchConfig.vue | 54 ++++++++++++++++++++++-----------
 src/store/modules/websocket.js          | 16 ++++++++--
 2 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/src/components/info/AirSwitchConfig.vue b/src/components/info/AirSwitchConfig.vue
index dd56338..9e46485 100644
--- a/src/components/info/AirSwitchConfig.vue
+++ b/src/components/info/AirSwitchConfig.vue
@@ -73,7 +73,7 @@ import {
   airInletProportionalValve_getStateJSON,
   AirOutletProportionalValve_getStateJSON,
 } from '@/mock/command'
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, watch } from 'vue'
 
 const activeTab = ref('1')
 const sealStore = useSealStore()
@@ -87,39 +87,59 @@ const bottomText = ref('0%')
 const topChange = ({ selectedOptions, selectedValues }) => {
   topText.value = selectedOptions[0].text
   webSocketStore.sendCommandMsg(
-    AirInletProportionalValve_setStateJSON([parseInt(selectedValues[0]) * 10]),
+    AirInletProportionalValve_setStateJSON([parseInt(selectedValues[0])]),
   )
-  sealStore.updateAirInletProportionalValue(parseInt(selectedValues[0]) * 10)
+  sealStore.updateAirInletProportionalValue(parseInt(selectedValues[0]))
 }
 const bottomChange = ({ selectedOptions, selectedValues }) => {
   bottomText.value = selectedOptions[0].text
   webSocketStore.sendCommandMsg(
-    AirOutletProportionalValve_setStateJSON([parseInt(selectedValues[0]) * 10]),
+    AirOutletProportionalValve_setStateJSON([parseInt(selectedValues[0])]),
   )
-  sealStore.updateAirOutletProportionalValue(parseInt(selectedValues[0]) * 10)
+  sealStore.updateAirOutletProportionalValue(parseInt(selectedValues[0]))
 }
 
 const columns = ref([
   { text: '0%', value: '0' },
-  { text: '10%', value: '1' },
-  { text: '20%', value: '2' },
-  { text: '30%', value: '3' },
-  { text: '40%', value: '4' },
-  { text: '50%', value: '5' },
-  { text: '60%', value: '6' },
-  { text: '70%', value: '7' },
-  { text: '80%', value: '8' },
-  { text: '90%', value: '9' },
-  { text: '100%', value: '10' },
+  { text: '10%', value: '10' },
+  { text: '20%', value: '20' },
+  { text: '30%', value: '30' },
+  { text: '40%', value: '40' },
+  { text: '50%', value: '50' },
+  { text: '60%', value: '60' },
+  { text: '70%', value: '70' },
+  { text: '80%', value: '80' },
+  { text: '90%', value: '90' },
+  { text: '100%', value: '100' },
 ])
 
 const selectedValuesTop = ref(['0'])
 const selectedValuesBottom = ref(['0'])
 
 onMounted(() => {
-  webSocketStore.sendCommandMsg(airInletProportionalValve_getStateJSON)
-  webSocketStore.sendCommandMsg(AirOutletProportionalValve_getStateJSON)
+  setTimeout(() => {
+    webSocketStore.sendCommandMsg(airInletProportionalValve_getStateJSON)
+    webSocketStore.sendCommandMsg(AirOutletProportionalValve_getStateJSON)
+  }, 1000)
 })
+
+watch(
+  () => sealStore.airInletProportionalInitVal,
+  (newVal, oldVal) => {
+    console.log('airInletProportionalInitVal', newVal)
+    selectedValuesTop.value = [newVal + '']
+    topText.value = `${newVal}%`
+  },
+)
+
+watch(
+  () => sealStore.airOutletProportionalInitVal,
+  (newVal, oldVal) => {
+    console.log('airOutletProportionalInitVal', newVal)
+    selectedValuesBottom.value = [newVal + '']
+    bottomText.value = `${newVal}%`
+  },
+)
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index d02fec4..70bc5de 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -94,9 +94,7 @@ export const useWebSocketStore = defineStore({
               AirOutletProportionalValve,
             } = sensor_data
             const { channelState } = airCompressor || {}
-            testStore.updateAirCompressorChannel(
-              channelState == 0 ? false : true,
-            )
+            testStore.updateAirCompressorChannel(channelState)
             const { nowlog, targetlog } = disinfectionState || {}
             deviceStore.updateTargetLog(targetlog)
             // 必须开始的时候才改变log 否则不懂
@@ -175,8 +173,20 @@ export const useWebSocketStore = defineStore({
             userStore.updateUserList(dbval)
             break
           case 'AirInletProportionalValve_getState':
+            const { ackcode: inletValAckCode, ack: inAck } = JSON.parse(ev.data)
+            if (inletValAckCode == 0) {
+              // 值初始化
+              sealStore.updateAirInletProportionalInitVal(inAck || 0)
+            }
             break
           case 'airOutletProportionalValve_getState':
+            const { ackcode: outletValAckCode, ack: outAck } = JSON.parse(
+              ev.data,
+            )
+            if (outletValAckCode == 0) {
+              // 值初始化
+              sealStore.updateAirOutletProportionalInitVal(outAck || 0)
+            }
             break
           case 'chpasswd':
             const { ackcode: chpasswdCode } = JSON.parse(ev.data)