From 4203de0535a2b0f1630876304012e9dc4fa08f00 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 24 一月 2024 13:15:29 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

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

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

--
Gitblit v1.8.0