diff --git a/src/components/content/tunnelScene/TunnelScene.vue b/src/components/content/tunnelScene/TunnelScene.vue index 3bfa10c..aa07095 100644 --- a/src/components/content/tunnelScene/TunnelScene.vue +++ b/src/components/content/tunnelScene/TunnelScene.vue @@ -109,6 +109,7 @@ async function handleMounted() { demo = new ThreeDScene(three, content.value); //看是不是预览模式,然后继续相关的操作(会在demo中的初始化中进行) demo.isedit = params.isedit; + demo.enableLeftBtn = true; // "../../../../public/tunnelModel/chanel-have-wall-now-use.gltf" const loaded = await demo.loadModel( GLTFLoader, @@ -209,6 +210,7 @@ let pointNum = ref(0); let targetP = ref({}); // 右键点击附着点后调函数 function rClickCallback(demo) { + function editDev(targetPoint = null) { hasDevice.value = targetPoint.hasDevice; targetP.value = targetPoint; diff --git a/src/components/content/tunnelScene/sceneClass/demo.js b/src/components/content/tunnelScene/sceneClass/demo.js index 571de53..a0294bc 100644 --- a/src/components/content/tunnelScene/sceneClass/demo.js +++ b/src/components/content/tunnelScene/sceneClass/demo.js @@ -261,7 +261,7 @@ export default class Demo { const intersects = raycaster.intersectObjects(hoverModels); if (intersects.length > 0) { - if(Object.keys(intersects[0].object).includes('enableHover') && !intersects[0].object.enableHover)return; + if(Object.keys(intersects[0].object).includes('enableHover') && !intersects[0].object.enableHover && !isedit)return; if (!this.preHover) { this.preHover = intersects[0].object; } else { @@ -353,6 +353,7 @@ export default class Demo { if (e.button === 0) { this._handleLClick(intersects[0].object); } else if (e.button === 2) { + return; //==========》暂时不处理右键事件 this._handleRClick(intersects[0].object); } }, 400);