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/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 @@