瀏覽代碼

fix:解决场景的bug

chenzhen2 2 年之前
父節點
當前提交
778ffd69d8
共有 2 個文件被更改,包括 16 次插入20 次删除
  1. 0 6
      src/views/envmonitor/components/ManualWork/WorkConfig.vue
  2. 16 14
      src/views/envmonitor/index.vue

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

@@ -61,10 +61,6 @@ import LeaveDailog from "@/views/envmonitor/components/ManualWork/LeaveDailog.vu
 
 export default defineComponent({
   props: {
-    scenarioArr: {
-      type: Array,
-      default: () => [],
-    },
     workkArr: {
       type: Array,
       default: () => [],
@@ -91,7 +87,6 @@ export default defineComponent({
     const proxyData = reactive({
       parseImgUrl: parseImgUrl,
       leaveBtnFlag: false,
-      scenarioArr: props.scenarioArr,
       workkArr: props.workkArr,
       forcedOverTimeFlag: false, // 强制加班标记 false:不需要强制加班
       onSubmit(values: any) {
@@ -600,7 +595,6 @@ export default defineComponent({
     watch(
       props,
       (newProps: any) => {
-        proxyData.scenarioArr = newProps.scenarioArr;
         proxyData.workkArr = newProps.workkArr;
         if (proxyData.workkArr && proxyData.workkArr.length) {
           proxyData.formateManualWorkTime();

+ 16 - 14
src/views/envmonitor/index.vue

@@ -571,6 +571,7 @@ export default defineComponent({
       },
     ];
     let scenarioArr: any = [];
+    let sceneConfigTimer: any = [];
     let realEevList: any = []; // 解决v-if报错的问题临时使用
     let workkArr: any = [];
     let spaceData: any = [];
@@ -1473,11 +1474,16 @@ export default defineComponent({
        * 获取场景列表
        */
       scenarioArr: scenarioArr,
+      sceneConfigTimer: sceneConfigTimer,
+      clearSceneConfigTimer() {
+        clearTimeout(proxyData.sceneConfigTimer);
+      },
       // 定时获取场景的配置
       querySpaceSceneConfigTimer(timer: any = 100000) {
-        let timerOut: any = setTimeout(() => {
+        proxyData.clearSceneConfigTimer();
+        proxyData.sceneConfigTimer = setTimeout(() => {
           proxyData.querySpaceSceneConfig();
-          clearTimeout(timerOut);
+          proxyData.clearSceneConfigTimer();
         }, timer);
       },
       querySpaceSceneConfig() {
@@ -1555,16 +1561,12 @@ export default defineComponent({
         queryCustomAndScence(str)
           .then((res) => {
             let resData: any = res?.data ?? [];
-
+            // 手动控制的情况下走新的服务定制
+            proxyData.workkArr = resData;
             for (let i = 0; i < resData.length; i++) {
               let customSceneList: any = resData[i]?.customSceneList ?? [];
               customSceneList = customSceneList.sort(proxyData.compare);
             }
-            // 手动控制的情况下走新的服务定制
-            proxyData.workkArr = resData;
-            // if (proxyData.controlMode === 1) {
-            //   proxyData.checkDeviceShowWork();
-            // }
             proxyData.queryCustomAndScenceTimer();
           })
           .catch(() => {
@@ -1593,14 +1595,14 @@ export default defineComponent({
         // proxyData.roomType = "";
         // 获取场景配置
         proxyData.getSpaceInfo();
-        // 获取空间下的设备信息
-        proxyData.getEquipments();
-        // 获取空间下受控设备
-        proxyData.getSpaceEquipList();
         // 动态获取场景配置
         proxyData.querySpaceSceneConfig();
+        // 获取空间下受控设备
+        proxyData.getSpaceEquipList();
         // 查询加班记录
         proxyData.queryCustomAndScence();
+        // 获取空间下的设备信息
+        proxyData.getEquipments();
       },
       /**
        *删除参数
@@ -1675,12 +1677,12 @@ export default defineComponent({
           item.active = false;
         });
         proxyData.controlMode = 0; // 模式变成自动的
+        proxyData.isWork = false;
         proxyData.roomType = "";
         proxyData.officeData.temperature = "";
         proxyData.spaceExistenceDevice = spaceExistenceDevice;
         //  切换空间的时候把加班按钮平板
         proxyData.setForceOverTimeFlag(false);
-        proxyData.isWork = false;
       },
       // 更多空间
       isShowMap: false,
@@ -1720,7 +1722,6 @@ export default defineComponent({
           proxyData.elChangeExForArray(item);
         }
         item.active = true;
-        console.log("proxyData.spaceInfo===", proxyData.spaceInfo);
         proxyData.init();
       },
       timeOutEvent: timeOutEvent,
@@ -1769,6 +1770,7 @@ export default defineComponent({
       // 定时器清除
       clearAll() {
         proxyData.clearTimerSpaceInfo();
+        proxyData.clearSceneConfigTimer();
         proxyData.clearSecenTimer();
         proxyData.clearEquipTimer();
       },