diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue index 2c00f6d..6e5432f 100644 --- a/src/views/realTimeMonitor/components/setschedule.vue +++ b/src/views/realTimeMonitor/components/setschedule.vue @@ -870,7 +870,10 @@ export default { dyid: this.listnr[0].id, xlname: this.listnr[0].list[0].name, xlid: this.listnr[0].list[0].id, - zzname: this.listnr[0].list[0].list[0].name, + zzname: + this.listnr[0].list[0].list[0].name == null + ? this.listnr[0].list[0].list[0].cmdid + : this.listnr[0].list[0].list[0].name, zzcmid: this.listnr[0].list[0].list[0].cmdid, zzid: this.listnr[0].list[0].list[0].id, zzprotocol: this.timeProtocol, @@ -1155,6 +1158,7 @@ export default { }, closebtn() { this.isShowset = false; + this.deviceListData = []; this.checkList = ""; // this.setNum = this.offsetnum; this.deviceList(); diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue index 2491621..46b17be 100644 --- a/src/views/realTimeMonitor/index.vue +++ b/src/views/realTimeMonitor/index.vue @@ -400,7 +400,10 @@ export default { }, created() { //获取日期 - this.zzradio = JSON.parse(localStorage.getItem("radio")); + this.zzradio = + JSON.parse(localStorage.getItem("radio")) !== null + ? JSON.parse(localStorage.getItem("radio")) + : -1; this.getRadio(); this.getLineTreeList(); this.treetimer = window.setInterval(() => {