优化下发时间表

src/views/devicePhotoSchedule/components/bdSchedule.vue

@@ -269,12 +269,20 @@ export default {
             .add(node.setNum, "minute")
             .format("YYYY-MM-DD HH:mm:ss");
 
-          var Etime = this.$moment(scheduleTimeList[i].endTime, "HH:mm")
+          // var Etime = this.$moment(scheduleTimeList[i].endTime, "HH:mm")
-            .add(node.setNum, "minute")
+          //   .add(node.setNum, "minute")
-            .format("YYYY-MM-DD HH:mm:ss");
+          //   .format("YYYY-MM-DD HH:mm:ss");
+          //结束时间不添加偏移量
+          var Etime = this.$moment(scheduleTimeList[i].endTime, "HH:mm").format(
+            "YYYY-MM-DD HH:mm:ss"
+          );
           var spanTime = scheduleTimeList[i].timeSpan;
           console.log(Stime, Etime, spanTime);
-          if (node.protocol == "65283" || node.protocol == "65285") {
+          if (
+            node.protocol == "65283" ||
+            node.protocol == "65285" ||
+            this.areaData.protocol == "65290"
+          ) {
             //湖南 河南
             console.log("湖南,河南", scheduleTimeList.length);
 

src/views/devicePhotoSchedule/components/setdevice.vue

@@ -346,9 +346,10 @@ export default {
             var Stime = moment(this.ruleSchedule[j].startTime)
               .add(this.allCheckNode[i].offsetNum, "minute")
               .format();
-            var Etime = moment(this.ruleSchedule[j].endTime)
+            // var Etime = moment(this.ruleSchedule[j].endTime)
-              .add(this.allCheckNode[i].offsetNum, "minute")
+            //   .add(this.allCheckNode[i].offsetNum, "minute")
-              .format();
+            //   .format();
+            var Etime = moment(this.ruleSchedule[j].endTime).format();
             var lastETime = moment(this.ruleSchedule[j].endTime).format();
 
             var spanTime = this.ruleSchedule[j].span;

src/views/devicePhotoSchedule/components/setdevice_yh.vue

@@ -235,10 +235,11 @@ export default {
               "minute"
             );
 
-            var Etime = this.$moment(this.rulesList[j].endTime).add(
+            // var Etime = this.$moment(this.rulesList[j].endTime).add(
-              this.allCheckNode[i].offsetNum,
+            //   this.allCheckNode[i].offsetNum,
-              "minute"
+            //   "minute"
-            );
+            // );
+            var Etime = this.$moment(this.rulesList[j].endTime);
 
             var spanTime = this.rulesList[j].span;
             console.log(Stime, Etime, spanTime);

src/views/realTimeMonitor/components/setschedule.vue

@@ -194,8 +194,9 @@
                 <el-input-number
                   v-model="setNum"
                   :min="0"
-                  :max="9"
+                  :max="minTimeSpan"
                 ></el-input-number>
+                {{ minTimeSpan }}
               </div>
             </div>
             <div class="ruleinfo">
@@ -258,6 +259,7 @@ export default {
       deviceTimer: null, //装置循环获取
       deviceNum: 1, //循环次数
       offsetTime: 0, //偏移量
+      minTimeSpan: "",
       page: 1, // 当前页数
       pageSize: 20, // 每页数量
       total: 0, //总条数
@@ -619,6 +621,9 @@ export default {
     //设置下发时间表规则
     handleSet(val) {
       console.log(val);
+      this.minTimeSpan = Math.min(...val.listTime.map((item) => item.timeSpan));
+      console.log(this.minTimeSpan);
+      this.minTimeSpan = this.minTimeSpan > 10 ? 10 : this.minTimeSpan - 1;
       this.isShowset = true;
       this.currentTimeRule = val;
       getScheduleRulelAccessList({ termid: this.areaData.id })
@@ -685,9 +690,14 @@ export default {
               .add(this.setNum, "minute")
               .format("YYYY-MM-DD HH:mm:ss");
 
-            var Etime = this.$moment(scheduleTimeList[i].endTime, "HH:mm")
+            // var Etime = this.$moment(scheduleTimeList[i].endTime, "HH:mm")
-              .add(this.setNum, "minute")
+            //   .add(this.setNum, "minute")
-              .format("YYYY-MM-DD HH:mm:ss");
+            //   .format("YYYY-MM-DD HH:mm:ss");
+            //结束时间不添加偏移量
+            var Etime = this.$moment(
+              scheduleTimeList[i].endTime,
+              "HH:mm"
+            ).format("YYYY-MM-DD HH:mm:ss");
             var spanTime = scheduleTimeList[i].timeSpan;
             console.log(Stime, Etime, spanTime);
             if (
@@ -706,19 +716,6 @@ export default {
               timeArr.push(fistSpan, Stime, Etime);
               console.log(timeArr);
             } else {
-              //其他规约
-              // if (this.$moment(Stime).isBefore(this.$moment(Etime))) {
-              //   timeArr.push(Stime);
-              //   Stime = this.$moment(Stime)
-              //     .add(spanTime, "minute")
-              //     .format("YYYY-MM-DD HH:mm:ss");
-              // } else if (this.$moment(Stime).isSame(this.$moment(Etime))) {
-              //   // Stime = "";
-              //   timeArr = [];
-              //   // Stime = this.$moment(Stime)
-              //   //   .add(spanTime, "minute")
-              //   //   .format("YYYY-MM-DD HH:mm:ss");
-              // }
               while (
                 this.$moment(Stime).isBefore(this.$moment(Etime)) ||
                 this.$moment(Stime).isSame(this.$moment(Etime))