From a706fa51846aa2edfdfd59073ef21c58ab40973d Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Tue, 15 Aug 2023 19:52:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Operator.vue                |  1 -
 src/components/Setting/components/Date.vue |  6 ++++--
 src/components/Test.vue                    | 27 ++++++++++++++++++++-------
 src/components/dialogs/DatePicker.vue      |  4 +++-
 src/components/dialogs/TimePicker.vue      |  4 +++-
 src/store/modules/setting.js               |  5 +++--
 src/store/modules/test.js                  |  8 ++++++++
 src/store/modules/websocket.js             | 21 +++++++++++++++++++--
 8 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/src/components/Operator.vue b/src/components/Operator.vue
index 474f08e..898b52a 100644
--- a/src/components/Operator.vue
+++ b/src/components/Operator.vue
@@ -131,7 +131,6 @@ const startDisinfect = () => {
     if (roomSize.value == 0) {
       showFailToast('请调整房间大小设置，不能为0')
     } else {
-      console.log(roomSize.value)
       webSocketStore.sendCommandMsg(
         startDisinfectionJSON(logVal.value, roomSize.value),
       )
diff --git a/src/components/Setting/components/Date.vue b/src/components/Setting/components/Date.vue
index 296f268..c3899e2 100644
--- a/src/components/Setting/components/Date.vue
+++ b/src/components/Setting/components/Date.vue
@@ -2,12 +2,12 @@
   <div class="date_container">
     <div class="row_wrap">
       <p class="title">当前日期</p>
-      <p class="num">2023-8-23</p>
+      <p class="num">{{ settingStore.currentDate.join('-') }}</p>
       <div class="btn" @click="showDatePicker">设置</div>
     </div>
     <div class="row_wrap">
       <p class="title">当前时间</p>
-      <p class="num">11:40</p>
+      <p class="num">{{ settingStore.currentTime.join(':') }}</p>
       <div class="btn" @click="showTimePicker">设置</div>
     </div>
     <DatePicker v-if="datePickerVisible" :hideDatePicker="hideDatePicker" />
@@ -18,8 +18,10 @@
 <script setup>
 import DatePicker from 'cpns/dialogs/DatePicker'
 import TimePicker from 'cpns/dialogs/TimePicker'
+import { useSettingStore } from '@/store'
 import { ref } from 'vue'
 
+const settingStore = useSettingStore()
 const datePickerVisible = ref(false)
 const timePickerVisible = ref(false)
 const showDatePicker = () => {
diff --git a/src/components/Test.vue b/src/components/Test.vue
index 671b639..7675dbd 100644
--- a/src/components/Test.vue
+++ b/src/components/Test.vue
@@ -91,14 +91,19 @@
       </div>
     </div>
     <div class="common_set update_wrap">
-      <p class="title">水浸</p>
-      <p class="num">有水</p>
-      <div class="btn_wrap">更新读取水浸状态</div>
+      <p class="title">水浸1</p>
+      <p class="num">{{ testStore.waterImmersionSensor1 ? '有水' : '没水' }}</p>
+      <div class="btn_wrap" @click="handleUpdate">更新读取水浸状态</div>
+    </div>
+    <div class="common_set update_wrap">
+      <p class="title">水浸2</p>
+      <p class="num">{{ testStore.waterImmersionSensor2 ? '有水' : '没水' }}</p>
+      <div class="btn_wrap" @click="handleUpdate">更新读取水浸状态</div>
     </div>
     <div class="common_set update_wrap">
       <p class="title">液位</p>
-      <p class="num">000 kPa/100g</p>
-      <div class="btn_wrap">更新读取液位状态</div>
+      <p class="num">{{ deviceStore.disinfectantCapacity }} kPa/100g</p>
+      <div class="btn_wrap" @click="handleUpdate">更新读取液位状态</div>
     </div>
     <div class="common_set info_wrap">
       <p class="title">仓内</p>
@@ -129,13 +134,21 @@ import {
   useWebSocketStore,
   useSettingStore,
 } from '@/store'
-import { someAirSwitchJSON, liquidpumpctrlJSON } from '@/mock/command'
+import {
+  someAirSwitchJSON,
+  liquidpumpctrlJSON,
+  getStateJSON,
+} from '@/mock/command'
 
 const testStore = useTestStore()
 const deviceStore = useDeviceStore()
 const websocketStore = useWebSocketStore()
 const settingStore = useSettingStore()
 
+const handleUpdate = () => {
+  websocketStore.sendCommandMsg(getStateJSON)
+}
+
 const changeFeedingStatus = flag => {
   if (flag == 1) {
     if (!testStore.feedingPeristalticPumpStatus) {
@@ -222,11 +235,11 @@ const changeDraughtStatus = flag => {
 .test_container {
   margin-bottom: 30px;
   height: 580px;
+  overflow: scroll;
   box-sizing: border-box;
   background: #ffffff;
   border-radius: 16px;
   padding: 20px;
-  padding-bottom: 80px;
   display: grid;
   row-gap: 20px;
   column-gap: 20px;
diff --git a/src/components/dialogs/DatePicker.vue b/src/components/dialogs/DatePicker.vue
index 71abb11..25cc0f7 100644
--- a/src/components/dialogs/DatePicker.vue
+++ b/src/components/dialogs/DatePicker.vue
@@ -50,6 +50,7 @@
 <script setup>
 import { ref } from 'vue'
 import { useSettingStore } from '@/store'
+import moment from 'moment'
 
 const settingStore = useSettingStore()
 const props = defineProps({
@@ -57,7 +58,8 @@ const props = defineProps({
     type: Function,
   },
 })
-const currentDate = ref(['2023', '08', '08'])
+// 拿到当前时间
+const currentDate = ref(moment().format('YYYY-MM-DD').split('-'))
 const columnsType = ref(['year', 'month', 'day'])
 const formatter = (type, option) => {
   if (type === 'year') {
diff --git a/src/components/dialogs/TimePicker.vue b/src/components/dialogs/TimePicker.vue
index f9ece4e..5093e57 100644
--- a/src/components/dialogs/TimePicker.vue
+++ b/src/components/dialogs/TimePicker.vue
@@ -49,6 +49,8 @@
 <script setup>
 import { ref } from 'vue'
 import { useSettingStore } from '@/store'
+import moment from 'moment'
+
 const settingStore = useSettingStore()
 const props = defineProps({
   hideTimePicker: {
@@ -56,7 +58,7 @@ const props = defineProps({
   },
 })
 
-const currentTime = ref(['12', '00'])
+const currentTime = ref(moment().utcOffset(8).format('HH:mm').split(':'))
 const formatter = (type, option) => {
   if (type === 'hour') {
     option.text += '时'
diff --git a/src/store/modules/setting.js b/src/store/modules/setting.js
index 9ae5e05..bc2ad87 100644
--- a/src/store/modules/setting.js
+++ b/src/store/modules/setting.js
@@ -1,13 +1,14 @@
 import { defineStore } from 'pinia'
+import moment from 'moment'
 export const useSettingStore = defineStore({
   id: 'setting', // id必填，且需要唯一
   // state
   state: () => {
     return {
       // 设置当前日期
-      currentDate: [],
+      currentDate: moment().format('YYYY-MM-DD').split('-'),
       // 设置当前时间
-      currentTime: [],
+      currentTime: moment().utcOffset(8).format('HH:mm').split(':'),
       // 设置加液泵的参数
       addLiquidConfigVal: 0,
       // 设置喷液泵的参数
diff --git a/src/store/modules/test.js b/src/store/modules/test.js
index 07340ce..53ee9e9 100644
--- a/src/store/modules/test.js
+++ b/src/store/modules/test.js
@@ -19,10 +19,18 @@ export const useTestStore = defineStore({
       airCompressorObj: {},
       airBlowerObj: {},
       heatingStripObj: {},
+      waterImmersionSensor1: false,
+      waterImmersionSensor2: false,
     }
   },
   // actions
   actions: {
+    updateWaterImmersionSensor1(waterImmersionSensor1) {
+      this.waterImmersionSensor1 = waterImmersionSensor1
+    },
+    updateWaterImmersionSensor2(waterImmersionSensor2) {
+      this.waterImmersionSensor2 = waterImmersionSensor2
+    },
     updateAirCompressorObj(airCompressorObj) {
       const { io1, io2, currentVal } = airCompressorObj
       if (io1 == 1 && io2 == 1) {
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 1e38a3a..8b3c139 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -30,7 +30,7 @@ export const useWebSocketStore = defineStore({
       const operatorStore = useOperatorStore()
       init.connect()
       init.ws.onmessage = function (ev) {
-        // console.log(JSON.parse(ev.data))
+        console.log(JSON.parse(ev.data))
         const { ackcode, messageId } = JSON.parse(ev.data)
 
         switch (messageId) {
@@ -65,7 +65,16 @@ export const useWebSocketStore = defineStore({
               airBlower,
               sprinklerPump,
               chargingPump,
+              waterImmersionSensor1,
+              waterImmersionSensor2,
             } = sensor_data
+
+            testStore.updateWaterImmersionSensor1(
+              waterImmersionSensor1 == 0 ? false : true,
+            )
+            testStore.updateWaterImmersionSensor2(
+              waterImmersionSensor2 == 0 ? false : true,
+            )
             // 将sensor_data中的数据更新到store中
             testStore.updateAirCompressorObj(airCompressor)
             testStore.updateAirBlowerObj(airBlower)
@@ -86,7 +95,7 @@ export const useWebSocketStore = defineStore({
 
             userStore.updatePermission(permissionLevel)
             settingStore.updateInitLoading()
-            operatorStore.updateDisinfectStatus(workState)
+            operatorStore.updateDisinfectStatus(workState == 0 ? false : true)
             operatorStore.updateEstimatedRemainingTimeS(estimatedRemainingTimeS)
             operatorStore.updateDisinfectionId(disinfection_id)
             // 将sensor_data中的数据更新到store中
@@ -154,8 +163,16 @@ export const useWebSocketStore = defineStore({
               airBlower,
               sprinklerPump,
               chargingPump,
+              waterImmersionSensor1,
+              waterImmersionSensor2,
             } = sensor_data
             // 将sensor_data中的数据更新到store中
+            testStore.updateWaterImmersionSensor1(
+              waterImmersionSensor1 == 0 ? false : true,
+            )
+            testStore.updateWaterImmersionSensor2(
+              waterImmersionSensor2 == 0 ? false : true,
+            )
             testStore.updateAirCompressorObj(airCompressor)
             testStore.updateAirBlowerObj(airBlower)
             testStore.updateHeatingStripObj(heatingStrip)