From 8410121fc91baaf1995131f161a7ff357b09610f Mon Sep 17 00:00:00 2001 From: hzz Date: Tue, 6 Jun 2023 18:07:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A03D=E6=8B=93=E6=89=91=E5=9B=BE?= =?UTF-8?q?=E9=A1=B5=20=E4=BF=AE=E6=94=B93D=E5=88=86=E5=B8=83=E5=9B=BEWIFI?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=20=E5=BC=80=E5=8F=91=E4=BC=A0=E6=84=9F?= =?UTF-8?q?=E5=99=A8=E8=B6=8B=E5=8A=BF=E5=9B=BE=E9=A1=B5=E9=9D=A2=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=89=E5=85=A8=E5=A4=A7=E5=B1=8F=20?= =?UTF-8?q?=E5=92=8C=E6=9C=BA=E6=A2=B0=E5=88=86=E5=8E=82=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 13 + src/router/index.ts | 16 + src/store/moduleSocket.ts | 2 +- src/store/moduleSocketjixie.ts | 5 +- src/views/FactoryView/threeMap.vue | 24 +- src/views/FactoryViewTopo/index.vue | 138 ++ src/views/FactoryViewTopo/statusBar.vue | 188 +++ src/views/FactoryViewTopo/threeMap.vue | 1264 +++++++++++++++++ src/views/TrendChart/index.vue | 98 ++ src/views/TrendChart/lineChart.vue | 128 ++ src/views/realtimeSecurity/index.vue | 14 +- .../realtimeSecurityJixiefenchang/index.vue | 18 +- 12 files changed, 1879 insertions(+), 29 deletions(-) create mode 100644 src/views/FactoryViewTopo/index.vue create mode 100644 src/views/FactoryViewTopo/statusBar.vue create mode 100644 src/views/FactoryViewTopo/threeMap.vue create mode 100644 src/views/TrendChart/index.vue create mode 100644 src/views/TrendChart/lineChart.vue diff --git a/src/App.vue b/src/App.vue index b75b8ad..23529b3 100644 --- a/src/App.vue +++ b/src/App.vue @@ -45,4 +45,17 @@ nav a { nav a.router-link-exact-active { color: #42b983; } +body { + +/* --content:calc(100vh - var(--header)) */ +overflow: hidden !important; +-ms-overflow-style: none; +/* IE + Edge */ +scrollbar-width: none; +/* Firefox */ +} + +::-webkit-scrollbar { +display: none; +} diff --git a/src/router/index.ts b/src/router/index.ts index ee35d88..bec05ce 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -160,6 +160,11 @@ const routes: Array = [ name: "FactoryView", component: () => import("../views/FactoryView/index.vue"), }, + { + path: "/FactoryViewTopo", + name: "FactoryViewTopo", + component: () => import("../views/FactoryViewTopo/index.vue"), + }, { path: "/FactoryView/:type", name: "FactoryViewEdit", @@ -231,6 +236,17 @@ const routes: Array = [ name: "OffsiteDevList", component: () => import("../views/Temp/OffsiteDevList/index.vue"), }, + { + path: "/TrendChart", + name: "TrendChart", + component: () => import("../views/TrendChart/index.vue"), + }, + + + + + + //理论二级 { path: "/Mechanics/:id", diff --git a/src/store/moduleSocket.ts b/src/store/moduleSocket.ts index 1a9d5c6..9e83ebe 100644 --- a/src/store/moduleSocket.ts +++ b/src/store/moduleSocket.ts @@ -341,7 +341,7 @@ export const useSocketStore = defineStore(Names.socket, { let pIndex = this.newVerticalNum.findIndex(item => item.type == val.type) let cIndex = null if (pIndex != -1) { - cIndex = this.newVerticalNum[pIndex].value.findIndex(item => item.name == val.data.name) + cIndex = this.newVerticalNum[pIndex].value.findIndex(item => item.devId == val.data.devId) } if (cIndex != -1) { if (val.data.val > this.newVerticalNum[pIndex].limit) { diff --git a/src/store/moduleSocketjixie.ts b/src/store/moduleSocketjixie.ts index a16b67e..f5772d7 100644 --- a/src/store/moduleSocketjixie.ts +++ b/src/store/moduleSocketjixie.ts @@ -320,11 +320,13 @@ export const useSocketStore = defineStore(Names.socketjixiefenchang,{ }, //更新 新的安全检测数据 changeNewVerticalNum(val) { + console.log(val); + //{"type":"Smoke","data":{"name":"精饰车间烟雾传感器","val":"100"}} let pIndex = this.newVerticalNum.findIndex(item => item.type == val.type) let cIndex = null if (pIndex != -1) { - cIndex = this.newVerticalNum[pIndex].value.findIndex(item => item.name == val.data.name) + cIndex = this.newVerticalNum[pIndex].value.findIndex(item => item.devId == val.data.devId) } if (cIndex != -1) { if (val.data.val>this.newVerticalNum[pIndex].limit) { @@ -343,6 +345,7 @@ export const useSocketStore = defineStore(Names.socketjixiefenchang,{ this.newVerticalNum[pIndex].value[cIndex].time = null } this.newVerticalNum[pIndex].value[cIndex].val = val.data.val + this.newVerticalNum[pIndex].value[cIndex].status = true } } } diff --git a/src/views/FactoryView/threeMap.vue b/src/views/FactoryView/threeMap.vue index b3327af..c33f7f5 100644 --- a/src/views/FactoryView/threeMap.vue +++ b/src/views/FactoryView/threeMap.vue @@ -414,22 +414,22 @@ const init = () => { /*创建wifi */ //机加 - createWifi({ x: -46.96, y: 2, z: 156.57 }) + createWifi({ x: -46.96, y: 3, z: 156.57 }) //大件 - createWifi({ x: 52.60, y: 2, z: 96.44 }) - createWifi({ x: 52.60, y: 2, z: 157.07 }) + createWifi({ x: 52.60, y: 3, z: 96.44 }) + createWifi({ x: 52.60, y: 3, z: 157.07 }) //精饰 - createWifi({ x: 133.14, y: 2, z: 107.43 }) - createWifi({ x: 133.14, y: 2, z: 156.25 }) + createWifi({ x: 133.14, y: 3, z: 107.43 }) + createWifi({ x: 133.14, y: 3, z: 156.25 }) //焊接 - createWifi({ x: 305.73, y: 2, z: 110.45 }) - createWifi({ x: 305.73, y: 2, z: 238.67 }) + createWifi({ x: 305.73, y: 3, z: 110.45 }) + createWifi({ x: 305.73, y: 3, z: 238.67 }) //服装 createWifi({ x: -89.13, y: 4, z: -245.33 }) - createWifi({ x: -132.07, y: 2, z: -245.33 }) - createWifi({ x: -222.31, y: 2, z: -245.33 }) - createWifi({ x: -119.3, y: 2, z: -114.15 }) - createWifi({ x: -176.45, y: 2, z: -114.40 }) + createWifi({ x: -132.07, y: 3, z: -245.33 }) + createWifi({ x: -222.31, y: 3, z: -245.33 }) + createWifi({ x: -119.3, y: 3, z: -114.15 }) + createWifi({ x: -176.45, y: 3, z: -114.40 }) //家纺 医防 createWifi({ x: 140.83, y: 2, z: -197.34 }) @@ -771,7 +771,7 @@ function createWifi(position: positionType) { loader.load('/models/glb/tothefuture_wifi.glb', function (gltf) { const mesh = gltf.scene.children[0]; - const s = 0.3; + const s = 0.5; mesh.scale.set(s, s, s); mesh.position.set(position.x, position.y, position.z); // mesh.rotation.x = THREE.MathUtils.degToRad(270) diff --git a/src/views/FactoryViewTopo/index.vue b/src/views/FactoryViewTopo/index.vue new file mode 100644 index 0000000..df70c1f --- /dev/null +++ b/src/views/FactoryViewTopo/index.vue @@ -0,0 +1,138 @@ + + + + + + diff --git a/src/views/FactoryViewTopo/statusBar.vue b/src/views/FactoryViewTopo/statusBar.vue new file mode 100644 index 0000000..0216a91 --- /dev/null +++ b/src/views/FactoryViewTopo/statusBar.vue @@ -0,0 +1,188 @@ + + + + + + diff --git a/src/views/FactoryViewTopo/threeMap.vue b/src/views/FactoryViewTopo/threeMap.vue new file mode 100644 index 0000000..23577f9 --- /dev/null +++ b/src/views/FactoryViewTopo/threeMap.vue @@ -0,0 +1,1264 @@ + + + + + diff --git a/src/views/TrendChart/index.vue b/src/views/TrendChart/index.vue new file mode 100644 index 0000000..6aef3b0 --- /dev/null +++ b/src/views/TrendChart/index.vue @@ -0,0 +1,98 @@ + + + + + + diff --git a/src/views/TrendChart/lineChart.vue b/src/views/TrendChart/lineChart.vue new file mode 100644 index 0000000..5af3e3a --- /dev/null +++ b/src/views/TrendChart/lineChart.vue @@ -0,0 +1,128 @@ + + + + + diff --git a/src/views/realtimeSecurity/index.vue b/src/views/realtimeSecurity/index.vue index d9355fe..06156ab 100644 --- a/src/views/realtimeSecurity/index.vue +++ b/src/views/realtimeSecurity/index.vue @@ -77,7 +77,7 @@ function getWebsocket(val) { //精饰车间燃气监测 if (data.type == "paintingGas") { store.changepaintingGas(data.msg); - let verticalData = {name:data.msg.devName,val:data.msg.paintingGas.value} + let verticalData = {name:data.msg.devName,val:data.msg.paintingGas.value,devId:data.msg.devId} store.changeNewVerticalNum({type:'Methane',data:verticalData}) } @@ -85,7 +85,7 @@ function getWebsocket(val) { if (data.type == "boilerGas") { // store.changePM(data.msg) store.changeboilerGas(data.msg.boilerGas); - let verticalData = {name:data.msg.devName,val:data.msg.boilerGas.value} + let verticalData = {name:data.msg.devName,val:data.msg.boilerGas.value,devId:data.msg.devId} store.changeNewVerticalNum({type:'Methane',data:verticalData}) } @@ -93,15 +93,15 @@ function getWebsocket(val) { if (data.type == "canteenGas") { // store.changeHumiture(data.msg) store.changecanteenGas(data.msg.canteenGas); - let verticalData = {name:data.msg.devName,val:data.msg.canteenGas.value} + let verticalData = {name:data.msg.devName,val:data.msg.canteenGas.value,devId:data.msg.devId} store.changeNewVerticalNum({type:'Methane',data:verticalData}) } //甲醛TVOC if (data.type == "TVOC_CH2O") { store.changeTVOC_CH2O(data.msg); - let verticalData_TVOC = {name:data.msg.TVOC.name,val:data.msg.TVOC.value} + let verticalData_TVOC = {name:data.msg.TVOC.name,val:data.msg.TVOC.value,devId:data.msg.TVOC.devId} store.changeNewVerticalNum({type:'TVOC',data:verticalData_TVOC}) - let verticalData_CH2O = {name:data.msg.CH2O.name,val:data.msg.CH2O.value} + let verticalData_CH2O = {name:data.msg.CH2O.name,val:data.msg.CH2O.value,devId:data.msg.CH2O.devId} store.changeNewVerticalNum({type:'CH2O',data:verticalData_CH2O}) } @@ -109,7 +109,7 @@ function getWebsocket(val) { if (data.type == "flame") { // store.changeHumiture(data.msg) store.changeflame(data.msg.flame); - let verticalData = {name:data.msg.devName,val:data.msg.flame.value} + let verticalData = {name:data.msg.devName,val:data.msg.flame.value,devId:data.msg.devId} store.changeNewVerticalNum({type:'FIRE',data:verticalData}) @@ -119,7 +119,7 @@ function getWebsocket(val) { // store.changeHumiture(data.msg) // store.changepaintingGas(data.msg) store.changesmoke(data.msg.smoke); - let verticalData = {name:data.msg.devName,val:data.msg.smoke.value} + let verticalData = {name:data.msg.devName,val:data.msg.smoke.value,devId:data.msg.devId} store.changeNewVerticalNum({type:'Smoke',data:verticalData}) // console.log(JSON.stringify({type:'Smoke',data:verticalData}),"烟雾传感器"); } diff --git a/src/views/realtimeSecurityJixiefenchang/index.vue b/src/views/realtimeSecurityJixiefenchang/index.vue index 9c34fda..2d2e99f 100644 --- a/src/views/realtimeSecurityJixiefenchang/index.vue +++ b/src/views/realtimeSecurityJixiefenchang/index.vue @@ -77,7 +77,7 @@ function getWebsocket(val) { //精饰车间燃气监测 if (data.type == "paintingGas") { store.changepaintingGas(data.msg); - let verticalData = {name:data.msg.devName,val:data.msg.paintingGas.value} + let verticalData = {name:data.msg.devName,val:data.msg.paintingGas.value,devId:data.msg.devId} store.changeNewVerticalNum({type:'Methane',data:verticalData}) } @@ -85,7 +85,7 @@ function getWebsocket(val) { if (data.type == "boilerGas") { // store.changePM(data.msg) store.changeboilerGas(data.msg.boilerGas); - let verticalData = {name:data.msg.devName,val:data.msg.boilerGas.value} + let verticalData = {name:data.msg.devName,val:data.msg.boilerGas.value,devId:data.msg.devId} store.changeNewVerticalNum({type:'Methane',data:verticalData}) } @@ -93,15 +93,17 @@ function getWebsocket(val) { if (data.type == "canteenGas") { // store.changeHumiture(data.msg) store.changecanteenGas(data.msg.canteenGas); - let verticalData = {name:data.msg.devName,val:data.msg.canteenGas.value} + let verticalData = {name:data.msg.devName,val:data.msg.canteenGas.value,devId:data.msg.devId} store.changeNewVerticalNum({type:'Methane',data:verticalData}) } //甲醛TVOC - if (data.type == "TVOC_CH2O") { + if (data.type == "TVOC_CH2O") { + console.log(data.msg,"TVOC_CH2O"); + store.changeTVOC_CH2O(data.msg); - let verticalData_TVOC = {name:data.msg.TVOC.name,val:data.msg.TVOC.value} + let verticalData_TVOC = {name:data.msg.TVOC.name,val:data.msg.TVOC.value,devId:data.msg.TVOC.devId} store.changeNewVerticalNum({type:'TVOC',data:verticalData_TVOC}) - let verticalData_CH2O = {name:data.msg.CH2O.name,val:data.msg.CH2O.value} + let verticalData_CH2O = {name:data.msg.CH2O.name,val:data.msg.CH2O.value,devId:data.msg.CH2O.devId} store.changeNewVerticalNum({type:'CH2O',data:verticalData_CH2O}) } @@ -109,7 +111,7 @@ function getWebsocket(val) { if (data.type == "flame") { // store.changeHumiture(data.msg) store.changeflame(data.msg.flame); - let verticalData = {name:data.msg.devName,val:data.msg.flame.value} + let verticalData = {name:data.msg.devName,val:data.msg.flame.value,devId:data.msg.devId} store.changeNewVerticalNum({type:'FIRE',data:verticalData}) @@ -119,7 +121,7 @@ function getWebsocket(val) { // store.changeHumiture(data.msg) // store.changepaintingGas(data.msg) store.changesmoke(data.msg.smoke); - let verticalData = {name:data.msg.devName,val:data.msg.smoke.value} + let verticalData = {name:data.msg.devName,val:data.msg.smoke.value,devId:data.msg.devId} store.changeNewVerticalNum({type:'Smoke',data:verticalData}) // console.log(JSON.stringify({type:'Smoke',data:verticalData}),"烟雾传感器"); }