低空修改250311-01

.env.production

@@ -1,8 +1,8 @@
-VITE_BASE_API='http://10.90.9.143:8100/'
-VITE_BASE_URL='http://10.90.9.143:8100/'
+VITE_BASE_API='http://10.90.9.143:8095/low-altitude/'
+VITE_BASE_URL='http://10.90.9.143:8095/low-altitude/'
 
 VITE_ZW_API='https://cimweb.zjw.sh.cegn.cn:2008/'
 VITE_ZW_URL='https://cimweb.zjw.sh.cegn.cn:2008/'
 
-VITE_NET_API='http://58.34.215.19:8100/'
-VITE_NET_URL='http://58.34.215.19:8100/'
+VITE_NET_API='http://58.34.215.19:8095/low-altitude/'
+VITE_NET_URL='http://58.34.215.19:8095/low-altitude/'

src/components/mapJK.vue

@@ -1023,6 +1023,7 @@ export default {
         if(depthTest == undefined){
           depthTest = true;
         }
+        let deepOpacity = params.deepOpacity;
         if(status === "hide"){
           if(addThreeCubeDetailInstance[id]){
             addThreeCubeDetailInstance[id].clear();
@@ -1039,6 +1040,7 @@ export default {
             points:params.points,
             size,
             bus,
+            deepOpacity,
             depthTest
           });
           addThreeCubeDetailEvent.start();
@@ -1820,7 +1822,7 @@ export default {
             if(virtualSocket){
               virtualSocket.send(JSON.stringify(params.flyList));
             }else{
-              virtualSocket = new WebSocket('ws://58.34.215.19:8100/simulate/getRouteInfoWebSocket');
+              virtualSocket = new WebSocket('ws://58.34.215.19:8100/low-altitude/simulate/getRouteInfoWebSocket');
               virtualSocket.onopen = () => {
                 console.log('WebSocket 连接成功');
                 virtualSocket.send(JSON.stringify(params.flyList));
@@ -1868,7 +1870,7 @@ export default {
           if(socket){
             socket.send(JSON.stringify(params.flyList));
           }else{
-            socket = new WebSocket('ws://58.34.215.19:8100/aircraftRouteSpeedWebSocket');
+            socket = new WebSocket('ws://58.34.215.19:8100/low-altitude/aircraftRouteSpeedWebSocket');
             socket.onopen = () => {
               console.log('WebSocket 连接成功');
               socket.send(JSON.stringify(params.flyList));
@@ -2115,7 +2117,7 @@ export default {
       //ws 推送方法
       function getRealPower(params){
         const connectWebSocket = () => {
-          socket = new WebSocket('ws://58.34.215.19:8100/gridSearchWebSocket');
+          socket = new WebSocket('ws://58.34.215.19:8100/low-altitude/gridSearchWebSocket');
           socket.onopen = () => {
             console.log('WebSocket 连接成功');
             socket.send(JSON.stringify({
@@ -2411,6 +2413,7 @@ export default {
           addDrawEvent.start(symbol,geometryType);
         }
         addDrawEvent.createListenerEvent((geometry) =>{
+          debugger
           bus.emit('SendMessage',{
             action:"DrawComplete",
             data:{
@@ -2419,6 +2422,7 @@ export default {
           })
         });
         addDrawEvent.updateListenerEvent((geometry) =>{
+          debugger
           bus.emit('SendMessage',{
             action:"DrawComplete",
             data:{
@@ -2649,7 +2653,7 @@ export default {
                   "isShow": true
               }));
             }else{
-              flyPointSocket = new WebSocket('ws://58.34.215.19:8100/flight/data/websocket');
+              flyPointSocket = new WebSocket('ws://58.34.215.19:8100/low-altitude/flight/data/websocket');
               flyPointSocket.onopen = () => {
                 console.log('WebSocket 连接成功');
               };
@@ -2684,6 +2688,7 @@ export default {
                         y:data[0].boxSize.lonLength,
                         z:data[0].boxSize.height
                       },
+                      "deepOpacity":true,
                       "points":data,
                       "depthTest":false
                     })
@@ -2945,7 +2950,6 @@ export default {
 
       function getFunnelCube(params){
         let id = params.id;
-        let lastId = params.lastId;
         let status = params.status;
         let level = params.level;
         let coneHeight = params.coneHeight;
@@ -2955,20 +2959,19 @@ export default {
         let point = params.point;
         if(status === "hide"){
           showThreeCubeDetail({
-            id:params.id,
+            id:params.id+ "23",
+            status:"hide"
+          });
+          showThreeCubeDetail({
+            id:params.id+ "24",
             status:"hide"
           });
           currentShowGridParams = null;
           return
         }
-        showThreeCubeDetail({
-          id:params.lastId,
-          status:"hide"
-        });
         currentShowGridParams = id;
         getSixPowerByFunnel({
           id,
-          lastId,
           status,
           coneHeight,
           cylinderHeight,
@@ -3000,13 +3003,33 @@ export default {
               "message":res.data.data.gridConflict
             }
           })
-          showThreeCubeDetail({
-            "id":params.id,
-            "status":params.status,
-            "size":size,
-            "points":res.data.data.list,
-            "depthTest":false
-          })
+
+          if(res.data.data.list.length>0){
+            showThreeCubeDetail({
+              "id":params.id+ "23",
+              "status":params.status,
+              "size": {
+                x:res.data.data.list[0].boxSize.latLength,
+                y:res.data.data.list[0].boxSize.lonLength,
+                z:res.data.data.list[0].boxSize.height
+              },
+              "points":res.data.data.list,
+              "depthTest":false
+            })
+          }
+          if(res.data.data.listInfo.length>0){
+            showThreeCubeDetail({
+              "id":params.id+ "24",
+              "status":params.status,
+              "size": {
+                x:res.data.data.listInfo[0].boxSize.latLength,
+                y:res.data.data.listInfo[0].boxSize.lonLength,
+                z:res.data.data.listInfo[0].boxSize.height
+              },
+              "points":res.data.data.listInfo,
+              "depthTest":false
+            })
+          }
         })
       }
 
@@ -3021,20 +3044,19 @@ export default {
         let point = params.point;
         if(status === "hide"){
           showThreeCubeDetail({
-            id:params.id,
+            id:params.id+ "23",
+            status:"hide"
+          });
+          showThreeCubeDetail({
+            id:params.id+ "24",
             status:"hide"
           });
           currentShowGridParams = null;
           return
         }
-        showThreeCubeDetail({
-          id:params.lastId,
-          status:"hide"
-        });
         currentShowGridParams = id;
         getSixPowerByFrustumCone({
           id,
-          lastId,
           status,
           height,
           level,
@@ -3053,11 +3075,6 @@ export default {
           topRadius: params.topRadius,
           bottomRadius: params.bottomRadius,
         }).then(res =>{
-          let size = {
-            x:res.data.data.list[0].boxSize.latLength,
-            y:res.data.data.list[0].boxSize.lonLength,
-            z:res.data.data.list[0].boxSize.height
-          }
           bus.emit('SendMessage',{
             action:"CubeResult",
             data:{
@@ -3065,19 +3082,38 @@ export default {
             }
           })
 
-          showThreeCubeDetail({
-            "id":params.id,
-            "status":params.status,
-            "size":size,
-            "points":res.data.data.list,
-            "depthTest":false
-          })
+          if(res.data.data.list.length>0){
+            debugger
+            showThreeCubeDetail({
+              "id":params.id+ "23",
+              "status":params.status,
+              "size": {
+                x:res.data.data.list[0].boxSize.latLength,
+                y:res.data.data.list[0].boxSize.lonLength,
+                z:res.data.data.list[0].boxSize.height
+              },
+              "points":res.data.data.list,
+              "depthTest":false
+            })
+          }
+          if(res.data.data.listInfo.length>0){
+            showThreeCubeDetail({
+              "id":params.id+ "24",
+              "status":params.status,
+              "size": {
+                x:res.data.data.listInfo[0].boxSize.latLength,
+                y:res.data.data.listInfo[0].boxSize.lonLength,
+                z:res.data.data.listInfo[0].boxSize.height
+              },
+              "points":res.data.data.listInfo,
+              "depthTest":false
+            })
+          }
         })
       }
 
       function getInvertedConeCube(params){
         let id = params.id;
-        let lastId = params.lastId;
         let status = params.status;
         let level = params.level;
         let height = params.height;
@@ -3085,20 +3121,19 @@ export default {
         let point = params.point;
         if(status === "hide"){
           showThreeCubeDetail({
-            id:params.id,
+            id:params.id+ "23",
+            status:"hide"
+          });
+          showThreeCubeDetail({
+            id:params.id+ "24",
             status:"hide"
           });
           currentShowGridParams = null;
           return
         }
-        showThreeCubeDetail({
-          id:params.lastId,
-          status:"hide"
-        });
         currentShowGridParams = id;
         getSixPowerByInvertedCone({
           id,
-          lastId,
           status,
           height,
           level,
@@ -3114,51 +3149,63 @@ export default {
           level: params.level,
           radius: params.radius,
         }).then(res =>{
-          let size = {
-            x:res.data.data.list[0].boxSize.latLength,
-            y:res.data.data.list[0].boxSize.lonLength,
-            z:res.data.data.list[0].boxSize.height
-          }
           bus.emit('SendMessage',{
             action:"CubeResult",
             data:{
               "message":res.data.data.gridConflict
             }
           })
-          showThreeCubeDetail({
-            "id":params.id,
-            "status":params.status,
-            "size":size,
-            "points":res.data.data.list,
-            "depthTest":false
-          })
+          if(res.data.data.list.length>0){
+            showThreeCubeDetail({
+              "id":params.id+ "23",
+              "status":params.status,
+              "size": {
+                x:res.data.data.list[0].boxSize.latLength,
+                y:res.data.data.list[0].boxSize.lonLength,
+                z:res.data.data.list[0].boxSize.height
+              },
+              "points":res.data.data.list,
+              "depthTest":false
+            })
+          }
+          if(res.data.data.listInfo.length>0){
+            showThreeCubeDetail({
+              "id":params.id+ "24",
+              "status":params.status,
+              "size": {
+                x:res.data.data.listInfo[0].boxSize.latLength,
+                y:res.data.data.listInfo[0].boxSize.lonLength,
+                z:res.data.data.listInfo[0].boxSize.height
+              },
+              "points":res.data.data.listInfo,
+              "depthTest":false
+            })
+          }
         })
       }
 
       //查询圆柱体
       function getCylinderCube(params){
         let id = params.id;
-        let lastId = params.lastId;
         let status = params.status;
         let level = params.level;
         let height = params.height;
         let rings = params.rings;
         if(status === "hide"){
           showThreeCubeDetail({
-            id:params.id,
+            id:params.id+ "23",
+            status:"hide"
+          });
+          showThreeCubeDetail({
+            id:params.id+ "24",
             status:"hide"
           });
           currentShowGridParams = null;
           return
         }
-        showThreeCubeDetail({
-          id:params.lastId,
-          status:"hide"
-        });
         currentShowGridParams = id;
         getSixPowerByPrism({
           id,
-          lastId,
           status,
           height,
           level,
@@ -3176,20 +3223,19 @@ export default {
         let rings = params.rings;
         if(status === "hide"){
           showThreeCubeDetail({
-            id:params.id,
+            id:params.id+ "23",
+            status:"hide"
+          });
+          showThreeCubeDetail({
+            id:params.id+ "24",
             status:"hide"
           });
           currentShowGridParams = null;
           return
         }
-        showThreeCubeDetail({
-          id:params.lastId,
-          status:"hide"
-        });
         currentShowGridParams = id;
         getSixPowerByPrism({
           id,
-          lastId,
           status,
           height,
           level,
@@ -3201,27 +3247,26 @@ export default {
       //查询棱柱体
       function getPrismCube(params){
         let id = params.id;
-        let lastId = params.lastId;
         let status = params.status;
         let level = params.level;
         let height = params.height;
         let rings = params.rings;
         if(status === "hide"){
           showThreeCubeDetail({
-            id:params.id,
+            id:params.id+ "23",
+            status:"hide"
+          });
+          showThreeCubeDetail({
+            id:params.id+ "24",
             status:"hide"
           });
+
           currentShowGridParams = null;
           return
         }
-        showThreeCubeDetail({
-          id:params.lastId,
-          status:"hide"
-        });
         currentShowGridParams = id;
         getSixPowerByPrism({
           id,
-          lastId,
           status,
           height,
           level,
@@ -3235,11 +3280,6 @@ export default {
           height:params.height,
           level: params.level
         }).then(res =>{
-          let size = {
-            x:res.data.data.list[0].boxSize.latLength,
-            y:res.data.data.list[0].boxSize.lonLength,
-            z:res.data.data.list[0].boxSize.height
-          }
           debugger
           bus.emit('SendMessage',{
             action:"CubeResult",
@@ -3247,13 +3287,32 @@ export default {
               "message":res.data.data.gridConflict
             }
           })
-          showThreeCubeDetail({
-            "id":params.id,
-            "status":params.status,
-            "size":size,
-            "points":res.data.data.list,
-            "depthTest":false
-          })
+          if(res.data.data.list.length>0){
+            showThreeCubeDetail({
+              "id":params.id+ "23",
+              "status":params.status,
+              "size": {
+                x:res.data.data.list[0].boxSize.latLength,
+                y:res.data.data.list[0].boxSize.lonLength,
+                z:res.data.data.list[0].boxSize.height
+              },
+              "points":res.data.data.list,
+              "depthTest":false
+            })
+          }
+          if(res.data.data.listInfo.length>0){
+            showThreeCubeDetail({
+              "id":params.id+ "24",
+              "status":params.status,
+              "size": {
+                x:res.data.data.listInfo[0].boxSize.latLength,
+                y:res.data.data.listInfo[0].boxSize.lonLength,
+                z:res.data.data.listInfo[0].boxSize.height
+              },
+              "points":res.data.data.listInfo,
+              "depthTest":false
+            })
+          }
         })
       }
 
@@ -3261,14 +3320,17 @@ export default {
       //查询航线
       function getPathCube(params){
         let id = params.id;
-        let lastId = params.lastId;
         let status = params.status;
         let level = params.level;
         let radius = params.radius;
         let originPaths = params.paths;
         if(status === "hide"){
           showThreeCubeDetail({
-            id:params.id,
+            id:params.id+ "23",
+            status:"hide"
+          });
+          showThreeCubeDetail({
+            id:params.id+ "24",
             status:"hide"
           });
           currentShowGridParams = null;
@@ -3282,14 +3344,9 @@ export default {
             z:item[2]
           })
         })
-        showThreeCubeDetail({
-          id:params.lastId,
-          status:"hide"
-        });
         currentShowGridParams = id;
         getSixPowerByPath({
           id,
-          lastId,
           status,
           radius,
           level,
@@ -3298,29 +3355,46 @@ export default {
       }
 
       function getSixPowerByPath(params){
+        debugger
         getPowerPointByPath({
           paths:params.paths,
           radius:params.radius,
           level: params.level
         }).then(res =>{
-          let size = {
-            x:res.data.data.list[0].boxSize.latLength,
-            y:res.data.data.list[0].boxSize.lonLength,
-            z:res.data.data.list[0].boxSize.height
-          }
           bus.emit('SendMessage',{
             action:"CubeResult",
             data:{
               "message":res.data.data.gridConflict
             }
           })
-          showThreeCubeDetail({
-            "id":params.id,
-            "status":params.status,
-            "size":size,
-            "points":res.data.data.list,
-            "depthTest":false
-          })
+          debugger
+          if(res.data.data.list.length>0){
+            showThreeCubeDetail({
+              "id":params.id+ "23",
+              "status":params.status,
+              "size": {
+                x:res.data.data.list[0].boxSize.latLength,
+                y:res.data.data.list[0].boxSize.lonLength,
+                z:res.data.data.list[0].boxSize.height
+              },
+              "points":res.data.data.list,
+              "depthTest":false
+            })
+          }
+          debugger
+          if(res.data.data.listInfo.length>0){
+            showThreeCubeDetail({
+              "id":params.id+ "24",
+              "status":params.status,
+              "size": {
+                x:res.data.data.listInfo[0].boxSize.latLength,
+                y:res.data.data.listInfo[0].boxSize.lonLength,
+                z:res.data.data.listInfo[0].boxSize.height
+              },
+              "points":res.data.data.listInfo,
+              "depthTest":false
+            })
+          }
         })
       }
 

src/components/mapTest.vue

@@ -75,8 +75,8 @@ export default {
       bridge = new CityGIS.Bridge({
         id:"i_map",
         //url:'https://cimweb.zjw.sh.cegn.cn:2007/map-tool-widget/#/jk_map',
-        url:'http://localhost:5173/map-tool-widget/#/jk_map',
-        //url: 'http://58.34.215.19:8095/map-tool-widget/#/jk_map',
+        //url:'http://localhost:5173/map-tool-widget/#/jk_map',
+        url: 'http://58.34.215.19:8095/map-tool-widget/#/jk_map',
         onReady:function (){
           // console.log("地图创建完成");
         }

src/config/basicTool.json

@@ -42,7 +42,7 @@
             "title":"BaseMap",
             "visible": true,
             "opacity": 1,
-            "url": "https://cimweb.zjw.sh.cegn.cn:2008/MapServiceProxy/eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NDE2ODIxOTQsImtleSI6IjkzNDkzMzIxIiwic2VydmljZU5vIjoiRDkwMDEwMDcxMjAyMzA4MDEiLCJ1c2VybmFtZSI6InB0Z2wifQ.etDUo922q_82ER_mzO2Ozm3gg7UmCAxu0ZH3jKZHV_g",
+            "url": "https://cimweb.zjw.sh.cegn.cn:2008/MapServiceProxy/eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NDE4NDYwOTUsImtleSI6IjkzNDkzMzIxIiwic2VydmljZU5vIjoiRDkwMDEwMDcxMjAyMzA4MDEiLCJ1c2VybmFtZSI6InB0Z2wifQ.YCQcZ2IkjxFBm5ezdxzz3DRxWW5GDzf1ZeodNGImP2M",
             "token": ""
           }
         }
@@ -58,7 +58,7 @@
             "title":"WhiteMold",
             "visible": true,
             "opacity": 1,
-            "url": "https://cimweb.zjw.sh.cegn.cn:2008/MapServiceProxy/eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NDE1MjEyNzMsImtleSI6IjA1MTk1NDE4Iiwic2VydmljZU5vIjoiRDkwMDMwMDA2MjAyMzA4MDEiLCJ1c2VybmFtZSI6InB0Z2wifQ.b5fTpwqBU-KftiKlYRLrpMtmUcWovWKZMzuQ_1Qx1gs",
+            "url": "https://cimweb.zjw.sh.cegn.cn:2008/MapServiceProxy/eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NDE4NzY5NjgsImtleSI6IjA1MTk1NDE4Iiwic2VydmljZU5vIjoiRDkwMDMwMDA2MjAyMzA4MDEiLCJ1c2VybmFtZSI6InB0Z2wifQ.jzmntxXRXrBLHTqs1-GosfwFx5U3gM4NiBcuX_-oPi8/SceneServer",
             "token": ""
           }
         }

src/units/map/AddThreeCubeDetailEvent.js

@@ -10,6 +10,7 @@ class AddThreeCubeDetailEvent{
         this.points = options.points || []; // 初始点位（可为空）
         this.size = options.size; // 初始大小（可根据需求调整）
         this.depthTest = options.depthTest;
+        this.deepOpacity = options.deepOpacity || false;
         this.addThreeCubeEvent = null;
     }
 
@@ -25,6 +26,7 @@ class AddThreeCubeDetailEvent{
             this.addThreeCubeEvent = new subRenderClass({
                 view:that.view,
                 size:that.size,
+                deepOpacity:that.deepOpacity,
                 points:this.points, // 初始为空，等待后续增量加载
                 webgl,
                 depthTest: this.depthTest,

src/units/map/addDrawEvent.js

@@ -276,10 +276,10 @@ class AddDrawEvent {
         this.clearCreateListenerEvent()
         this.createListenerEventHander = this.sketchViewModel.on("create", (event) => {
             if (event.state === "complete") {
-                if(event.graphic.geometry.type == "mesh"){
+                if(event?.graphic?.geometry?.type == "mesh"){
                     callback(this.getBaseCenter(event.graphic.geometry,this.type));
                 }else{
-                    callback(event.graphic.geometry);
+                    callback(event?.graphic?.geometry);
                 }
             }
         });
@@ -288,10 +288,10 @@ class AddDrawEvent {
         this.clearUpdateListenerEvent()
         this.updateListenerEventHander = this.sketchViewModel.on("update", (event) => {
             if (event.state === "complete") {
-                if(event.graphic.geometry.type == "mesh"){
+                if(event?.graphic?.geometry?.type == "mesh"){
                     callback(this.getBaseCenter(event.graphic.geometry,this.type));
                 }else{
-                    callback(event.graphic.geometry);
+                    callback(event?.graphic?.geometry);
                 }
             }
         });

src/units/threejs/threeCubeDetail.js

@@ -1,5 +1,6 @@
 import * as THREE from 'three';
 import texture1 from "../../assets/tex_white_8.png";
+import texture2 from "../../assets/max_texture1.png";
 export const ThreeCubeDetailClass = {
     constructor(options) {
         this.webgl = options.webgl;
@@ -15,6 +16,7 @@ export const ThreeCubeDetailClass = {
         this.callBackFunction = options.callBackFunction; // 回调函数
         this.mouseClickEvent = null;
         this.depthTest = options.depthTest;    //false是优先级低，true是优先级高
+        this.deepOpacity = options.deepOpacity;
     },
 
     initialize() {
@@ -68,7 +70,13 @@ export const ThreeCubeDetailClass = {
 
         const boxGeometry = new THREE.BoxGeometry(this.size.z, this.size.x, this.size.y);
         boxGeometry.computeVertexNormals();
-        const texture = new THREE.TextureLoader().load(texture1);
+        let texture;
+        if(this.deepOpacity){  //深度贴图
+            texture = new THREE.TextureLoader().load(texture2);
+        }else{
+            texture = new THREE.TextureLoader().load(texture1);
+        }
+        //const texture = new THREE.TextureLoader().load(texture1);
         // texture.wrapS = THREE.RepeatWrapping;  // 设置U轴的重复模式
         // texture.wrapT = THREE.RepeatWrapping;  // 设置V轴的重复模式
         // texture.repeat.set(1, 1);  // 设置重复次数

vite.config.js

@@ -29,7 +29,7 @@ export default defineConfig({
       '/zwapi': {
         // 代理请求之后的请求地址（你的真实接口地址)
         target: 'https://cimweb.zjw.sh.cegn.cn:2008/',
-        //target: 'http://58.34.215.19:8100/DataSearch/',
+        //target: 'http://58.34.215.19:8095/low-altitude/DataSearch/',
         //target: 'http://localhost:9250/',
         secure: false,
         ws: true,
@@ -39,8 +39,8 @@ export default defineConfig({
       },
       '/netapi': {
         // 代理请求之后的请求地址（你的真实接口地址)
-        target: 'http://58.34.215.19:8100/',
-        //target: 'http://10.1.161.53:8100/',
+        target: 'http://58.34.215.19:8095/low-altitude/',
+        //target: 'http://10.1.161.53:8095/',
         //target: 'http://localhost:9250/',
         secure: false,
         ws: true,