Browse Source

低空修改250330-01

zhiyuan-007 2 days ago
parent
commit
1277606ac2
6 changed files with 22 additions and 334 deletions
  1. 2 2
      .env.production
  2. 14 10
      src/components/mapJK.vue
  3. 2 2
      src/components/mapTest.vue
  4. 0 316
      src/config/basicTool.json
  5. 2 2
      src/main.js
  6. 2 2
      src/service/http.js

+ 2 - 2
.env.production

@@ -4,5 +4,5 @@ VITE_BASE_URL='http://172.16.8.44:9250/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://172.16.8.44:9250/low-altitude/'
-VITE_NET_URL='http://172.16.8.44:9250/low-altitude/'
+VITE_NET_API='http://58.34.215.19:8095/low-altitude/'
+VITE_NET_URL='http://58.34.215.19:8095/low-altitude/'

+ 14 - 10
src/components/mapJK.vue

@@ -421,7 +421,7 @@ export default {
           title:params.title,
           visible:params.visible,
           opacity:params.opacity,
-          url:"https://chengdi.china-gis.com:6443/geoscene/rest/services/HP/MapServer",
+          url:"https://192.168.2.140:6443/geoscene/rest/services/WT_HP/MapServer",
           where:params.where,
           popupEnabled:params.popupEnabled,
           renderer:params.renderer,
@@ -436,7 +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://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",
           m_spatialReference,
           m_fullExtent,
         })
@@ -449,7 +450,7 @@ export default {
           title:params.title,
           visible:params.visible,
           opacity:params.opacity,
-          url:"https://chengdi.china-gis.com:6443/geoscene/rest/services/Hosted/WT_JC_withe/MapServer",
+          url:"https://192.168.2.140:6443/geoscene/rest/services/JC_white/MapServer",
           m_spatialReference,
           m_fullExtent,
         })
@@ -466,7 +467,7 @@ export default {
           title:params.title,
           visible:params.visible,
           opacity:params.opacity,
-          url: "https://chengdi.china-gis.com:6443/geoscene/rest/services/WT/SceneServer",
+          url: "https://192.168.2.140:6443/geoscene/rest/services/WT_BM/SceneServer",
           where:params.where,
           popupEnabled:params.popupEnabled,
           renderer:params.renderer,
@@ -3065,6 +3066,7 @@ export default {
 
       // 获取当前场景-递归获取权重数据
       function getOccupyByPolygon(params) {
+        debugger
         getOccupyPointByPolygon({
           minZ:params.minZ,
           maxZ:params.maxZ,
@@ -3083,9 +3085,9 @@ export default {
           })){
             if(res.data.data.list?.length >= 100000 && res.data.data.scrollId){
               let size = {
-                x:16,
-                y:16,
-                z:16
+                x:32,
+                y:32,
+                z:32
               }
               showThreeCubeDetail({
                 "id":params.id,
@@ -3099,9 +3101,9 @@ export default {
             }else{
               if(res.data.data.list?.length > 0){
                 let size = {
-                  x:16,
-                  y:16,
-                  z:16
+                  x:32,
+                  y:32,
+                  z:32
                 }
                 showThreeCubeDetail({
                   "id":params.id,
@@ -3155,6 +3157,8 @@ export default {
         let fields = params.fields;
 
 
+
+
         // const cubeGrid = generateGrid({
         //   x:500,
         //   y:-1500,

+ 2 - 2
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://172.16.8.44:9250/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',
         onReady:function (){
           // console.log("地图创建完成");
         }

+ 0 - 316
src/config/basicTool.json

@@ -342,322 +342,6 @@
                   ],
                   "color": [0,255,0,0.3]
                 }
-              },
-              {
-                "type": "polygon",
-                "shape": {
-                  "height": 300,
-                  "rings": [
-                    [
-                      [
-                        -6193.269497659612,
-                        17278.09490721943,
-                        0
-                      ],
-                      [
-                        -6202.454125402919,
-                        17102.841769823484,
-                        0
-                      ],
-                      [
-                        -6229.907379929278,
-                        16929.50874247493,
-                        0
-                      ],
-                      [
-                        -6275.328477637135,
-                        16759.994898093653,
-                        0
-                      ],
-                      [
-                        -6338.219775475027,
-                        16596.157465831762,
-                        0
-                      ],
-                      [
-                        -6417.8922232229925,
-                        16439.791482882294,
-                        0
-                      ],
-                      [
-                        -6513.472912870972,
-                        16292.610127676136,
-                        0
-                      ],
-                      [
-                        -6623.914642381638,
-                        16156.225949940601,
-                        0
-                      ],
-                      [
-                        -6748.007389055054,
-                        16032.133203267185,
-                        0
-                      ],
-                      [
-                        -6884.3915667905885,
-                        15921.691473756518,
-                        0
-                      ],
-                      [
-                        -7031.572921996748,
-                        15826.11078410854,
-                        0
-                      ],
-                      [
-                        -7187.938904946214,
-                        15746.438336360574,
-                        0
-                      ],
-                      [
-                        -7351.776337208108,
-                        15683.547038522682,
-                        0
-                      ],
-                      [
-                        -7521.29018158938,
-                        15638.125940814825,
-                        0
-                      ],
-                      [
-                        -7694.623208937938,
-                        15610.672686288466,
-                        0
-                      ],
-                      [
-                        -7869.876346333884,
-                        15601.48805854516,
-                        0
-                      ],
-                      [
-                        -8045.129483729828,
-                        15610.672686288466,
-                        0
-                      ],
-                      [
-                        -8218.462511078385,
-                        15638.125940814825,
-                        0
-                      ],
-                      [
-                        -8387.97635545966,
-                        15683.547038522682,
-                        0
-                      ],
-                      [
-                        -8551.813787721552,
-                        15746.438336360574,
-                        0
-                      ],
-                      [
-                        -8708.179770671019,
-                        15826.11078410854,
-                        0
-                      ],
-                      [
-                        -8855.361125877178,
-                        15921.691473756518,
-                        0
-                      ],
-                      [
-                        -8991.745303612714,
-                        16032.133203267185,
-                        0
-                      ],
-                      [
-                        -9115.83805028613,
-                        16156.225949940601,
-                        0
-                      ],
-                      [
-                        -9226.279779796796,
-                        16292.610127676135,
-                        0
-                      ],
-                      [
-                        -9321.860469444775,
-                        16439.791482882294,
-                        0
-                      ],
-                      [
-                        -9401.53291719274,
-                        16596.157465831762,
-                        0
-                      ],
-                      [
-                        -9464.424215030633,
-                        16759.994898093653,
-                        0
-                      ],
-                      [
-                        -9509.84531273849,
-                        16929.508742474925,
-                        0
-                      ],
-                      [
-                        -9537.298567264848,
-                        17102.841769823484,
-                        0
-                      ],
-                      [
-                        -9546.483195008155,
-                        17278.09490721943,
-                        0
-                      ],
-                      [
-                        -9537.298567264848,
-                        17453.348044615374,
-                        0
-                      ],
-                      [
-                        -9509.84531273849,
-                        17626.681071963932,
-                        0
-                      ],
-                      [
-                        -9464.424215030633,
-                        17796.194916345205,
-                        0
-                      ],
-                      [
-                        -9401.53291719274,
-                        17960.0323486071,
-                        0
-                      ],
-                      [
-                        -9321.860469444775,
-                        18116.398331556567,
-                        0
-                      ],
-                      [
-                        -9226.279779796796,
-                        18263.579686762725,
-                        0
-                      ],
-                      [
-                        -9115.83805028613,
-                        18399.96386449826,
-                        0
-                      ],
-                      [
-                        -8991.745303612714,
-                        18524.056611171676,
-                        0
-                      ],
-                      [
-                        -8855.36112587718,
-                        18634.49834068234,
-                        0
-                      ],
-                      [
-                        -8708.17977067102,
-                        18730.079030330322,
-                        0
-                      ],
-                      [
-                        -8551.813787721554,
-                        18809.751478078288,
-                        0
-                      ],
-                      [
-                        -8387.97635545966,
-                        18872.642775916178,
-                        0
-                      ],
-                      [
-                        -8218.462511078387,
-                        18918.063873624036,
-                        0
-                      ],
-                      [
-                        -8045.12948372983,
-                        18945.517128150394,
-                        0
-                      ],
-                      [
-                        -7869.876346333884,
-                        18954.701755893704,
-                        0
-                      ],
-                      [
-                        -7694.62320893794,
-                        18945.517128150394,
-                        0
-                      ],
-                      [
-                        -7521.290181589382,
-                        18918.063873624036,
-                        0
-                      ],
-                      [
-                        -7351.776337208108,
-                        18872.642775916178,
-                        0
-                      ],
-                      [
-                        -7187.938904946215,
-                        18809.751478078288,
-                        0
-                      ],
-                      [
-                        -7031.572921996749,
-                        18730.079030330322,
-                        0
-                      ],
-                      [
-                        -6884.391566790589,
-                        18634.49834068234,
-                        0
-                      ],
-                      [
-                        -6748.007389055055,
-                        18524.056611171676,
-                        0
-                      ],
-                      [
-                        -6623.914642381639,
-                        18399.963864498262,
-                        0
-                      ],
-                      [
-                        -6513.472912870972,
-                        18263.579686762725,
-                        0
-                      ],
-                      [
-                        -6417.8922232229925,
-                        18116.398331556567,
-                        0
-                      ],
-                      [
-                        -6338.219775475028,
-                        17960.032348607103,
-                        0
-                      ],
-                      [
-                        -6275.328477637135,
-                        17796.19491634521,
-                        0
-                      ],
-                      [
-                        -6229.907379929278,
-                        17626.681071963936,
-                        0
-                      ],
-                      [
-                        -6202.454125402919,
-                        17453.348044615377,
-                        0
-                      ],
-                      [
-                        -6193.269497659612,
-                        17278.09490721943,
-                        0
-                      ]
-                    ]
-                  ],
-                  "color": [0,255,255,0.7]
-                }
               }
             ]
           }

+ 2 - 2
src/main.js

@@ -6,8 +6,8 @@ import '@arcgis/core/assets/esri/themes/dark/main.css'
 import router from "./router/index.js";
 import './assets/global.scss'
 import esriConfig from  '@arcgis/core/config.js'
-esriConfig.assetsPath = '/public/assets';
-//esriConfig.assetsPath = '/map-tool-widget/assets';
+//esriConfig.assetsPath = '/public/assets';
+esriConfig.assetsPath = '/map-tool-widget/assets';
 import mitt from 'mitt'
 app.use(ElementPlus, {
     locale: zhCn,

+ 2 - 2
src/service/http.js

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