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