From 0341e93686ea341491f23b77134ac8e2762d1a93 Mon Sep 17 00:00:00 2001
From: Hcat1314 <2768237203@qq.com>
Date: Tue, 19 Dec 2023 10:12:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96promise+=E7=AC=AC?=
=?UTF-8?q?=E4=B8=80=E6=AC=A1=E8=BF=9B=E5=85=A5=E6=A8=A1=E5=9E=8B=E4=B8=8D?=
=?UTF-8?q?=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/content/tunnelScene/TunnelScene.vue | 5 ++---
src/components/content/tunnelScene/sceneClass/demo.js | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/components/content/tunnelScene/TunnelScene.vue b/src/components/content/tunnelScene/TunnelScene.vue
index 133d09e..57c28f6 100644
--- a/src/components/content/tunnelScene/TunnelScene.vue
+++ b/src/components/content/tunnelScene/TunnelScene.vue
@@ -81,12 +81,11 @@ async function handleMounted() {
// 给对象初加载设备模型
demo.initDevicesModel(map);
+ await Promise.all([map.get("equ_fan"), map.get("equ_sensors")]);
+ demo.tunnelModeInit();
} catch (err) {
console.log(err);
}
-
- demo.tunnelModeInit();
-
}
// 每个模型加载回调
diff --git a/src/components/content/tunnelScene/sceneClass/demo.js b/src/components/content/tunnelScene/sceneClass/demo.js
index b66276b..b2456fd 100644
--- a/src/components/content/tunnelScene/sceneClass/demo.js
+++ b/src/components/content/tunnelScene/sceneClass/demo.js
@@ -513,7 +513,7 @@ export default class Demo {
for (const item of this.tunnelConfigEquipment) {
//使用api取拿到附着点
let pointmodel = this.scene.getObjectByName(item.pointName)
- // pointmodel.hasDevice = true;
+ pointmodel.hasDevice;
let formInfo = {
equipmentType: item.equipmentType, //设备类型
chooseEquipment: item.equipmentName, //设备选择(设备名称)
From a850d9af78513eb3d94537584ab2b6771ce76735 Mon Sep 17 00:00:00 2001
From: Hcat1314 <2768237203@qq.com>
Date: Wed, 20 Dec 2023 12:21:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=A8=A1=E5=BC=8F?=
=?UTF-8?q?=E5=92=8C=E7=BC=96=E8=BE=91=E6=A8=A1=E5=BC=8F=E5=A4=A7=E8=87=B4?=
=?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../content/tunnelScene/PreviewScene.vue | 346 ++++++++++++++++++
.../content/tunnelScene/TunnelScene.vue | 11 +
.../tunnelScene/editEquComp/editDialog.vue | 8 +
.../preEquComp/childComps/InputNum.vue | 60 +++
.../tunnelScene/preEquComp/preDialog.vue | 304 +++++++++++++++
.../content/tunnelScene/sceneClass/demo.js | 11 +
src/router/index.js | 12 +-
src/views/tunnel/{preview.vue => edit.vue} | 121 +++++-
src/views/tunnel/index.vue | 72 ++--
9 files changed, 894 insertions(+), 51 deletions(-)
create mode 100644 src/components/content/tunnelScene/PreviewScene.vue
create mode 100644 src/components/content/tunnelScene/preEquComp/childComps/InputNum.vue
create mode 100644 src/components/content/tunnelScene/preEquComp/preDialog.vue
rename src/views/tunnel/{preview.vue => edit.vue} (58%)
diff --git a/src/components/content/tunnelScene/PreviewScene.vue b/src/components/content/tunnelScene/PreviewScene.vue
new file mode 100644
index 0000000..c0063c4
--- /dev/null
+++ b/src/components/content/tunnelScene/PreviewScene.vue
@@ -0,0 +1,346 @@
+
+ 是否确定删除该设备
{{ params.name }}
+ +当前距离洞口:{{ pointDistance_str }}
+传感器类型
+设备选择
+