diff --git a/src/views/devicePhotoSchedule/components/setdevice.vue b/src/views/devicePhotoSchedule/components/setdevice.vue index cd4150b..5bc8730 100644 --- a/src/views/devicePhotoSchedule/components/setdevice.vue +++ b/src/views/devicePhotoSchedule/components/setdevice.vue @@ -298,6 +298,8 @@ export default { var Etime = moment(this.ruleSchedule[j].endTime) .add(this.allCheckNode[i].offsetNum, "minute") .format(); + var lastETime = moment(this.ruleSchedule[j].endTime).format(); + var spanTime = this.ruleSchedule[j].span; console.log(spanTime); console.log(moment(this.ruleSchedule[j].endTime).hour()); @@ -378,14 +380,17 @@ export default { console.log("河南规约"); //偏移时间 //this.getDayArr(startDay, endDay); + let startDay = Stime; let endDay = Etime; + var lastendDay = lastETime; + console.log(lastETime); console.log(startDay, endDay); let startVal = this.$moment(new Date(startDay)).format( "YYYY-MM-DD HH:mm" ); console.log(startVal); - + console.log(moment().isSame(moment(endDay), "day")); while (this.$moment(startVal).isBefore(endDay)) { dayArr.push(startVal); // 自增 @@ -396,9 +401,12 @@ export default { } // // 将结束日期的天放进数组 - dayArr.push( - this.$moment(new Date(endDay)).format("YYYY-MM-DD HH:mm") - ); + if (!moment().isSame(moment(endDay), "day")) { + dayArr.push( + this.$moment(new Date(lastETime)).format("YYYY-MM-DD HH:mm") + ); + } + console.log(dayArr); for (var k = 0; k < dayArr.length; k++) { //console.log(moment(dayArr[k]).hour()); diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue index 309dd5a..ebcecc3 100644 --- a/src/views/realTimeMonitor/components/setschedule.vue +++ b/src/views/realTimeMonitor/components/setschedule.vue @@ -50,12 +50,22 @@
时间表:
{{ val.substring(0, val.lastIndexOf(":")) }}{{ val.substring(val.length - 5) }} + {{ $moment(val).format("HH:mm") }} +
@@ -65,11 +75,20 @@ >
{{ val.substring(val.length - 5) }} + {{ val.substring(0, val.lastIndexOf(":")) }}{{ $moment(val).format("HH:mm") }}
@@ -101,10 +120,10 @@ - + +