Merge branch 'develop' of http://39.106.78.171:3000/shaojiahao/AX.Angular9DataCollection into develop

src/app/ui/collection-tools/collection-tools.component.html

@@ -23,7 +23,7 @@
       <mat-icon style="padding-bottom: 7px;">screen_share</mat-icon>
     </button>
 
-    <span style="margin-right:20px;user-select: none;margin-left: 12px;" class="nameShow" (click)="basicInfoClick()">
+    <span title="基本信息名称显示/隐藏" style="margin-right:20px;user-select: none;margin-left: 12px;" class="nameShow" (click)="basicInfoClick()">
       基本信息名称
       <mat-icon [ngClass]="{'icongray': !basicInfo}">visibility</mat-icon>
     </span>

src/app/ui/collection-tools/collection-tools.component.ts

@@ -815,8 +815,9 @@ export class CollectionToolsComponent implements OnInit {
 
   //处理 tree 数据结构
   handleTreeData (storeyData) {
+    this.canvas.setNameVisible(this.basicInfo,0)
+    
     this.storeyData = storeyData
-
     let data = this.allFireElements //所有消防要素模板
     let treeData = [] //tree型 处理完成后的数据
     data.forEach(element => {

src/app/working-area/working-area.component.ts

@@ -465,6 +465,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
                 this.canvasData.originaleveryStoreyData.data[singleIcon.assetData.Id] = singleIcon.assetData;
               }
               this.emit('createIcon');
+              this.emit('backgroundScale', this.backgroundImage.scale.x);
               this.canvasData.isChange = true;
               break;
             case PaintMode.lineIcon: