Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

wuyouming666

2024-01-05 e67b38c4ed42d78a0ab8235f1adcb7eefc011631

 CanadaMes-ui/src/layout/index.vue

@@ -274,6 +274,7 @@
            }

            //复位倒计时
            console.log(obj.countdown);
            if (obj.countdown != null) {
              if ((obj.countdown[0] == true && this.CountDowns == 0) || this.EmergencyStop == true) {
                this.CountDown();