From 5db14138646f88b780fcf90000abdd0cd925c1b9 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 一月 2024 09:54:21 +0800
Subject: [PATCH] 主界面添加扫码枪二维码显示，添加软急停，调整终止任务功能
---
CanadaMes-ui/src/layout/index.vue | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/CanadaMes-ui/src/layout/index.vue b/CanadaMes-ui/src/layout/index.vue
index 584fa66..13cc3f5 100644
--- a/CanadaMes-ui/src/layout/index.vue
+++ b/CanadaMes-ui/src/layout/index.vue
@@ -231,7 +231,7 @@
},
init() {
- let viewname = "Home";
+ let viewname = "Layout";
if (typeof (WebSocket) == "undefined") {
console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
} else {
@@ -289,8 +289,6 @@
-
-
if (obj.Abort) {
if (obj.Abort[0].length > 0) {
@@ -340,7 +338,7 @@
},
1000
);
- if (this.reset == false&&this.EmergencyStop != true) {
+ if (this.reset == false && this.EmergencyStop != true) {
this.dialogFormCountDown = true;
}
},
--
Gitblit v1.8.0