diff --git a/src/views/devicePhotoSchedule/components/setdevice.vue b/src/views/devicePhotoSchedule/components/setdevice.vue index 495aaf2..cb1fc90 100644 --- a/src/views/devicePhotoSchedule/components/setdevice.vue +++ b/src/views/devicePhotoSchedule/components/setdevice.vue @@ -376,7 +376,10 @@ export default { console.log(timearr); } ////判断河南规约 - if (this.allCheckNode[i].protocol == "65286") { + if ( + this.allCheckNode[i].protocol == "65286" || + this.allCheckNode[i].protocol == "65282" + ) { console.log("河南规约"); //偏移时间 //this.getDayArr(startDay, endDay); diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue index 6e5432f..869712e 100644 --- a/src/views/realTimeMonitor/components/setschedule.vue +++ b/src/views/realTimeMonitor/components/setschedule.vue @@ -58,7 +58,7 @@ >{{ val.substring(val.length - 5) }} {{ val.substring(val.length - 5) }} { this.shedulenr = res.data.list; + console.log(res.data.offset); + this.offsetnum = res.data.offset; + console.log(this.offsetnum); + console.log("aaaaa"); console.log(this.shedulenr); //湖南规约 if (this.timeProtocol == "65283") { @@ -462,7 +466,10 @@ export default { } } //河南规约 - if (this.timeProtocol == "65286") { + if ( + this.timeProtocol == "65286" || + this.timeProtocol == "65282" + ) { console.log("河南规约"); var hnarr = []; for (var i = 0; i < this.shedulenr.length; i++) { @@ -477,7 +484,6 @@ export default { console.log(hnarr); this.shedulenr = hnarr; } - this.offsetnum = res.data.offset; this.loading = false; }) @@ -571,7 +577,7 @@ export default { } } //河南规约 - if (this.timeProtocol == "65286") { + if (this.timeProtocol == "65286" || this.timeProtocol == "65282") { console.log("河南规约"); var hnarr = []; for (var i = 0; i < this.shedulenr.length; i++) { @@ -626,6 +632,9 @@ export default { // this.shedulenr = res.data.list.join("; ") this.compareloading = false; this.newshedulenr = res.data.list; + this.offsetnum = res.data.offset; + console.log("qqqqqqqqqqqqqqqqqqqqqq"); + console.log(this.offsetnum); //湖南规约 if (this.timeProtocol == "65283") { console.log("湖南规约"); @@ -704,7 +713,10 @@ export default { } } //河南规约 - if (this.timeProtocol == "65286") { + if ( + this.timeProtocol == "65286" || + this.timeProtocol == "65282" + ) { console.log("河南规约"); var hnarr = []; for (var i = 0; i < this.newshedulenr.length; i++) { @@ -1036,7 +1048,10 @@ export default { } ////判断河南规约 - if (this.deviceListData.zzprotocol == "65286") { + if ( + this.deviceListData.zzprotocol == "65286" || + this.timeProtocol == "65282" + ) { console.log("河南规约"); //偏移时间 //this.getDayArr(startDay, endDay); @@ -1218,12 +1233,14 @@ export default { } } .timeShow { - display: flex; + //display: flex; .leftTime { width: 50%; + float: left; } .rightTime { width: 50%; + float: right; position: relative; .offtime { position: absolute;