From 4ef89727c1d69967d8a22e789e945de17a5d1fc0 Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Wed, 16 Aug 2023 09:59:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E6=B6=B2=E6=8E=92=E6=B6=B2=E9=80=BB?=
=?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/img/liquid/chart.png | Bin 6211 -> 7015 bytes
src/components/LiquidHandle.vue | 45 +++++++++++----------------------
src/components/dialogs/LiquidModal.vue | 13 ++--------
3 files changed, 17 insertions(+), 41 deletions(-)
diff --git a/src/assets/img/liquid/chart.png b/src/assets/img/liquid/chart.png
index 4487df122a0d3930fc07ca5bff2d7690dd7b32b2..3365b5cd24b387cb6f932a82562a3c77cab4a792 100644
GIT binary patch
literal 7015
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设置加液
停止加液
开始加液
停止排液
{
- if (!isAddLiquidStatus.value) {
- isAddLiquidStatus.value = true
+ if (!operatorStore.replenishingFluidsWorkState) {
console.log(startReplenishingFluidsJSON(parseInt(addLiquidVal.value)))
webSocketStore.sendCommandMsg(
startReplenishingFluidsJSON(parseInt(addLiquidVal.value)),
@@ -149,40 +151,23 @@ const startAdd = () => {
}
const stopAdd = () => {
- if (isAddLiquidStatus.value) {
- isAddLiquidStatus.value = false
+ if (operatorStore.replenishingFluidsWorkState) {
webSocketStore.sendCommandMsg(stopReplenishingFluidsJSON)
}
}
const stopPop = () => {
- if (isPopLiquidStatus.value) {
+ if (operatorStore.drainingWorkState) {
webSocketStore.sendCommandMsg(stopDrainingJSON)
- isPopLiquidStatus.value = false
}
}
-const startPopFlag = () => {
- isPopLiquidStatus.value = true
-}
-
const startTabLiquid = () => {
- if (!isPopLiquidStatus.value) {
+ if (!operatorStore.drainingWorkState) {
tipModalVisible.value = true
}
}
-const formatter = value => {
- if (value > 500) {
- return '500/g'
- }
- if (value != 0) {
- var newVal = value.replace(/\b(0+)/gi, '')
- return newVal + '/g'
- }
- return '0/g'
-}
-
const hideTabLiquid = () => {
tipModalVisible.value = false
}
diff --git a/src/components/dialogs/LiquidModal.vue b/src/components/dialogs/LiquidModal.vue
index 9e0d079..1d0c904 100644
--- a/src/components/dialogs/LiquidModal.vue
+++ b/src/components/dialogs/LiquidModal.vue
@@ -42,20 +42,11 @@ const props = defineProps({
hideTabLiquid: {
type: Function,
},
- startPopFlag: {
- type: Function,
- },
- isPopLiquidStatus: {
- type: Boolean,
- },
})
const tapLiquid = () => {
- if (!props.isPopLiquidStatus) {
- props.startPopFlag()
- webSocketStore.sendCommandMsg(startDrainingJSON)
- props?.hideTabLiquid()
- }
+ webSocketStore.sendCommandMsg(startDrainingJSON)
+ props?.hideTabLiquid()
}
const cancelTap = () => {