From 4b81d409bf47326a86fa8e0cd4da8139f1ff51c0 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Sat, 9 Jan 2021 15:23:41 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=AD=A3]=20=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E7=B4=A0=E6=9D=90tree=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=96=B0,=20?=
 =?UTF-8?q?=E7=B4=A0=E6=9D=90=E5=90=8D=E7=A7=B0=E6=98=BE=E9=9A=90,=20?=
 =?UTF-8?q?=E7=B4=A0=E6=9D=90=E5=8E=9A=E5=BA=A6BUG=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collection-tools.component.html             |  6 +++---
 .../collection-tools.component.ts               | 17 ++++-------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/app/ui/collection-tools/collection-tools.component.html b/src/app/ui/collection-tools/collection-tools.component.html
index 45ba161..f0f019c 100644
--- a/src/app/ui/collection-tools/collection-tools.component.html
+++ b/src/app/ui/collection-tools/collection-tools.component.html
@@ -15,9 +15,9 @@
       <mat-icon style="padding-bottom: 7px;">screen_share</mat-icon>
     </button>
 
-    <span title="基本信息名称显示/隐藏" style="margin-right:20px;user-select: none;margin-left: 12px;" class="nameShow" (click)="basicInfoClick()">
+    <span [ngClass]="{'icongray': !basicInfo}" title="基本信息名称显示/隐藏" style="margin-right:20px;user-select: none;margin-left: 12px;" class="nameShow" (click)="basicInfoClick()">
       基本信息名称
-      <mat-icon [ngClass]="{'icongray': !basicInfo}">visibility</mat-icon>
+      <mat-icon>visibility</mat-icon>
     </span>
 
     <span style="position: absolute;right: 60px;cursor: pointer;">
@@ -164,7 +164,7 @@
               </div>
             </div>
             <!-- 如果是多点连线 -->
-            <div *ngIf="canvasAssetObj.InteractiveMode == 1 || canvasAssetObj.InteractiveMode == 3">
+            <div *ngIf="canvasAssetObj.Name == '普通墙' || canvasAssetObj.Name == '承重墙'">
               <p>厚度</p>
               <div style="width: 100%;display: flex;vertical-align: top;height: 22px;">
                 <input type="number" class="smallinput" [(ngModel)]="sliderValueThickness"
diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts
index 8ae3e37..12158b5 100644
--- a/src/app/ui/collection-tools/collection-tools.component.ts
+++ b/src/app/ui/collection-tools/collection-tools.component.ts
@@ -91,7 +91,6 @@ export class CollectionToolsComponent implements OnInit {
     this.imagesArrNum = ""
 
     this.canvasAssetObj = obj //将选中素材对象存到本地变量
-    // console.log(666,this.canvasAssetObj)
     this.assetName = obj.Name
     this.assetWidth = obj.Width
     this.assetHeight = obj.Height
@@ -476,22 +475,16 @@ export class CollectionToolsComponent implements OnInit {
 
     this.canvas.paste(companyId,buildingId,floorId)
     this.canvasData.isChange = true
+    this.renovateTreeData(false)
   }
 
   basicInfo:boolean = true //基本信息名称显隐
-  wantToWork:boolean = true //想定作业名称显隐
   //点击基本信息名称
   basicInfoClick(){
     this.basicInfo = !this.basicInfo
     this.canvas.setNameVisible(this.basicInfo,0)
   }
 
-  //点击想定作业名称
-  wantToWorkClick(){
-    this.wantToWork = !this.wantToWork
-    this.canvas.setNameVisible(this.basicInfo,1)
-  }
-
   isEditPattern:boolean = true //是否为编辑模式
   //进入编辑模式
   editpat(){
@@ -862,8 +855,6 @@ export class CollectionToolsComponent implements OnInit {
 
   //处理 tree 数据结构
   handleTreeData (storeyData) {
-    this.canvas.setNameVisible(this.basicInfo,0)
-    
     this.storeyData = storeyData
     let data = this.allFireElements //所有消防要素模板
     let treeData = [] //tree型 处理完成后的数据
@@ -1025,13 +1016,13 @@ export class CollectionToolsComponent implements OnInit {
   }
 
   //封装 刷新 tree 数据
-  renovateTreeData (isRefresh:boolean = true) {
+  async renovateTreeData (isRefresh:boolean = true) {
     this.allFireElements[this.allFireElements.length-1].children = []
-    isRefresh? this.canvas.refresh() : null
+    isRefresh? await this.canvas.refresh() : null
     isRefresh? this.canvasData.isChange = false : null //服务中 数据是否改动 改为false
     isRefresh? this.isShowProperty = true : null
     isRefresh? this.isShowAttribute = true : null
-
+    this.canvas.setNameVisible(this.basicInfo,0)
     let beforeOneId = this.selectingSitePlan.id || '' //当前 选中 平面图 楼层/区域 id
     let companyBuildingData = JSON.parse(JSON.stringify( this.canvasData.originalcompanyBuildingData || {} )) // 当前 单位/建筑 数据 
     let storeyData = JSON.parse(JSON.stringify( this.canvasData.originaleveryStoreyData || {} )) //当前 楼层 数据