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 }) } })