diff --git a/src/app/ui/collection-tools-read/collection-tools.component.html b/src/app/ui/collection-tools-read/collection-tools.component.html index 5519d75..bd3cfe3 100644 --- a/src/app/ui/collection-tools-read/collection-tools.component.html +++ b/src/app/ui/collection-tools-read/collection-tools.component.html @@ -118,35 +118,6 @@ - - - diff --git a/src/app/ui/collection-tools-read/collection-tools.component.ts b/src/app/ui/collection-tools-read/collection-tools.component.ts index d3abad7..45a4342 100644 --- a/src/app/ui/collection-tools-read/collection-tools.component.ts +++ b/src/app/ui/collection-tools-read/collection-tools.component.ts @@ -433,7 +433,7 @@ export class CollectionToolsReadComponent implements OnInit { console.log(iconVisibleArr) console.log(678,this.renderData) - this.canvas.setIconVisible(iconVisibleArr,true) + } //打开消防设施考题设定 @@ -541,7 +541,6 @@ export class CollectionToolsReadComponent implements OnInit { renderData:any = []//当前层默认隐藏的基本信息考试题目 //封装 刷新 tree 数据 async renovateTreeData (isRefresh:boolean = true) { - this.allFireElements[this.allFireElements.length-1].children = [] this.beforeOneCheckedBuildingIsShow = false isRefresh? await this.canvas.refresh() : null @@ -563,9 +562,18 @@ export class CollectionToolsReadComponent implements OnInit { this.canvasData.hiddenBasicInfoFacilities = arr console.log('这层有',item) let allFireElements = JSON.parse(JSON.stringify(this.allFireElements)) - this.renderData = this.processingData(allFireElements,item.children) + this.renderData = [] + setTimeout(() => { + this.renderData = [...this.processingData(allFireElements,item.children)] + }, 0); this.canvas.loadExamineeData() + // this.canvas.createBackground(this.canvasData.selectStorey.imageUrl, this.canvasData.selectStorey.imageAngle); + // this.canvas.createFloorShape(this.canvasData.examOriginaleveryStoreyData.data); + // this.canvas.processinghiddenData(); + // this.canvas.createNodeShape(this.canvasData.selectPanelPoint.Data); + // this.canvas.setNameVisible(false, 0); + // this.canvas.setNameVisible(false, 1); return true } else{ console.log('这层没有tree') @@ -626,6 +634,7 @@ export class CollectionToolsReadComponent implements OnInit { allFireElements.forEach(item => { if (item.parentId == element.id) {element.children.push(item)} }); }); allFireElements.forEach(element => { + element.isLook = false if (!element.parentId) { element.isLook = false treeData.push(element)