Explorar el Código

fix:空间服务定制bug 修改

chenzhen2 hace 2 años
padre
commit
b0fbdfbac6

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

@@ -555,19 +555,21 @@ export default defineComponent({
       (newProps: any) => {
         if (newProps.workkArr && newProps.workkArr.length) {
           proxyData.workkArr = JSON.parse(JSON.stringify(newProps.workkArr));
+          console.log("workkArr数据变化了", proxyData.workkArr);
           proxyData.formateApproveData();
           proxyData.formateWorkTime();
         }
       },
       {
-        deep: true,
+        deep: false,
         immediate: true,
       }
     );
     onMounted(() => {
-      proxyData.workkArr = JSON.parse(JSON.stringify(props.workkArr));
-      proxyData.formateApproveData();
-      proxyData.formateWorkTime();
+      // proxyData.workkArr = props.workkArr;
+      // proxyData.workkArr = JSON.parse(JSON.stringify(props.workkArr));
+      // proxyData.formateApproveData();
+      // proxyData.formateWorkTime();
     });
     return {
       ...toRefs(proxyData),

+ 8 - 8
src/views/envmonitor/index.vue

@@ -1568,16 +1568,15 @@ export default defineComponent({
         queryCustomAndScence(str)
           .then((res) => {
             let resData: any = res?.data ?? [];
-            // 手动控制的情况下走新的服务定制
-            proxyData.workkArr = resData;
-            for (let i = 0; i < proxyData.workkArr.length; i++) {
-              let customSceneList: any =
-                proxyData.workkArr[i]?.customSceneList ?? [];
+
+            for (let i = 0; i < resData.length; i++) {
+              let customSceneList: any = resData[i]?.customSceneList ?? [];
               customSceneList = customSceneList.sort(proxyData.compare);
             }
-            if (proxyData.controlMode == 1) {
-              proxyData.formateManualWorkTime();
-            }
+            // 手动控制的情况下走新的服务定制
+            proxyData.workkArr = resData;
+            proxyData.formateManualWorkTime();
+
             proxyData.queryCustomAndScenceTimer();
           })
           .catch(() => {
@@ -1742,6 +1741,7 @@ export default defineComponent({
         proxyData.roomType = "";
         proxyData.officeData.temperature = "";
         proxyData.spaceExistenceDevice = spaceExistenceDevice;
+        proxyData.workkArr = [];
         //  切换空间的时候把加班按钮平板
         proxyData.setForceOverTimeFlag(false);
       },