From e0a92b51f31f925e73f7b9e9afc04be52b1f9330 Mon Sep 17 00:00:00 2001 From: zhangkaihuai Date: Fri, 3 Jan 2025 16:21:02 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20nginx.conf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx.conf b/nginx.conf index 2ea5122..394f6e3 100644 --- a/nginx.conf +++ b/nginx.conf @@ -30,7 +30,7 @@ http { listen [::]:80; location /api { - proxy_pass http://gateway.pro.svc.cluster.local:8080; + proxy_pass http://gateway.pro.svc.cluster.local:80; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Port $server_port; From 62c8da2ea24f4dd8f5edbb3f304cddb0f044ce09 Mon Sep 17 00:00:00 2001 From: zhangkaihuai Date: Fri, 3 Jan 2025 16:28:17 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20nginx.conf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx.conf b/nginx.conf index 394f6e3..2ea5122 100644 --- a/nginx.conf +++ b/nginx.conf @@ -30,7 +30,7 @@ http { listen [::]:80; location /api { - proxy_pass http://gateway.pro.svc.cluster.local:80; + proxy_pass http://gateway.pro.svc.cluster.local:8080; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Port $server_port; From 3b538ee6d288782401fff75fa9f33cc397371a5e Mon Sep 17 00:00:00 2001 From: trp <2477421791@qq.com> Date: Tue, 25 Feb 2025 20:55:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?trp:=E4=BF=AE=E5=A4=8D=E9=9A=A7=E9=81=93?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=A8=A1=E5=BC=8F=E4=B8=8B=E4=B8=8D=E8=83=BD?= =?UTF-8?q?hover=E5=92=8C=E8=AE=BE=E5=A4=87=E7=BC=96=E8=BE=91=E6=83=85?= =?UTF-8?q?=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/content/tunnelScene/TunnelScene.vue | 2 ++ src/components/content/tunnelScene/sceneClass/demo.js | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) 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);