Browse Source

低空修改250309-02

zhiyuan-007 1 month ago
parent
commit
38de193513
7 changed files with 38 additions and 16 deletions
  1. BIN
      dist (2).zip
  2. BIN
      dist (4).zip
  3. BIN
      dist.zip
  4. 32 0
      src/components/mapJK.vue
  5. 3 0
      src/components/mapTest.vue
  6. 1 1
      src/config/basicTool.json
  7. 2 15
      src/service/http.js

BIN
dist (2).zip


BIN
dist (4).zip


BIN
dist.zip


+ 32 - 0
src/components/mapJK.vue

@@ -2858,6 +2858,12 @@ export default {
             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,
@@ -2916,6 +2922,13 @@ export default {
             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,
@@ -2970,6 +2983,12 @@ export default {
             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,
@@ -3085,6 +3104,13 @@ export default {
             y:res.data.data.list[0].boxSize.lonLength,
             z:res.data.data.list[0].boxSize.height
           }
+          debugger
+          bus.emit('SendMessage',{
+            action:"CubeResult",
+            data:{
+              "message":res.data.data.gridConflict
+            }
+          })
           showThreeCubeDetail({
             "id":params.id,
             "status":params.status,
@@ -3146,6 +3172,12 @@ export default {
             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,

+ 3 - 0
src/components/mapTest.vue

@@ -104,6 +104,9 @@ export default {
           case "ReturnResult":
             t_result.value = JSON.stringify(arg.data, null, 4);
             break;
+          case "CubeResult":
+            t_result.value = JSON.stringify(arg.data, null, 4);
+            break;
         }
       })
     })

+ 1 - 1
src/config/basicTool.json

@@ -42,7 +42,7 @@
             "title":"BaseMap",
             "visible": true,
             "opacity": 1,
-            "url": "https://cimweb.zjw.sh.cegn.cn:2008/MapServiceProxy/eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NDE1MDc1MzgsImtleSI6IjkzNDkzMzIxIiwic2VydmljZU5vIjoiRDkwMDEwMDcxMjAyMzA4MDEiLCJ1c2VybmFtZSI6InB0Z2wifQ.HetDOuz3SUpWuP8mQGwSIwTPfxTsx2MxTk9HbOLLsOQ",
+            "url": "https://cimweb.zjw.sh.cegn.cn:2008/MapServiceProxy/eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NDE1OTUyMDMsImtleSI6IjkzNDkzMzIxIiwic2VydmljZU5vIjoiRDkwMDEwMDcxMjAyMzA4MDEiLCJ1c2VybmFtZSI6InB0Z2wifQ.dfJmWQC6WF1QXyqC7PKqdzekmiVWSOAvEwyjlszX1R4",
             "token": ""
           }
         }

+ 2 - 15
src/service/http.js

@@ -237,7 +237,7 @@ export function getPowerPointByInvertedCone(params){
 //棱柱查询权重网格
 export function getPowerPointByPrism(params){
     return requestNetPost({
-        url:'/DataSearch/grid/search/v3/calculateWeight',
+        url:'/DataSearch/grid/search/cutPrism',
         // header:{
         //     'Content-Encoding': 'gzip'
         // },
@@ -251,21 +251,8 @@ export function getPowerPointByPrism(params){
                 }
             },
             "minZ": 0,
-            "maxZ": params.height,
+            "maxZ": params.height * 1,
             "level": params.level,
-            "routes": [],
-            "fields": [
-                "gridCode",
-                "element",
-                "boxSize",
-                "x","y","z"
-            ],
-            "scrollPage": {
-                "pageIndex": 1,
-                "pageSize": 100000,
-                "scrollId": ""
-            },
-            "isShowInfo": 0,
         }
     })
 }