Przeglądaj źródła

fix:手动加班处理

chenzhen2 2 lat temu
rodzic
commit
e3bd516ce0

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

@@ -1242,8 +1242,11 @@ export default defineComponent({
 
           addTimeArr.map((item: any) => {
             let realTime: any = getRelNowTime();
-            if (realTime >= item.startTime && realTime <= item.endTime) {
-              item.type === "2";
+            if (item.type == "1") {  // 删除当前时间段
+              if (realTime >= item.startTime && realTime <= item.endTime) {
+                item.type = "3";
+                item.endTimeReal = realTime;
+              }
             }
           });
           let formTimeArr: any = addTimeArr.concat(delTimerArr);

+ 8 - 9
src/views/envmonitor/components/workOvertime/index.vue

@@ -829,7 +829,7 @@ export default defineComponent({
                 item.startTime,
                 item.endTime
               );
-              delTimerArr.push(delObj);
+               delTimerArr.push(delObj);
               startTime = item.startTime;
               endTime = endTime;
             }
@@ -1018,14 +1018,13 @@ export default defineComponent({
               }
             }
           }
-
-          addTimeArr.map((item: any) => {
-            let realTime: any = getRelNowTime();
-            if (realTime >= item.startTime && realTime <= item.endTime) {
-              item.type = "3";
-              item.endTimeReal = realTime;
-            }
-          });
+          // addTimeArr.map((item: any) => {
+          //   let realTime: any = getRelNowTime();
+          //   if (realTime >= item.startTime && realTime <= item.endTime) {
+          //     item.type = "3";
+          //     item.endTimeReal = realTime;
+          //   }
+          // });
           let formTimeArr: any = addTimeArr.concat(delTimerArr);
           return formTimeArr;
         } else {