From 3305a5d08037ca1e32756cd0ab9bf773f95d2674 Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Wed, 28 Jun 2023 18:05:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A3=B0=E9=9F=B3=E4=BC=A0?=
 =?UTF-8?q?=E6=84=9F=E5=99=A8=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/moduleSocketMechanics.ts               | 3 ++-
 src/views/Mechanics/components/ringChart.vue     | 2 +-
 src/views/generalEnvironmentMechanical/index.vue | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/store/moduleSocketMechanics.ts b/src/store/moduleSocketMechanics.ts
index c0f9f1f..bcb2b07 100644
--- a/src/store/moduleSocketMechanics.ts
+++ b/src/store/moduleSocketMechanics.ts
@@ -200,7 +200,8 @@ export const useSocketStore = defineStore(Names.socketMechanics, {
                     this.newVerticalNum[pIndex].value[cIndex].time = null
                 }
                 this.newVerticalNum[pIndex].value[cIndex].val = val.data.val
-                this.newVerticalNum[pIndex].value[cIndex].status = true
+                this.newVerticalNum[pIndex].value[cIndex].status = val.data.hasOwnProperty('status')?val.data.status:true 
+                
             }
         },
         /**
diff --git a/src/views/Mechanics/components/ringChart.vue b/src/views/Mechanics/components/ringChart.vue
index 7c7ce41..c9d20a6 100644
--- a/src/views/Mechanics/components/ringChart.vue
+++ b/src/views/Mechanics/components/ringChart.vue
@@ -68,7 +68,7 @@ const init = () => {
                 labelLine: {
                     show: true,
                 },
-                top: '10%',
+                top: '13%',
                 data: prop.data,
             },
         ],
diff --git a/src/views/generalEnvironmentMechanical/index.vue b/src/views/generalEnvironmentMechanical/index.vue
index 24a7514..ac02798 100644
--- a/src/views/generalEnvironmentMechanical/index.vue
+++ b/src/views/generalEnvironmentMechanical/index.vue
@@ -154,7 +154,7 @@ async function getSensorData() {
                 devId: item.devId,
                 name: item.name + '噪音监测',
                 type: 'noise',
-                status: true,
+                status: item.status,
                 val: item.value,
             }
         })
@@ -359,7 +359,7 @@ function getWebsocket(val) {
         if (data.type == "noise") {
             data.msg.listData.forEach(ele => {
                 if (noiseData.indexOf(ele.devId) > -1) {
-                    let verticalData = { name: ele.name, val: ele.value, devId: ele.devId }                    
+                    let verticalData = { name: ele.name, val: ele.value, devId: ele.devId,status:ele.status }                    
                     store.changeNewVerticalNum({ type: 'noise', data: verticalData })
                 }
             })