From 6b8f5b27be57413aae81b3505878b71097b0751e Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 23 一月 2024 16:09:21 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 CanadaMes-ui/src/layout/index.vue |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/CanadaMes-ui/src/layout/index.vue b/CanadaMes-ui/src/layout/index.vue
index 0ca9cdd..25a28ce 100644
--- a/CanadaMes-ui/src/layout/index.vue
+++ b/CanadaMes-ui/src/layout/index.vue
@@ -131,7 +131,6 @@
 // import store from '../store';
 let socket;
 let timer;
-
 export default {
   name: "Layout",
   // store,
@@ -313,8 +312,8 @@
     },
     //45绉掑浣嶅�掓暟璁℃椂
     CountDown() {
-      let count = 60;
       clearInterval(timer);
+      let count = 45;
       timer = setInterval(
         () => {
           if (this.EmergencyStop == true) {

--
Gitblit v1.8.0