Browse Source

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

YaolongHan 4 years ago
parent
commit
b05adde51f
2 changed files with 14 additions and 6 deletions
  1. 5 5
      package.json
  2. 9 1
      src/components/floorMap/index.vue

+ 5 - 5
package.json

@@ -11,11 +11,11 @@
     },
     "dependencies": {
         "@mapbox/geojson-merge": "^1.1.1",
-        "@saga-web/base": "2.1.25",
-        "@saga-web/big": "1.0.107",
-        "@saga-web/draw": "2.1.106",
-        "@saga-web/feng-map": "1.0.39",
-        "@saga-web/graph": "2.1.123",
+        "@saga-web/base": "2.1.27",
+        "@saga-web/big": "1.0.110",
+        "@saga-web/draw": "2.1.107",
+        "@saga-web/feng-map": "1.0.43",
+        "@saga-web/graph": "2.1.124",
         "ant-design-vue": "^1.4.10",
         "axios": "^0.19.2",
         "core-js": "^3.4.4",

+ 9 - 1
src/components/floorMap/index.vue

@@ -88,7 +88,7 @@
 </template>
 <script>
 import { SFengParser, ProjectRf } from '@saga-web/feng-map'
-import { SFloorParser, ItemOrder, ItemColor, SPolygonItem } from '@saga-web/big'
+import { SFloorParser, ItemOrder, ItemColor, SPolygonItem, SBoardItem } from '@saga-web/big'
 import { FloorView } from '@/lib/FloorView'
 import { FloorScene } from '@/lib/FloorScene'
 import RoomBox from '@/views/room/index'
@@ -336,7 +336,15 @@ export default {
                 }
             }
         }, // 解析底图
+        // 解析楼地板
+        loadBoard(floor){
+            window.fengmapData.loadFloor(floor, res => {
+                const zone = new SBoardItem(null, res)
+                this.scene.addItem(zone);
+            })
+        },
         readBaseMap(floor) {
+            this.loadBoard(window.fengmapData.gnameToGid[floor]);
             window.fengmapData.parseData(window.fengmapData.gnameToGid[floor], (res) => {
                 if (res.err) {
                     console.log('errr', res.err)