From a7eb4dc5be36baebf6d60cf2eaf40d38e7d0264f Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Fri, 18 Jul 2025 14:34:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BD=8E=E6=88=90=E6=9C=AC=E5=8F=AA?=
 =?UTF-8?q?=E6=9C=89=E6=97=A0=E7=BA=BF=E6=8E=A2=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/home/Environment.vue |  8 ++---
 src/stores/homeStore.ts             | 62 +++++++++++++++++++++++++++----------
 src/types/home.d.ts                 |  1 +
 src/views/home/index.vue            | 38 ++++++++++++++++++-----
 4 files changed, 81 insertions(+), 28 deletions(-)

diff --git a/src/components/home/Environment.vue b/src/components/home/Environment.vue
index 46a16aa..58989c0 100644
--- a/src/components/home/Environment.vue
+++ b/src/components/home/Environment.vue
@@ -1,7 +1,6 @@
 <script lang="ts" setup>
 import { sendCmd } from 'apis/system'
 import homeInside from 'assets/images/home/home-inside.svg'
-import homeProbe1 from 'assets/images/home/home-probe1.svg'
 import homeProbe2 from 'assets/images/home/home-probe2.svg'
 import { FtMessage } from 'libs/message'
 import { roundNumber } from 'libs/utils'
@@ -50,7 +49,8 @@ const aliasName = ref(props.envParams.aliasName)
  */
 const imgs: Record<string, any> = {
   Internal: homeInside,
-  WiredExtSensor: homeProbe1,
+  // WiredExtSensor: homeProbe1,
+  WiredExtSensor: homeProbe2,
   WirelessExtSensor: homeProbe2,
 }
 
@@ -100,8 +100,8 @@ const showInput = () => {
   <div class="box">
     <div class="title">
       <div style="width: 100%; display: flex; align-items: center">
-        <img :src="imgs[envParams.type] || homeInside" alt="" style="margin-right: 10px"> {{ titles[envParams.type]
-        }}{{ envParams.id }}
+        <img :src="imgs[envParams.type] || homeInside" alt="" style="margin-right: 10px"> {{ titles[envParams.type] }}
+        <!--        {{ envParams.type === 'Internal' ? '' : envParams.id }} -->
       </div>
 
       <el-tag v-if="!envParams.isOnline" type="danger">
diff --git a/src/stores/homeStore.ts b/src/stores/homeStore.ts
index 1a2deaf..5e4c311 100644
--- a/src/stores/homeStore.ts
+++ b/src/stores/homeStore.ts
@@ -27,7 +27,7 @@ const h2O2Data: Home.DisplayrelyMgrParams[] = [deviceTypeMap.PipeDM, deviceTypeM
       {
         type: 'WirelessExtSensor',
         isOnline: false,
-        sensorId: 1,
+        id: 1,
         temp: -1,
         rh: -1,
         rs: -1,
@@ -36,7 +36,7 @@ const h2O2Data: Home.DisplayrelyMgrParams[] = [deviceTypeMap.PipeDM, deviceTypeM
       {
         type: 'WirelessExtSensor',
         isOnline: false,
-        sensorId: 2,
+        id: 2,
         temp: -1,
         rh: -1,
         rs: -1,
@@ -45,7 +45,7 @@ const h2O2Data: Home.DisplayrelyMgrParams[] = [deviceTypeMap.PipeDM, deviceTypeM
       {
         type: 'WirelessExtSensor',
         isOnline: false,
-        sensorId: 3,
+        id: 3,
         temp: -1,
         rh: -1,
         rs: -1,
@@ -54,7 +54,7 @@ const h2O2Data: Home.DisplayrelyMgrParams[] = [deviceTypeMap.PipeDM, deviceTypeM
       {
         type: 'WirelessExtSensor',
         isOnline: false,
-        sensorId: 4,
+        id: 4,
         temp: -1,
         rh: -1,
         rs: -1,
@@ -63,7 +63,7 @@ const h2O2Data: Home.DisplayrelyMgrParams[] = [deviceTypeMap.PipeDM, deviceTypeM
       {
         type: 'WirelessExtSensor',
         isOnline: false,
-        sensorId: 5,
+        id: 5,
         temp: -1,
         rh: -1,
         rs: -1,
@@ -72,7 +72,7 @@ const h2O2Data: Home.DisplayrelyMgrParams[] = [deviceTypeMap.PipeDM, deviceTypeM
       {
         type: 'WirelessExtSensor',
         isOnline: false,
-        sensorId: 6,
+        id: 6,
         temp: -1,
         rh: -1,
         rs: -1,
@@ -91,7 +91,7 @@ const h2O2Data: Home.DisplayrelyMgrParams[] = [deviceTypeMap.PipeDM, deviceTypeM
       {
         type: 'WiredExtSensor',
         isOnline: false,
-        sensorId: 1,
+        id: 1,
         temp: -1,
         rh: -1,
         rs: -1,
@@ -100,7 +100,7 @@ const h2O2Data: Home.DisplayrelyMgrParams[] = [deviceTypeMap.PipeDM, deviceTypeM
       {
         type: 'WiredExtSensor',
         isOnline: false,
-        sensorId: 2,
+        id: 2,
         temp: -1,
         rh: -1,
         rs: -1,
@@ -110,7 +110,7 @@ const h2O2Data: Home.DisplayrelyMgrParams[] = [deviceTypeMap.PipeDM, deviceTypeM
         type: 'WirelessExtSensor',
         isOnline: false,
         temp: -1,
-        sensorId: 1,
+        id: 1,
         rh: -1,
         rs: -1,
         h2o2: -1,
@@ -118,7 +118,7 @@ const h2O2Data: Home.DisplayrelyMgrParams[] = [deviceTypeMap.PipeDM, deviceTypeM
       {
         type: 'WirelessExtSensor',
         isOnline: false,
-        sensorId: 2,
+        id: 2,
         temp: -1,
         rh: -1,
         rs: -1,
@@ -127,7 +127,34 @@ const h2O2Data: Home.DisplayrelyMgrParams[] = [deviceTypeMap.PipeDM, deviceTypeM
       {
         type: 'WirelessExtSensor',
         isOnline: false,
-        sensorId: 3,
+        id: 3,
+        temp: -1,
+        rh: -1,
+        rs: -1,
+        h2o2: -1,
+      },
+      {
+        type: 'WirelessExtSensor',
+        isOnline: false,
+        id: 4,
+        temp: -1,
+        rh: -1,
+        rs: -1,
+        h2o2: -1,
+      },
+      {
+        type: 'WirelessExtSensor',
+        isOnline: false,
+        id: 5,
+        temp: -1,
+        rh: -1,
+        rs: -1,
+        h2o2: -1,
+      },
+      {
+        type: 'WirelessExtSensor',
+        isOnline: false,
+        id: 6,
         temp: -1,
         rh: -1,
         rs: -1,
@@ -172,11 +199,14 @@ export const useHomeStore = defineStore('home', () => {
   const setLog = (data: any) => {
     realLog.value = data
   }
-  watch(() => disinfectionState.value.state, () => {
-    if (disinfectionState.value.state === 'idle' || disinfectionState.value.state === 'finished') {
-      disinfectionState.value.nlog = 0
-    }
-  })
+  watch(
+    () => disinfectionState.value.state,
+    () => {
+      if (disinfectionState.value.state === 'idle' || disinfectionState.value.state === 'finished') {
+        disinfectionState.value.nlog = 0
+      }
+    },
+  )
   /**
    * @function updateHomeData
    * @param {Home.DisplayrelyMgr[]} data - 当前设备所有环境数据（仓内、探头）
diff --git a/src/types/home.d.ts b/src/types/home.d.ts
index 78a97ca..21dfc64 100644
--- a/src/types/home.d.ts
+++ b/src/types/home.d.ts
@@ -11,6 +11,7 @@ declare namespace Home {
     title?: string
     chartId?: string
     isOnline?: boolean
+    id?: number
   }
   interface DisplayrelyMgrs {
     internalSensorNum: number // 内置传感器数量
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 8893acd..8abdb58 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -102,16 +102,34 @@ const deviceType = computed(() => {
       <div
         class="home-left"
         :style="{
-          'grid-template-rows': deviceType === deviceStore.deviceTypeMap.DrawBarDM ? 'repeat(1, 1fr)' : 'repeat(2, 1fr)',
+          'grid-template-rows': [
+            deviceStore.deviceTypeMap.DrawBarDM,
+            deviceStore.deviceTypeMap.LargeSpaceDM_B,
+          ].includes(deviceType)
+            ? 'repeat(1, 1fr)'
+            : 'repeat(2, 1fr)',
         }"
       >
-        <div class="left-box" :class="{ 'left-box-1': [deviceStore.deviceTypeMap.DrawBarDM].includes(deviceType) }">
+        <div
+          class="left-box"
+          :class="{
+            'left-box-1': [deviceStore.deviceTypeMap.DrawBarDM].includes(deviceType),
+          }"
+        >
           <el-card
-            v-for="item in homeStore.h2O2SensorData.filter(item =>
-              [deviceStore.deviceTypeMap.DrawBarDM].includes(deviceType)
-                ? item.type === 'Internal'
-                : item.type !== 'WirelessExtSensor',
-            )"
+            v-for="item in homeStore.h2O2SensorData
+              .filter(item =>
+                [deviceStore.deviceTypeMap.DrawBarDM, deviceStore.deviceTypeMap.LargeSpaceDM_B].includes(deviceType)
+                  ? item.type === 'Internal'
+                  : item.type !== 'WirelessExtSensor',
+              )
+              .concat(
+                [deviceStore.deviceTypeMap.LargeSpaceDM_B].includes(deviceType)
+                  ? homeStore.h2O2SensorData
+                    .filter(item => item.type === 'WirelessExtSensor')
+                    .filter((item, index) => index < 2)
+                  : [],
+              )"
             :key="item.sensorId"
             class="card"
             :class="{
@@ -172,7 +190,11 @@ const deviceType = computed(() => {
         </div>
         <div v-if="deviceType !== deviceStore.deviceTypeMap.DrawBarDM" class="left-box">
           <el-card
-            v-for="item in homeStore.h2O2SensorData.filter(item => item.type === 'WirelessExtSensor')"
+            v-for="item in homeStore.h2O2SensorData
+              .filter(item => item.type === 'WirelessExtSensor')
+              .filter((item, index) =>
+                [deviceStore.deviceTypeMap.LargeSpaceDM_B].includes(deviceType) ? index > 1 : true,
+              )"
             :key="item.sensorId"
             class="card"
           >