From c0b8b10db09a7087f1566ff7e9cda5a5741aa864 Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Thu, 15 Jun 2023 08:58:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=93=E6=89=91=E5=9B=BE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E6=9C=BA=E6=A2=B0=E5=88=86=E5=8E=82?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87new=20=E6=B7=BB=E5=8A=A0=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E5=99=A8=E8=8E=B7=E5=8F=96=E8=AE=BE=E5=A4=87=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/FactoryViewTopo/threeMap.vue | 26 ++------------------------
 src/views/Mechanics/indexNew.vue       |  7 +++++--
 2 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/src/views/FactoryViewTopo/threeMap.vue b/src/views/FactoryViewTopo/threeMap.vue
index e0cdba0..5928a97 100644
--- a/src/views/FactoryViewTopo/threeMap.vue
+++ b/src/views/FactoryViewTopo/threeMap.vue
@@ -666,7 +666,6 @@ const init = () => {
         TWEEN.update()
         controls.update()
         labelRenderer.render(scene, camera)
-        store.clearupdateSensorData()
         // reader(mesh_qcjt)
         window.requestAnimationFrame(render) //避免掉帧，就是一帧接一帧，逐帧，预备加载下一帧
     }
@@ -862,12 +861,13 @@ function createGlb(name) {
         mesh.position.set(-346, 0, 51);
         mesh.castShadow = true;
         mesh.receiveShadow = true;
+        mesh.name = name
         scene.add(mesh);
     }, undefined, function (error) {
 
         console.error(error);
 
-    });
+    });    
 }
 
 
@@ -1259,28 +1259,6 @@ onMounted(() => {
 
     //初始化场景
     init()
-    /**创建传感器 */
-    getSensorDataTimer = setInterval(() => {
-        if (store.sensorList.length > 0) {
-            store.sensorList.forEach((element: any) => {
-                let state = element.status ? 0x88e76a : 0xff0000;
-                let wallMesh = createBox(small_size, { x: element.x, y: 0, z: element.y }, state, true, element, element.icon)
-
-            });
-            clearInterval(getSensorDataTimer)
-        }
-    }, 100)
-
-    getDevDataTimer = setInterval(() => {
-        if (store.devdataList.length > 0) {
-
-            store.devdataList.forEach((element: any) => {
-                let state = element.status ? 0x88e76a : 0xff0000;
-                let wallMesh = createBox(small_size, { x: element.x, y: 0, z: element.y }, state, false, element, element.icon)
-            });
-            clearInterval(getDevDataTimer)
-        }
-    }, 100)
 
 
 
diff --git a/src/views/Mechanics/indexNew.vue b/src/views/Mechanics/indexNew.vue
index 5801778..76c5640 100644
--- a/src/views/Mechanics/indexNew.vue
+++ b/src/views/Mechanics/indexNew.vue
@@ -96,6 +96,7 @@ let scrollBoardConfig = reactive({
   data: []
 })
 let gatewayData = ref([])
+let devNumTimer: any = null
 //车间列表
 let facList = ref([])
 //机械分厂总数
@@ -188,7 +189,6 @@ onMounted(() => {
   // let Timedombox=Timedom.value
   window.document.title = t("messages.Mechanics");
   setTimeout(() => {
-    DevOverviewData.value = [{ title: '车间', value: [1, 2, 3] }]
     devFaultTipData.value = [
       { label: '111111', devName: '富怡精密绣花机', status: '故障' },
       { label: '222222', devName: '富怡精密绣花机', status: '故障' },
@@ -211,7 +211,9 @@ onMounted(() => {
     { label: '666666', devName: '富怡精密绣花机', on: 111, off: 222, stop: 333 },
     { label: '777777', devName: '富怡精密绣花机', on: 111, off: 222, stop: 333 }]
   }, 1000)
-
+  devNumTimer = setInterval(() => {
+    getDeviceTotelStatusMF()
+  }, 1000*60)
   gatewayOfMachineryFactoryfun()
   // gatcountsOfMachineryFactoryfun()
   //获取机械分厂设备总数
@@ -223,6 +225,7 @@ onMounted(() => {
 
 onUnmounted(() => {
   closeWebsocket();
+  clearInterval(devNumTimer)
 });
 </script>