From b2c7099fae689b9fb4638cf75966648d3b99f46e Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Mon, 29 Apr 2024 14:28:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E5=8F=91=E6=97=B6?=
=?UTF-8?q?=E9=97=B4=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/bdSchedule.vue | 16 +++++++---
.../components/setdevice.vue | 7 +++--
.../components/setdevice_yh.vue | 9 +++---
.../components/setschedule.vue | 31 +++++++++----------
4 files changed, 35 insertions(+), 28 deletions(-)
diff --git a/src/views/devicePhotoSchedule/components/bdSchedule.vue b/src/views/devicePhotoSchedule/components/bdSchedule.vue
index e32f2fe..73ee39f 100644
--- a/src/views/devicePhotoSchedule/components/bdSchedule.vue
+++ b/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")
- .add(node.setNum, "minute")
- .format("YYYY-MM-DD HH:mm:ss");
+ // var Etime = this.$moment(scheduleTimeList[i].endTime, "HH:mm")
+ // .add(node.setNum, "minute")
+ // .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);
diff --git a/src/views/devicePhotoSchedule/components/setdevice.vue b/src/views/devicePhotoSchedule/components/setdevice.vue
index 895ebb6..21d5316 100644
--- a/src/views/devicePhotoSchedule/components/setdevice.vue
+++ b/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)
- .add(this.allCheckNode[i].offsetNum, "minute")
- .format();
+ // var Etime = moment(this.ruleSchedule[j].endTime)
+ // .add(this.allCheckNode[i].offsetNum, "minute")
+ // .format();
+ var Etime = moment(this.ruleSchedule[j].endTime).format();
var lastETime = moment(this.ruleSchedule[j].endTime).format();
var spanTime = this.ruleSchedule[j].span;
diff --git a/src/views/devicePhotoSchedule/components/setdevice_yh.vue b/src/views/devicePhotoSchedule/components/setdevice_yh.vue
index 83022b4..3ce5bb5 100644
--- a/src/views/devicePhotoSchedule/components/setdevice_yh.vue
+++ b/src/views/devicePhotoSchedule/components/setdevice_yh.vue
@@ -235,10 +235,11 @@ export default {
"minute"
);
- var Etime = this.$moment(this.rulesList[j].endTime).add(
- this.allCheckNode[i].offsetNum,
- "minute"
- );
+ // var Etime = this.$moment(this.rulesList[j].endTime).add(
+ // this.allCheckNode[i].offsetNum,
+ // "minute"
+ // );
+ var Etime = this.$moment(this.rulesList[j].endTime);
var spanTime = this.rulesList[j].span;
console.log(Stime, Etime, spanTime);
diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue
index a078d74..d7a6789 100644
--- a/src/views/realTimeMonitor/components/setschedule.vue
+++ b/src/views/realTimeMonitor/components/setschedule.vue
@@ -194,8 +194,9 @@
+ {{ minTimeSpan }}
@@ -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")
- .add(this.setNum, "minute")
- .format("YYYY-MM-DD HH:mm:ss");
+ // var Etime = this.$moment(scheduleTimeList[i].endTime, "HH:mm")
+ // .add(this.setNum, "minute")
+ // .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))