低空修改250303

.env.production

@@ -1,8 +1,8 @@
-VITE_BASE_API='http://10.90.9.143:9252/DataSearch/'
-VITE_BASE_URL='http://10.90.9.143:9252/DataSearch/'
+VITE_BASE_API='http://10.90.9.143:8100/'
+VITE_BASE_URL='http://10.90.9.143:8100/'
 
 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:19259/DataSearch/'
-VITE_NET_URL='http://58.34.215.19:19259/DataSearch/'
+VITE_NET_API='http://58.34.215.19:8100/'
+VITE_NET_URL='http://58.34.215.19:8100/'

src/components/mapJK.vue

@@ -53,12 +53,12 @@ import routeList from '../config/routeList.json'
 import {
   getAvoidRoute,
   getBuildingPoint,
-  getNoFlyPointInterface,
+  getNoFlyPointInterface, getPath,
   getPowerInterface,
-  getPowerPoint,
-  getPowerPointByFunnel,
-  getPowerPointByPolygon,
-  getProxyToken,
+  getPowerPoint, getPowerPointByFrustumCone,
+  getPowerPointByFunnel, getPowerPointByInvertedCone, getPowerPointByPath,
+  getPowerPointByPolygon, getPowerPointByPrism, getPrism,
+  getProxyToken, getQJC,
   getRiverPointInterface,
   getRoadPointInterface,
   gridBaseInfo
@@ -323,6 +323,35 @@ export default {
           case "GetFunnelCube":
             getFunnelCube(params);
             break;
+          case "GetFrustumConeCube":
+            getFrustumConeCube(params);
+            break;
+          case "GetInvertedConeCube":
+            getInvertedConeCube(params);
+            break;
+
+
+          case "GetCylinderCube":
+            getCylinderCube(params);
+            break;
+          case "GetCuboidCube":
+            getCuboidCube(params);
+            break;
+          case "GetPrismCube":
+            getPrismCube(params);
+            break;
+          case "GetPathCube":
+            getPathCube(params);
+            break;
+          case "GetBasePrism":
+            getBasePrism(params);
+            break;
+          case "GetBasePath":
+            getBasePath(params);
+            break;
+          case "GetBaseQJC":
+            getBaseQJC(params);
+            break;
         }
       }
       function setBackground(params){
@@ -2688,6 +2717,370 @@ export default {
         })
       }
 
+      function getFrustumConeCube(params){
+        let id = params.id;
+        let lastId = params.lastId;
+        let status = params.status;
+        let level = params.level;
+        let height = params.height;
+        let topRadius = params.topRadius;
+        let bottomRadius = params.bottomRadius;
+        let point = params.point;
+        if(status === "hide"){
+          showThreeCubeDetail({
+            id:params.id,
+            status:"hide"
+          });
+          currentShowGridId = null;
+          return
+        }
+        showThreeCubeDetail({
+          id:params.lastId,
+          status:"hide"
+        });
+        currentShowGridId = id;
+        getSixPowerByFrustumCone({
+          id,
+          lastId,
+          status,
+          height,
+          level,
+          topRadius,
+          bottomRadius,
+          point
+        });
+      }
+
+
+      function getSixPowerByFrustumCone(params){
+        getPowerPointByFrustumCone({
+          point:params.point,
+          height:params.height,
+          level: params.level,
+          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
+          }
+          debugger
+          showThreeCubeDetail({
+            "id":params.id,
+            "status":params.status,
+            "size":size,
+            "points":res.data.data.list,
+          })
+        })
+      }
+
+      function getInvertedConeCube(params){
+        let id = params.id;
+        let lastId = params.lastId;
+        let status = params.status;
+        let level = params.level;
+        let height = params.height;
+        let radius = params.radius;
+        let point = params.point;
+        if(status === "hide"){
+          showThreeCubeDetail({
+            id:params.id,
+            status:"hide"
+          });
+          currentShowGridId = null;
+          return
+        }
+        showThreeCubeDetail({
+          id:params.lastId,
+          status:"hide"
+        });
+        currentShowGridId = id;
+        getSixPowerByInvertedCone({
+          id,
+          lastId,
+          status,
+          height,
+          level,
+          radius,
+          point
+        });
+      }
+
+      function getSixPowerByInvertedCone(params){
+        getPowerPointByInvertedCone({
+          point:params.point,
+          height:params.height,
+          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
+          }
+          debugger
+          showThreeCubeDetail({
+            "id":params.id,
+            "status":params.status,
+            "size":size,
+            "points":res.data.data.list,
+          })
+        })
+      }
+
+      //查询圆柱体
+      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,
+            status:"hide"
+          });
+          currentShowGridId = null;
+          return
+        }
+        showThreeCubeDetail({
+          id:params.lastId,
+          status:"hide"
+        });
+        currentShowGridId = id;
+        getSixPowerByPrism({
+          id,
+          lastId,
+          status,
+          height,
+          level,
+          rings
+        });
+      }
+
+      //查询长方体
+      function getCuboidCube(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,
+            status:"hide"
+          });
+          currentShowGridId = null;
+          return
+        }
+        showThreeCubeDetail({
+          id:params.lastId,
+          status:"hide"
+        });
+        currentShowGridId = id;
+        getSixPowerByPrism({
+          id,
+          lastId,
+          status,
+          height,
+          level,
+          rings
+        });
+      }
+
+
+      //查询棱柱体
+      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,
+            status:"hide"
+          });
+          currentShowGridId = null;
+          return
+        }
+        showThreeCubeDetail({
+          id:params.lastId,
+          status:"hide"
+        });
+        currentShowGridId = id;
+        getSixPowerByPrism({
+          id,
+          lastId,
+          status,
+          height,
+          level,
+          rings
+        });
+      }
+
+      function getSixPowerByPrism(params){
+        getPowerPointByPrism({
+          rings:params.rings,
+          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
+          }
+          showThreeCubeDetail({
+            "id":params.id,
+            "status":params.status,
+            "size":size,
+            "points":res.data.data.list,
+          })
+        })
+      }
+
+
+      //查询航线
+      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;
+        let paths = [];
+        originPaths[0].forEach((item)=>{
+          paths.push({
+            x:item[0],
+            y:item[1],
+            z:item[2]
+          })
+        })
+        if(status === "hide"){
+          showThreeCubeDetail({
+            id:params.id,
+            status:"hide"
+          });
+          currentShowGridId = null;
+          return
+        }
+        showThreeCubeDetail({
+          id:params.lastId,
+          status:"hide"
+        });
+        currentShowGridId = id;
+        getSixPowerByPath({
+          id,
+          lastId,
+          status,
+          radius,
+          level,
+          paths
+        });
+      }
+
+      function getSixPowerByPath(params){
+        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
+          }
+          showThreeCubeDetail({
+            "id":params.id,
+            "status":params.status,
+            "size":size,
+            "points":res.data.data.list,
+          })
+        })
+      }
+
+      function getBasePrism(params){
+        getPrism({
+          paths:params.paths,
+          radius:params.radius,
+          level: params.level
+        }).then(res =>{
+          debugger
+          let data  = res.data.data;
+          let showData = [];
+
+          data.forEach((item)=>{
+            let newShape = JSON.parse(item.shape);
+            newShape.color = "red"
+            showData.push({
+              type:item.geoType,
+              shape: newShape
+            })
+          })
+          geometryMeshEffect({
+            "status": "show",
+            "id": "drawOne",
+            "data": showData
+          })
+        })
+      }
+
+      function getBasePath(params){
+        getPath({
+          paths:params.paths,
+          radius:params.radius,
+          level: params.level
+        }).then(res =>{
+          debugger
+          let data  = res.data.data;
+          let showData = [];
+
+          data.forEach((item)=>{
+            let newShape = JSON.parse(item.shape);
+            newShape.color = "green"
+            showData.push({
+              type:"polyline",
+              shape: newShape
+            })
+          })
+          geometryMeshEffect({
+            "status": "show",
+            "id": "drawOne",
+            "data": showData
+          })
+        })
+      }
+
+      function getBaseQJC(params){
+        getQJC({
+          paths:params.paths,
+          radius:params.radius,
+          level: params.level
+        }).then(res =>{
+          debugger
+          let data  = res.data.data;
+          let showData = [];
+
+          data.forEach((item)=>{
+            let newShape = JSON.parse(item.shape);
+            newShape.color = "green"
+            showData.push({
+              type:item.geoType,
+              shape: newShape
+            })
+          })
+          geometryMeshEffect({
+            "status": "show",
+            "id": "drawOne",
+            "data": showData
+          })
+        })
+      }
+
     })
   }
 }

src/config/basicTool.json

@@ -42,7 +42,7 @@
             "title":"BaseMap",
             "visible": true,
             "opacity": 1,
-            "url": "https://cimweb.zjw.sh.cegn.cn:2008/MapServiceProxy/eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NDA2NDA5OTMsImtleSI6IjkzNDkzMzIxIiwic2VydmljZU5vIjoiRDkwMDEwMDcxMjAyMzA4MDEiLCJ1c2VybmFtZSI6InB0Z2wifQ.ZUEicfY9y4eC6agPaQORO4LU74iWiJWQHK6VmeUVjGM",
+            "url": "https://cimweb.zjw.sh.cegn.cn:2008/MapServiceProxy/eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NDEwNTgzODQsImtleSI6IjkzNDkzMzIxIiwic2VydmljZU5vIjoiRDkwMDEwMDcxMjAyMzA4MDEiLCJ1c2VybmFtZSI6InB0Z2wifQ.QM0Chn_mAQFJgCMFSvh_WDVpgbX4VTxlGM5ZqjwmJFU",
             "token": ""
           }
         }
@@ -58,7 +58,7 @@
             "title":"WhiteMold",
             "visible": true,
             "opacity": 1,
-            "url": "\nhttps://cimweb.zjw.sh.cegn.cn:2008/MapServiceProxy/eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NDA0NTM4OTIsImtleSI6IjA1MTk1NDE4Iiwic2VydmljZU5vIjoiRDkwMDMwMDA2MjAyMzA4MDEiLCJ1c2VybmFtZSI6InB0Z2wifQ.10E5RmknF8evyx7lsSgoLOPcxTUMMiNeoq6WbDRs3ok",
+            "url": "https://cimweb.zjw.sh.cegn.cn:2008/MapServiceProxy/eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NDA4OTc2MjcsImtleSI6IkQ5OTk5OTkwMTIwMjQxMjI1Iiwic2VydmljZU5vIjoiRDk5OTk5OTAxMjAyNDEyMjUiLCJ1c2VybmFtZSI6Imd4amhfZndqayJ9.h999YmVKvxPEsxLwTI2DXbAmrZckCNnMu-RZ_CVczso/SceneServer",
             "token": ""
           }
         }
@@ -916,9 +916,9 @@
               "type": "point-3d",
               "symbolLayers": [{
                 "type": "object",
-                "width": 200,
-                "height": 200,
-                "depth": 200,
+                "width": 400,
+                "height": 100,
+                "depth": 400,
                 "anchor": "origin",
                 "resource": { "primitive": "inverted-cone" },
                 "material": { "color": [0, 255, 0,0.3] }
@@ -2124,6 +2124,574 @@
             "token": ""
           }
         }
+      },
+      {
+        "code": "1-50",
+        "title": "获取圆台网格",
+        "data": {
+          "ActionName": "GetFrustumConeCube",
+          "Parameters": {
+            "id" : "1",
+            "status" : "show",
+            "level": 23,
+            "point": {
+              "x": 4215.071719858532,
+              "y": 7389.792634183172,
+              "z": 0
+            },
+            "height": 100,
+            "topRadius": 200,
+            "bottomRadius": 70,
+            "token": ""
+          }
+        }
+      },
+      {
+        "code": "1-51",
+        "title": "获取圆锥网格",
+        "data": {
+          "ActionName": "GetInvertedConeCube",
+          "Parameters": {
+            "id" : "1",
+            "status" : "show",
+            "level": 23,
+            "point": {
+              "x": 4215.071719858532,
+              "y": 7389.792634183172,
+              "z": 0
+            },
+            "height": 100,
+            "radius": 200,
+            "token": ""
+          }
+        }
+      },
+      {
+        "code": "1-52",
+        "title": "获取圆柱网格",
+        "data": {
+          "ActionName": "GetCylinderCube",
+          "Parameters": {
+            "id" : "1",
+            "status" : "show",
+            "level": 23,
+            "rings": [
+              [
+                [
+                  4215.058197222865,
+                  7393.884003575816,
+                  0
+                ],
+                [
+                  4214.954511520578,
+                  7391.9055625179235,
+                  0
+                ],
+                [
+                  4214.644590415971,
+                  7389.948797674278,
+                  0
+                ],
+                [
+                  4214.131829469519,
+                  7388.035147769982,
+                  0
+                ],
+                [
+                  4213.4218465974545,
+                  7386.185579153849,
+                  0
+                ],
+                [
+                  4212.522420520698,
+                  7384.420356086681,
+                  0
+                ],
+                [
+                  4211.443405539563,
+                  7382.7588187218,
+                  0
+                ],
+                [
+                  4210.19662356798,
+                  7381.219171210273,
+                  0
+                ],
+                [
+                  4208.7957346101375,
+                  7379.81828225243,
+                  0
+                ],
+                [
+                  4207.256087098611,
+                  7378.571500280847,
+                  0
+                ],
+                [
+                  4205.59454973373,
+                  7377.492485299713,
+                  0
+                ],
+                [
+                  4203.829326666561,
+                  7376.593059222956,
+                  0
+                ],
+                [
+                  4201.979758050428,
+                  7375.883076350891,
+                  0
+                ],
+                [
+                  4200.066108146133,
+                  7375.37031540444,
+                  0
+                ],
+                [
+                  4198.109343302487,
+                  7375.060394299832,
+                  0
+                ],
+                [
+                  4196.130902244595,
+                  7374.956708597546,
+                  0
+                ],
+                [
+                  4194.152461186703,
+                  7375.060394299832,
+                  0
+                ],
+                [
+                  4192.195696343057,
+                  7375.37031540444,
+                  0
+                ],
+                [
+                  4190.282046438761,
+                  7375.883076350891,
+                  0
+                ],
+                [
+                  4188.432477822628,
+                  7376.593059222956,
+                  0
+                ],
+                [
+                  4186.66725475546,
+                  7377.492485299713,
+                  0
+                ],
+                [
+                  4185.005717390579,
+                  7378.571500280847,
+                  0
+                ],
+                [
+                  4183.466069879052,
+                  7379.81828225243,
+                  0
+                ],
+                [
+                  4182.0651809212095,
+                  7381.219171210273,
+                  0
+                ],
+                [
+                  4180.8183989496265,
+                  7382.7588187218,
+                  0
+                ],
+                [
+                  4179.739383968492,
+                  7384.420356086681,
+                  0
+                ],
+                [
+                  4178.839957891735,
+                  7386.185579153849,
+                  0
+                ],
+                [
+                  4178.12997501967,
+                  7388.035147769982,
+                  0
+                ],
+                [
+                  4177.617214073219,
+                  7389.948797674278,
+                  0
+                ],
+                [
+                  4177.307292968611,
+                  7391.9055625179235,
+                  0
+                ],
+                [
+                  4177.203607266325,
+                  7393.884003575816,
+                  0
+                ],
+                [
+                  4177.307292968611,
+                  7395.862444633708,
+                  0
+                ],
+                [
+                  4177.617214073219,
+                  7397.819209477354,
+                  0
+                ],
+                [
+                  4178.12997501967,
+                  7399.732859381649,
+                  0
+                ],
+                [
+                  4178.839957891735,
+                  7401.582427997782,
+                  0
+                ],
+                [
+                  4179.739383968492,
+                  7403.347651064951,
+                  0
+                ],
+                [
+                  4180.8183989496265,
+                  7405.009188429832,
+                  0
+                ],
+                [
+                  4182.0651809212095,
+                  7406.548835941358,
+                  0
+                ],
+                [
+                  4183.466069879052,
+                  7407.949724899201,
+                  0
+                ],
+                [
+                  4185.005717390579,
+                  7409.196506870784,
+                  0
+                ],
+                [
+                  4186.66725475546,
+                  7410.275521851919,
+                  0
+                ],
+                [
+                  4188.432477822628,
+                  7411.1749479286755,
+                  0
+                ],
+                [
+                  4190.282046438761,
+                  7411.88493080074,
+                  0
+                ],
+                [
+                  4192.195696343057,
+                  7412.397691747192,
+                  0
+                ],
+                [
+                  4194.152461186703,
+                  7412.707612851799,
+                  0
+                ],
+                [
+                  4196.130902244595,
+                  7412.811298554086,
+                  0
+                ],
+                [
+                  4198.109343302487,
+                  7412.707612851799,
+                  0
+                ],
+                [
+                  4200.066108146133,
+                  7412.397691747192,
+                  0
+                ],
+                [
+                  4201.979758050428,
+                  7411.88493080074,
+                  0
+                ],
+                [
+                  4203.829326666561,
+                  7411.1749479286755,
+                  0
+                ],
+                [
+                  4205.59454973373,
+                  7410.275521851919,
+                  0
+                ],
+                [
+                  4207.256087098611,
+                  7409.196506870784,
+                  0
+                ],
+                [
+                  4208.7957346101375,
+                  7407.949724899201,
+                  0
+                ],
+                [
+                  4210.19662356798,
+                  7406.548835941358,
+                  0
+                ],
+                [
+                  4211.443405539563,
+                  7405.009188429832,
+                  0
+                ],
+                [
+                  4212.522420520698,
+                  7403.347651064951,
+                  0
+                ],
+                [
+                  4213.4218465974545,
+                  7401.582427997782,
+                  0
+                ],
+                [
+                  4214.131829469519,
+                  7399.732859381649,
+                  0
+                ],
+                [
+                  4214.644590415971,
+                  7397.819209477354,
+                  0
+                ],
+                [
+                  4214.954511520578,
+                  7395.862444633708,
+                  0
+                ],
+                [
+                  4215.058197222865,
+                  7393.884003575816,
+                  0
+                ]
+              ]
+            ],
+            "height": 100,
+            "token": ""
+          }
+        }
+      },
+      {
+        "code": "1-53",
+        "title": "获取矩形网格",
+        "data": {
+          "ActionName": "GetCuboidCube",
+          "Parameters": {
+            "id" : "1",
+            "status" : "show",
+            "level": 23,
+            "rings": [
+              [
+                [
+                  4398.3497070245885,
+                  7655.315732726375,
+                  0
+                ],
+                [
+                  4520.6448806901735,
+                  7704.312131059312,
+                  0
+                ],
+                [
+                  4553.298742415221,
+                  7622.807982747839,
+                  0
+                ],
+                [
+                  4431.003568311868,
+                  7573.811585109692,
+                  0
+                ],
+                [
+                  4398.3497070245885,
+                  7655.315732726375,
+                  0
+                ]
+              ]
+            ],
+            "height": 100,
+            "token": ""
+          }
+        }
+      },
+      {
+        "code": "1-54",
+        "title": "获取不规则体网格",
+        "data": {
+          "ActionName": "GetPrismCube",
+          "Parameters": {
+            "id" : "1",
+            "status" : "show",
+            "level": 23,
+            "rings": [
+              [
+                [
+                  4479.576232672102,
+                  7297.029791248735,
+                  0
+                ],
+                [
+                  4613.843125522217,
+                  7354.234751378365,
+                  0
+                ],
+                [
+                  4643.20759982829,
+                  6991.8694261742485,
+                  0
+                ],
+                [
+                  4556.092362030114,
+                  6986.82807003776,
+                  0
+                ],
+                [
+                  4556.813024159852,
+                  7177.554172129637,
+                  0
+                ],
+                [
+                  4479.576232672102,
+                  7297.029791248735,
+                  0
+                ]
+              ]
+            ],
+            "height": 100,
+            "token": ""
+          }
+        }
+      },
+      {
+        "code": "1-55",
+        "title": "获取航线网格",
+        "data": {
+          "ActionName": "GetPathCube",
+          "Parameters": {
+            "id" : "1",
+            "status" : "show",
+            "level": 23,
+            "paths": [
+              [
+                [
+                  3499.5782683948523,
+                  7252.273350408689,
+                  0
+                ],
+                [
+                  3499.364569722593,
+                  7251.626996858693,
+                  100
+                ],
+                [
+                  3558.8660344507416,
+                  7251.648514626977,
+                  100
+                ],
+                [
+                  3558.852005535551,
+                  7290.14634859842,
+                  100
+                ],
+                [
+                  3568.767473443955,
+                  7293.999751210939,
+                  100
+                ],
+                [
+                  4279.47656249917,
+                  7294.283510610084,
+                  100
+                ],
+                [
+                  4282.768839396391,
+                  7325.0832129770815,
+                  100
+                ],
+                [
+                  4286.069444710435,
+                  7336.633997891262,
+                  100
+                ],
+                [
+                  4299.290211928166,
+                  7340.489525285203,
+                  100
+                ],
+                [
+                  4309.205361465806,
+                  7344.34362776725,
+                  100
+                ],
+                [
+                  4735.628798268906,
+                  7344.538185844389,
+                  100
+                ],
+                [
+                  4735.579268035517,
+                  7448.4823634558725,
+                  100
+                ],
+                [
+                  4734.06792183444,
+                  7449.867157578444,
+                  0
+                ]
+              ]
+            ],
+            "radius": 5,
+            "token": ""
+          }
+        }
+      },
+      {
+        "code": "1-56",
+        "title": "查询所有入库几何体",
+        "data": {
+          "ActionName": "GetBasePrism",
+          "Parameters": {
+            "token": ""
+          }
+        }
+      },
+      {
+        "code": "1-57",
+        "title": "查询所有入库航线",
+        "data": {
+          "ActionName": "GetBasePath",
+          "Parameters": {
+            "token": ""
+          }
+        }
+      },
+      {
+        "code": "1-58",
+        "title": "查询所有入库起降场",
+        "data": {
+          "ActionName": "GetBaseQJC",
+          "Parameters": {
+            "token": ""
+          }
+        }
       }
     ]
   }

src/service/http.js

@@ -29,7 +29,7 @@ export function gridBaseInfo(params){
 //查询权重
 export function getPowerPoint(params){
     return requestNetPost({
-        url:'/grid/search/v3/calculateWeight',
+        url:'/DataSearch/grid/search/v3/calculateWeight',
         // header:{
         //     'Content-Encoding': 'gzip'
         // },
@@ -60,7 +60,7 @@ export function getPowerPoint(params){
 //范围查询权重网格
 export function getPowerPointByPolygon(params){
     return requestNetPost({
-        url:'/grid/search/v3/calculateWeight',
+        url:'/DataSearch/grid/search/v3/calculateWeight',
         // header:{
         //     'Content-Encoding': 'gzip'
         // },
@@ -74,33 +74,28 @@ export function getPowerPointByPolygon(params){
                         [
                             [
                                 [
-                                    4130.976404781395,
-                                    7414.170031254575,
+                                    4510.965178032473,
+                                    8630.368364146465,
                                     0
                                 ],
                                 [
-                                    4230.5636578285,
-                                    7461.1376642530695,
+                                    5172.681364747654,
+                                    6222.235213498214,
                                     0
                                 ],
                                 [
-                                    4282.768409661947,
-                                    7356.489302356174,
+                                    3592.9849815986345,
+                                    5788.15954811861,
                                     0
                                 ],
                                 [
-                                    4219.073065521287,
-                                    7284.442400386499,
+                                    2931.26796348097,
+                                    8196.293085792775,
                                     0
                                 ],
                                 [
-                                    4192.363664967816,
-                                    7365.681086452302,
-                                    0
-                                ],
-                                [
-                                    4130.976404781395,
-                                    7414.170031254575,
+                                    4510.965178032473,
+                                    8630.368364146465,
                                     0
                                 ]
                             ]
@@ -118,6 +113,17 @@ export function getPowerPointByPolygon(params){
                 "pageSize": 100000,
                 "scrollId": params.scrollId
             },
+            // "scoreMap": {
+            //     "9.0": -999,
+            //     "12.0": -999,
+            //     "13.0": -999,
+            //     "5.0": -999,
+            //     "7.0": -999
+            // },
+            "elementCount":{
+                "7.0":1,
+                "12.0":1
+            },
             "isShowInfo":0,
             "level":params.level
         }
@@ -128,7 +134,7 @@ export function getPowerPointByPolygon(params){
 //漏斗查询权重网格
 export function getPowerPointByFunnel(params){
     return requestNetPost({
-        url:'/grid/search/cutUsingFunnel',
+        url:'/DataSearch/grid/search/cutUsingFunnel',
         // header:{
         //     'Content-Encoding': 'gzip'
         // },
@@ -143,10 +149,139 @@ export function getPowerPointByFunnel(params){
     })
 }
 
+
+//圆台查询权重网格
+export function getPowerPointByFrustumCone(params){
+    return requestNetPost({
+        url:'/DataSearch/grid/search/cutUsingFrustum',
+        // header:{
+        //     'Content-Encoding': 'gzip'
+        // },
+        data:{
+            "level": params.level,
+            "point": params.point,
+            "height": params.height,
+            "topRadius": params.topRadius,
+            "bottomRadius": params.bottomRadius
+        }
+    })
+}
+
+
+//圆锥查询权重网格
+export function getPowerPointByInvertedCone(params){
+    return requestNetPost({
+        url:'/DataSearch/grid/search/cutUsingCone',
+        // header:{
+        //     'Content-Encoding': 'gzip'
+        // },
+        data:{
+            "level": params.level,
+            "point": params.point,
+            "height": params.height,
+            "radius": params.radius,
+        }
+    })
+}
+
+//棱柱查询权重网格
+export function getPowerPointByPrism(params){
+    return requestNetPost({
+        url:'/DataSearch/grid/search/v3/calculateWeight',
+        // header:{
+        //     'Content-Encoding': 'gzip'
+        // },
+        data:{
+            "geoShapeQuery": {
+                "fieldName": "locationPoint",
+                "relation": "intersects",
+                "shape": {
+                    "type": "Polygon",
+                    "coordinates": params.rings
+                }
+            },
+            "minZ": 0,
+            "maxZ": params.height,
+            "level": params.level,
+            "routes": [],
+            "fields": [
+                "gridCode",
+                "element",
+                "boxSize",
+                "x","y","z"
+            ],
+            "scrollPage": {
+                "pageIndex": 1,
+                "pageSize": 10000,
+                "scrollId": ""
+            },
+            "isShowInfo": 0,
+        }
+    })
+}
+
+//查询所有空域
+export function getPrism(params){
+    return requestNetPost({
+        url:'/pg/airSpace/query',
+        // header:{
+        //     'Content-Encoding': 'gzip'
+        // },
+        data:{
+            "fullExport": true
+        }
+    })
+}
+
+
+//查询所有航线
+export function getPath(params){
+    return requestNetPost({
+        url:'/pg/airLine/query',
+        // header:{
+        //     'Content-Encoding': 'gzip'
+        // },
+        data:{
+            "fullExport": true
+        }
+    })
+}
+
+
+//查询所有入库起降场
+export function getQJC(params){
+    return requestNetPost({
+        url:'/pg/airPort/query',
+        // header:{
+        //     'Content-Encoding': 'gzip'
+        // },
+        data:{
+            "fullExport": true
+        }
+    })
+}
+
+
+//航线查询网格
+export function getPowerPointByPath(params){
+    return requestNetPost({
+        url:'/DataSearch/grid/search/cutUsingCylinderForPath',
+        // header:{
+        //     'Content-Encoding': 'gzip'
+        // },
+        data:{
+            "paths": params.paths,
+            "radius": params.radius,
+            "level": params.level,
+        }
+    })
+}
+
+
 //查询规避路线
 export function getAvoidRoute(params){
     return requestNetPost({
-        url:'/routePlan/search/routeSkipPath',
+        url:'/DataSearch/routePlan/search/routeSkipPath',
         data:{
             "uavid": params.uavid,
             "skip_route_id": params.skip_route_id,
@@ -158,7 +293,7 @@ export function getAvoidRoute(params){
 //查询建筑
 export function getBuildingPoint(params){
     return requestNetPost({
-        url:'/grid/search/collision/queryPageList',
+        url:'/DataSearch/grid/search/collision/queryPageList',
         data:{
             "locationPoint": {
                 "mapX":  params.x,

src/service/index.js

@@ -25,6 +25,7 @@ const requestNetPost = axios.create({
     method:"post"
 })
 
+
 const requestNetGet = axios.create({
     baseURL:import.meta.env.VITE_NET_API,
     timeout,

src/units/map/GeometryMeshEffect.js

@@ -81,9 +81,9 @@ class GeometryMeshEffect{
                         "symbolLayers": [
                             {
                                 "type": "object",
-                                "width": 200,
-                                "height": 200,
-                                "depth": 200,
+                                "width": item.shape.radius * 2,
+                                "height": item.shape.height,
+                                "depth": item.shape.radius * 2,
                                 "anchor": "origin",
                                 "resource": {
                                     "primitive": "inverted-cone"

vite.config.js

@@ -18,7 +18,7 @@ export default defineConfig({
     proxy: {
       '/api': {
         // 代理请求之后的请求地址（你的真实接口地址)
-        target: 'http://10.90.9.143:9252/DataSearch/',
+        target: 'http://10.90.9.143:9252/',
         //target: 'http://localhost:9250/',
         secure: false,
         ws: true,
@@ -39,8 +39,8 @@ export default defineConfig({
       },
       '/netapi': {
         // 代理请求之后的请求地址（你的真实接口地址)
-        target: 'http://58.34.215.19:8100/DataSearch/',
-        //target: 'http://10.1.163.15:19259/DataSearch/',
+        //target: 'http://58.34.215.19:8100/',
+        target: 'http://10.1.161.53:8100/',
         //target: 'http://localhost:9250/',
         secure: false,
         ws: true,