fix:加班bug修改

src/views/envmonitor/components/Air/manualIndex.vue

@@ -782,6 +782,7 @@ export default defineComponent({
       checkDeviceIsExeSpaceTime(deviceAll: any = []) {
         let seviceEquipmentList: any = proxyData.seviceEquipmentList;
         let flag: any = false;
+        // debugger
         for (let i = 0; i < seviceEquipmentList.length; i++) {
           for (let j = 0; j < deviceAll.length; j++) {
             if (
@@ -967,8 +968,6 @@ export default defineComponent({
           proxyData.userIsControl = newProps[0].userIsControl;
           proxyData.forceOverTimeFlag = newProps[0].forceOverTimeFlag;
           proxyData.seviceEquipmentList = newProps[0].seviceEquipmentList;
-          console.log("=== proxyData.seviceEquipmentList")
-          console.log(proxyData.seviceEquipmentList);
         }
         if (newProps[1] && newProps[1] != oldProps[1]) {
           proxyData.spaceId = newProps[1];
@@ -976,7 +975,7 @@ export default defineComponent({
         }
       },
       {
-        deep: false,
+        deep: true,
         immediate: true,
       }
     );

src/views/envmonitor/components/Light/index.vue

@@ -186,6 +186,7 @@ export default defineComponent({
       },
       // 检查设备是否执行空间服务时间
       checkDeviceIsExeSpaceTime(deviceAll: any = []) {
+        // debugger
         if (proxyData.controlMode !== 1) {
           return true;
         }
@@ -567,8 +568,8 @@ export default defineComponent({
         }
       },
       {
-        deep: false,
-        immediate: false,
+        deep: true,
+        immediate: true,
       }
     );
     onBeforeUnmount(() => {

src/views/envmonitor/components/ManualWork/WorkConfig.vue

@@ -95,7 +95,7 @@ export default defineComponent({
       },
       // 触发加班按钮
       childTriggerWork() {
-        contx.emit("triggerWork", null);
+        contx.emit("triggerWork", 1);
       },
       timerText: timerText,
       text: text,

src/views/envmonitor/components/ManualWork/index.vue

@@ -136,7 +136,7 @@
         </div>
       </template>
 
-      <div class="device-tip" v-if="isLight || isAir">
+      <div class="device-tip" v-if="isAir">
         <span>计费方式:</span>
         <p>
           <span> * </span>
@@ -779,6 +779,7 @@ export default defineComponent({
       airNum: 0,
       // 格式化设备
       formateEquipment() {
+        // debugger
         proxyData.isLight = false;
         proxyData.isAir = false;
         proxyData.lightNum = 0;
@@ -789,6 +790,7 @@ export default defineComponent({
           proxyData.nowData.equipmentList.length
         ) {
           if (proxyData.enterType === 1) {
+            // debugger
             proxyData.nowData.equipmentList.map((item: any) => {
               item.isCheck = true;
             });
@@ -1070,6 +1072,7 @@ export default defineComponent({
         proxyData.activeIndex = index;
         proxyData.nowTimerArr = proxyData.dateArr[index].timerArr;
         proxyData.nowData = proxyData.dateArr[index];
+        // debugger
         proxyData.formateEquipment();
         nextTick(() => {
           proxyData.setNowBarPerstion(proxyData.nowTimerArr);
@@ -1581,15 +1584,22 @@ export default defineComponent({
         }
       },
     });
-    watch(props, (newProps: any) => {
-      proxyData.workkArr = newProps.workkArr;
-      proxyData.projectId = newProps.projectId;
-      proxyData.enterType = newProps.enterType;
-      proxyData.deviceItem = newProps.deviceItem;
-      proxyData.seviceEquipmentList = newProps.seviceEquipmentList;
-      console.log("弹窗变化了-----==");
-      // proxyData.setWorkTimeList();
-    });
+    watch(
+      props,
+      (newProps: any) => {
+        proxyData.workkArr = newProps.workkArr;
+        proxyData.projectId = newProps.projectId;
+        proxyData.enterType = newProps.enterType;
+        proxyData.deviceItem = newProps.deviceItem;
+        proxyData.seviceEquipmentList = newProps.seviceEquipmentList;
+        console.log("弹窗变化了-----==");
+        // proxyData.setWorkTimeList();
+      },
+      {
+        deep: true,
+        immediate: true,
+      }
+    );
     onMounted(() => {
       // 设置dom最外层的宽
       // console.log("弹窗变化了-----==");

src/views/envmonitor/index.vue

@@ -880,6 +880,7 @@ export default defineComponent({
        */
       triggerWork(type: any = 1, deviceItem: any = null) {
         // console.log(type);
+        // debugger
         proxyData.enterType = type;
         proxyData.deviceItem = deviceItem || null;
         proxyData.isShowWork = true;