diff --git a/src/components/LiquidHandle.vue b/src/components/LiquidHandle.vue
index 39d05fb..6423984 100644
--- a/src/components/LiquidHandle.vue
+++ b/src/components/LiquidHandle.vue
@@ -98,10 +98,15 @@
-
{{ disinfectantCapacity }}g
+
+ {{ disinfectantCapacity <= 0 ? 0 : disinfectantCapacity }}g
+
设置
@@ -25,7 +25,7 @@
:formatter="formatter7"
:maxlength="4"
readonly
- @touchstart.stop="sprayLiquidConfigValShow = true"
+ @touchstart.stop="hideClickKey(2)"
/>
设置
@@ -40,7 +40,7 @@
:formatter="formatter1"
:maxlength="4"
readonly
- @touchstart.stop="stoped_gsShow = true"
+ @touchstart.stop="hideClickKey(3)"
/>
设置
@@ -55,7 +55,7 @@
:maxlength="4"
:formatter="formatter2"
readonly
- @touchstart.stop="continued_gsShow = true"
+ @touchstart.stop="hideClickKey(4)"
/>
设置
@@ -70,7 +70,7 @@
:clickable="true"
:maxlength="3"
readonly
- @touchstart.stop="stoped_saturShow = true"
+ @touchstart.stop="hideClickKey(5)"
/>
设置
@@ -85,7 +85,7 @@
:clickable="true"
:maxlength="3"
readonly
- @touchstart.stop="continued_saturShow = true"
+ @touchstart.stop="hideClickKey(6)"
/>
设置
@@ -100,12 +100,12 @@
:clickable="true"
:maxlength="3"
readonly
- @touchstart.stop="max_humidityShow = true"
+ @touchstart.stop="hideClickKey(7)"
/>
设置
-
+
预热时间(s)
设置
@@ -199,6 +199,41 @@ const stoped_saturShow = ref(false)
const continued_saturShow = ref(false)
const max_humidityShow = ref(false)
+const hideClickKey = flag => {
+ pre_heat_time_sShow.value = false
+ addLiquidConfigValShow.value = false
+ sprayLiquidConfigValShow.value = false
+ stoped_gsShow.value = false
+ continued_gsShow.value = false
+ stoped_saturShow.value = false
+ continued_saturShow.value = false
+ max_humidityShow.value = false
+ if (flag == 1) {
+ addLiquidConfigValShow.value = true
+ }
+ if (flag == 2) {
+ sprayLiquidConfigValShow.value = true
+ }
+ if (flag == 3) {
+ stoped_gsShow.value = true
+ }
+ if (flag == 4) {
+ continued_gsShow.value = true
+ }
+ if (flag == 5) {
+ stoped_saturShow.value = true
+ }
+ if (flag == 6) {
+ continued_saturShow.value = true
+ }
+ if (flag == 7) {
+ max_humidityShow.value = true
+ }
+ if (flag == 8) {
+ pre_heat_time_sShow.value = true
+ }
+}
+
const formatter1 = value => {
let arr = settingStore.allSettingList.filter(item => item.name == 'stoped_gs')
if (arr && arr.length > 0) {
@@ -378,7 +413,7 @@ const setSprayLiquidVal = () => {
.device_container {
box-sizing: border-box;
width: 100%;
- height: 100%;
+ height: 580px;
padding: 20px;
display: grid;
overflow: scroll;
diff --git a/src/components/info/DisinfectantLiquidInfo.vue b/src/components/info/DisinfectantLiquidInfo.vue
index ad27f97..bd0c3a6 100644
--- a/src/components/info/DisinfectantLiquidInfo.vue
+++ b/src/components/info/DisinfectantLiquidInfo.vue
@@ -24,12 +24,17 @@
- {{ disinfectantCapacity }} (g)
+
+ {{ disinfectantCapacity <= 0 ? 0 : disinfectantCapacity }} (g)
+
diff --git a/src/socket/index.js b/src/socket/index.js
index 2c791b6..2b7aa64 100644
--- a/src/socket/index.js
+++ b/src/socket/index.js
@@ -3,8 +3,9 @@ export default class Socket {
this.url = url
this.protocols = protocols
this.ws = null
- this.reconnectTimeout = 1000
- this.maxReconnectTimes = 20
+ this.reconnectTimeout = 2000
+ this.maxReconnectTimes = 100
+ this.reconnectTimes = 0
}
connect() {
@@ -28,9 +29,9 @@ export default class Socket {
this.connect()
this.reconnectTimes++
}, this.reconnectTimeout)
- this.reconnectTimeout *= 2
} else {
console.log('WebSocket重连超过最大次数,放弃重连')
+ // window.location.href = 'http://127.0.0.1/#/login'
}
}