diff --git a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.html b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.html
index b21169d..573d925 100644
--- a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.html
+++ b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.html
@@ -1,5 +1,5 @@
 <div class="content" id="firefightingdevice">
-  <mat-tab-group  (selectedIndexChange)="selectedChange($event)">
+  <mat-tab-group (selectedIndexChange)="selectedChange($event)">
 
     <!-- <mat-tab style="display: none;" label="单位消防设施">
       <div class="contentBox">
@@ -103,8 +103,10 @@
           <h3 style="text-align: center;font-weight: 550;">{{item.name}}</h3>
           <div style="margin-bottom: 10px;">
             <mat-icon title="创建" (click)='addBuildingGrouping(newItem,item)'>add_circle_outline</mat-icon>
-            <mat-icon title="保存" style="margin-left: 25px;" (click)='editBuildingGrouping(newItem,item)'>description</mat-icon>
-            <mat-icon title="删除" style="margin-left: 25px;" (click)='deleteBuildingGrouping(newItem,item)'>delete</mat-icon>
+            <mat-icon title="保存" style="margin-left: 25px;" (click)='editBuildingGrouping(newItem,item)'>description
+            </mat-icon>
+            <mat-icon title="删除" style="margin-left: 25px;" (click)='deleteBuildingGrouping(newItem,item)'>delete
+            </mat-icon>
           </div>
           <div>
             <mat-accordion multi>
@@ -121,124 +123,164 @@
               <mat-expansion-panel *ngFor="let items of item.facilityItems" disabled [expanded]=items.expanded>
                 <mat-expansion-panel-header class="expansionheader">
                   <label class="firstContent">
-                    <mat-checkbox (change)='checkedCompany($event,item,items)' [disabled]='items.isBuiltin'></mat-checkbox>
+                    <mat-checkbox (change)='checkedCompany($event,item,items)' [disabled]='items.isBuiltin'>
+                    </mat-checkbox>
                   </label>
                   <label class="textContent">{{items.name}}</label>
-                  <label class="textContent"><a href="javascript:void(0)" (click)='previewBuildingImg(newItem,items)'>查看图片</a></label>
+                  <label class="textContent"><a href="javascript:void(0)"
+                      (click)='previewBuildingImg(newItem,items)'>查看图片</a></label>
                   <label class="totalContent">
-                    <span *ngIf="item.name == '消防水系统' && items.name == '供水管网'"> 
+                    <span *ngIf="item.name == '消防水系统' && items.name == '供水管网'">
                       <input type="text" value="" [(ngModel)]="fireProtectionWaterSystem.waterSupplyNetwork.total">
                     </span>
-                    <span *ngIf="item.name == '消防水系统' && items.name == '自动喷水灭火系统'"> 
+                    <span *ngIf="item.name == '消防水系统' && items.name == '自动喷水灭火系统'">
                       <input type="text" value="" [(ngModel)]="fireProtectionWaterSystem.sprinklerSystem.total">
                     </span>
-                    <span *ngIf="item.name == '消防灭火给水系统' && items.name == '自动喷水灭火系统'"> 
-                      <input type="text" value="" [(ngModel)]="FireExtinguishingWaterSupplySystem.sprinklerSystem.total">
+                    <span *ngIf="item.name == '消防灭火给水系统' && items.name == '自动喷水灭火系统'">
+                      <input type="text" value=""
+                        [(ngModel)]="FireExtinguishingWaterSupplySystem.sprinklerSystem.total">
                     </span>
-                    <span *ngIf="item.name == '消防灭火给水系统' && items.name == '气体自动灭火系统'"> 
-                      <input type="text" value="" [(ngModel)]="FireExtinguishingWaterSupplySystem.AutomaticGasFireExtinguishingSystem.total">
+                    <span *ngIf="item.name == '消防灭火给水系统' && items.name == '气体自动灭火系统'">
+                      <input type="text" value=""
+                        [(ngModel)]="FireExtinguishingWaterSupplySystem.AutomaticGasFireExtinguishingSystem.total">
                     </span>
-                    <span *ngIf="item.name == '消防灭火给水系统' && items.name == '消防泵房'"> 
+                    <span *ngIf="item.name == '消防灭火给水系统' && items.name == '消防泵房'">
                       <input type="text" value="" [(ngModel)]="FireExtinguishingWaterSupplySystem.firePumpRoom.total">
                     </span>
-                    <span *ngIf="item.name == '其它' && items.name == '排烟系统'"> 
+                    <span *ngIf="item.name == '其它' && items.name == '排烟系统'">
                       <input type="text" value="" [(ngModel)]="other.purgingSystem.total">
                     </span>
-                    <span *ngIf="item.name == '其它' && items.name == '灭火器'"> 
+                    <span *ngIf="item.name == '其它' && items.name == '灭火器'">
                       <input type="text" value="" [(ngModel)]="other.fireExtinguisher.total">
                     </span>
-                    <span *ngIf="item.name == '其它' && items.name == '气体灭火'"> 
+                    <span *ngIf="item.name == '其它' && items.name == '气体灭火'">
                       <input type="text" value="" [(ngModel)]="other.extinctionUsingGas.total">
                     </span>
-                    <span *ngIf="item.name == '其它' && items.name == '消防通信'"> 
+                    <span *ngIf="item.name == '其它' && items.name == '消防通信'">
                       <input type="text" value="" [(ngModel)]="other.fireControlCommunication.total">
                     </span>
-                    <span *ngIf="item.name == '消防设施' && items.name == '自动报警系统'"> 
+                    <span *ngIf="item.name == '消防设施' && items.name == '自动报警系统'">
                       <input type="text" value="" [(ngModel)]="fireFightingEquipment.automaticAlarmSystem.total">
                     </span>
-                    <span *ngIf="item.name == '消防设施' && items.name == '消防泵'"> 
+                    <span *ngIf="item.name == '消防设施' && items.name == '消防泵'">
                       <input type="text" value="" [(ngModel)]="fireFightingEquipment.firePump.total">
                     </span>
 
-                    <span *ngIf="item.name == '消火栓系统' && items.name == '灭火剂'"> 
+                    <span *ngIf="item.name == '消火栓系统' && items.name == '灭火剂'">
                       <input type="text" value="" [(ngModel)]="hydrantSystem.fireExtinguishingAgent.total">
                     </span>
-                    <span *ngIf="item.name == '消火栓系统' && items.name == '报警设施'"> 
+                    <span *ngIf="item.name == '消火栓系统' && items.name == '报警设施'">
                       <input type="text" value="" [(ngModel)]="hydrantSystem.AlarmFacilities.total">
                     </span>
-                    <span *ngIf="item.name == '消火栓系统' && items.name == '消防管网'"> 
+                    <span *ngIf="item.name == '消火栓系统' && items.name == '消防管网'">
                       <input type="text" value="" [(ngModel)]="hydrantSystem.FireControlPipeNetwork.total">
                     </span>
 
-                    <span *ngIf="item.name == '其它设施' && items.name == '优先广播'"> 
+                    <span *ngIf="item.name == '其它设施' && items.name == '优先广播'">
                       <input type="text" value="" [(ngModel)]="otherFacilities.givePriorityToBroadcast.total">
                     </span>
-                    <span *ngIf="item.name == '其它设施' && items.name == 'VI检测仪'"> 
+                    <span *ngIf="item.name == '其它设施' && items.name == 'VI检测仪'">
                       <input type="text" value="" [(ngModel)]="otherFacilities.VIdetector.total">
                     </span>
-                    <span *ngIf="item.name == '其它设施' && items.name == '泡沫水喷雾系统'"> 
+                    <span *ngIf="item.name == '其它设施' && items.name == '泡沫水喷雾系统'">
                       <input type="text" value="" [(ngModel)]="otherFacilities.foamWaterSpraySystem.total">
                     </span>
 
-                    <span *ngIf="item.name == '自动消防设施' && items.name == '喷水灭火系统'"> 
-                      <input type="text" value="" [(ngModel)]="automaticFireProtectionFacility.fireSprinklingSystem.total">
+                    <span *ngIf="item.name == '自动消防设施' && items.name == '喷水灭火系统'">
+                      <input type="text" value=""
+                        [(ngModel)]="automaticFireProtectionFacility.fireSprinklingSystem.total">
                     </span>
-                    <span *ngIf="item.name == '自动消防设施' && items.name == '自动报警系统'"> 
-                      <input type="text" value="" [(ngModel)]="automaticFireProtectionFacility.automaticAlarmSystem.total">
+                    <span *ngIf="item.name == '自动消防设施' && items.name == '自动报警系统'">
+                      <input type="text" value=""
+                        [(ngModel)]="automaticFireProtectionFacility.automaticAlarmSystem.total">
                     </span>
-                    <span *ngIf="item.name == '自动消防设施' && items.name == '防排烟系统'"> 
-                      <input type="text" value="" [(ngModel)]="automaticFireProtectionFacility.smokeControlAndExhaustSystem.total">
+                    <span *ngIf="item.name == '自动消防设施' && items.name == '防排烟系统'">
+                      <input type="text" value=""
+                        [(ngModel)]="automaticFireProtectionFacility.smokeControlAndExhaustSystem.total">
                     </span>
-                    <span *ngIf="item.name == '自动消防设施' && items.name == '水幕系统'"> 
-                      <input type="text" value="" [(ngModel)]="automaticFireProtectionFacility.waterCurtainSystem.total">
+                    <span *ngIf="item.name == '自动消防设施' && items.name == '水幕系统'">
+                      <input type="text" value=""
+                        [(ngModel)]="automaticFireProtectionFacility.waterCurtainSystem.total">
                     </span>
-                    <span *ngIf="item.name == '自动消防设施' && items.name == '消防泵'"> 
+                    <span *ngIf="item.name == '自动消防设施' && items.name == '消防泵'">
                       <input type="text" value="" [(ngModel)]="automaticFireProtectionFacility.firePump.total">
                     </span>
-                    <span *ngIf="item.name == '消防水源' && items.name == '消防水池'"> 
+                    <span *ngIf="item.name == '消防水源' && items.name == '消防水池'">
                       <input type="text" value="" [(ngModel)]="fireWaterSupply.firePool.total">
                     </span>
-                    
-                    <span *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 == '消防水池'))">
+
+                    <span
+                      *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 == '消防水池'))">
                       {{items.total ? items.total : '总数: 0'}}
                     </span>
-                    
+
                   </label>
 
-                  <label class="lastTextContent"> 
-                    <textarea *ngIf="item.name == '消防水系统' && items.name == '供水管网'" maxlength="250" [(ngModel)]="fireProtectionWaterSystem.waterSupplyNetwork.details" style="width: 80%;"></textarea>
-                    <textarea *ngIf="item.name == '消防水系统' && items.name == '自动喷水灭火系统'" maxlength="250" [(ngModel)]="fireProtectionWaterSystem.sprinklerSystem.details" style="width: 80%;"></textarea>
-                    <textarea *ngIf="item.name == '消防灭火给水系统' && items.name == '自动喷水灭火系统'" maxlength="250" [(ngModel)]="FireExtinguishingWaterSupplySystem.sprinklerSystem.details" style="width: 80%;"></textarea>
-                    <textarea *ngIf="item.name == '消防灭火给水系统' && items.name == '气体自动灭火系统'" maxlength="250" [(ngModel)]="FireExtinguishingWaterSupplySystem.AutomaticGasFireExtinguishingSystem.details" style="width: 80%;"></textarea>
-                    <textarea *ngIf="item.name == '消防灭火给水系统' && items.name == '消防泵房'" maxlength="250" [(ngModel)]="FireExtinguishingWaterSupplySystem.firePumpRoom.details" style="width: 80%;"></textarea>
-                    <textarea *ngIf="item.name == '其它' && items.name == '排烟系统'" maxlength="250" [(ngModel)]="other.purgingSystem.details" style="width: 80%;"></textarea>
-                    <textarea *ngIf="item.name == '其它' && items.name == '灭火器'" maxlength="250" [(ngModel)]="other.fireExtinguisher.details" style="width: 80%;"></textarea>
-                    <textarea *ngIf="item.name == '其它' && items.name == '气体灭火'" maxlength="250" [(ngModel)]="other.extinctionUsingGas.details" style="width: 80%;"></textarea>
-                    <textarea *ngIf="item.name == '其它' && items.name == '消防通信'" maxlength="250" [(ngModel)]="other.fireControlCommunication.details" style="width: 80%;"></textarea>
-                    <textarea *ngIf="item.name == '消防设施' && items.name == '自动报警系统'" maxlength="250" [(ngModel)]="fireFightingEquipment.automaticAlarmSystem.details" style="width: 80%;"></textarea>
-                    <textarea *ngIf="item.name == '消防设施' && items.name == '消防泵'" maxlength="250" [(ngModel)]="fireFightingEquipment.firePump.details" style="width: 80%;"></textarea>
-
-                    <textarea *ngIf="item.name == '消火栓系统' && items.name == '灭火剂'" maxlength="250" [(ngModel)]="hydrantSystem.fireExtinguishingAgent.details" style="width: 80%;"></textarea>
-                    <textarea *ngIf="item.name == '消火栓系统' && items.name == '报警设施'" maxlength="250" [(ngModel)]="hydrantSystem.AlarmFacilities.details" style="width: 80%;"></textarea>
-                    <textarea *ngIf="item.name == '消火栓系统' && items.name == '消防管网'" maxlength="250" [(ngModel)]="hydrantSystem.FireControlPipeNetwork.details" style="width: 80%;"></textarea>
-
-                    <textarea *ngIf="item.name == '其它设施' && items.name == '优先广播'" maxlength="250" [(ngModel)]="otherFacilities.givePriorityToBroadcast.details" style="width: 80%;"></textarea>
-                    <textarea *ngIf="item.name == '其它设施' && items.name == 'VI检测仪'" maxlength="250" [(ngModel)]="otherFacilities.VIdetector.details" style="width: 80%;"></textarea>
-                    <textarea *ngIf="item.name == '其它设施' && items.name == '泡沫水喷雾系统'" maxlength="250" [(ngModel)]="otherFacilities.foamWaterSpraySystem.details" style="width: 80%;"></textarea>
-
-                    <textarea *ngIf="item.name == '自动消防设施' && items.name == '喷水灭火系统'" maxlength="250" [(ngModel)]="automaticFireProtectionFacility.fireSprinklingSystem.details" style="width: 80%;"></textarea>
-                    <textarea *ngIf="item.name == '自动消防设施' && items.name == '自动报警系统'" maxlength="250" [(ngModel)]="automaticFireProtectionFacility.automaticAlarmSystem.details" style="width: 80%;"></textarea>
-                    <textarea *ngIf="item.name == '自动消防设施' && items.name == '防排烟系统'" maxlength="250" [(ngModel)]="automaticFireProtectionFacility.smokeControlAndExhaustSystem.details" style="width: 80%;"></textarea>
-                    <textarea *ngIf="item.name == '自动消防设施' && items.name == '水幕系统'" maxlength="250" [(ngModel)]="automaticFireProtectionFacility.waterCurtainSystem.details" style="width: 80%;"></textarea>
-                    <textarea *ngIf="item.name == '自动消防设施' && items.name == '消防泵'" maxlength="250" [(ngModel)]="automaticFireProtectionFacility.firePump.details" style="width: 80%;"></textarea>
-
-                    <textarea *ngIf="item.name == '消防水源' && items.name == '消防水池'" maxlength="250" [(ngModel)]="fireWaterSupply.firePool.details" style="width: 80%;"></textarea>
-                    <textarea maxlength="250" [(ngModel)]="items.details" style="width: 80%;"  *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 class="lastTextContent">
+                    <textarea *ngIf="item.name == '消防水系统' && items.name == '供水管网'" maxlength="250"
+                      [(ngModel)]="fireProtectionWaterSystem.waterSupplyNetwork.details" style="width: 80%;"></textarea>
+                    <textarea *ngIf="item.name == '消防水系统' && items.name == '自动喷水灭火系统'" maxlength="250"
+                      [(ngModel)]="fireProtectionWaterSystem.sprinklerSystem.details" style="width: 80%;"></textarea>
+                    <textarea *ngIf="item.name == '消防灭火给水系统' && items.name == '自动喷水灭火系统'" maxlength="250"
+                      [(ngModel)]="FireExtinguishingWaterSupplySystem.sprinklerSystem.details"
+                      style="width: 80%;"></textarea>
+                    <textarea *ngIf="item.name == '消防灭火给水系统' && items.name == '气体自动灭火系统'" maxlength="250"
+                      [(ngModel)]="FireExtinguishingWaterSupplySystem.AutomaticGasFireExtinguishingSystem.details"
+                      style="width: 80%;"></textarea>
+                    <textarea *ngIf="item.name == '消防灭火给水系统' && items.name == '消防泵房'" maxlength="250"
+                      [(ngModel)]="FireExtinguishingWaterSupplySystem.firePumpRoom.details"
+                      style="width: 80%;"></textarea>
+                    <textarea *ngIf="item.name == '其它' && items.name == '排烟系统'" maxlength="250"
+                      [(ngModel)]="other.purgingSystem.details" style="width: 80%;"></textarea>
+                    <textarea *ngIf="item.name == '其它' && items.name == '灭火器'" maxlength="250"
+                      [(ngModel)]="other.fireExtinguisher.details" style="width: 80%;"></textarea>
+                    <textarea *ngIf="item.name == '其它' && items.name == '气体灭火'" maxlength="250"
+                      [(ngModel)]="other.extinctionUsingGas.details" style="width: 80%;"></textarea>
+                    <textarea *ngIf="item.name == '其它' && items.name == '消防通信'" maxlength="250"
+                      [(ngModel)]="other.fireControlCommunication.details" style="width: 80%;"></textarea>
+                    <textarea *ngIf="item.name == '消防设施' && items.name == '自动报警系统'" maxlength="250"
+                      [(ngModel)]="fireFightingEquipment.automaticAlarmSystem.details" style="width: 80%;"></textarea>
+                    <textarea *ngIf="item.name == '消防设施' && items.name == '消防泵'" maxlength="250"
+                      [(ngModel)]="fireFightingEquipment.firePump.details" style="width: 80%;"></textarea>
+
+                    <textarea *ngIf="item.name == '消火栓系统' && items.name == '灭火剂'" maxlength="250"
+                      [(ngModel)]="hydrantSystem.fireExtinguishingAgent.details" style="width: 80%;"></textarea>
+                    <textarea *ngIf="item.name == '消火栓系统' && items.name == '报警设施'" maxlength="250"
+                      [(ngModel)]="hydrantSystem.AlarmFacilities.details" style="width: 80%;"></textarea>
+                    <textarea *ngIf="item.name == '消火栓系统' && items.name == '消防管网'" maxlength="250"
+                      [(ngModel)]="hydrantSystem.FireControlPipeNetwork.details" style="width: 80%;"></textarea>
+
+                    <textarea *ngIf="item.name == '其它设施' && items.name == '优先广播'" maxlength="250"
+                      [(ngModel)]="otherFacilities.givePriorityToBroadcast.details" style="width: 80%;"></textarea>
+                    <textarea *ngIf="item.name == '其它设施' && items.name == 'VI检测仪'" maxlength="250"
+                      [(ngModel)]="otherFacilities.VIdetector.details" style="width: 80%;"></textarea>
+                    <textarea *ngIf="item.name == '其它设施' && items.name == '泡沫水喷雾系统'" maxlength="250"
+                      [(ngModel)]="otherFacilities.foamWaterSpraySystem.details" style="width: 80%;"></textarea>
+
+                    <textarea *ngIf="item.name == '自动消防设施' && items.name == '喷水灭火系统'" maxlength="250"
+                      [(ngModel)]="automaticFireProtectionFacility.fireSprinklingSystem.details"
+                      style="width: 80%;"></textarea>
+                    <textarea *ngIf="item.name == '自动消防设施' && items.name == '自动报警系统'" maxlength="250"
+                      [(ngModel)]="automaticFireProtectionFacility.automaticAlarmSystem.details"
+                      style="width: 80%;"></textarea>
+                    <textarea *ngIf="item.name == '自动消防设施' && items.name == '防排烟系统'" maxlength="250"
+                      [(ngModel)]="automaticFireProtectionFacility.smokeControlAndExhaustSystem.details"
+                      style="width: 80%;"></textarea>
+                    <textarea *ngIf="item.name == '自动消防设施' && items.name == '水幕系统'" maxlength="250"
+                      [(ngModel)]="automaticFireProtectionFacility.waterCurtainSystem.details"
+                      style="width: 80%;"></textarea>
+                    <textarea *ngIf="item.name == '自动消防设施' && items.name == '消防泵'" maxlength="250"
+                      [(ngModel)]="automaticFireProtectionFacility.firePump.details" style="width: 80%;"></textarea>
+
+                    <textarea *ngIf="item.name == '消防水源' && items.name == '消防水池'" maxlength="250"
+                      [(ngModel)]="fireWaterSupply.firePool.details" style="width: 80%;"></textarea>
+                    <textarea maxlength="250" [(ngModel)]="items.details" style="width: 80%;"
+                      *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">
                   <div class="detailsTable">
                     <table>
@@ -251,7 +293,8 @@
                     </table>
                   </div>
                   <div *ngFor="let tableMsg of items.loopTable" class="detailsTable">
-                    <p style="text-align: center; font-size: 16px; margin: 5px 0;">楼层/区域名称: {{tableMsg.name? tableMsg.name : '暂无名称'}}</p>
+                    <p style="text-align: center; font-size: 16px; margin: 5px 0;">楼层/区域名称: {{tableMsg.name?
+                      tableMsg.name : '暂无名称'}}</p>
                     <table>
                       <tr>
                         <th *ngFor="let header of tableMsg.header">{{header}}</th>
@@ -263,7 +306,7 @@
                   </div>
                 </div>
               </mat-expansion-panel>
-  
+
             </mat-accordion>
           </div>
         </div>
@@ -274,17 +317,23 @@
             <mat-expansion-panel>
               <mat-expansion-panel-header>
                 <h3 style="text-align: center;font-weight: 550;">{{item.name}}</h3>
-                <mat-icon title="保存" style="margin-left: 25px;" (click)='editBuildingOptional($event,item)'>description</mat-icon>
+                <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>
 
-                <input type="text" *ngIf="items.propertyType!=1&&items.propertyType!=2&&items.propertyType!=4&&items.propertyType!=6"
-                [(ngModel)]="items.propertyValue" name="propertyValue">
-                <textarea maxlength="250" *ngIf="items.propertyType==1" [(ngModel)]="items.propertyValue" name="propertyValue"></textarea>
-                <input type="number" *ngIf="items.propertyType==2 ||items.propertyType==4" [(ngModel)]="items.propertyValue" name="propertyValue">
+                <input type="text"
+                  *ngIf="(items.propertyType!=1 && items.propertyType != 2&&items.propertyType !=4 &&items.propertyType != 6 ) || items.propertyName == '固定值班电话'"
+                  [(ngModel)]="items.propertyValue" name="propertyValue">
+                <input type="number" *ngIf="(items.propertyType == 2 || items.propertyType == 4) && items.propertyName != '固定值班电话'"
+                  [(ngModel)]="items.propertyValue" name="propertyValue">
+
+                <textarea maxlength="250" *ngIf="items.propertyType==1" [(ngModel)]="items.propertyValue"
+                  name="propertyValue"></textarea>
                 <mat-radio-group *ngIf="items.propertyType==6" [(ngModel)]="items.propertyValue" name="propertyValue">
-                  <mat-radio-button style="margin-left: 5px;" [value]='radio.value' *ngFor="let radio of singleElection">{{radio.name}}</mat-radio-button>
+                  <mat-radio-button style="margin-left: 5px;" [value]='radio.value'
+                    *ngFor="let radio of singleElection">{{radio.name}}</mat-radio-button>
                 </mat-radio-group>
               </div>
             </mat-expansion-panel>
diff --git a/src/app/pipes/boolean.pipe.ts b/src/app/pipes/boolean.pipe.ts
index 3df03f5..025507f 100644
--- a/src/app/pipes/boolean.pipe.ts
+++ b/src/app/pipes/boolean.pipe.ts
@@ -53,6 +53,8 @@ export class differentContentTitle implements PipeTransform {
             return '是'
         } else if (typeof (value) == 'boolean' && !value) {
             return '否'
+        } else if (JSON.stringify(value) == "{}") {
+            return '空'
         } else if (!value) {
             return '空'
         } else {
diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.html b/src/app/plan-audit/wait-examineer/wait-examineer.component.html
index f86086a..b4435e5 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html
@@ -149,18 +149,28 @@
                       <ng-container *ngIf="i.propertyName == 'imageUrl'; else elseTemplate">
                         <td>
                           <span class="spantext" style="vertical-align: top;">由</span> 
-                          <img (click)="lookImg(i.oldValue)" 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" alt="">
                           <span class="spantext" style="vertical-align: top;">变更为</span>
-                          <img (click)="lookImg(i.newValue)" 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" alt="">
                         </td>
                       </ng-container>
                       <ng-template #elseTemplate>
-                        <td>
-                          <span class="spantext">由</span> 
-                          <span class="spantext buleColor">{{i.oldValue}}</span>
-                          <span class="spantext">变更为</span>
-                          <span class="spantext buleColor">{{i.newValue}}</span>
-                        </td>
+                        <ng-container *ngIf="i.propertyName == 'location'; else elseTemplate">
+                          <td>
+                            <span class="spantext buleColor">
+                              {{i.displayName}} 发生变化
+                            </span> 
+                          </td>
+                         
+                        </ng-container>
+                        <ng-template #elseTemplate>
+                          <td >
+                            <span class="spantext">由</span> 
+                            <span class="spantext buleColor">{{i.oldValue | differentContentTitle}}</span>
+                            <span class="spantext">变更为</span>
+                            <span class="spantext buleColor">{{i.newValue | differentContentTitle}}</span>
+                          </td>
+                        </ng-template>
                       </ng-template>
                     </tr>
                   </table>
@@ -254,8 +264,8 @@
                       <span *ngIf="item.operation == 1">修改</span>
                       <span *ngIf="item.operation == 0">新增</span>
                       <span *ngIf="item.operation == 2">删除</span>
-                      文件夹
-                      <span>{{- item.propertyName}}</span>
+                      文件夹 - 
+                      <span>{{item.propertyName}}</span>
                       
                     </mat-panel-title>
                   </mat-expansion-panel-header>
diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
index 7092417..81e19ff 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
@@ -139,13 +139,18 @@ export class WaitExamineerComponent implements OnInit {
     this.getAlltabledate()
   }
 
-  lookImg(imgUrl) {
-    console.log(imgUrl)
+  lookImg(imgUrl,type?:boolean) {
+    // console.log(imgUrl)
     let dom = document.getElementById(`viewerjs`)
     let pObjs = dom.childNodes;
     let node = document.createElement("img")
     node.style.display = "none";
-    node.src = "/api/Objects/PlanPlatform/" + imgUrl;
+    if(type){
+      let src = imgUrl.split("?")[0]
+      node.src = src
+    }else{
+      node.src = "/api/Objects/PlanPlatform/" + imgUrl;
+    }
     node.id = 'imgxxx'
     dom.appendChild(node)
     setTimeout(() => {
@@ -217,7 +222,7 @@ export class WaitExamineerComponent implements OnInit {
         this.differentContentOfBuildingsInfo.childrens.forEach(element => {
           element.difData = resolveDiff(element.childrens)
         });
-        // console.log('建筑信息', this.differentContentOfBuildingsInfo
+        console.log('建筑信息', this.differentContentOfBuildingsInfo)
         //功能分区
         let differentContentOfFunction = JSON.parse(JSON.stringify(differentContent.filter(item => item.propertyName == 'buildings')[0]))
         this.differentContentOfFunction = []
diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
index 2367518..4b7febe 100644
--- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
+++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
@@ -796,6 +796,7 @@ export class OpenPlanToolDialog {
 
   //通知 子组件 传递参数
   noticePlan() {
+    this.plan.isEditPattern = false
     let parameter = { //查询 节点 对应 建筑/楼层 index,id
       buildingIndex: this.data.key, //总平面图/建筑 index
       storeyId: this.data.select.id
diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html
index 61276b8..b86f89d 100644
--- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html
+++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html
@@ -40,7 +40,6 @@
         </div>
         <div class="tablebox">
             <table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8">
-
                 <ng-container matColumnDef="planname">
                     <th mat-header-cell *matHeaderCellDef>预案名称</th>
                     <td mat-cell *matCellDef="let element">{{element.name}}</td>
diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.html b/src/app/ui/collection-tools-plan/collection-tools.component.html
index a4ca870..0b296c8 100644
--- a/src/app/ui/collection-tools-plan/collection-tools.component.html
+++ b/src/app/ui/collection-tools-plan/collection-tools.component.html
@@ -11,7 +11,7 @@
       基本信息名称
       <mat-icon>visibility</mat-icon>
     </span>
-    <span class="marginLeftRight">
+    <span class="marginLeftRight" *ngIf="isEditPattern">
       <mat-checkbox color="primary" [(ngModel)]="isMultiSelect" (change)='changeMultiSelect($event)'></mat-checkbox> 多选
     </span>
     <span class="marginLeftRight">