From 626090cb8b25215878e22ebcd2e861742b22eea2 Mon Sep 17 00:00:00 2001 From: hzz Date: Wed, 24 May 2023 16:03:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=20=E4=BF=AE=E6=94=B9=E7=B2=89=E5=B0=98=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F=E5=90=8D=E7=A7=B0=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E7=8E=AF=E5=A2=83=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/module/Mechanics.ts | 16 +- src/store/moduleSocket.ts | 6 +- src/views/FactoryViewEdit/index.vue | 104 -- src/views/FactoryViewEdit/threeMap.vue | 955 ------------------ src/views/Mechanics/child/main/index.vue | 2 +- .../Mechanics/content/chart/equipment.vue | 3 - .../chart/humidity.vue | 6 +- src/views/generalEnvironment/index.vue | 2 +- src/views/pmData/index.vue | 11 +- .../content/chart/verticalNumLoop.vue | 2 +- 10 files changed, 24 insertions(+), 1083 deletions(-) delete mode 100644 src/views/FactoryViewEdit/index.vue delete mode 100644 src/views/FactoryViewEdit/threeMap.vue diff --git a/src/store/module/Mechanics.ts b/src/store/module/Mechanics.ts index 42f62c5..f2509af 100644 --- a/src/store/module/Mechanics.ts +++ b/src/store/module/Mechanics.ts @@ -191,7 +191,7 @@ export const useMechanicsStore = defineStore(Names.Mechanics, { if (ele.name == "H_ON") { data.push({ value: ele.counts, - name: "messages.work", + name: messages.work, itemStyle:{ color:'#91CC75' } @@ -201,7 +201,7 @@ export const useMechanicsStore = defineStore(Names.Mechanics, { if (ele.name == "H_IDLE") { data.push({ value: ele.counts, - name: "messages.halt", + name: messages.halt, itemStyle:{ color:'#AAAAAA' } @@ -211,7 +211,7 @@ export const useMechanicsStore = defineStore(Names.Mechanics, { if (ele.name == "H_OFF") { data.push({ value: ele.counts, - name:"messages.Standby", + name:messages.Standby, itemStyle:{ color:'#FAC858' } @@ -221,7 +221,7 @@ export const useMechanicsStore = defineStore(Names.Mechanics, { if (ele.name == "H_E_STOP") { data.push({ value: ele.counts, - name: "messages.STOP", + name: messages.STOP, itemStyle:{ color:'#EE6666' } @@ -232,7 +232,7 @@ export const useMechanicsStore = defineStore(Names.Mechanics, { if (status[0] == 0) { data.push({ value: null, - name: "messages.work", + name: messages.work, itemStyle:{ color:'#91CC75' } @@ -241,7 +241,7 @@ export const useMechanicsStore = defineStore(Names.Mechanics, { if (status[1] == 0) { data.push({ value: null, - name: "messages.halt", + name: messages.halt, itemStyle:{ color:'#AAAAAA' } @@ -250,7 +250,7 @@ export const useMechanicsStore = defineStore(Names.Mechanics, { if (status[2] == 0) { data.push({ value: null, - name: "messages.Standby", + name: messages.Standby, itemStyle:{ color:'#FAC858' } @@ -259,7 +259,7 @@ export const useMechanicsStore = defineStore(Names.Mechanics, { if (status[3] == 0) { data.push({ value: null, - name: "messages.halt", + name: messages.halt, itemStyle:{ color:'#EE6666' } diff --git a/src/store/moduleSocket.ts b/src/store/moduleSocket.ts index e852aab..d1f97b7 100644 --- a/src/store/moduleSocket.ts +++ b/src/store/moduleSocket.ts @@ -59,7 +59,7 @@ export const useSocketStore = defineStore(Names.socket, { "icon": "icon-yanwubaojingqi", "title": "烟雾检测", "limit": "100", - "unit": null, + "unit": 'ppm', "value": [ { "name": "精饰车间烟雾传感器", @@ -155,7 +155,7 @@ export const useSocketStore = defineStore(Names.socket, { } else { val.listData.forEach(res => { this.noise.listData.forEach(ele => { - if (res.name == ele.name) { + if (res.devId == ele.devId) { ele.value = res.value } }) @@ -196,7 +196,7 @@ export const useSocketStore = defineStore(Names.socket, { } else { val.Humiture.forEach(res => { this.humiture.Humiture.forEach(ele => { - if (res.name == ele.name) { + if (res.devId == ele.devId) { ele.humidity = res.humidity ele.temp = res.temp } diff --git a/src/views/FactoryViewEdit/index.vue b/src/views/FactoryViewEdit/index.vue deleted file mode 100644 index 2462023..0000000 --- a/src/views/FactoryViewEdit/index.vue +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - diff --git a/src/views/FactoryViewEdit/threeMap.vue b/src/views/FactoryViewEdit/threeMap.vue deleted file mode 100644 index ca82c06..0000000 --- a/src/views/FactoryViewEdit/threeMap.vue +++ /dev/null @@ -1,955 +0,0 @@ - - - - - diff --git a/src/views/Mechanics/child/main/index.vue b/src/views/Mechanics/child/main/index.vue index 7f6e486..3f5b247 100644 --- a/src/views/Mechanics/child/main/index.vue +++ b/src/views/Mechanics/child/main/index.vue @@ -11,7 +11,7 @@
- +
diff --git a/src/views/Mechanics/content/chart/equipment.vue b/src/views/Mechanics/content/chart/equipment.vue index 86b8acf..7d1b38f 100644 --- a/src/views/Mechanics/content/chart/equipment.vue +++ b/src/views/Mechanics/content/chart/equipment.vue @@ -34,9 +34,6 @@ const echartsData = reactive({ }); const setData = (value: any, type: number) => { - value.forEach(res=>{ - res.name=t(res.name) - }) echartsData.equipment!.div = inpie.value; echartsData.equipment!.title = props.title; diff --git a/src/views/electronicControlAmbient/chart/humidity.vue b/src/views/electronicControlAmbient/chart/humidity.vue index 0687079..ca6b753 100644 --- a/src/views/electronicControlAmbient/chart/humidity.vue +++ b/src/views/electronicControlAmbient/chart/humidity.vue @@ -140,7 +140,7 @@ const setData = (value: any) => { startAngle: 200, endAngle: -20, min: -30, - max: 70, + max: 50, progress: { show: false, width: 5 @@ -155,8 +155,8 @@ const setData = (value: any) => { lineStyle: { width: 10, color: [ - [0.46, '#1089E7'], - [0.58, '#7CFFB2'], + [0.575, '#1089E7'], + [0.725, '#7CFFB2'], [1, '#FF6E76'] ] } diff --git a/src/views/generalEnvironment/index.vue b/src/views/generalEnvironment/index.vue index 6e4a594..8af3a48 100644 --- a/src/views/generalEnvironment/index.vue +++ b/src/views/generalEnvironment/index.vue @@ -67,7 +67,7 @@ function getWebsocket(val) { headerref.value.HeadergetWebsocket(val) try { let data = JSON.parse(val); - if (data.type == "noise") { + if (data.type == "noise") { store.changenoise(data.msg); } if (data.type == "dust") { diff --git a/src/views/pmData/index.vue b/src/views/pmData/index.vue index aa0ad09..4641c16 100644 --- a/src/views/pmData/index.vue +++ b/src/views/pmData/index.vue @@ -3,7 +3,7 @@
+ :typeFun="['AbnormalData', 'time']" :alarmType="['dustAlarm']">
@@ -37,6 +37,7 @@ let pmtest = ref({ }) type pmData = { title: string, + devId:string, value: { two: string, ten: string @@ -52,8 +53,10 @@ async function getData() { if (resulttwo.code == 200) { resulttwo.data.forEach(res => { + let title = res.devName.split('粉尘') let temp = { - title: res.name + "(PM2.5/PM10)", + title: title[0] + "(PM2.5/PM10)", + devId:res.devId, value: { two: res.value, ten: '0' @@ -65,7 +68,7 @@ async function getData() { } if (resultten.code == 200) { resultten.data.forEach(res => { - let index = pmData.findIndex(item => item.title == res.name + "(PM2.5/PM10)") + let index = pmData.findIndex(item => item.devId == res.devId) if (index != -1) { pmData[index].value.ten = res.value @@ -81,7 +84,7 @@ function getWebsocket(val) { let data = JSON.parse(val); if (data.type == "dust") { - let index = pmData.findIndex(item => item.title == data.msg.name + "(PM2.5/PM10)") + let index = pmData.findIndex(item => item.devId == data.msg.devId) if (index != -1) { pmData[index].value.ten = data.msg.pm10 pmData[index].value.two = data.msg.pm25 diff --git a/src/views/realtimeSecurity/content/chart/verticalNumLoop.vue b/src/views/realtimeSecurity/content/chart/verticalNumLoop.vue index 9e5f2d7..d87af79 100644 --- a/src/views/realtimeSecurity/content/chart/verticalNumLoop.vue +++ b/src/views/realtimeSecurity/content/chart/verticalNumLoop.vue @@ -73,7 +73,7 @@ let props = defineProps<{ title: string; icon: string; limit: string | number; - unit: string; + unit: string|null; value: Array; }>(); let keynum = ref(0);