|
@@ -1096,7 +1096,7 @@ export default defineComponent({
|
|
|
sceneEquipList:
|
|
|
item && item.sceneEquipList ? item.sceneEquipList : [],
|
|
|
objectId: proxyData.nowData.objectId, //类型:String 必有字段 备注:空间id
|
|
|
- sourceType: "sagacareAndtenantslink", //类型:String 必有字段 备注:sagacareAndtenantslink 来源
|
|
|
+ sourceType: proxyData.userInfo.pubname, //类型:String 必有字段 备注:sagacareAndtenantslink 来源
|
|
|
startDate: proxyData.nowData.oldDate, //类型:String 必有字段 备注://开始日期
|
|
|
endDate: proxyData.nowData.oldDate, //类型:String 必有字段 备注://结束日期
|
|
|
startTime: startTime, //类型:String 必有字段 备注://开始时间
|
|
@@ -1122,14 +1122,28 @@ export default defineComponent({
|
|
|
timerArr[proxyData.startIndex].isCheck &&
|
|
|
timerArr[endIndex].isCheck
|
|
|
) {
|
|
|
- let customSceneList: any = proxyData.nowData.customSceneList;
|
|
|
+ let customSceneList: any = proxyData.nowData.customSceneList || [];
|
|
|
let startTime: any = timerArr[proxyData.startIndex].formatTimer;
|
|
|
let endTime: any = timerArr[proxyData.endIndex].formatTimer;
|
|
|
let delTimerArr: any = [];
|
|
|
let addTimeArr: any = [];
|
|
|
+
|
|
|
// 删除时间的数据拼接
|
|
|
- customSceneList.map((item: any, index: any) => {
|
|
|
- if (item.startTime < startTime) {
|
|
|
+ for (let i = 0; i < customSceneList.length; i++) {
|
|
|
+ let item: any = customSceneList[i];
|
|
|
+ let index: any = i;
|
|
|
+ if (item.startTime === startTime && item.endTime === endTime) {
|
|
|
+ // 代表需要删除该段
|
|
|
+ // 整段删除
|
|
|
+ let delObj: any = proxyData.formaTimeObj(
|
|
|
+ item,
|
|
|
+ "1",
|
|
|
+ item.startTime,
|
|
|
+ item.endTime
|
|
|
+ );
|
|
|
+ delTimerArr.push(delObj);
|
|
|
+ break;
|
|
|
+ } else if (item.startTime < startTime) {
|
|
|
if (item.endTime <= endTime) {
|
|
|
let delObj: any = proxyData.formaTimeObj(
|
|
|
item,
|
|
@@ -1221,7 +1235,8 @@ export default defineComponent({
|
|
|
addTimeArr.push(addObj1);
|
|
|
}
|
|
|
}
|
|
|
- });
|
|
|
+ }
|
|
|
+
|
|
|
addTimeArr.map((item: any) => {
|
|
|
let realTime: any = getRelNowTime();
|
|
|
if (realTime >= item.startTime && realTime <= item.endTime) {
|