From 91b1834ba3ad28076d2818a024f663553e8680f3 Mon Sep 17 00:00:00 2001 From: zhangjiming Date: Tue, 4 Mar 2025 00:16:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=91=BD=E4=BB=A4Toast?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 15 ++++++++++++--- src/components/FooterBar.vue | 2 ++ src/views/HomeView.vue | 1 + src/views/PreSpray.vue | 3 +++ src/views/SprayView.vue | 1 + 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/App.vue b/src/App.vue index 0f52d32..1084bc4 100644 --- a/src/App.vue +++ b/src/App.vue @@ -6,6 +6,8 @@ import { onMounted, ref } from "vue"; import { getList } from "./services/matrix/manage"; import { useSettingStore } from "./stores/setting"; import Dialog, { type DialogParam } from "./components/Dialog.vue"; +import { pushOutTray } from "./services/globalCmd/globalCmd"; +import { ElMessage } from "element-plus"; const equipmentStatusStore = useEquipmentStatusStore(); const settingStore = useSettingStore(); @@ -40,9 +42,10 @@ wsClient.dataOb.subscribe(data => { showDialog.value = true; } else if (data.data.code === "spray_complete") { dialogContent.value = { - desc: "喷涂结束，建议回首页清洗管道", + desc: "喷涂完成", type: "confirm", - okText: "去清洗", + okText: "推出玻片", + cancelText: "确认完成", _brand: "spray_complete", }; showDialog.value = true; @@ -76,7 +79,13 @@ function onOk() { if (dialogContent.value._brand === "dehumidify_complete") { router.push("/spray"); } else if (dialogContent.value._brand === "spray_complete") { - router.replace("/home"); + pushOutTray({}).then(res => { + if (res.success) { + ElMessage.success("正在推出"); + } else { + ElMessage.error(res.msg); + } + }); } } diff --git a/src/components/FooterBar.vue b/src/components/FooterBar.vue index f06b9d4..4bcc55e 100644 --- a/src/components/FooterBar.vue +++ b/src/components/FooterBar.vue @@ -65,6 +65,7 @@ function onPushTrayClick() { if (isTrayOutside.value) { pushInTray({}).then(res => { if (res.success) { + ElMessage.success("正在推入"); } else { ElMessage.error(res.msg); } @@ -72,6 +73,7 @@ function onPushTrayClick() { } else if (isTrayInside.value) { pushOutTray({}).then(res => { if (res.success) { + ElMessage.success("正在推出"); } else { ElMessage.error(res.msg); } diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index 9a38bd2..4279b08 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -125,6 +125,7 @@ function onStartWash(type: WashType) { showWashDialog.value = false; startWash({ type }).then(res => { if (res.success) { + ElMessage.success("已经开始清洗"); } else { ElMessage.error(res.msg); } diff --git a/src/views/PreSpray.vue b/src/views/PreSpray.vue index 156c427..fd21fc3 100644 --- a/src/views/PreSpray.vue +++ b/src/views/PreSpray.vue @@ -171,6 +171,7 @@ function onOk() { if (dialogContent.value._brand === "start_dehumidify") { startDehumidify({ humidity: humidity.value! }).then(res => { if (res.success) { + ElMessage.success("已经开始除湿"); } else { ElMessage.error(res.msg); } @@ -191,6 +192,7 @@ function onGoSpray() { function onStartWash(type: WashType) { startWash({ type }).then(res => { if (res.success) { + ElMessage.success("已经开始清洗"); } else { ElMessage.error(res.msg); } @@ -209,6 +211,7 @@ function onStopWash() { function onStartPrefill() { startPrefill({}).then(res => { if (res.success) { + ElMessage.success("已经开始预充"); } else { ElMessage.error(res.msg); } diff --git a/src/views/SprayView.vue b/src/views/SprayView.vue index fdc76c3..45e8aa7 100644 --- a/src/views/SprayView.vue +++ b/src/views/SprayView.vue @@ -236,6 +236,7 @@ function onStartSpray() { matrixCraftId: selectCraft.value.id || 0, }).then(res => { if (res.success) { + ElMessage.success("已经开始喷涂"); } else { ElMessage.error(res.msg); } From a41c92ccd432689f2204a2b65f11ce989c3dc94a Mon Sep 17 00:00:00 2001 From: zhangjiming Date: Tue, 4 Mar 2025 00:33:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=93=E5=8B=BE=E6=98=BE=E9=9A=90?= =?UTF-8?q?=E9=80=89=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Spray.vue | 20 ++++++++++++++++---- src/views/SprayView.vue | 4 ++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/components/Spray.vue b/src/components/Spray.vue index 134879a..e834046 100644 --- a/src/components/Spray.vue +++ b/src/components/Spray.vue @@ -5,7 +5,7 @@