|
@@ -1258,6 +1258,7 @@ export default defineComponent({
|
|
|
let delTimerArr: any = [];
|
|
|
let addTimeArr: any = [];
|
|
|
let flag = false;
|
|
|
+ debugger;
|
|
|
for (let i = 0; i < customSceneList.length; i++) {
|
|
|
let item: any = customSceneList[i];
|
|
|
if (item.startTime === startTime && item.endTime === endTime) {
|
|
@@ -1290,7 +1291,7 @@ export default defineComponent({
|
|
|
);
|
|
|
delTimerArr.push(delObj);
|
|
|
let addObj: any = proxyData.formaTimeObj(
|
|
|
- customSceneList[0],
|
|
|
+ item,
|
|
|
"0",
|
|
|
item.startTime,
|
|
|
startTime
|
|
@@ -1305,14 +1306,14 @@ export default defineComponent({
|
|
|
);
|
|
|
delTimerArr.push(delObj);
|
|
|
let addObj1: any = proxyData.formaTimeObj(
|
|
|
- customSceneList[0],
|
|
|
+ item,
|
|
|
"0",
|
|
|
item.startTime,
|
|
|
startTime
|
|
|
);
|
|
|
addTimeArr.push(addObj1);
|
|
|
let addObj2: any = proxyData.formaTimeObj(
|
|
|
- customSceneList[0],
|
|
|
+ item,
|
|
|
"0",
|
|
|
endTime,
|
|
|
item.endTime
|
|
@@ -1338,7 +1339,7 @@ export default defineComponent({
|
|
|
);
|
|
|
delTimerArr.push(delObj);
|
|
|
let addObj1: any = proxyData.formaTimeObj(
|
|
|
- customSceneList[0],
|
|
|
+ item,
|
|
|
"0",
|
|
|
endTime,
|
|
|
item.endTime
|
|
@@ -1364,7 +1365,7 @@ export default defineComponent({
|
|
|
);
|
|
|
delTimerArr.push(delObj);
|
|
|
let addObj1: any = proxyData.formaTimeObj(
|
|
|
- customSceneList[0],
|
|
|
+ item,
|
|
|
"0",
|
|
|
endTime,
|
|
|
item.endTime
|
|
@@ -1380,6 +1381,7 @@ export default defineComponent({
|
|
|
let formTimeArr: any = addTimeArr.concat(delTimerArr);
|
|
|
let realTime: any = getRelNowTime();
|
|
|
formTimeArr.map((item: any, index: any) => {
|
|
|
+ // debugger;
|
|
|
if (item.type == "1") {
|
|
|
// 删除当前时间段
|
|
|
if (realTime >= item.startTime && realTime <= item.endTime) {
|
|
@@ -1391,7 +1393,7 @@ export default defineComponent({
|
|
|
});
|
|
|
formTimeArr.map((item: any, index: any) => {
|
|
|
if (item.type == "0" && delStartTime) {
|
|
|
- if (item.startTime == delStartTime) {
|
|
|
+ if (item.endTime <= delStartTime) {
|
|
|
formTimeArr.splice(index, 1);
|
|
|
}
|
|
|
}
|