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

src/app/gis-management/plan-list/plan-list.component.html

@@ -10,7 +10,7 @@
               <div class="contant">
                 <div class="contantitem" *ngFor="let item of sitePlanItems">
                     <div>
-                        <img (click)="openPlan(item,-1)" [src]="item.imageUrl ? item.imageUrl+'?x-oss-process=image/resize,m_fill,h_110,w_110' : '../../../assets/images/noImg.png'" alt="">
+                        <img (click)="openPlan(item,-1)" [src]="item.imageUrl ? item.imageUrl+'?x-oss-process=image/resize,m_fill,h_110,w_110' : '/assets/images/noImg.png'" alt="">
                     </div>
                     <p>{{item.name}}</p>
                 </div>
@@ -31,7 +31,7 @@
                 <div class="contant">
                   <div class="contantitem" *ngFor="let i of item.plandata">
                       <div>
-                          <img (click)="openPlan(i,key)" [src]="i.imageUrl ? i.imageUrl+'?x-oss-process=image/resize,m_fill,h_110,w_110' : '../../../assets/images/noImg.png'" alt="">
+                          <img (click)="openPlan(i,key)" [src]="i.imageUrl ? i.imageUrl+'?x-oss-process=image/resize,m_fill,h_110,w_110' : '/assets/images/noImg.png'" alt="">
                       </div>
                       <p>{{i.name}}</p>
                   </div>

src/app/key-unit/fire-fighting-device/fire-fighting-device.component.html

@@ -177,6 +177,7 @@
                       *ngIf="!((item.name == '消防水系统' && items.name == '供水管网') || (item.name == '消防水系统' && items.name == '自动喷水灭火系统') || (item.name == '消防灭火给水系统' && items.name == '自动喷水灭火系统') || (item.name == '消防灭火给水系统' && items.name == '气体自动灭火系统') || (item.name == '消防灭火给水系统' && items.name == '消防泵房') || (item.name == '其它' && items.name == '排烟系统') || (item.name == '其它' && items.name == '灭火器') || (item.name == '其它' && items.name == '气体灭火') || (item.name == '其它' && items.name == '消防通信') || (item.name == '消防设施' && items.name == '自动报警系统') || (item.name == '消防设施' && items.name == '消防泵') || (item.name == '消火栓系统' && items.name == '灭火剂') || (item.name == '消火栓系统' && items.name == '报警设施') || (item.name == '消火栓系统' && items.name == '消防管网') || (item.name == '其它设施' && items.name == '优先广播') || (item.name == '其它设施' && items.name == 'VI检测仪') || (item.name == '其它设施' && items.name == '泡沫水喷雾系统') || (item.name == '自动消防设施' && items.name == '喷水灭火系统') || (item.name == '自动消防设施' && items.name == '自动报警系统') || (item.name == '自动消防设施' && items.name == '防排烟系统') || (item.name == '自动消防设施' && items.name == '水幕系统') || (item.name == '自动消防设施' && items.name == '消防泵') || (item.name == '消防水源' && items.name == '消防水池'))"></textarea>
                   </label>
                   
+                  <!-- <label><mat-icon (click)='SwitchBuildingBoard(newItem,items)' *ngIf="items.isBuiltin">keyboard_arrow_down</mat-icon></label> -->
                 </mat-expansion-panel-header>
 
                 <div class="overflowTable">
@@ -218,6 +219,7 @@
                 <mat-icon title="保存" style="margin-left: 25px;" (click)='editBuildingOptional($event,item)'>description
                 </mat-icon>
               </mat-expansion-panel-header>
+              
               <div *ngFor="let items of item.propertyInfos" class="InputField">
                 <label>{{items.propertyName}}:</label>
 

src/app/plan-audit/wait-examineer/wait-examineer.component.html

@@ -149,9 +149,9 @@
                       <ng-container *ngIf="i.propertyName == 'imageUrl'; else elseTemplate">
                         <td>
                           <span class="spantext" style="vertical-align: top;">由</span> 
-                          <img (click)="lookImg(i.oldValue,true)" class="spantext" style="width: 150px;height: 105px;" [src]="i.oldValue" alt="">
+                          <img (click)="lookImg(i.oldValue,true)" class="spantext" style="width: 150px;height: 105px;" [src]="i.oldValue ? i.oldValue : '/assets/images/noImg.png'" alt="">
                           <span class="spantext" style="vertical-align: top;">变更为</span>
-                          <img (click)="lookImg(i.newValue,true)" class="spantext" style="width: 150px;height: 105px;" [src]="i.newValue" alt="">
+                          <img (click)="lookImg(i.newValue,true)" class="spantext" style="width: 150px;height: 105px;" [src]="i.newValue ? i.newValue : '/assets/images/noImg.png'" alt="">
                         </td>
                       </ng-container>
                       <ng-template #elseTemplate>

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

@@ -12,9 +12,9 @@
       </mat-form-field>
     </div>
 
-    <div class="keyMargin">
+    <!-- <div class="keyMargin">
       <a href="javascript:;" class="uploadBackGround" (click)='toGIS()' [ngClass]="{'uploadBackGroundSelected': selectedType == 'gis'}">导入GIS地图</a>
-    </div>
+    </div> -->
 
     <div class="keyMargin">
       <a href="javascript:;" class="uploadBackGround" [ngClass]="{'uploadBackGroundSelected': selectedType == 'image'}">