diff --git a/src/app/ui/collection-tools-examinee/collection-tools.component.ts b/src/app/ui/collection-tools-examinee/collection-tools.component.ts index 374d6a3..3961814 100644 --- a/src/app/ui/collection-tools-examinee/collection-tools.component.ts +++ b/src/app/ui/collection-tools-examinee/collection-tools.component.ts @@ -525,7 +525,7 @@ export class CollectionToolsExamineeComponent implements OnInit { this.canvas.on("select",obj=>{ //选中素材属性注入函数 this.setAssetsProperty(obj.assetData) - + console.log(obj.assetData) }) // 监听canvas组件取消选中素材事件 this.canvas.on("deselect",obj=>{ @@ -873,8 +873,6 @@ export class CollectionToolsExamineeComponent implements OnInit { this.allFireElements[this.allFireElements.length-1].children = [] this.beforeOneCheckedBuildingIsShow = false isRefresh? await this.canvas.refresh() : null - this.canvas.setNameVisible(this.basicInfo,0) - this.canvas.setNameVisible(this.wantToWork,1) isRefresh? this.canvasData.isChange = false : null //服务中 数据是否改动 改为false isRefresh? this.isShowProperty = true : null isRefresh? this.isShowAttribute = true : null @@ -1045,17 +1043,23 @@ export class CollectionToolsExamineeComponent implements OnInit { this.renovateTreeData() if(this.Facilities){ console.log(1111) - this.Facilities.forEach(item => { + console.log('走这里了') + this.Facilities.forEach((item,key) => { if(item.key == this.selectingSitePlan.id){ console.log(333) //如果当层有需要标记的基本信息素材 this.getAllAssetLibraries(item) }else{ - console.log(444) - this.canvas.onExamineeClickFloor() + + if(key == this.Facilities.length - 1 ){ + console.log(444) + this.canvas.onExamineeClickFloor() + } + } }) }else{ + console.log('走这里了') console.log(2222) this.canvas.onExamineeClickFloor(); this.allLibrary = this.originalallLibrary @@ -1084,6 +1088,7 @@ export class CollectionToolsExamineeComponent implements OnInit { this.canvasData.examOriginaleveryStoreyData.buildingAreaId? null : this.canvasData.examOriginaleveryStoreyData.buildingAreaId = e.id || null this.renovateTreeData() if(this.Facilities){ + console.log('走这里了') this.Facilities.forEach(item => { if(item.key == this.selectingSitePlan.id){ this.getAllAssetLibraries(item) @@ -1092,6 +1097,7 @@ export class CollectionToolsExamineeComponent implements OnInit { } }) }else{ + console.log('走这里了') this.canvas.onExamineeClickFloor();this.allLibrary = this.originalallLibrary } }) diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index 582c13a..7ecb766 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -1110,8 +1110,8 @@ export class CollectionToolsComponent implements OnInit { this.allFireElements[this.allFireElements.length-1].children = [] this.beforeOneCheckedBuildingIsShow = false // isRefresh? await this.canvas.refresh() : null - this.canvas.setNameVisible(this.basicInfo,0) - this.canvas.setNameVisible(this.wantToWork,1) + // this.canvas.setNameVisible(this.basicInfo,0) + // this.canvas.setNameVisible(this.wantToWork,1) isRefresh? this.canvasData.isChange = false : null //服务中 数据是否改动 改为false isRefresh? this.isShowProperty = true : null isRefresh? this.isShowAttribute = true : null