浏览代码

add space scenemark

haojianlong 5 年之前
父节点
当前提交
a03dc40c8c
共有 2 个文件被更改,包括 16 次插入6 次删除
  1. 13 3
      src/components/business_space/newGraphy/graphy.vue
  2. 3 3
      src/views/ledger/spacelist/index.vue

+ 13 - 3
src/components/business_space/newGraphy/graphy.vue

@@ -106,7 +106,8 @@ export default {
       search: '',//搜索
       search: '',//搜索
       num: 0, // 未关联空间的业务空间条数
       num: 0, // 未关联空间的业务空间条数
       buildFloor: [],
       buildFloor: [],
-      FloorMap: '',
+      FloorObj: {}, //楼层对象
+      FloorMap: '', //楼层底图
       tab: {},
       tab: {},
       isEdit: false,
       isEdit: false,
       canvasLoading: false,
       canvasLoading: false,
@@ -188,9 +189,10 @@ export default {
       this.view.fitSelectedToView();
       this.view.fitSelectedToView();
     },
     },
     // 父组件调用
     // 父组件调用
-    getData(buildFloor, FloorMap, tab) {
+    getData(buildFloor, FloorObj, tab) {
       this.buildFloor = buildFloor;
       this.buildFloor = buildFloor;
-      this.FloorMap = FloorMap;
+      this.FloorObj = FloorObj;
+      this.FloorMap = FloorObj.StructureInfo ? FloorObj.StructureInfo.FloorMap : ''
       this.tab = tab;
       this.tab = tab;
       console.log(arguments)
       console.log(arguments)
       this.init();
       this.init();
@@ -235,6 +237,7 @@ export default {
           return;
           return;
         }
         }
         that.view.scene = that.scene;
         that.view.scene = that.scene;
+        // 绘制业务空间
         let tempArr = this.BSPRelaISPList.map((t, i) => {
         let tempArr = this.BSPRelaISPList.map((t, i) => {
           return {
           return {
             RoomLocalName: t.RoomLocalName,
             RoomLocalName: t.RoomLocalName,
@@ -246,6 +249,13 @@ export default {
         that.scene.addZoneList(tempArr);
         that.scene.addZoneList(tempArr);
         that.scene.click(that, that.canvasClick);
         that.scene.click(that, that.canvasClick);
         that.zoneList = that.scene.zoneList;
         that.zoneList = that.scene.zoneList;
+        // 蒙版
+        if (this.FloorObj.Outline) {
+          let newArr = this.FloorObj.Outline.map(t => {
+            return new SPoint(t.X, t.Y);
+          })
+          this.scene.addSceneMark(newArr)
+        }
         that.view.fitSceneToView();
         that.view.fitSceneToView();
         that.view.maxScale = that.view.scale * 10;
         that.view.maxScale = that.view.scale * 10;
         that.view.minScale = that.view.scale;
         that.view.minScale = that.view.scale;

+ 3 - 3
src/views/ledger/spacelist/index.vue

@@ -112,7 +112,7 @@ export default {
         children: "Floor"
         children: "Floor"
       },
       },
       floorToMap: {}, //楼层及其对应的模型图
       floorToMap: {}, //楼层及其对应的模型图
-      FloorMap: "", //当前选中的楼层平面图
+      FloorMap: "", //当前选中的楼层对象
       buildFloorSelectd: [], //当前所选的建筑楼层
       buildFloorSelectd: [], //当前所选的建筑楼层
       childBackParam: {}
       childBackParam: {}
     };
     };
@@ -140,7 +140,7 @@ export default {
             t.Floor = t.Floor.map(item => {
             t.Floor = t.Floor.map(item => {
               item.BuildID = item.FloorID;
               item.BuildID = item.FloorID;
               item.BuildLocalName = item.FloorLocalName;
               item.BuildLocalName = item.FloorLocalName;
-              this.floorToMap[item.FloorID] = item.StructureInfo ? item.StructureInfo.FloorMap : '';
+              this.floorToMap[item.FloorID] = item;
               return item;
               return item;
             })
             })
           } else {
           } else {
@@ -196,7 +196,7 @@ export default {
     //修改所选建筑楼层
     //修改所选建筑楼层
     changeCascader(val) {
     changeCascader(val) {
       // val[0]->建筑 val[1]->楼层
       // val[0]->建筑 val[1]->楼层
-      if (!this.floorToMap[val[1]]) {
+      if (!this.floorToMap[val[1]].StructureInfo || !this.floorToMap[val[1]].StructureInfo.FloorMap) {
         this.isMyTab = 2;
         this.isMyTab = 2;
       }
       }
       this.FloorMap = this.floorToMap[val[1]];
       this.FloorMap = this.floorToMap[val[1]];