Quellcode durchsuchen

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into develop

YaolongHan vor 4 Jahren
Ursprung
Commit
2e756b5956
3 geänderte Dateien mit 27 neuen und 5 gelöschten Zeilen
  1. 3 3
      package.json
  2. 4 0
      src/api/public.js
  3. 20 2
      src/components/floorMap/index.vue

+ 3 - 3
package.json

@@ -12,10 +12,10 @@
     "dependencies": {
         "@mapbox/geojson-merge": "^1.1.1",
         "@saga-web/base": "2.1.27",
-        "@saga-web/big": "1.0.112",
+        "@saga-web/big": "1.0.113",
         "@saga-web/draw": "2.1.107",
-        "@saga-web/feng-map": "1.0.45",
-        "@saga-web/graph": "2.1.125",
+        "@saga-web/feng-map": "1.0.47",
+        "@saga-web/graph": "2.1.126",
         "ant-design-vue": "^1.4.10",
         "axios": "^0.19.2",
         "core-js": "^3.4.4",

+ 4 - 0
src/api/public.js

@@ -57,3 +57,7 @@ export function getPvUv(data, postParams) {
 export function setFloor(data, postParams) {
     return httputils.fetchJson(`/data/plaza/floor/set`, data, postParams)
 }
+// 查询图
+export function graphQuery(params){
+    return httputils.postJson(`/serve/topology-wanda/graph/query`, params)
+}

+ 20 - 2
src/components/floorMap/index.vue

@@ -94,7 +94,7 @@ import { FloorView } from '@/lib/FloorView'
 import { FloorScene } from '@/lib/FloorScene'
 import RoomBox from '@/views/room/index'
 import canvasFun from '@/components/floorMap/canvasFun'
-import { readGroup, queryStatis } from '@/api/public'
+import { readGroup, queryStatis, graphQuery } from '@/api/public'
 import { queryShops, queryAssetAll } from '@/api/equipmentList.js'
 import { STopologyParser } from '@/lib/parsers/STopologyParser'
 import { mapGetters, mapActions } from 'vuex'
@@ -288,7 +288,17 @@ export default {
                     if (this.canvasID != `canvas${this.id}`) {
                         this.canvasID = `canvas${this.id}`
                     }
-                    this.parserData(floorid)
+                    this.getGraphDetail().then(res => {
+                        if (res.Content.length == 1) {
+                            const data = res.Content[0];
+                            if (data.MaxY && data.MinX) {
+                                window.fengmapData.maxY = data.MaxY;
+                                window.fengmapData.minX = data.MinX;
+                            }
+                        }
+                        this.parserData(floorid);
+                    });
+                    // this.parserData(floorid);
                 } else if (this.haveFengMap == 0) {
                     this.view.scene = this.scene
                     this.readGraph()
@@ -650,6 +660,14 @@ export default {
             }
             return readGroup(data)
         },
+        // 获取图最大最小值
+        getGraphDetail(){
+            const categoryId = this.categoryId ? this.categoryId : this.$cookie.get('categoryId');
+            const data = {
+                Filters:`categoryId='${categoryId}';projectId='${this.urlMsg.ProjectID}';BuildingID='1';FloorID='${this.floorid}';isPub=true`
+            };
+            return graphQuery(data);
+        },
         // 地图尺寸
         mapSize() {
             this.canvasWidth = this.$refs.graphy.offsetWidth