From d310c767eef62fc8202f531e7492ecd58779af72 Mon Sep 17 00:00:00 2001
From: longyvfengyun <496960745@qq.com>
Date: 星期一, 09 十月 2023 16:03:54 +0800
Subject: [PATCH] 内容修改

---
 src/views/home/js/homeInfoModule.js |  126 +++++++++++++++++++++++++++++++++---------
 1 files changed, 99 insertions(+), 27 deletions(-)

diff --git a/src/views/home/js/homeInfoModule.js b/src/views/home/js/homeInfoModule.js
index d92a961..43dd696 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 {
@@ -16,7 +17,7 @@
         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);
@@ -32,28 +33,30 @@
       temp: 32,
       hum: 7,
       diffPre: 1,
+      noInfo: true,
       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,
+      noInfo: false,
       pos: {
         visible: true,
         placement: "top",
-        x: 916,
+        x: 900,
         y: 690
       },
       info: {
@@ -68,10 +71,11 @@
       temp: 32,
       hum: 7,
       diffPre: 1,
+      noInfo: true,
       pos: {
         visible: true,
         placement: "left",
-        x: 1212,
+        x: 1230,
         y: 690
       },
       info: {
@@ -86,6 +90,7 @@
       temp: 32,
       hum: 7,
       diffPre: 1,
+      noInfo: true,
       pos: {
         visible: true,
         placement: "top",
@@ -104,6 +109,7 @@
       temp: 32,
       hum: 7,
       diffPre: 1,
+      noInfo: true,
       pos: {
         visible: true,
         placement: "top",
@@ -122,6 +128,7 @@
       temp: 32,
       hum: 7,
       diffPre: 1,
+      noInfo: false,
       pos: {
         visible: true,
         placement: "top",
@@ -140,6 +147,7 @@
       temp: 32,
       hum: 7,
       diffPre: 1,
+      noInfo: true,
       pos: {
         visible: true,
         placement: "top",
@@ -158,6 +166,7 @@
       temp: 32,
       hum: 7,
       diffPre: 1,
+      noInfo: false,
       pos: {
         visible: true,
         placement: "top",
@@ -176,17 +185,18 @@
       temp: 0,
       hum: 0,
       diffPre: 0,
+      noInfo: true,
       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
       }
     },
     {
@@ -194,17 +204,18 @@
       temp: 0,
       hum: 0,
       diffPre: 0,
+      noInfo: true,
       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
       }
     },
     {
@@ -212,17 +223,18 @@
       temp: 0,
       hum: 0,
       diffPre: 0,
+      noInfo: true,
       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
       }
     },
     {
@@ -230,17 +242,18 @@
       temp: 0,
       hum: 0,
       diffPre: 0,
+      noInfo: true,
       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
       }
     },
     {
@@ -248,9 +261,10 @@
       temp: 32,
       hum: 7,
       diffPre: 1,
+      noInfo: false,
       pos: {
         visible: true,
-        placement: "top",
+        placement: "left",
         x: 820,
         y: 490
       },
@@ -266,10 +280,11 @@
       temp: 32,
       hum: 7,
       diffPre: 1,
+      noInfo: false,
       pos: {
         visible: true,
         placement: "left",
-        x: 1200,
+        x: 1240,
         y: 490
       },
       info: {
@@ -279,6 +294,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