Browse Source

fix:加班逻辑处理

chenzhen2 2 năm trước cách đây
mục cha
commit
954007432d

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

@@ -517,6 +517,7 @@ export default defineComponent({
         saveBatchCustomScene(proxyData.delTimeArr)
           .then((res) => {
             proxyData.leaveBtnFlag = false;
+            contx.emit("closeWork");
             // console.log(res);
             // proxyGlobal.proxy.$loadinngEnd();
           })

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

@@ -500,6 +500,7 @@ export default defineComponent({
         saveBatchCustomScene(proxyData.delTimeArr)
           .then((res) => {
             proxyData.leaveBtnFlag = false;
+            contx.emit("closeWork");
             // console.log(res);
             // proxyGlobal.proxy.$loadinngEnd();
           })

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

@@ -1053,7 +1053,6 @@ export default defineComponent({
             // debugger;
             if (type === 1) {
               // 添加
-              context.emit("closeWork");
               // proxyGlobal.proxy.$loadinngEnd();
               proxyData.showLoading = false;
             } else if (type === 2) {
@@ -1062,6 +1061,7 @@ export default defineComponent({
               proxyData.showLoading = false;
               // proxyData.setWorkTimeList();
             }
+            context.emit("closeWork");
             proxyData.formBtn = false;
           })
           .catch(() => {

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

@@ -146,6 +146,7 @@
           v-if="roomType === '开放' && isWork && controlMode !== 1"
           :scenarioArr="scenarioArr"
           :workkArr="workkArr"
+          @closeWork="closeWork"
           @triggerWork="triggerWork"
           @setForceOverTimeFlag="setForceOverTimeFlag"
         ></work-config>
@@ -155,6 +156,7 @@
           v-if="roomType === '开放' && isWork && controlMode === 1"
           :scenarioArr="scenarioArr"
           :workkArr="workkArr"
+          @closeWork="closeWork"
           @triggerWork="triggerWork"
           @setForceOverTimeFlag="setForceOverTimeFlag"
         ></manual-config>
@@ -1554,6 +1556,7 @@ export default defineComponent({
             // 手动控制的情况下走新的服务定制
             if (proxyData.controlMode === 1) {
               proxyData.formateManualWorkTime();
+              proxyData.checkDeviceShowWork()
             }
             proxyData.queryCustomAndScenceTimer();
           })