Parcourir la source

fix:删除当前时间段代表我要离开

chenzhen2 il y a 2 ans
Parent
commit
8afafc0114

+ 1 - 0
src/views/envmonitor/components/ManualWork/WorkConfig.vue

@@ -502,6 +502,7 @@ export default defineComponent({
         proxyData.delTimeArr.map((delTime: any) => {
           if (nowTime >= delTime.startTime && nowTime <= delTime.endTime) {
             delTime.endTimeReal = nowTime;
+            // delTime.type = 3
           } else if (nowTime < delTime.startTime) {
             delTime.type = 1; // 时间还未开始直接取消加班记录
           } else if (nowTime > delTime.endTime) {

+ 2 - 1
src/views/envmonitor/components/workOvertime/index.vue

@@ -1021,7 +1021,8 @@ export default defineComponent({
           addTimeArr.map((item: any) => {
             let realTime: any = getRelNowTime();
             if (realTime >= item.startTime && realTime <= item.endTime) {
-              item.type === "2";
+              item.type = "3";
+              item.endTimeReal = realTime;
             }
           });
           let formTimeArr: any = addTimeArr.concat(delTimerArr);