From 4f3aa71ed602c1abbafa638591b20abc3c7be224 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 18 一月 2024 10:03:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/layout/index.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/CanadaMes-ui/src/layout/index.vue b/CanadaMes-ui/src/layout/index.vue
index 244d977..584fa66 100644
--- a/CanadaMes-ui/src/layout/index.vue
+++ b/CanadaMes-ui/src/layout/index.vue
@@ -340,7 +340,7 @@
},
1000
);
- if (this.reset == false) {
+ if (this.reset == false&&this.EmergencyStop != true) {
this.dialogFormCountDown = true;
}
},
--
Gitblit v1.8.0