From ab212243a9f9f20a6cc5ea28daa0504aa94a44f8 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Mon, 4 Jan 2021 12:10:42 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E6=B6=88=E9=98=B2=E8=A6=81?=
 =?UTF-8?q?=E7=B4=A0=E7=9C=BC=E7=9D=9Bbug=20=E5=88=87=E6=8D=A2=E6=A5=BC?=
 =?UTF-8?q?=E5=B1=82=E6=B6=88=E9=98=B2=E8=A6=81=E7=B4=A0tree=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collection-tools.component.html           | 29 -------------------
 .../collection-tools.component.ts             | 15 ++++++++--
 2 files changed, 12 insertions(+), 32 deletions(-)

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 @@
                 </div>
             </ng-template>
             <!-- 消防列表树 -->
-            <!-- 消防列表树 -->
-            <!-- <mat-tree [dataSource]="renderData" [treeControl]="treeControl">
-
-              <mat-tree-node *matTreeNodeDef="let node;" matTreeNodePadding cdkTreeNodePaddingIndent='26' (click)="clickTreeNode(node)" class="treeNode">
-                <button mat-icon-button disabled></button>
-                <span title="{{node.name}}" [ngClass]="{'treeText': !node.isTemplate}">
-                  {{node.name || node.Name}}      
-                </span> 
-                <span  *ngIf="node.isTemplate">({{node.children.length}})</span>
-                <span class="isLookCss" (click)="clickLookItem(node)"><mat-icon [ngClass]="{'icongray': node.isLook == false}">visibility</mat-icon></span>
-              </mat-tree-node>
-
-              <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)="clickTreeNode(node)"class="treeNode" >
-                <button mat-icon-button 
-                        matTreeNodeToggle
-                        [attr.aria-label]="'toggle ' + node.name">
-                  <mat-icon class="mat-icon-rtl-mirror">
-                    {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
-                  </mat-icon>
-                </button>
-                <span title="{{node.name}}" [ngClass]="{'treeText': !node.isTemplate}">
-                  {{node.name || node.Name}}     
-                </span>   
-                <span *ngIf="node.isTemplate && node.isNewElement">({{node.children.length}})</span>
-                <span class="isLookCss" (click)="clickLookItem(node)"><mat-icon [ngClass]="{'icongray': node.isLook == false}">visibility</mat-icon></span>
-              </mat-tree-node>
-
-            </mat-tree> -->
-            <!-- 消防列表树 -->
           </div>
         </div>
         <!-- 消防设施 -->
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)