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

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

@@ -82,8 +82,7 @@
           <div [hidden]="!togglePlane" >
             <div class="sitePlanContent" *ngFor="let item of sitePlanData;let key = index"
               [ngClass]="{'isRefugeStorey':item.isRefugeStorey==true,'selectSitePlan': selectSitePlanIndex==key}" (click)='selectSitePlan(item,key)'>
-              <mat-icon *ngIf="!item.imageUrl" class="matIcons">broken_image</mat-icon>
-              <label class="overflowText">{{item.name}}</label>
+              <label class="overflowText planEveryRow"><mat-icon *ngIf="!item.imageUrl" class="matIcons">broken_image</mat-icon>{{item.name}}</label>
               <a href="javascript:;" class="a-upload" *ngIf="selectSitePlanIndex==key && isEditPattern" title="替换底图" >
                 <input type="file" (change)='replaceBaseMap($event,item)' accept="image/*">
                 <mat-icon class="matIcons">photo_size_select_actual</mat-icon>

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

@@ -98,7 +98,7 @@
     flex-direction: column;
     margin-left: 0px;
     transition: margin-left 0.5s;
-    min-width: 160px;
+    min-width: 230px;
     border: 1px solid #E6EAEE;
     width: 230px;
     left: 0;

src/app/ui/collection-tools/panel.scss

@@ -44,6 +44,10 @@
   .mat-icon {
     font-size: 20px;
   }
+  .planEveryRow {
+    display: inline-block;
+    max-width: 155px;
+  }
 }
 
 //替换底图  inputfile