From bfbf1b51168501d6b7bd99340718cc72526cf718 Mon Sep 17 00:00:00 2001
From: dj <1042039504@qq.com>
Date: Sun, 29 Dec 2024 19:28:12 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BC=98=E5=8C=96=E9=9A=A7=E9=81=93?=
=?UTF-8?q?=E6=A8=A1=E6=8B=9F=E9=A6=96=E9=A1=B5=E7=9A=84=E9=9A=A7=E9=81=93?=
=?UTF-8?q?=E9=A2=84=E8=A7=88=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tunnelScene/TunnelSceneSimulate.vue | 117 ++++++++++--------
src/views/tunnel-simulate/index.vue | 2 +-
2 files changed, 66 insertions(+), 53 deletions(-)
diff --git a/src/components/content/tunnelScene/TunnelSceneSimulate.vue b/src/components/content/tunnelScene/TunnelSceneSimulate.vue
index 171180b..68331c8 100644
--- a/src/components/content/tunnelScene/TunnelSceneSimulate.vue
+++ b/src/components/content/tunnelScene/TunnelSceneSimulate.vue
@@ -3,40 +3,40 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 是否确定删除该设备
+
+
+
+
+
@@ -89,7 +89,6 @@ const params = defineProps([
"deviceData",
"devRealtimeData",
"simulateData",
- "tunnelAlias",
]); //接收参数看是不是编辑模式，如果是编辑模式，则需要做一些处理
let isedit = ref(params.isedit);
@@ -112,7 +111,7 @@ onMounted(handleMounted);
// 挂载后回调
async function handleMounted() {
- const doms = [info.value.$el];//edit.value.$el
+ const doms = [info.value.$el, edit.value.$el];
demo = new ThreeDScene(three, content.value);
//看是不是预览模式，然后继续相关的操作(会在demo中的初始化中进行)
// "../../../../public/tunnelModel/chanel-have-wall-now-use.gltf"
@@ -126,8 +125,8 @@ async function handleMounted() {
demo.addTween(TWEEN);
demo.addCSS3Renderer(CSS3DRenderer, CSS3DSprite, doms);
demo.setDistance(10);
- // lClickCallback(demo); //绑定左键回调
- // rClickCallback(demo); //绑定右键回调
+ lClickCallback(demo); //绑定左键回调
+ rClickCallback(demo); //绑定右键回调
//加载HDR背景图片
demo.loadBackground(hdrLoader, backColorSet);
@@ -143,6 +142,19 @@ async function handleMounted() {
// params.tunnelId,
// params.form
// );
+ //todo 父组件传的设备数据params.deviceData
+ // const newModelList=[...params.deviceData.frequencyChangerList,...params.deviceData.windPressureSensorList, ...params.deviceData.sensorList]
+ // newModelList.map((item,index1)=>{
+ // const index=index1+1
+ // item.threshold=""
+ // if(index ({
...item,
- data:'10',
equipmentType: item.equipmentType.startsWith("frequency")
? "frequency"
: "sensor",
}));
- console.log('modeData',modeData)
+ demo.enableLeftBtn = false //关闭左键
+ demo.pointsVisible(false);
demo.editTunnelInit(modeData);
// 初始化标牌信息
- demo.SignsInf(params.tunnelAlias, String(params.tunnelLength));
+ demo.SignsInf("dsadsa", String(params.tunnelLength));
} catch (err) {}
}
+
// 从新渲染数据
async function rerender() {
try {
@@ -284,9 +297,9 @@ function editDevInfo(
//左键/双击左键回调函数
function lClickCallback(demo) {
- // console.log('左键点击查看信息');
+ console.log('左键点击查看信息');
- //demo动态添加函数，为操作组件内部
+ // demo动态添加函数，为操作组件内部
function displayDevInfo(targetPoint = null) {
hasDevice.value = targetPoint.hasDevice;
if (!targetPoint.info) {
@@ -329,15 +342,15 @@ function rClickCallback(demo) {
function handleAddEqu(formInfo) {
demo.addEquipment(targetP.value, formInfo);
// //将墙壁设置为可以穿透点击
- // for (let line = 1; line <= 20; line++) {
- // if (line < 10) {
- // let wall = 'wall_' + '0' + line
- // this.scene.getObjectByName(wall).layers.set(0)
- // } else if (line >= 10) {
- // let wall = 'wall_' + line
- // this.scene.getObjectByName(wall).layers.set(0)
- // }
- // }
+ for (let line = 1; line <= 20; line++) {
+ if (line < 10) {
+ let wall = 'wall_' + '0' + line
+ this.scene.getObjectByName(wall).layers.set(0)
+ } else if (line >= 10) {
+ let wall = 'wall_' + line
+ this.scene.getObjectByName(wall).layers.set(0)
+ }
+ }
}
const centerDialogVisible = ref(false);
diff --git a/src/views/tunnel-simulate/index.vue b/src/views/tunnel-simulate/index.vue
index 85bd0ad..55d5ae2 100644
--- a/src/views/tunnel-simulate/index.vue
+++ b/src/views/tunnel-simulate/index.vue
@@ -46,7 +46,7 @@
id="tunnel-box"
:isedit="false"
:device-data="largeScreenData"
- :tunnelLength="tunnelLength"
+ :tunnelLength="tunnelLen"
:tunnelId="tunnelId"
:tunnelAlias="tunnelAlias"
>