From fc47e0b6038e1c17d736d249ea871d66c7de1b7c Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Wed, 16 Aug 2023 18:50:16 +0800
Subject: [PATCH] 123

---
 src/assets/img/liquid/oper.png       | Bin 2691 -> 2827 bytes
 src/components/LiquidHandle.vue      |  14 +++++-----
 src/components/LoginForm.vue         |  10 ++++---
 src/components/Operator.vue          |   4 +--
 src/components/Progress.vue          |  50 +++++++++++++++++++++--------------
 src/components/Test.vue              |  18 +++++++++++--
 src/components/dialogs/LogPicker.vue |   2 +-
 src/pages/Login.vue                  |   6 +++++
 src/socket/index.js                  |   3 ++-
 src/store/modules/device.js          |  44 ++++++++++++++++++++++++++++++
 src/store/modules/test.js            |  36 ++++++++++++-------------
 src/store/modules/websocket.js       |  38 ++++++++++++++++++++++----
 12 files changed, 165 insertions(+), 60 deletions(-)

diff --git a/src/assets/img/liquid/oper.png b/src/assets/img/liquid/oper.png
index 814f7e2ab936ace0dfbc340e44e75178c782bc70..cad9399b1d33a9db222207ca960b449c944ff4d6 100644
GIT binary patch
delta 2790
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

delta 2653
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
LNkvXXu0mjfOF%PE

diff --git a/src/components/LiquidHandle.vue b/src/components/LiquidHandle.vue
index 6423984..a6bc859 100644
--- a/src/components/LiquidHandle.vue
+++ b/src/components/LiquidHandle.vue
@@ -6,7 +6,7 @@
           type="number"
           v-model="addLiquidVal"
           :clickable="true"
-          :maxlength="3"
+          :maxlength="4"
           readonly
           @touchstart.stop="numberKeyboardShow = true"
           class="add_liquid_input"
@@ -116,7 +116,7 @@
     <van-number-keyboard
       v-model="addLiquidVal"
       :show="numberKeyboardShow"
-      :maxlength="3"
+      :maxlength="4"
       @blur="numberKeyboardShow = false"
     />
   </div>
@@ -142,14 +142,14 @@ const props = defineProps({
   },
 })
 
-const addLiquidVal = ref(1)
+const addLiquidVal = ref(2000)
 const tipModalVisible = ref(false)
 const webSocketStore = useWebSocketStore()
 
 const isPopLiquidStatus = ref(false)
 
 const startAdd = () => {
-  if (!operatorStore.replenishingFluidsWorkState) {
+  if (!(operatorStore.replenishingFluidsWorkState == 1)) {
     console.log(startReplenishingFluidsJSON(parseInt(addLiquidVal.value)))
     webSocketStore.sendCommandMsg(
       startReplenishingFluidsJSON(parseInt(addLiquidVal.value)),
@@ -158,19 +158,19 @@ const startAdd = () => {
 }
 
 const stopAdd = () => {
-  if (operatorStore.replenishingFluidsWorkState) {
+  if (operatorStore.replenishingFluidsWorkState == 1) {
     webSocketStore.sendCommandMsg(stopReplenishingFluidsJSON)
   }
 }
 
 const stopPop = () => {
-  if (operatorStore.drainingWorkState) {
+  if (operatorStore.drainingWorkState == 1) {
     webSocketStore.sendCommandMsg(stopDrainingJSON)
   }
 }
 
 const startTabLiquid = () => {
-  if (!operatorStore.drainingWorkState) {
+  if (!(operatorStore.drainingWorkState == 1)) {
     tipModalVisible.value = true
   }
 }
diff --git a/src/components/LoginForm.vue b/src/components/LoginForm.vue
index ee5d8f7..04b2695 100644
--- a/src/components/LoginForm.vue
+++ b/src/components/LoginForm.vue
@@ -84,6 +84,7 @@ const handleLogin = () => {
   tip.value = ''
   webSocketStore?.sendCommandMsg(loginJSON(username.value, password.value))
   // 前端自己校验
+  console.log(userStore.allUserList)
   let flag = false
   userStore.allUserList?.map(item => {
     if (item.uid == username.value && password.value == item.passwd) {
@@ -91,10 +92,11 @@ const handleLogin = () => {
       flag = true
       userStore.updatePermission(item.permission_level)
       userStore.updateLoginUser(item.uid)
+      window.location.href = 'http://127.0.0.1/'
     }
   })
-  if (flag) {
-    router.push('/')
+  if (!flag) {
+    tip.value = '账号或密码错误'
   }
 }
 </script>
@@ -135,7 +137,7 @@ const handleLogin = () => {
     left: 120px;
     top: 142px;
     font-family: Source Han Sans CN;
-    font-size: 12px;
+    font-size: 18px;
     font-weight: 350;
     letter-spacing: 0.06em;
   }
@@ -148,7 +150,7 @@ const handleLogin = () => {
     left: 120px;
     top: 209px;
     font-family: Source Han Sans CN;
-    font-size: 12px;
+    font-size: 18px;
     font-weight: 350;
     letter-spacing: 0.06em;
   }
diff --git a/src/components/Operator.vue b/src/components/Operator.vue
index d064108..b9aa356 100644
--- a/src/components/Operator.vue
+++ b/src/components/Operator.vue
@@ -121,7 +121,7 @@ const toDetail = () => {
 }
 
 const logVisible = ref(false)
-const logVal = ref(1)
+const logVal = ref('3')
 const roomSize = ref(0)
 
 watch(() => {
@@ -148,7 +148,7 @@ const startDisinfect = () => {
       localStorage.removeItem('envir2')
       localStorage.clear()
       webSocketStore.sendCommandMsg(
-        startDisinfectionJSON(logVal.value, roomSize.value),
+        startDisinfectionJSON(parseInt(logVal.value), parseInt(roomSize.value)),
       )
       props.changeShowOperator(false)
     }
diff --git a/src/components/Progress.vue b/src/components/Progress.vue
index cf24753..5760127 100644
--- a/src/components/Progress.vue
+++ b/src/components/Progress.vue
@@ -26,10 +26,20 @@
               ? 'btn active'
               : 'btn'
           "
+          v-if="[1, 2].includes(operatorStore.disinfectStatus)"
           @click="stopDisinfect"
         >
           停止消毒
         </div>
+        <div
+          :class="
+            [0].includes(operatorStore.disinfectStatus) ? 'btn active' : 'btn'
+          "
+          v-if="operatorStore.disinfectStatus == 0"
+          @click="showDetail"
+        >
+          返回
+        </div>
         <!-- <div
           :class="
             operatorStore.disinfectStatus == 1 ? 'btn active ml' : 'btn ml'
@@ -173,19 +183,19 @@ const envir1Option = ref({
       name: '温度',
       type: 'line',
       stack: 'Total',
-      data: echartsStore.envir1Temp,
+      data: [],
     },
     {
       name: '湿度',
       type: 'line',
       stack: 'Total',
-      data: echartsStore.envir1Humidity,
+      data: [],
     },
     {
       name: '过氧化氢浓度',
       type: 'line',
       stack: 'Total',
-      data: echartsStore.envir1HP,
+      data: [],
     },
   ],
 })
@@ -215,19 +225,19 @@ const envir2Option = ref({
       name: '温度',
       type: 'line',
       stack: 'Total',
-      data: echartsStore.envir2Temp,
+      data: [],
     },
     {
       name: '湿度',
       type: 'line',
       stack: 'Total',
-      data: echartsStore.envir2Humidity,
+      data: [],
     },
     {
       name: '过氧化氢浓度',
       type: 'line',
       stack: 'Total',
-      data: echartsStore.envir2HP,
+      data: [],
     },
   ],
 })
@@ -340,19 +350,19 @@ onMounted(() => {
           name: '温度',
           type: 'line',
           stack: 'Total',
-          data: echartsStore.envir1Temp,
+          data: [],
         },
         {
           name: '湿度',
           type: 'line',
           stack: 'Total',
-          data: echartsStore.envir1Humidity,
+          data: [],
         },
         {
           name: '过氧化氢浓度',
           type: 'line',
           stack: 'Total',
-          data: echartsStore.envir1HP,
+          data: [],
         },
       ],
     })
@@ -382,25 +392,25 @@ onMounted(() => {
           name: '温度',
           type: 'line',
           stack: 'Total',
-          data: echartsStore.envir2Temp,
+          data: [],
         },
         {
           name: '湿度',
           type: 'line',
           stack: 'Total',
-          data: echartsStore.envir2Humidity,
+          data: [],
         },
         {
           name: '过氧化氢浓度',
           type: 'line',
           stack: 'Total',
-          data: echartsStore.envir2HP,
+          data: [],
         },
       ],
     })
   }, 1000 * 20)
 
-  time2.value = setTimeout(() => {
+  time1.value = setInterval(() => {
     binCharts.value?.setOption({
       tooltip: {
         trigger: 'axis',
@@ -469,19 +479,19 @@ onMounted(() => {
           name: '温度',
           type: 'line',
           stack: 'Total',
-          data: echartsStore.envir1Temp,
+          data: [],
         },
         {
           name: '湿度',
           type: 'line',
           stack: 'Total',
-          data: echartsStore.envir1Humidity,
+          data: [],
         },
         {
           name: '过氧化氢浓度',
           type: 'line',
           stack: 'Total',
-          data: echartsStore.envir1HP,
+          data: [],
         },
       ],
     })
@@ -511,23 +521,23 @@ onMounted(() => {
           name: '温度',
           type: 'line',
           stack: 'Total',
-          data: echartsStore.envir2Temp,
+          data: [],
         },
         {
           name: '湿度',
           type: 'line',
           stack: 'Total',
-          data: echartsStore.envir2Humidity,
+          data: [],
         },
         {
           name: '过氧化氢浓度',
           type: 'line',
           stack: 'Total',
-          data: echartsStore.envir2HP,
+          data: [],
         },
       ],
     })
-  })
+  }, 1000)
 })
 
 // 监听到store中的数据变化动态更改options
diff --git a/src/components/Test.vue b/src/components/Test.vue
index 45f2f66..aeeda08 100644
--- a/src/components/Test.vue
+++ b/src/components/Test.vue
@@ -78,7 +78,14 @@
     </div>
     <div class="common_set switch_wrap">
       <p class="title">空压机</p>
-      <p class="num">{{ testStore?.airCompressorObj?.currentVal }} A</p>
+      <p class="num">
+        {{
+          testStore?.airCompressorObj?.currentVal > 5000
+            ? 5000
+            : testStore?.airCompressorObj?.currentVal
+        }}
+        A
+      </p>
       <div class="btn_wrap">
         <div
           :class="testStore.airCompressor ? 'close' : 'open'"
@@ -142,7 +149,14 @@
     </div>
     <div class="common_set update_wrap">
       <p class="title">液位</p>
-      <p class="num">{{ deviceStore.disinfectantCapacity }} kPa/100g</p>
+      <p class="num">
+        {{
+          deviceStore.disinfectantCapacity <= 0
+            ? 0
+            : deviceStore.disinfectantCapacity
+        }}
+        kPa/100g
+      </p>
       <div class="btn_wrap" @click="handleUpdate">更新读取液位状态</div>
     </div>
     <div class="common_set info_wrap">
diff --git a/src/components/dialogs/LogPicker.vue b/src/components/dialogs/LogPicker.vue
index 421f4f9..0564fce 100644
--- a/src/components/dialogs/LogPicker.vue
+++ b/src/components/dialogs/LogPicker.vue
@@ -46,7 +46,7 @@ const chooseLog = () => {
   props.changeLogVal(selectedValues.value[0])
 }
 
-const selectedValues = ref([])
+const selectedValues = ref(['3'])
 
 watch(() => {
   selectedValues.value = [props.logVal]
diff --git a/src/pages/Login.vue b/src/pages/Login.vue
index 15b943d..98b0145 100644
--- a/src/pages/Login.vue
+++ b/src/pages/Login.vue
@@ -84,6 +84,12 @@ onMounted(() => {
   setTimeout(() => {
     webSocketStore?.sendCommandMsg(getAllUserJSON)
   }, 1000)
+  setTimeout(() => {
+    webSocketStore?.sendCommandMsg(getAllUserJSON)
+  }, 2000)
+  setTimeout(() => {
+    webSocketStore?.sendCommandMsg(getAllUserJSON)
+  }, 3000)
 })
 
 const reboot = () => {}
diff --git a/src/socket/index.js b/src/socket/index.js
index 2b7aa64..41ebc39 100644
--- a/src/socket/index.js
+++ b/src/socket/index.js
@@ -4,11 +4,12 @@ export default class Socket {
     this.protocols = protocols
     this.ws = null
     this.reconnectTimeout = 2000
-    this.maxReconnectTimes = 100
+    this.maxReconnectTimes = 10000000
     this.reconnectTimes = 0
   }
 
   connect() {
+    console.log(this.url)
     this.ws = new WebSocket(this.url, this.protocols)
     this.ws.onopen = () => {
       console.log('WebSocket连接成功')
diff --git a/src/store/modules/device.js b/src/store/modules/device.js
index 2ca3dfc..5b469e0 100644
--- a/src/store/modules/device.js
+++ b/src/store/modules/device.js
@@ -30,33 +30,77 @@ export const useDeviceStore = defineStore({
   // actions
   actions: {
     updateDisinfectantCapacity(disinfectantCapacity) {
+      if (disinfectantCapacity < 0) {
+        this.disinfectantCapacity = 0
+        return
+      }
+      if (disinfectantCapacity > 5000) {
+        this.disinfectantCapacity = 5000
+        return
+      }
       this.disinfectantCapacity = disinfectantCapacity
     },
     updateBinTemperature(binTemperature) {
+      if (binTemperature < 0) {
+        this.binTemperature = 0
+        return
+      }
       this.binTemperature = binTemperature
     },
     updateBinHumidity(binHumidity) {
+      if (binHumidity < 0) {
+        this.binHumidity = 0
+        return
+      }
       this.binHumidity = binHumidity
     },
     updateBinHP(binHP) {
+      if (binHP < 0) {
+        this.binHP = 0
+        return
+      }
       this.binHP = binHP
     },
     updateEnvirTemperature1(envirTemperature1) {
+      if (envirTemperature1 < 0) {
+        this.envirTemperature1 = 0
+        return
+      }
       this.envirTemperature1 = envirTemperature1
     },
     updateEnvirHumidity1(envirHumidity1) {
+      if (envirHumidity1 < 0) {
+        this.envirHumidity1 = 0
+        return
+      }
       this.envirHumidity1 = envirHumidity1
     },
     updateEnvirHP1(envirHP1) {
+      if (envirHP1 < 0) {
+        this.envirHP1 = 0
+        return
+      }
       this.envirHP1 = envirHP1
     },
     updateEnvirTemperature2(envirTemperature2) {
+      if (envirTemperature2 < 0) {
+        this.envirTemperature2 = 0
+        return
+      }
       this.envirTemperature2 = envirTemperature2
     },
     updateEnvirHumidity2(envirHumidity2) {
+      if (envirHumidity2 < 0) {
+        this.envirHumidity2 = 0
+        return
+      }
       this.envirHumidity2 = envirHumidity2
     },
     updateEnvirHP2(envirHP2) {
+      if (envirHP2 < 0) {
+        this.envirHP2 = 0
+        return
+      }
       this.envirHP2 = envirHP2
     },
   },
diff --git a/src/store/modules/test.js b/src/store/modules/test.js
index 53ee9e9..7e88f21 100644
--- a/src/store/modules/test.js
+++ b/src/store/modules/test.js
@@ -32,30 +32,30 @@ export const useTestStore = defineStore({
       this.waterImmersionSensor2 = waterImmersionSensor2
     },
     updateAirCompressorObj(airCompressorObj) {
-      const { io1, io2, currentVal } = airCompressorObj
-      if (io1 == 1 && io2 == 1) {
-        this.airCompressor = true
-      } else {
-        this.airCompressor = false
-      }
+      // const { io1, io2, currentVal } = airCompressorObj
+      // if (io1 == 1 && io2 == 1) {
+      //   this.airCompressor = true
+      // } else {
+      //   this.airCompressor = false
+      // }
       this.airCompressorObj = airCompressorObj
     },
     updateAirBlowerObj(airBlowerObj) {
-      const { io1, io2, currentVal } = airBlowerObj
-      if (io1 == 1 && io2 == 1) {
-        this.draughtFan = true
-      } else {
-        this.draughtFan = false
-      }
+      // const { io1, io2, currentVal } = airBlowerObj
+      // if (io1 == 1 && io2 == 1) {
+      //   this.draughtFan = true
+      // } else {
+      //   this.draughtFan = false
+      // }
       this.airBlowerObj = airBlowerObj
     },
     updateHeatingStripObj(heatingStripObj) {
-      const { io1, io2, currentVal } = heatingStripObj
-      if (io1 == 1 && io2 == 1) {
-        this.heatingStrip = true
-      } else {
-        this.heatingStrip = false
-      }
+      // const { io1, io2, currentVal } = heatingStripObj
+      // if (io1 == 1 && io2 == 1) {
+      //   this.heatingStrip = true
+      // } else {
+      //   this.heatingStrip = false
+      // }
       this.heatingStripObj = heatingStripObj
     },
     updateHeatingStrip(heatingStrip) {
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index f4d0f31..1cdb7a1 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -31,10 +31,11 @@ export const useWebSocketStore = defineStore({
       const testStore = useTestStore()
       const deviceStore = useDeviceStore()
       const operatorStore = useOperatorStore()
+      const echartsStore = useEchartsStore()
       init.connect()
       init.ws.onmessage = function (ev) {
-        const { ackcode, messageId } = JSON.parse(ev.data)
-        // console.log(JSON.parse(ev.data))
+        const { ackcode, messageId, timeStamp } = JSON.parse(ev.data)
+        console.log(JSON.parse(ev.data))
         switch (messageId) {
           case 'getState':
             // 初始化完毕
@@ -106,13 +107,31 @@ export const useWebSocketStore = defineStore({
             operatorStore.updateEstimatedRemainingTimeS(estimatedRemainingTimeS)
             operatorStore.updateDisinfectionId(disinfection_id)
             // 将sensor_data中的数据更新到store中
+
+            if (operatorStore.disinfectStatus == 1) {
+              saveEchartsDataToLocal(
+                moment(timeStamp).format('HH:mm'),
+                [temp_1, humid_1, h2o2_1],
+                [temp_2, humid_2, h2o2_2],
+                [temp_3, humid_3, h2o2_3],
+              )
+              echartsStore.updateBinCharts(
+                JSON.parse(localStorage.getItem('bin')),
+              )
+              echartsStore.updateEnvir1Charts(
+                JSON.parse(localStorage.getItem('envir1')),
+              )
+              echartsStore.updateEnvir2Charts(
+                JSON.parse(localStorage.getItem('envir2')),
+              )
+            }
             break
           case 'getAllUser':
             const { dbval } = JSON.parse(ev.data)
+            console.log(dbval, 'dbva;')
             userStore.updateUserList(dbval)
             break
           case 'chpasswd':
-            console.log(JSON.parse(ev.data))
             if (ackcode != 0) {
               // 修改失败
               showFailToast('修改失败')
@@ -120,11 +139,22 @@ export const useWebSocketStore = defineStore({
               showSuccessToast('修改成功')
             }
             break
+          case 'startReplenishingFluids':
+            if (ackcode == 0) {
+              operatorStore.updateReplenishingFluidsWorkState(1)
+            }
+          case 'startDraining':
+            if (ackcode == 0) {
+              operatorStore.updateDrainingWorkState(1)
+            }
           case 'startDisinfection':
             break
           case 'stopDisinfection':
             break
           case 'login':
+            if (ackcode == 0) {
+              window.location.href = 'http://127.0.0.1/'
+            }
             break
           case 'getAllRecords':
             break
@@ -201,8 +231,6 @@ export const useWebSocketStore = defineStore({
             deviceStore.updateEnvirHP2(h2o2_3)
 
             // 对数据进行处理 并存入到localstorage中
-            // console.log(moment(timeStamp).format('HH:mm:ss'))
-            // console.log(localStorage)
             if (operatorStore.disinfectStatus) {
               saveEchartsDataToLocal(
                 moment(timeStamp).format('HH:mm'),