|
@@ -225,11 +225,13 @@ export default defineComponent({
|
|
|
},
|
|
|
// 获取时间的下标
|
|
|
getTimerIndex(timerArr: any, val: any) {
|
|
|
+ let cusIndex: any = 0;
|
|
|
timerArr.map((time: any, index: any) => {
|
|
|
if (time.formatTimer == val) {
|
|
|
- return index;
|
|
|
+ cusIndex = index;
|
|
|
}
|
|
|
});
|
|
|
+ return cusIndex;
|
|
|
},
|
|
|
// 获取当前位置的坐标(多端服务定制的判断规则-待开发)
|
|
|
getNowPerstion(timerArr: any) {
|
|
@@ -248,7 +250,7 @@ export default defineComponent({
|
|
|
|
|
|
let spaceCustomContentList: any =
|
|
|
proxyData.nowData.spaceCustomContentList || [];
|
|
|
- // debugger
|
|
|
+ // debugger
|
|
|
if (formatTimer >= cusStartTime && formatTimer <= cusEndTime) {
|
|
|
// debugger
|
|
|
//在服务定制时间之间
|
|
@@ -261,8 +263,9 @@ export default defineComponent({
|
|
|
spaceCustomContentList.map((item: any) => {
|
|
|
let startTime: any = proxyData.parseCusStartTime(item.startTime);
|
|
|
if (startTime > cusEndTime && endFormatTimer > startTime) {
|
|
|
- let index: any = proxyData.getTimerIndex(timerArr, startTime);
|
|
|
- obj.len = index - obj.nowIndex;
|
|
|
+ let cusIndex: any = proxyData.getTimerIndex(timerArr, startTime);
|
|
|
+ obj.len =
|
|
|
+ cusIndex - obj.nowIndex > 0 ? cusIndex - obj.nowIndex : 0;
|
|
|
}
|
|
|
});
|
|
|
} else if (formatTimer < cusStartTime) {
|
|
@@ -722,6 +725,17 @@ export default defineComponent({
|
|
|
});
|
|
|
}
|
|
|
},
|
|
|
+ // 加班时间是否在所有的服务定制时间之前
|
|
|
+ isCusTimeBefore(spaceCustomContentList: any, time: any) {
|
|
|
+ let flag: any = false;
|
|
|
+ spaceCustomContentList.map((item: any) => {
|
|
|
+ if (time > item.startTime) {
|
|
|
+ flag = true;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ return flag;
|
|
|
+ },
|
|
|
+ // 设置加班选中区域
|
|
|
setWorkTimeList() {
|
|
|
proxyData.isUpdate = false;
|
|
|
proxyGlobal.proxy.$loadinngEnd();
|
|
@@ -730,15 +744,11 @@ export default defineComponent({
|
|
|
let nowDate: any = formatDate("YYYY-MM-DD");
|
|
|
for (let i = 0; i < data.length; i++) {
|
|
|
let date: any = formatDateStr(data[i].date);
|
|
|
+ let spaceCustomContentList: any =
|
|
|
+ data[i].spaceCustomContentList || []; // 固定服务定制时间
|
|
|
|
|
|
- let cusStartTime: any = proxyData.parseCusStartTime(
|
|
|
- data[i].cusStartTime
|
|
|
- );
|
|
|
- let cusEndTime: any = proxyData.parseCusEndTime(data[i].cusEndTime);
|
|
|
- // let isActive: Boolean = false;
|
|
|
let week: any = getWeekDate(new Date(date).getDay());
|
|
|
if (date === nowDate) {
|
|
|
- // isActive = true;
|
|
|
week = "今天";
|
|
|
}
|
|
|
let timerArr: any = [];
|
|
@@ -754,15 +764,20 @@ export default defineComponent({
|
|
|
let customSceneList: any = data[i]?.customSceneList ?? [];
|
|
|
customSceneList.map((custom: any) => {
|
|
|
for (let j = 0; j < timerArr.length; j++) {
|
|
|
- // debugger
|
|
|
- if (timerArr[j].formatTimer < cusStartTime) {
|
|
|
+ if (
|
|
|
+ proxyData.isCusTimeBefore(
|
|
|
+ spaceCustomContentList,
|
|
|
+ timerArr[j].formatTimer
|
|
|
+ )
|
|
|
+ ) {
|
|
|
+ // 加班时间在服务定制时间之前
|
|
|
let tempStartTime: any = proxyData.parseCusStartTime(
|
|
|
custom.startTime
|
|
|
);
|
|
|
let tempEndTime: any = proxyData.parseCusStartTime(
|
|
|
custom.endTime
|
|
|
);
|
|
|
- // 加班时间在服务定制时间之前
|
|
|
+
|
|
|
if (
|
|
|
timerArr[j].formatTimer >= tempStartTime &&
|
|
|
timerArr[j].formatTimer < tempEndTime
|
|
@@ -771,6 +786,7 @@ export default defineComponent({
|
|
|
}
|
|
|
} else {
|
|
|
// 加班时间在服务外定制时间之后
|
|
|
+
|
|
|
let tempStartTime: any = proxyData.parseCusEndTime(
|
|
|
custom.startTime
|
|
|
);
|
|
@@ -787,8 +803,6 @@ export default defineComponent({
|
|
|
}
|
|
|
});
|
|
|
|
|
|
- let spaceCustomContentList: any =
|
|
|
- data[i].spaceCustomContentList || [];
|
|
|
spaceCustomContentList.map((spaceCustom: any) => {
|
|
|
let startTime: any = proxyData.parseCusStartTime(
|
|
|
spaceCustom.startTime
|