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 573d925..ae7feb3 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,104 +1,7 @@
 <div class="content" id="firefightingdevice">
   <mat-tab-group (selectedIndexChange)="selectedChange($event)">
-
-    <!-- <mat-tab style="display: none;" label="单位消防设施">
-      <div class="contentBox">
-
-        <p style="width: 100%; margin: 30px auto; text-align: center;" *ngIf="!companyBuiltInGrouping.length">暂无数据,请完善单位基本信息</p>
-        <div style="width: 100%;margin-top: 25px;" *ngFor="let item of companyBuiltInGrouping;let key = index">
-          <h3 style="text-align: center;font-weight: 550;">{{item.name}}</h3>
-          <div style="margin-bottom: 10px;">
-            <mat-icon title="创建" (click)='addCompanyGrouping(item)'>add_circle_outline</mat-icon>
-            <mat-icon title="保存" style="margin-left: 25px;" (click)='editCompanyGrouping(item)'>description</mat-icon>
-            <mat-icon title="删除" style="margin-left: 25px;" (click)='deleteCompanyGrouping(item)'>delete</mat-icon>
-          </div>
-          <div>
-            <mat-accordion multi>
-              <mat-expansion-panel disabled>
-                <mat-expansion-panel-header>
-                  <label class="firstContent"></label>
-                  <label class="textContent">项目</label>
-                  <label class="textContent">照片</label>
-                  <label class="totalContent">总数</label>
-                  <label class="lastTextContent">主要情况</label>
-                </mat-expansion-panel-header>
-              </mat-expansion-panel>
-
-              <mat-expansion-panel *ngFor="let items of item.facilityItems" disabled [expanded]=items.expanded>
-                <mat-expansion-panel-header>
-                  <label class="firstContent">
-                    <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)='previewImg(items)'>查看图片</a></label>
-                  <label class="totalContent">{{items.total ? items.total : '总数: 0'}}</label>
-
-                  <label class="lastTextContent">
-                    <textarea maxlength="250" [(ngModel)]="items.details" style="width: 80%;"></textarea>
-                  </label>
-
-                  <label><mat-icon (click)='SwitchBoard(items)' *ngIf="items.isBuiltin">keyboard_arrow_down</mat-icon></label>
-                </mat-expansion-panel-header>
-
-                <div class="overflowTable">
-                  <div class="detailsTable">
-                    <table>
-                      <tr>
-                        <th *ngFor="let header of items.header">{{header}}</th>
-                      </tr>
-                      <tr *ngFor="let body of items.body">
-                        <td *ngFor="let header of items.header">{{body[header]? body[header] : '暂无数据'}}</td>
-                      </tr>
-                    </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>
-                    <table>
-                      <tr>
-                        <th *ngFor="let header of tableMsg.header">{{header}}</th>
-                      </tr>
-                      <tr *ngFor="let body of tableMsg.body">
-                        <td *ngFor="let header of tableMsg.header">{{body[header]? body[header] : '暂无数据'}}</td>
-                      </tr>
-                    </table>
-                  </div>
-                </div>
-              </mat-expansion-panel>
-  
-            </mat-accordion>
-          </div>
-        </div>
-
-        <div style="width: 100%;margin-top: 25px;" *ngFor="let item of companyOptionalGrouping;let key = index">
-          <mat-accordion multi>
-
-            <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)='editCompanyOptional($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">
-                <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-group>
-              </div>
-            </mat-expansion-panel>
-
-          </mat-accordion>
-        </div>
-
-      </div>
-    </mat-tab> -->
-
     <mat-tab label="{{newItem.name}}" *ngFor="let newItem of allBuildingGrouping">
       <div class="contentBox">
-
         <div style="width: 100%;margin-top: 25px;" *ngFor="let item of newItem.buildingFacilityGroups">
           <h3 style="text-align: center;font-weight: 550;">{{item.name}}</h3>
           <div style="margin-bottom: 10px;">
@@ -165,7 +68,6 @@
                     <span *ngIf="item.name == '消防设施' && items.name == '消防泵'">
                       <input type="text" value="" [(ngModel)]="fireFightingEquipment.firePump.total">
                     </span>
-
                     <span *ngIf="item.name == '消火栓系统' && items.name == '灭火剂'">
                       <input type="text" value="" [(ngModel)]="hydrantSystem.fireExtinguishingAgent.total">
                     </span>
@@ -175,7 +77,6 @@
                     <span *ngIf="item.name == '消火栓系统' && items.name == '消防管网'">
                       <input type="text" value="" [(ngModel)]="hydrantSystem.FireControlPipeNetwork.total">
                     </span>
-
                     <span *ngIf="item.name == '其它设施' && items.name == '优先广播'">
                       <input type="text" value="" [(ngModel)]="otherFacilities.givePriorityToBroadcast.total">
                     </span>
@@ -185,7 +86,6 @@
                     <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">
@@ -208,7 +108,6 @@
                     <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 == '消防水池'))">
                       {{items.total ? items.total : '总数: 0'}}
@@ -278,7 +177,6 @@
                       *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">
@@ -326,7 +224,8 @@
                 <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 != '固定值班电话'"
+                <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"