Sfoglia il codice sorgente

fix: 加班逻辑调整

chenzhen2 2 anni fa
parent
commit
81c62d0624

+ 18 - 2
src/views/envmonitor/components/ManualWork/index.vue

@@ -223,6 +223,14 @@ export default defineComponent({
         }
         return nowIndex;
       },
+      // 获取时间的下标
+      getTimerIndex(timerArr: any, val: any) {
+        timerArr.map((time: any, index: any) => {
+          if (time.formatTimer == val) {
+            return index;
+          }
+        });
+      },
       // 获取当前位置的坐标(多端服务定制的判断规则-待开发)
       getNowPerstion(timerArr: any) {
         let nowIndex: any = proxyData.getNowIndex();
@@ -240,15 +248,23 @@ export default defineComponent({
 
         let spaceCustomContentList: any =
           proxyData.nowData.spaceCustomContentList || [];
-
+          // debugger
         if (formatTimer >= cusStartTime && formatTimer <= cusEndTime) {
+          // debugger
           //在服务定制时间之间
           timerArr.map((item: any, index: any) => {
             if (item.formatTimer === cusEndTime) {
               obj.nowIndex = index;
             }
           });
-          spaceCustomContentList.map((item: any) => {});
+          let endFormatTimer: any = timerArr[nowIndex + obj.len].formatTimer;
+          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;
+            }
+          });
         } else if (formatTimer < cusStartTime) {
           timerArr.map((item: any, index: any) => {
             if (item.formatTimer === cusStartTime) {

+ 6 - 0
src/views/envmonitor/index.vue

@@ -353,6 +353,7 @@ import {
 import Keys from "@/constant/key";
 import {
   formatDate,
+  formatDateStr,
   getHours,
   getLocalNewSpaceInfo,
   getNowWeek,
@@ -1681,6 +1682,8 @@ export default defineComponent({
       },
       // 手动控制加班处理时间段拼接的逻辑
       formateManualWorkTime() {
+        // debugger
+        let data: any = proxyData.workkArr
         for (let i = 0; i < proxyData.workkArr.length; i++) {
           let item: any = proxyData.workkArr[i];
           item.cusStartTime = "";
@@ -1688,6 +1691,8 @@ export default defineComponent({
           let spaceCustomContentList: any =
             proxyData.workkArr[i].spaceCustomContentList || [];
           let nowTime: any = getRelNowTime();
+          let nowDate: any = formatDate("YYYY-MM-DD");
+          let date: any = formatDateStr(data[i].date);
           for (let j = 0; j < spaceCustomContentList.length; j++) {
             if (item.cusStartTime && item.cusEndTime) {
               if (item.cusEndTime + 1 === spaceCustomContentList[j].startTime) {
@@ -1703,6 +1708,7 @@ export default defineComponent({
               }
             }
           }
+
           console.log("proxyData.workkArr===");
           console.log(proxyData.workkArr);
         }