|
|
|
@ -547,6 +547,7 @@ export class CollectionToolsPlanComponent implements OnInit {
|
|
|
|
|
this.isEditPattern = false |
|
|
|
|
this.isediticon = false |
|
|
|
|
this.canvasData.gameMode = GameMode.Assignment |
|
|
|
|
|
|
|
|
|
} else if (this.router.url.indexOf("keyUnit/editplaninfo") != -1) { //编辑模式
|
|
|
|
|
this.canvasData.gameMode = GameMode.BasicInformation |
|
|
|
|
} |
|
|
|
@ -811,7 +812,7 @@ export class CollectionToolsPlanComponent implements OnInit {
|
|
|
|
|
//遍历 建筑数据 删除多余数据
|
|
|
|
|
let object = this.canvasData.originalcompanyBuildingData.data |
|
|
|
|
let adjoinArr = [] //毗邻数组
|
|
|
|
|
console.log('平面图数据',this.sitePlanData) |
|
|
|
|
console.log('平面图数据', this.sitePlanData) |
|
|
|
|
Object.keys(object).forEach(key => { |
|
|
|
|
let isExist = this.sitePlanData.find(item => { return item.id === object[key].FloorId }) |
|
|
|
|
if (isExist === undefined) { |
|
|
|
@ -1322,9 +1323,14 @@ export class CollectionToolsPlanComponent implements OnInit {
|
|
|
|
|
this.canvas.setNameVisible(this.basicInfo, 0) |
|
|
|
|
this.canvas.setNameVisible(this.wantToWork, 1) |
|
|
|
|
this.canvas.setLegendVisible(this.isShowLegend) //图例显隐
|
|
|
|
|
if (this.router.url.indexOf("keyUnit/viewunitinfo") != -1) { //查看模式
|
|
|
|
|
console.log('查看模式') |
|
|
|
|
this.canvas.allowEdit = false |
|
|
|
|
} |
|
|
|
|
isRefresh ? this.canvasData.isChange = false : null //服务中 数据是否改动 改为false
|
|
|
|
|
isRefresh ? this.isShowProperty = true : null |
|
|
|
|
isRefresh ? this.isShowAttribute = true : null |
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
|
//加载高德地图
|
|
|
|
|
this.toLoadGis() |
|
|
|
@ -2222,7 +2228,7 @@ export class CollectionToolsPlanComponent implements OnInit {
|
|
|
|
|
|
|
|
|
|
//将图标数据添加
|
|
|
|
|
let itemData = JSON.parse(JSON.stringify(this.selectImage)) |
|
|
|
|
console.log(6666,this.selectingSitePlan) |
|
|
|
|
console.log(6666, this.selectingSitePlan) |
|
|
|
|
itemData.id = id |
|
|
|
|
itemData.FloorId = this.selectingSitePlan.id |
|
|
|
|
itemData.point = { x: e.lnglat.lng, y: e.lnglat.lat } |
|
|
|
|