diff --git a/src/assets/img/operator/form.png b/src/assets/img/operator/form.png index 8b7d912..28a7365 100644 Binary files a/src/assets/img/operator/form.png and b/src/assets/img/operator/form.png differ diff --git a/src/components/Operator.vue b/src/components/Operator.vue index 201b8a2..6f2b36b 100644 --- a/src/components/Operator.vue +++ b/src/components/Operator.vue @@ -78,37 +78,284 @@

SET

- +

5000

{{ logVal }}
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - 开始消毒 -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

预计剩余时间

-
{{ operatorStore.estimatedRemainingTimeS == 0 @@ -183,18 +430,14 @@ const changeLogVal = val => { const startDisinfect = () => { // 改变开始消毒状态 如果已经开始则不可点击 if (![1, 2].includes(operatorStore.disinfectStatus)) { - if (roomSize.value == 0) { - showFailToast('请调整房间大小设置,不能为0') - } else { - localStorage.removeItem('bin') - localStorage.removeItem('envir1') - localStorage.removeItem('envir2') - localStorage.clear() - webSocketStore.sendCommandMsg( - startDisinfectionJSON(parseInt(logVal.value), parseInt(roomSize.value)), - ) - props.changeShowOperator(false) - } + localStorage.removeItem('bin') + localStorage.removeItem('envir1') + localStorage.removeItem('envir2') + localStorage.clear() + webSocketStore.sendCommandMsg( + startDisinfectionJSON(parseInt(logVal.value), parseInt(roomSize.value)), + ) + props.changeShowOperator(false) } } @@ -312,29 +555,33 @@ onUnmounted(() => { } .set_form { width: 340px; - height: 190px; + height: 153px; box-sizing: border-box; - margin-bottom: 41px; + margin-bottom: 26px; overflow: hidden; background: url(../assets/img/operator/form.png) no-repeat; background-size: 100% 100%; position: relative; - .room_size { + .textP { + font-family: Source Han Sans CN; + font-size: 28px; + font-weight: bold; + line-height: normal; + letter-spacing: 0.02em; + color: #17f179; position: absolute; - top: 45px; - left: 23px; - width: 189px; - height: 20px; + left: 197px; + top: 3px; + width: 68px; + height: 41px; text-align: center; - border: none; - outline: none; } .log { position: absolute; - top: 145px; + bottom: 0; left: 0px; width: 240px; - height: 42px; + height: 44px; text-align: center; display: flex; align-items: center; @@ -374,6 +621,7 @@ onUnmounted(() => { background: #f6f6f6; box-sizing: border-box; padding: 27px 24px 18px 27px; + margin-top: 30px; .title { font-family: Source Han Sans CN; font-size: 12px;