Merge branch 'baiyanting1' of http://124.70.43.205:3000/xieshengjie/jn_sis_zhfx into new-power

src/views/stateMonitor/alarmCenter/commonAlarm/index.vue

@@ -404,7 +404,9 @@ export default {
             : "";
           this.alarmType = val.query.alarmType;
           this.begin = this.route.ts;
-          this.end = this.route.endts ? this.route.endts : this.end;
+          this.end = this.route.endts
+            ? this.route.endts
+            : dayjs().format("YYYY-MM-DD HH:mm:ss");
           if (!val.query.deviceId) {
             this.GetSubOptions(1);
           } else {