diff --git a/src/views/PaintShopView/View1/top.vue b/src/views/PaintShopView/View1/top.vue index c7aa413..9d06f5b 100644 --- a/src/views/PaintShopView/View1/top.vue +++ b/src/views/PaintShopView/View1/top.vue @@ -268,7 +268,7 @@ function setcontentData(val) { return { name: item.name, val: item.data,status:item.status }; }); verticalNum3.value.setData(val.FIRE, 'icon-weibiaoti1', 0, "") - verticalNum4.value.setData(noise, 'icon-shengyin', 120, "dB") + verticalNum4.value.setData(noise, 'icon-shengyin', 85, "dB") verticalNum5.value.setData(Smoke, 'icon-yanwubaojingqi', 100, "PPM") verticalNum6.value.setData(CH2O, 'icon-app_icons--', 0.08, "mg/m3") verticalNum7.value.setData(TVOC, 'icon-TVOC-Outlined', 0.5, "mg/m3") diff --git a/src/views/PaintShopView/finishView/top.vue b/src/views/PaintShopView/finishView/top.vue index ea913a8..e9bee6c 100644 --- a/src/views/PaintShopView/finishView/top.vue +++ b/src/views/PaintShopView/finishView/top.vue @@ -281,7 +281,7 @@ let temp_humi_index = 0 return { name: item.name, val: item.data,status:item.status }; }); // verticalNum3.value.setData(val.FIRE,'icon-ranqi',5,"") - verticalNum4.value.setData(noise,'icon-shengyin',120,"dB") + verticalNum4.value.setData(noise,'icon-shengyin',85,"dB") // verticalNum5.value.setData(val.Smoke,'icon-yanwubaojingqi',200,"") verticalNum6.value.setData(CH2O,'icon-app_icons--',0.08,"mg/m3") verticalNum7.value.setData(TVOC,'icon-TVOC-Outlined',0.5,"mg/m3") diff --git a/src/views/PaintShopView/machiningView/top.vue b/src/views/PaintShopView/machiningView/top.vue index 9056166..fb2a089 100644 --- a/src/views/PaintShopView/machiningView/top.vue +++ b/src/views/PaintShopView/machiningView/top.vue @@ -281,7 +281,7 @@ let temp_humi_index = 0 return { name: item.name, val: item.data,status:item.status }; }); // verticalNum3.value.setData(val.FIRE,'icon-ranqi',5,"") - verticalNum4.value.setData(noise,'icon-shengyin',120,"dB") + verticalNum4.value.setData(noise,'icon-shengyin',85,"dB") // verticalNum5.value.setData(val.Smoke,'icon-yanwubaojingqi',200,"") verticalNum6.value.setData(CH2O,'icon-app_icons--',0.08,"mg/m3") verticalNum7.value.setData(TVOC,'icon-TVOC-Outlined',0.5,"mg/m3") diff --git a/src/views/PaintShopView/stuffView/top.vue b/src/views/PaintShopView/stuffView/top.vue index 2b87281..98ea596 100644 --- a/src/views/PaintShopView/stuffView/top.vue +++ b/src/views/PaintShopView/stuffView/top.vue @@ -281,7 +281,7 @@ function setcontentData(val) { return { name: item.name, val: item.data,status:item.status }; }); // verticalNum3.value.setData(val.FIRE,'icon-ranqi',5,"") - verticalNum4.value.setData(noise, 'icon-shengyin', 120, "dB") + verticalNum4.value.setData(noise, 'icon-shengyin', 85, "dB") // verticalNum5.value.setData(val.Smoke,'icon-yanwubaojingqi',200,"") verticalNum6.value.setData(CH2O, 'icon-app_icons--', 0.08, "mg/m3") verticalNum7.value.setData(TVOC, 'icon-TVOC-Outlined', 0.5, "mg/m3") diff --git a/src/views/PaintShopView/weldView/top.vue b/src/views/PaintShopView/weldView/top.vue index 968ed99..08d5c49 100644 --- a/src/views/PaintShopView/weldView/top.vue +++ b/src/views/PaintShopView/weldView/top.vue @@ -280,7 +280,7 @@ function setcontentData(val) { return { name: item.name, val: item.data,status:item.status }; }); // verticalNum3.value.setData(val.FIRE,'icon-ranqi',5,"") - verticalNum4.value.setData(noise, 'icon-shengyin', 120, "dB") + verticalNum4.value.setData(noise, 'icon-shengyin', 85, "dB") // verticalNum5.value.setData(val.Smoke,'icon-yanwubaojingqi',200,"") verticalNum6.value.setData(CH2O, 'icon-app_icons--', 0.08, "mg/m3") verticalNum7.value.setData(TVOC, 'icon-TVOC-Outlined', 0.5, "mg/m3") diff --git a/src/views/electronicControlAmbient/top.vue b/src/views/electronicControlAmbient/top.vue index a5f398b..87b6ee0 100644 --- a/src/views/electronicControlAmbient/top.vue +++ b/src/views/electronicControlAmbient/top.vue @@ -261,7 +261,7 @@ function setcontentData(val) { }); // verticalNum3.value.setData(val.FIRE,'icon-ranqi',5,"") - verticalNum4.value.setData(noise, 'icon-shengyin', 120, "dB") + verticalNum4.value.setData(noise, 'icon-shengyin', 85, "dB") // verticalNum5.value.setData(val.Smoke,'icon-yanwubaojingqi',200,"") // verticalNum6.value.setData(val.TVOC_CH2O.CH2O,'icon-app_icons--',5,"mg/m3") // verticalNum7.value.setData(val.TVOC_CH2O.TVOC,'icon-TVOC-Outlined',5,"PPM") diff --git a/src/views/generalEnvironmentMechanical/index.vue b/src/views/generalEnvironmentMechanical/index.vue index 448aecf..24a7514 100644 --- a/src/views/generalEnvironmentMechanical/index.vue +++ b/src/views/generalEnvironmentMechanical/index.vue @@ -343,12 +343,27 @@ async function getpipeDatafun() { } } /************************************************************ */ +let noiseData = [ + '55aaf760-4e88-11ed-b6af-15994988a6b3', + '8733fe40-4e82-11ed-b6af-15994988a6b3', + 'cae16000-4e88-11ed-b6af-15994988a6b3', + '08144ba0-4e88-11ed-b6af-15994988a6b3', + '2a5f6600-4e87-11ed-b6af-15994988a6b3' +] //socket function getWebsocket(val) { headerref.value.HeadergetWebsocket(val) try { let data = JSON.parse(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 } + store.changeNewVerticalNum({ type: 'noise', data: verticalData }) + } + }) + } //精饰车间燃气监测 if (data.type == "paintingGas") { let verticalData = { name: data.msg.devName, val: data.msg.paintingGas.value, devId: data.msg.devId }