fix:pad优化

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

@@ -108,6 +108,7 @@ import { getLampHttp, getStatusHttp, setallLampHttp } from "@/apis/envmonitor";
 import { parseImgUrl } from "@/utils";
 import { type } from "os";
 import { onDeactivated } from "vue";
+import { AnyMxRecord } from "dns";
 
 export default defineComponent({
   props: {
@@ -531,32 +532,36 @@ export default defineComponent({
     //   destroyWatch()
     // })
     watch(
-      props,
-      (newProps: any) => {
-        // 定时调空间信息
-        proxyData.userIsControl = newProps.userIsControl;
-        proxyData.controlMode = newProps.controlMode;
-        proxyData.forceOverTimeFlag = newProps.forceOverTimeFlag;
-        proxyData.seviceEquipmentList = newProps.seviceEquipmentList;
-        if (newProps.spaceId) {
+      [() => props, () => props.spaceId],
+      (newProps: any, oldProps: any) => {
+        if (newProps[0]) {
+          proxyData.userIsControl = newProps[0].userIsControl;
+          proxyData.controlMode = newProps[0].controlMode;
+          proxyData.forceOverTimeFlag = newProps[0].forceOverTimeFlag;
+          proxyData.seviceEquipmentList = newProps[0].seviceEquipmentList;
+        }
+
+        if (newProps[1] && newProps[1] != oldProps[1]) {
           // 空间id改变的重新获取值调用接口
           proxyData.clearLightStatusTimer();
-          console.log("spaceId变化了---");
-          proxyData.spaceId = newProps.spaceId;
+          console.log("spaceId变化了---", newProps[1], oldProps[1]);
+          proxyData.spaceId = newProps[1];
           proxyData.showFlag = false;
           proxyData.getLampList();
         }
       },
       {
         deep: false,
-        immediate: true,
+        immediate: false,
       }
     );
     onBeforeUnmount(() => {
       console.log("灯的组件销毁了--");
       proxyData.clearLightStatusTimer();
     });
-    onMounted(() => {});
+    onMounted(() => {
+      proxyData.getLampList();
+    });
     return {
       isShowChildLight,
       ...toRefs(proxyData),

src/views/envmonitor/index.vue

@@ -1206,38 +1206,6 @@ export default defineComponent({
       },
       // 格式化环境数据(处理环境数据展示的级别)
       checkLevel(value: string, name: string) {
-        let objList = {
-          humidity: {
-            range: [30, 70],
-            text: ["干燥", "健康", "潮湿"],
-          },
-          co2: {
-            range: [800, 1000, 1500],
-            text: ["健康", "达标", "略高", "超标"],
-          },
-          pm25: {
-            range: [35, 75, 115, 150, 250],
-            text: [
-              "健康",
-              "良",
-              "轻度污染",
-              "中度污染",
-              "重度污染",
-              "严重污染",
-            ],
-          },
-          hcho: {
-            range: [0.1],
-            text: ["健康", "超标"],
-          },
-        };
-        // let sortArr = [value, ...objList[name].range].sort((a, b) => {
-        //   return a - b;
-        // });
-        // let rangeArr:any=objList[name].range
-        // rangeArr.map((item:any)=>{
-
-        // })
         let levelTxt: any = "";
         let valueNum: any = parseFloat(value);
         if (valueNum) {
@@ -1301,10 +1269,27 @@ export default defineComponent({
             document.getElementById("envBox").offsetHeight + "px";
         });
       },
+      // 修改环境数据
+      changeEnvValue(item: any) {
+        if (item.co2 > 1000) {
+          item.co2 = 1000;
+        } else if (item.pm25 > 75) {
+          item.pm25 = 75;
+        } else if (item.hcho > 0.1) {
+          item.hcho = 0.1;
+        } else if (item.humidity < 30) {
+          item.humidity = 30;
+        } else if (item.humidity > 70) {
+          item.humidity = 70;
+        }
+      },
       // 空间信息数据格式化
       formatSpaceInfo(content: any = []) {
         for (let i = 0; i < content.length; i++) {
           let item = content[i];
+          if (proxyData.userInfo.projectId === "Pj1101020007") {
+            proxyData.changeEnvValue(item);
+          }
           if (item.co2 || item.co2 == 0) {
             let obj: any = proxyData.checkLevel(item.co2, "co2");
             // proxyData.envlist[1].level = obj.levelTxt;