From fe936486ee0023e4be8d17625471aad6e8e284ff Mon Sep 17 00:00:00 2001
From: longyvfengyun <496960745@qq.com>
Date: 星期四, 24 八月 2023 10:52:35 +0800
Subject: [PATCH] 内容调整

---
 src/views/home/js/homeInfoModule.js |  107 +++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 83 insertions(+), 24 deletions(-)

diff --git a/src/views/home/js/homeInfoModule.js b/src/views/home/js/homeInfoModule.js
index d92a961..07b45f3 100644
--- a/src/views/home/js/homeInfoModule.js
+++ b/src/views/home/js/homeInfoModule.js
@@ -1,5 +1,6 @@
 import {onMounted, reactive} from "vue";
 import createWs from "@/assets/js/tools/websocket/createWs";
+import regEquipType from "@/assets/js/tools/regEquipType";
 
 const homeInfoModule = ()=>{
   const {
@@ -12,11 +13,12 @@
     const rs = JSON.parse(res.data);
     if(rs.code === 1 && rs.data) {
       const data = rs.data2;
+      console.log(data);
       for(let i=0; i<data.length;i++) {
         let iData = data[i];
         for(let j=0; j<homeInfo.length; j++) {
           let jData = homeInfo[j];
-          if(iData.roomName === jData.name) {
+          if(iData.roomName === jData.name && regEquipType(iData.devId, 'env')) {
             jData.info.tmp = iData.envirState.devTemp.toHold(2);
             jData.info.hum = iData.envirState.devHumid.toHold(2);
             jData.info.diff = iData.envirState.devPresss.toHold(2);
@@ -33,20 +35,20 @@
       hum: 7,
       diffPre: 1,
       pos: {
-        visible: false,
-        placement: "top",
+        visible: true,
+        placement: "left",
         x: 710,
         y: 690
       },
       info: {
         num: 99,
-        tmp: 0,
-        hum: 0,
-        diff: 0
+        tmp: 20,
+        hum: 35,
+        diff: 5
       }
     },
     {
-      name: "鍩瑰吇闂�",
+      name: "鏃犺弻瀹�",
       temp: 32,
       hum: 7,
       diffPre: 1,
@@ -177,16 +179,16 @@
       hum: 0,
       diffPre: 0,
       pos: {
-        visible: false,
+        visible: true,
         placement: "top",
         x: 550,
         y: 380
       },
       info: {
         num: 99,
-        tmp: 0,
-        hum: 0,
-        diff: 0
+        tmp: 20,
+        hum: 35,
+        diff: 5
       }
     },
     {
@@ -195,16 +197,16 @@
       hum: 0,
       diffPre: 0,
       pos: {
-        visible: false,
+        visible: true,
         placement: "top",
         x: 750,
         y: 360
       },
       info: {
         num: 99,
-        tmp: 0,
-        hum: 0,
-        diff: 0
+        tmp: 20,
+        hum: 35,
+        diff: 5
       }
     },
     {
@@ -213,16 +215,16 @@
       hum: 0,
       diffPre: 0,
       pos: {
-        visible: false,
+        visible: true,
         placement: "top",
         x: 420,
         y: 700
       },
       info: {
         num: 99,
-        tmp: 0,
-        hum: 0,
-        diff: 0
+        tmp: 20,
+        hum: 35,
+        diff: 5
       }
     },
     {
@@ -231,16 +233,16 @@
       hum: 0,
       diffPre: 0,
       pos: {
-        visible: false,
+        visible: true,
         placement: "top",
         x: 420,
         y: 1100
       },
       info: {
         num: 99,
-        tmp: 0,
-        hum: 0,
-        diff: 0
+        tmp: 20,
+        hum: 35,
+        diff: 5
       }
     },
     {
@@ -250,7 +252,7 @@
       diffPre: 1,
       pos: {
         visible: true,
-        placement: "top",
+        placement: "left",
         x: 820,
         y: 490
       },
@@ -279,6 +281,63 @@
         diff: 0
       }
     },
+    {
+      name: "浼氳瀹�",
+      temp: 32,
+      hum: 7,
+      diffPre: 1,
+      noInfo: true,
+      pos: {
+        visible: true,
+        placement: "top",
+        x: 1900,
+        y: 450
+      },
+      info: {
+        num: 99,
+        tmp: 0,
+        hum: 0,
+        diff: 0
+      }
+    },
+    {
+      name: "鑼舵按闂�",
+      temp: 32,
+      hum: 7,
+      diffPre: 1,
+      noInfo: true,
+      pos: {
+        visible: true,
+        placement: "top",
+        x: 1790,
+        y: 730
+      },
+      info: {
+        num: 99,
+        tmp: 0,
+        hum: 0,
+        diff: 0
+      }
+    },
+    {
+      name: "浠撳簱",
+      temp: 32,
+      hum: 7,
+      diffPre: 1,
+      noInfo: true,
+      pos: {
+        visible: true,
+        placement: "top",
+        x: 2180,
+        y: 730
+      },
+      info: {
+        num: 99,
+        tmp: 0,
+        hum: 0,
+        diff: 0
+      }
+    },
   ]);
 
   onMounted(()=>{

--
Gitblit v1.9.1