Browse Source

低空修改250330-01

zhiyuan-007 2 days ago
parent
commit
d6431ada58
5 changed files with 90 additions and 61 deletions
  1. BIN
      dist.zip
  2. BIN
      dist_test.zip
  3. 87 58
      src/components/mapJK.vue
  4. 1 1
      src/components/mapTest.vue
  5. 2 2
      src/service/http.js

BIN
dist.zip


BIN
dist_test.zip


+ 87 - 58
src/components/mapJK.vue

@@ -436,8 +436,8 @@ export default {
           title:params.title,
           visible:params.visible,
           opacity:params.opacity,
-          //url:"https://chengdi.china-gis.com:6443/geoscene/rest/services/Hosted/WT_JC_DARK/MapServer",
-          url:"https://192.168.2.140:6443/geoscene/rest/services/JC_dark/MapServer",
+          url:"https://serve2d21.gis.cn:6443/geoscene/rest/services/google_shanghai_black/MapServer",
+          //url:"https://192.168.2.140:6443/geoscene/rest/services/JC_dark/MapServer",
           m_spatialReference,
           m_fullExtent,
         })
@@ -3031,6 +3031,35 @@ export default {
         let rings = params.rings;
         let fields = params.fields;
         let deepShow = params.deepShow;
+        // if(status === "hide"){
+        //   showThreeCubeDetail({
+        //     id:"test",
+        //     status:"hide"
+        //   });
+        //   currentShowGridParams = null;
+        //   return
+        // }
+        // //备用方案:根据rings四至范围生成矩形面,获取左下角的点为原点,距离分别为长、宽
+        //
+        // let { origin,length,width } = createBoundingBoxFromRings(rings);
+        //
+        // debugger
+        // const cubeGrid = generateGrid({
+        //   x:origin[0],
+        //   y:origin[1],
+        //   z:minZ,
+        // }, length, width, maxZ-minZ,32);
+        // showThreeCubeDetail({
+        //   "id":"test",
+        //   "status":"show",
+        //   "size": {
+        //     x:32,
+        //     y:32,
+        //     z:32
+        //   },
+        //   "points":cubeGrid,
+        //   "depthTest":false
+        // })
         if(status === "hide"){
           showThreeCubeDetail({
             id:params.id,
@@ -3128,14 +3157,14 @@ export default {
         const zCount = Math.ceil(zRange / size);
 
         // 生成网格点
-        for (let x = origin.x; x < xCount; x++) {
-          for (let y = origin.y; y < yCount; y++) {
-            for (let z = origin.z; z < zCount; z++) {
+        for (let x = 0; x < xCount; x++) {
+          for (let y = 0; y < yCount; y++) {
+            for (let z = 0; z < zCount; z++) {
               grid.push({
-                x: startPoint.x + x * size,
-                y: startPoint.y + y * size,
-                z: startPoint.z + z * size,
-                color: [0,0,1]
+                x: startPoint.x* 1 + x * size,
+                y: startPoint.y * 1 + y * size,
+                z: startPoint.z * 1 + z * size,
+                color: [0,1,1]
               });
             }
           }
@@ -3192,6 +3221,36 @@ export default {
         let fields = params.fields;
 
 
+        // if(status === "hide"){
+        //   showThreeCubeDetail({
+        //     id:"test",
+        //     status:"hide"
+        //   });
+        //   currentShowGridParams = null;
+        //   return
+        // }
+        // //备用方案:根据rings四至范围生成矩形面,获取左下角的点为原点,距离分别为长、宽
+        //
+        // let { origin,length,width } = createBoundingBoxFromRings(rings);
+        //
+        // debugger
+        // const cubeGrid = generateGrid({
+        //   x:origin[0],
+        //   y:origin[1],
+        //   z:minZ,
+        // }, length, width, maxZ-minZ,32);
+        // showThreeCubeDetail({
+        //   "id":"test",
+        //   "status":"show",
+        //   "size": {
+        //     x:32,
+        //     y:32,
+        //     z:32
+        //   },
+        //   "points":cubeGrid,
+        //   "depthTest":false
+        // })
+        //
         if(status === "hide"){
           showThreeCubeDetail({
             id:params.id,
@@ -3200,55 +3259,25 @@ export default {
           currentShowGridParams = null;
           return
         }
-        //备用方案:根据rings四至范围生成矩形面,获取左下角的点为原点,距离分别为长、宽
-
-        let { origin,length,width } = createBoundingBoxFromRings(rings);
-
-        debugger
-        const cubeGrid = generateGrid({
-          x:origin[0],
-          y:origin[1],
-          z:minZ,
-        }, length, width, maxZ-minZ,32);
-        showThreeCubeDetail({
-          "id":"test",
-          "status":"show",
-          "size": {
-            x:32,
-            y:32,
-            z:32
-          },
-          "points":cubeGrid,
-          "depthTest":false
-        })
-        //
-        // if(status === "hide"){
-        //   showThreeCubeDetail({
-        //     id:params.id,
-        //     status:"hide"
-        //   });
-        //   currentShowGridParams = null;
-        //   return
-        // }
-        // currentShowGridParams = {
-        //   id,
-        //   level,
-        //   minZ,
-        //   maxZ,
-        //   rings,
-        //   fields
-        // };
-        // getSixPowerByPolygon({
-        //   id,
-        //   status,
-        //   minZ,
-        //   maxZ,
-        //   level,
-        //   fields,
-        //   rings,
-        //   deepShow,
-        //   scrollId:"",
-        // });
+        currentShowGridParams = {
+          id,
+          level,
+          minZ,
+          maxZ,
+          rings,
+          fields
+        };
+        getSixPowerByPolygon({
+          id,
+          status,
+          minZ,
+          maxZ,
+          level,
+          fields,
+          rings,
+          deepShow,
+          scrollId:"",
+        });
       }
 
       // 获取当前场景-递归获取权重数据

+ 1 - 1
src/components/mapTest.vue

@@ -76,7 +76,7 @@ export default {
         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/#//map-tool-widget/#/jk_map',
+        url: 'http://58.34.215.19:8095/map-tool-widget/#/jk_map',
         onReady:function (){
           // console.log("地图创建完成");
         }

+ 2 - 2
src/service/http.js

@@ -109,7 +109,7 @@ export function getPowerPointByPolygon(params){
             //     "13.0":1,  //航线
             // },
             "isShowInfo":0,
-            "level":13
+            "level":15
         }
     })
 }
@@ -186,7 +186,7 @@ export function getOccupyPointByPolygon(params){
             //     "13.0":1,  //航线
             // },
             "isShowInfo":0,
-            "level":13
+            "level":15
         }
     })
 }