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

wuyouming666

2024-01-17 61a7e61458a5a2ed3a4636b079e7ee987614888a

 CanadaMes-ui/src/layout/index.vue

@@ -340,7 +340,7 @@
        },
        1000
      );
      if (this.reset == false&&this.EmergencyStop == false) {
      if (this.reset == false&&this.EmergencyStop != true) {
        this.dialogFormCountDown = true;
      }
    },