Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

src/app/key-unit/basicinfo/basicinfo.component.ts

@@ -26,11 +26,16 @@ import { MapFactory } from '@src/modules/map/declare/factory';
 export class BasicinfoComponent implements OnInit {
 
   //查看消防设施统计
+  dialogRef
   seeFirfightingDevice(e) {
     e.stopPropagation()
-    let dialogRef = this.dialog.open(StatisticsOfFireFightingFacilities, { hasBackdrop: false, position: { right: '55px', top: '165px' } });
-    dialogRef.afterClosed().subscribe();
+    this.dialogRef = this.dialog.open(StatisticsOfFireFightingFacilities, { hasBackdrop: false, position: { right: '55px', top: '165px' } });
+    this.dialogRef.afterClosed().subscribe();
   }
+  ngOnDestroy(){
+    this.dialogRef ? this.dialogRef.close() : null
+  }
+
 
   unitinfo: any = {
     id: '',

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

@@ -178,8 +178,7 @@
             </div>
           </div>
           <!-- 素材属性 -->
-          <div class="assetsproperty" style="user-select: none"
-            *ngIf="isShowProperty && !isShowAttribute && !isMultipleAsset">
+          <div class="assetsproperty" style="user-select: none" *ngIf="isShowProperty && !isShowAttribute && !isMultipleAsset">
             <h3 style="text-align: center;font-weight: 900;">{{assetName}}</h3>
 
             <div *ngIf="canvasAssetObj.InteractiveMode == 0 && !isGis">