From fd47f109744c98ebce40b03386ac79458255ba5e Mon Sep 17 00:00:00 2001 From: Hcat <2768237203@qq.com> Date: Fri, 1 Mar 2024 21:50:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BB=96=E6=9D=B0=EF=BC=9A=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=A8=A1=E5=BC=8F=E7=9A=84=E9=9A=A7=E9=81=93?= =?UTF-8?q?=E5=88=87=E6=8D=A2bug=E5=92=8C=E7=BC=96=E8=BE=91=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E6=B7=BB=E5=8A=A0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../content/tunnelScene/PreviewScene.vue | 9 ++- .../content/tunnelScene/TunnelScene.vue | 8 +- .../tunnelScene/editEquComp/editDialog.vue | 35 ++------- .../sceneClass/editEquipment/index.js | 75 ++++++++++++------- .../sceneClass/previewTunnelInit/index.js | 4 +- src/views/tunnel/index.vue | 1 + 6 files changed, 67 insertions(+), 65 deletions(-) diff --git a/src/components/content/tunnelScene/PreviewScene.vue b/src/components/content/tunnelScene/PreviewScene.vue index f5b810b..b41c813 100644 --- a/src/components/content/tunnelScene/PreviewScene.vue +++ b/src/components/content/tunnelScene/PreviewScene.vue @@ -73,6 +73,7 @@ let fanData; watch( () => params.largeScreen, (now) => { + console.log(params.largeScreen); params.largeScreen = now; fanData = (toRaw(params.largeScreen.value)).frequencyChangerList; console.log(fanData); @@ -174,10 +175,10 @@ async function handleMounted() { return } else { console.log(err); - // ElMessage({ - // message: "场景初始化异常---！", - // type: "warning", - // }); + ElMessage({ + message: "场景初始化异常---！", + type: "warning", + }); } } } diff --git a/src/components/content/tunnelScene/TunnelScene.vue b/src/components/content/tunnelScene/TunnelScene.vue index 367563e..d61b253 100644 --- a/src/components/content/tunnelScene/TunnelScene.vue +++ b/src/components/content/tunnelScene/TunnelScene.vue @@ -117,10 +117,10 @@ async function handleMounted() { demo.SignsInf(params.form.tunnelAlias, String(params.tunnelLength)) } catch (err) { console.log(err); - // ElMessage({ - // message: "场景初始化异常---！", - // type: "warning", - // }); + ElMessage({ + message: "场景初始化异常---！", + type: "warning", + }); } } diff --git a/src/components/content/tunnelScene/editEquComp/editDialog.vue b/src/components/content/tunnelScene/editEquComp/editDialog.vue index a754fa9..ddf571a 100644 --- a/src/components/content/tunnelScene/editEquComp/editDialog.vue +++ b/src/components/content/tunnelScene/editEquComp/editDialog.vue @@ -2,39 +2,20 @@

当前距离洞口：{{ pointDistance_str }}

- +
当前风压:{{ p }}Pa

传感器类型

- +

设备选择

- +
- +
@@ -76,8 +57,7 @@ const modelStore = useModelSceneStore(); //计算锚点之间距离 const pointDistance_str = computed( () => - `${parseInt(params.pointGap)}米*${params.pointNum}=${ - parseInt(params.pointGap) * params.pointNum + `${parseInt(params.pointGap)}米*${params.pointNum}=${parseInt(params.pointGap) * params.pointNum }米` ); @@ -187,9 +167,9 @@ function addEquipment() { .addEquipment({ ...toRaw(equipmentSetting.value) }, params.pointGap) .then((res) => { emit("addEquipment", equipmentSetting.value); - if (res.code===1000) { + if (res.code === 1000) { ElMessage.success(res.msg) - }else { + } else { ElMessage.error(res.msg) } resetEquipmentSetting(); @@ -202,6 +182,7 @@ function addEquipment() { }); resetEquipmentSetting(); } else { + console.log(err); ElMessage({ message: "添加异常！", type: "warning", diff --git a/src/components/content/tunnelScene/sceneClass/editEquipment/index.js b/src/components/content/tunnelScene/sceneClass/editEquipment/index.js index 57cddc8..2817fa8 100644 --- a/src/components/content/tunnelScene/sceneClass/editEquipment/index.js +++ b/src/components/content/tunnelScene/sceneClass/editEquipment/index.js @@ -177,7 +177,7 @@ function handleOtherEqu(targetPoint, equipmentInfo) { function handleFanEqu( targetPoint, equipmentInfo, - fanData, + fanData = 1, speed = Math.random().toFixed(1) * 1000 ) { // 由于风机比较多，每个风机转速不一直，保存在一个数中遍历 @@ -200,35 +200,54 @@ function handleFanEqu( // console.log(targetPoint.info); //风机颜色重新命名 if (fanData != 1) { - let fan1 = fanData[0].equipmentType - let fan2 = fanData[1].equipmentType - if (targetPoint.info.typeKey == fan1) { - if (fanData[0].online == false) { - this.scene.traverse(function (child) { - if (child.id === 1005) { - child.traverse(function (obj) { - // console.log(obj); - // 判断子对象是否是物体，如果是，更改其颜色 - if (obj.isMesh) { - obj.material.color.set(0xFF0000) - } - }) - } - }); + if (fanData.length == 2) { + let fan1 = fanData[0].equipmentType + let fan2 = fanData[1].equipmentType + if (targetPoint.info.typeKey == fan1) { + if (fanData[0].online == false) { + this.scene.traverse(function (child) { + if (child.id === 1005) { + child.traverse(function (obj) { + // console.log(obj); + // 判断子对象是否是物体，如果是，更改其颜色 + if (obj.isMesh) { + obj.material.color.set(0xFF0000) + } + }) + } + }); + } + } else { + if (fanData[1].online == false) { + this.scene.traverse(function (child) { + if (child.id === 1005) { + child.traverse(function (obj) { + // console.log(obj); + // 判断子对象是否是物体，如果是，更改其颜色 + if (obj.isMesh) { + obj.material.color.set(0xFF0000) + } + }) + } + }); + } } } else { - if (fanData[1].online == false) { - this.scene.traverse(function (child) { - if (child.id === 1005) { - child.traverse(function (obj) { - // console.log(obj); - // 判断子对象是否是物体，如果是，更改其颜色 - if (obj.isMesh) { - obj.material.color.set(0xFF0000) - } - }) - } - }); + let fan1 = fanData[0].equipmentType + if (targetPoint.info.typeKey == fan1) { + if (fanData[0].online == false) { + this.scene.traverse(function (child) { + if (child.id === 1005) { + child.traverse(function (obj) { + // console.log(obj); + // 判断子对象是否是物体，如果是，更改其颜色 + if (obj.isMesh) { + obj.material.color.set(0xFF0000) + } + }) + } + }); + } } } } diff --git a/src/components/content/tunnelScene/sceneClass/previewTunnelInit/index.js b/src/components/content/tunnelScene/sceneClass/previewTunnelInit/index.js index 4664584..f5a68b1 100644 --- a/src/components/content/tunnelScene/sceneClass/previewTunnelInit/index.js +++ b/src/components/content/tunnelScene/sceneClass/previewTunnelInit/index.js @@ -1,5 +1,5 @@ -export default function previewtunnelModeInit(equipmentList, fanData) { +export default function previewtunnelModeInit(equipmentList, fanData = 1) { //初始化将墙壁隐藏起来 // for (let line = 1; line <= 20; line++) { // if (line < 10) { @@ -13,7 +13,7 @@ export default function previewtunnelModeInit(equipmentList, fanData) { // console.log(equipmentList); equipmentList.forEach((item) => { - this.addEquipment(this.scene.getObjectByName(item.position), item, fanData); + this.addEquipment(this.scene.getObjectByName(item.position), item, fanData = 1); }); //进行预览和编辑模式的一些操作 if (this.isedit == false) { diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue index f548f46..389d850 100644 --- a/src/views/tunnel/index.vue +++ b/src/views/tunnel/index.vue @@ -287,6 +287,7 @@ const getList = () => { }) } //根据站点id获取隧道信息option + let largeScreen = computed(() => largeScreenData) const getTunnel = (id) => { getTunnelBySiteId(id).then((res) => {