|
@@ -1563,10 +1563,14 @@ export default defineComponent({
|
|
|
let resData: any = res?.data ?? [];
|
|
|
// 手动控制的情况下走新的服务定制
|
|
|
proxyData.workkArr = resData;
|
|
|
- for (let i = 0; i < resData.length; i++) {
|
|
|
- let customSceneList: any = resData[i]?.customSceneList ?? [];
|
|
|
+ for (let i = 0; i < proxyData.workkArr.length; i++) {
|
|
|
+ let customSceneList: any =
|
|
|
+ proxyData.workkArr[i]?.customSceneList ?? [];
|
|
|
customSceneList = customSceneList.sort(proxyData.compare);
|
|
|
}
|
|
|
+ if (proxyData.controlMode == 1) {
|
|
|
+ proxyData.formateManualWorkTime();
|
|
|
+ }
|
|
|
proxyData.queryCustomAndScenceTimer();
|
|
|
})
|
|
|
.catch(() => {
|
|
@@ -1586,7 +1590,57 @@ export default defineComponent({
|
|
|
}
|
|
|
},
|
|
|
// 格式化当前页面展示的时间
|
|
|
- formateWorkTime() {},
|
|
|
+ // 手动控制加班处理时间段拼接的逻辑
|
|
|
+ formateManualWorkTime() {
|
|
|
+ // debugger
|
|
|
+ let data: any = proxyData.workkArr || [];
|
|
|
+ for (let i = 0; i < data.length; i++) {
|
|
|
+ let item: any = data[i];
|
|
|
+ let spaceCustomContentList: any =
|
|
|
+ data[i].spaceCustomContentList || [];
|
|
|
+ spaceCustomContentList = spaceCustomContentList.sort(
|
|
|
+ proxyData.compare
|
|
|
+ );
|
|
|
+ item.spaceCustomContentList = spaceCustomContentList;
|
|
|
+ let nowTime: any = getRelNowTime();
|
|
|
+ let nowDate: any = formatDate("YYYY-MM-DD");
|
|
|
+ let date: any = formatDateStr(data[i].date);
|
|
|
+ item.cusStartTime = spaceCustomContentList[0]
|
|
|
+ ? spaceCustomContentList[0].startTime
|
|
|
+ : "";
|
|
|
+ item.cusEndTime = spaceCustomContentList[0]
|
|
|
+ ? spaceCustomContentList[0].endTime
|
|
|
+ : "";
|
|
|
+ if (nowDate == date) {
|
|
|
+ // 当前时间
|
|
|
+ item.cusStartTime = "";
|
|
|
+ item.cusEndTime = "";
|
|
|
+ }
|
|
|
+ for (let j = 0; j < spaceCustomContentList.length; j++) {
|
|
|
+ if (item.cusStartTime && item.cusEndTime) {
|
|
|
+ if (item.cusEndTime + 1 === spaceCustomContentList[j].startTime) {
|
|
|
+ item.cusEndTime = spaceCustomContentList[j].endTime;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if (
|
|
|
+ nowTime >= spaceCustomContentList[j].startTime &&
|
|
|
+ nowTime <= spaceCustomContentList[j].endTime
|
|
|
+ ) {
|
|
|
+ item.cusStartTime = spaceCustomContentList[j].startTime;
|
|
|
+ item.cusEndTime = spaceCustomContentList[j].endTime;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (!item.cusStartTime) {
|
|
|
+ item.cusStartTime = spaceCustomContentList[0]
|
|
|
+ ? spaceCustomContentList[0].startTime
|
|
|
+ : "";
|
|
|
+ item.cusEndTime = spaceCustomContentList[0]
|
|
|
+ ? spaceCustomContentList[0].endTime
|
|
|
+ : "";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
/**
|
|
|
* 空间相关的接口
|
|
|
*/
|
|
@@ -1600,7 +1654,7 @@ export default defineComponent({
|
|
|
// 获取空间下受控设备
|
|
|
proxyData.getSpaceEquipList();
|
|
|
// 查询加班记录
|
|
|
- proxyData.queryCustomAndScence();
|
|
|
+ proxyData.queryCustomAndScenceTimer(0);
|
|
|
// 获取空间下的设备信息
|
|
|
proxyData.getEquipments();
|
|
|
},
|