From b2fa1215d819f621e436feb0a3a7b38efc74846f Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Wed, 13 Jan 2021 14:34:52 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=88=A0=E9=99=A4]=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E9=99=A4H5=E5=B7=A5=E5=85=B7=E4=B9=8B=E5=A4=96=20=E6=80=BB?=
 =?UTF-8?q?=E5=B9=B3=E5=9B=BE=E6=A8=A1=E5=9D=97=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../allaround/allaround.component.html        | 37 --------
 .../key-unit/allaround/allaround.component.ts |  9 +-
 .../fire-fighting-device.component.html       | 94 -------------------
 .../fire-fighting-device.component.ts         | 10 +-
 .../fire-fighting-device.component.html       | 94 -------------------
 .../fire-fighting-device.component.ts         | 10 +-
 .../function-division.component.html          | 53 -----------
 .../function-division.component.ts            |  6 +-
 .../function-division.component.html          | 51 +---------
 .../function-division.component.ts            |  7 +-
 .../key-site-look/key-site.component.html     | 57 -----------
 .../key-site-look/key-site.component.ts       |  7 +-
 .../key-unit/key-site/key-site.component.html | 57 -----------
 .../key-unit/key-site/key-site.component.ts   |  7 +-
 14 files changed, 44 insertions(+), 455 deletions(-)

diff --git a/src/app/key-unit/allaround/allaround.component.html b/src/app/key-unit/allaround/allaround.component.html
index 9d94ca3..fd54eb2 100644
--- a/src/app/key-unit/allaround/allaround.component.html
+++ b/src/app/key-unit/allaround/allaround.component.html
@@ -1,42 +1,5 @@
 <div class="content">
   <mat-tab-group style="height: 100%;">
-    <mat-tab label="单位毗邻">
-      <div class="allImgs">
-
-        <div class="imgBox" *ngFor="let item of AllAdjoining" >
-          <div class="fixedImg" *ngIf="item.imageUrls.length">
-            <img [src]="item.imgURL" onerror="javascript:this.src='../../../assets/images/upload.png'" (click)='imgdetails(item.imageUrls)'>
-          </div>
-          <div class="fixedImg" *ngIf="!item.imageUrls.length">
-            <img src="../../../assets/images/upload.png" (click)='imgdetails(item.imageUrls)'>
-          </div>
-          <div style="margin-top: 5px;">
-            <label style="margin-left: 25px;">建筑物名称:</label>
-            <label style="margin-left: 25px;">{{item.name}}</label>
-          </div>
-          <div style="margin-top: 5px;">
-            <label style="margin-left: 25px;">建筑物方向:</label>
-            <label style="margin-left: 25px;">
-              <label *ngIf="item.direction==0">东</label>
-              <label *ngIf="item.direction==1">西</label>
-              <label *ngIf="item.direction==2">南</label>
-              <label *ngIf="item.direction==3">北</label>
-              <label *ngIf="item.direction==4">东南</label>
-              <label *ngIf="item.direction==5">西南</label>
-              <label *ngIf="item.direction==6">东北</label>
-              <label *ngIf="item.direction==7">西北</label>
-            </label>
-          </div>
-          <div style="margin-top: 5px;">
-            <label style="margin-left: 25px;">图片数量:</label>
-            <label style="margin-left: 25px;" *ngIf="item.imageUrls.length">{{item.imageUrls.length}}张</label>
-            <label style="margin-left: 25px;" *ngIf="!item.imageUrls.length">0张</label>
-          </div>
-        </div>
-
-        <p style="width: 100%;text-align: center;margin-top: 25px;" *ngIf="!AllAdjoining.length">暂无数据,请前往平面图进行相关数据录入</p>
-      </div>
-    </mat-tab>
 
     <mat-tab label="{{item.name}}" *ngFor="let item of AllBuilding">
       <div class="allImgs">
diff --git a/src/app/key-unit/allaround/allaround.component.ts b/src/app/key-unit/allaround/allaround.component.ts
index 4702938..27693f8 100644
--- a/src/app/key-unit/allaround/allaround.component.ts
+++ b/src/app/key-unit/allaround/allaround.component.ts
@@ -17,7 +17,6 @@ export class AllaroundComponent implements OnInit {
   constructor(private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,private route:ActivatedRoute,) { }
 
   ngOnInit(): void {
-    this.getAllCompany()
     this.getAllBuilding()
   }
 
@@ -42,7 +41,13 @@ export class AllaroundComponent implements OnInit {
         this.AllBuilding.forEach(element => {
           element.allImgs = []
         });
-       this.getAllArchitecture()}
+       this.getAllArchitecture()
+      } else {
+        const config = new MatSnackBarConfig();
+        config.verticalPosition = 'top';
+        config.duration = 3000
+        this.snackBar.open('暂无建筑数据','确定',config);
+      }
     })
   }
 
diff --git a/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.html b/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.html
index 44661db..ee701d0 100644
--- a/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.html
+++ b/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.html
@@ -1,99 +1,5 @@
 <div class="content">
   <mat-tab-group>
-    <mat-tab 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 readonly 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 readonly type="text" *ngIf="items.propertyType!=1&&items.propertyType!=2&&items.propertyType!=4&&items.propertyType!=6"
-                [(ngModel)]="items.propertyValue" name="propertyValue">
-                <textarea readonly maxlength="250" *ngIf="items.propertyType==1" [(ngModel)]="items.propertyValue" name="propertyValue"></textarea>
-                <input readonly 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">
diff --git a/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.ts b/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.ts
index ddaae08..ce55913 100644
--- a/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.ts
+++ b/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.ts
@@ -21,7 +21,6 @@ export class FireFightingDeviceLookComponent implements OnInit {
   constructor(private router:Router,private route:ActivatedRoute,public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { }
 
   ngOnInit(): void {
-    this.getCompanyInformation()
     this.getAllBuilding()
   }
 
@@ -234,7 +233,14 @@ export class FireFightingDeviceLookComponent implements OnInit {
       companyId:companyId
     }}).subscribe((data:any)=>{
       this.allBuildingGrouping = data
-      if (this.allBuildingGrouping.length) { this.getAllBuildingFacilities() }
+      if (this.allBuildingGrouping.length) { 
+        this.getAllBuildingFacilities() 
+      } else {
+        const config = new MatSnackBarConfig();
+        config.verticalPosition = 'top';
+        config.duration = 3000
+        this.snackBar.open('暂无建筑数据','确定',config);
+      }
     })
   }
 
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 1bf4c41..2ccf727 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,99 +1,5 @@
 <div class="content">
   <mat-tab-group>
-    <mat-tab 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">
diff --git a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.ts b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.ts
index a3be170..8393abf 100644
--- a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.ts
+++ b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.ts
@@ -22,7 +22,6 @@ export class FireFightingDeviceComponent implements OnInit {
   constructor(private tabbarService: TabbarAndScoreService,private router:Router,private route:ActivatedRoute,public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { }
 
   ngOnInit(): void {
-    this.getCompanyInformation()
     this.getAllBuilding()
   }
 
@@ -233,7 +232,14 @@ export class FireFightingDeviceComponent implements OnInit {
       companyId:companyId
     }}).subscribe((data:any)=>{
       this.allBuildingGrouping = data
-      if (this.allBuildingGrouping.length) { this.getAllBuildingFacilities() }
+      if (this.allBuildingGrouping.length) { 
+        this.getAllBuildingFacilities() 
+      } else {
+        const config = new MatSnackBarConfig();
+        config.verticalPosition = 'top';
+        config.duration = 3000
+        this.snackBar.open('暂无建筑数据','确定',config);
+      }
     })
   }
 
diff --git a/src/app/key-unit/function-division-look/function-division.component.html b/src/app/key-unit/function-division-look/function-division.component.html
index 21de153..93cde75 100644
--- a/src/app/key-unit/function-division-look/function-division.component.html
+++ b/src/app/key-unit/function-division-look/function-division.component.html
@@ -1,59 +1,6 @@
 <div class="content">
-  <div style="margin-top:16px">
-    <!-- <mat-icon title="创建" (click)='addPartition()'>add_circle_outline</mat-icon> -->
-  </div>
-
   <mat-tab-group class="tableContent">
 
-    <mat-tab label="单位功能分区">
-      <div style="overflow: auto; height: 100%;">
-        <div style="margin: 30px 0 25px 5%;">
-          <!-- <mat-icon title="创建" (click)='addCompany()'>add_circle_outline</mat-icon>
-          <mat-icon title="保存" style="margin-left: 25px;" (click)='preservation()'>description</mat-icon>
-          <mat-icon title="删除" style="margin-left: 25px;" (click)='delete()'>delete</mat-icon> -->
-        </div>
-        <table mat-table [dataSource]="companyFunctionalZoning">
-  
-          <ng-container matColumnDef="checked">
-            <th mat-header-cell *matHeaderCellDef></th>
-            <td mat-cell *matCellDef="let element">
-              <mat-checkbox disabled (change)='changeCompany(element,$event)'></mat-checkbox>
-            </td>
-          </ng-container>
-  
-          <ng-container matColumnDef="region">
-            <th mat-header-cell *matHeaderCellDef>区域</th>
-            <td mat-cell *matCellDef="let element">
-              <mat-form-field class="example-full-width">
-                <input readonly matInput [(ngModel)]="element.region" type="text" maxlength="20">
-              </mat-form-field>
-            </td>
-          </ng-container>
-  
-          <ng-container matColumnDef="measure">
-            <th mat-header-cell *matHeaderCellDef>面积</th>
-            <td mat-cell *matCellDef="let element">
-              <mat-form-field class="example-full-width">
-                <input readonly matInput type="number" [(ngModel)]="element.area" onKeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))" placeholder="请输入数字">
-              </mat-form-field>
-              <label style="margin-left: 5px;">m²</label>
-            </td>
-          </ng-container>
-  
-          <ng-container matColumnDef="situation">
-            <th mat-header-cell *matHeaderCellDef>基本情况</th>
-            <td mat-cell *matCellDef="let element">
-              <textarea readonly [(ngModel)]="element.details" maxlength="250"></textarea>
-            </td>
-          </ng-container>
-        
-          <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-          <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
-        </table>
-        <p style="width: 100%; margin-top: 30px; text-align: center;" *ngIf="!companyFunctionalZoning.length">暂无数据</p>
-      </div>
-    </mat-tab>
-
     <mat-tab label="{{item.name}}" *ngFor="let item of allBuildingFunctionalZoning;let key = index">
       <div style="overflow: auto; height: 100%;">
         <div style="margin: 30px 0 25px 5%;">
diff --git a/src/app/key-unit/function-division-look/function-division.component.ts b/src/app/key-unit/function-division-look/function-division.component.ts
index 372b02b..c9e0ccc 100644
--- a/src/app/key-unit/function-division-look/function-division.component.ts
+++ b/src/app/key-unit/function-division-look/function-division.component.ts
@@ -16,7 +16,6 @@ export class FunctionDivisionLookComponent implements OnInit {
 
   ngOnInit(): void {
     this.companyId = this.route.snapshot.queryParams.id
-    this.getAllCompany()
     this.getAllBuilding()
   }
 
@@ -121,6 +120,11 @@ export class FunctionDivisionLookComponent implements OnInit {
           element.functionalZoning = null
         });
         this.getAllBuildingFunctionalZoning()
+      } else {
+        const config = new MatSnackBarConfig();
+        config.verticalPosition = 'top';
+        config.duration = 3000
+        this.snackBar.open('暂无建筑数据','确定',config);
       }
     })
   }
diff --git a/src/app/key-unit/function-division/function-division.component.html b/src/app/key-unit/function-division/function-division.component.html
index ce618bf..9e50317 100644
--- a/src/app/key-unit/function-division/function-division.component.html
+++ b/src/app/key-unit/function-division/function-division.component.html
@@ -1,59 +1,10 @@
 <div class="content">
-  <div style="margin-top:16px">
+  <div style="margin-top:16px" *ngIf="allBuilding.length">
     <mat-icon title="创建" (click)='addPartition()'>add_circle_outline</mat-icon>
   </div>
 
   <mat-tab-group class="tableContent">
 
-    <mat-tab label="单位功能分区">
-      <div style="overflow: auto; height: 100%;">
-        <div style="margin: 30px 0 25px 5%;">
-          <mat-icon title="创建" (click)='addCompany()'>add_circle_outline</mat-icon>
-          <mat-icon title="保存" style="margin-left: 25px;" (click)='preservation()'>description</mat-icon>
-          <mat-icon title="删除" style="margin-left: 25px;" (click)='delete()'>delete</mat-icon>
-        </div>
-        <table mat-table [dataSource]="companyFunctionalZoning">
-  
-          <ng-container matColumnDef="checked">
-            <th mat-header-cell *matHeaderCellDef></th>
-            <td mat-cell *matCellDef="let element">
-              <mat-checkbox (change)='changeCompany(element,$event)'></mat-checkbox>
-            </td>
-          </ng-container>
-  
-          <ng-container matColumnDef="region">
-            <th mat-header-cell *matHeaderCellDef>区域</th>
-            <td mat-cell *matCellDef="let element">
-              <mat-form-field class="example-full-width">
-                <input matInput [(ngModel)]="element.region" type="text" maxlength="20">
-              </mat-form-field>
-            </td>
-          </ng-container>
-  
-          <ng-container matColumnDef="measure">
-            <th mat-header-cell *matHeaderCellDef>面积</th>
-            <td mat-cell *matCellDef="let element">
-              <mat-form-field class="example-full-width">
-                <input matInput type="number" [(ngModel)]="element.area" onKeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))" placeholder="请输入数字">
-              </mat-form-field>
-              <label style="margin-left: 5px;">m²</label>
-            </td>
-          </ng-container>
-  
-          <ng-container matColumnDef="situation">
-            <th mat-header-cell *matHeaderCellDef>基本情况</th>
-            <td mat-cell *matCellDef="let element">
-              <textarea [(ngModel)]="element.details" maxlength="250"></textarea>
-            </td>
-          </ng-container>
-        
-          <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-          <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
-        </table>
-        <p style="width: 100%; margin-top: 30px; text-align: center;" *ngIf="!companyFunctionalZoning.length">暂无数据</p>
-      </div>
-    </mat-tab>
-
     <mat-tab label="{{item.name}}" *ngFor="let item of allBuildingFunctionalZoning;let key = index">
       <div style="overflow: auto; height: 100%;">
         <div style="margin: 30px 0 25px 5%;">
diff --git a/src/app/key-unit/function-division/function-division.component.ts b/src/app/key-unit/function-division/function-division.component.ts
index 7da8809..2611f5e 100644
--- a/src/app/key-unit/function-division/function-division.component.ts
+++ b/src/app/key-unit/function-division/function-division.component.ts
@@ -17,7 +17,6 @@ export class FunctionDivisionComponent implements OnInit {
 
   ngOnInit(): void {
     this.companyId = this.route.snapshot.queryParams.id
-    this.getAllCompany()
     this.getAllBuilding()
   }
 
@@ -49,7 +48,6 @@ export class FunctionDivisionComponent implements OnInit {
   //保存单位功能分区属性
   preservation () {
     let companyId = this.route.snapshot.queryParams.id
-    // console.log(123,companyId)
     if (this.companyFunctionalZoning.length) {
       this.http.post('/api/CompanyFunctionalDivisions/Batch',this.companyFunctionalZoning,{params:{
         companyId:companyId
@@ -124,6 +122,11 @@ export class FunctionDivisionComponent implements OnInit {
           element.functionalZoning = null
         });
         this.getAllBuildingFunctionalZoning()
+      } else {
+        const config = new MatSnackBarConfig();
+        config.verticalPosition = 'top';
+        config.duration = 3000
+        this.snackBar.open('暂无建筑数据','确定',config);
       }
     })
   }
diff --git a/src/app/key-unit/key-site-look/key-site.component.html b/src/app/key-unit/key-site-look/key-site.component.html
index 8af5827..bdb2718 100644
--- a/src/app/key-unit/key-site-look/key-site.component.html
+++ b/src/app/key-unit/key-site-look/key-site.component.html
@@ -1,62 +1,5 @@
 <div class="content">
   <mat-tab-group style="height: 100%;">
-    <mat-tab label="单位重点部位">
-      <div class="contentBox">
-
-        <div style="margin-top: 25px;">
-          <h3 style="text-align: center;font-weight: 550;">重点部位情况</h3>
-          <table mat-table [dataSource]="allCompanyPosition">
-            <ng-container matColumnDef="mainname">
-              <th mat-header-cell *matHeaderCellDef>重点部位名称</th>
-              <td mat-cell *matCellDef="let element">
-                {{element.name}}
-              </td>
-            </ng-container>
-            <ng-container matColumnDef="position">
-              <th mat-header-cell *matHeaderCellDef>重点部位所在位置</th>
-              <td mat-cell *matCellDef="let element">
-                {{element.position}}
-              </td>
-            </ng-container>
-            <ng-container matColumnDef="construction">
-              <th mat-header-cell *matHeaderCellDef>建筑结构</th>
-              <td mat-cell *matCellDef="let element">
-                {{element.structure}}
-              </td>
-            </ng-container>
-            <ng-container matColumnDef="nature">
-              <th mat-header-cell *matHeaderCellDef>使用性质</th>
-              <td mat-cell *matCellDef="let element">
-                {{element.nature}}
-              </td>
-            </ng-container>
-            <ng-container matColumnDef="danger">
-              <th mat-header-cell *matHeaderCellDef>主要危险性</th>
-              <td mat-cell *matCellDef="let element">
-                {{element.hazards}}
-              </td>
-            </ng-container>
-            <ng-container matColumnDef="img">
-              <th mat-header-cell *matHeaderCellDef>图片</th>
-              <td mat-cell *matCellDef="let element">
-                <a href="javascript:void(0);" (click)='seeImg(element.imageUrls)' style="color: blue;">查看图片</a>
-              </td>
-            </ng-container>
-            <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-            <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
-          </table>
-          <p style="text-align: center;" *ngIf="!allCompanyPosition.length">暂无数据,请前往平面图进行相关数据录入</p>
-        </div>
-        <div style="margin-top: 25px; text-align: left;">
-          <h3 style="text-align: center;font-weight: 550;">重点提示</h3>
-          <!-- <mat-icon title="保存" style="margin-left: 11%; cursor: pointer;" (click)='Preservation()'>description</mat-icon> -->
-          <p class="tips">
-            <textarea readonly [(ngModel)]="companyInput" maxlength="500"></textarea>
-          </p>
-        </div>
-
-      </div>
-    </mat-tab>
 
     <mat-tab label="{{item.name}}" *ngFor="let item of allBuilding">
       <div class="contentBox">
diff --git a/src/app/key-unit/key-site-look/key-site.component.ts b/src/app/key-unit/key-site-look/key-site.component.ts
index ba659df..053dc20 100644
--- a/src/app/key-unit/key-site-look/key-site.component.ts
+++ b/src/app/key-unit/key-site-look/key-site.component.ts
@@ -19,8 +19,6 @@ export class KeySiteLookComponent implements OnInit {
   displayedColumns: string[] = ['mainname', 'position', 'construction', 'nature', 'danger', 'img'];
 
   ngOnInit(): void {
-    this.getCompanyPostion()
-    this.getCompanyTips()
     this.getAllBuilding()
   }
 
@@ -59,6 +57,11 @@ export class KeySiteLookComponent implements OnInit {
           element.companyInput = null })  //建筑重点提示数据
         this.getAllBuildingPositon()
         this.getAllBuildingTips()
+      } else {
+        const config = new MatSnackBarConfig();
+        config.verticalPosition = 'top';
+        config.duration = 3000
+        this.snackBar.open('暂无建筑数据','确定',config);
       }
     })
   }
diff --git a/src/app/key-unit/key-site/key-site.component.html b/src/app/key-unit/key-site/key-site.component.html
index 4adf51d..c79f635 100644
--- a/src/app/key-unit/key-site/key-site.component.html
+++ b/src/app/key-unit/key-site/key-site.component.html
@@ -1,62 +1,5 @@
 <div class="content">
   <mat-tab-group style="height: 100%;">
-    <mat-tab label="单位重点部位">
-      <div class="contentBox">
-
-        <div style="margin-top: 25px;">
-          <h3 style="text-align: center;font-weight: 550;">重点部位情况</h3>
-          <table mat-table [dataSource]="allCompanyPosition">
-            <ng-container matColumnDef="mainname">
-              <th mat-header-cell *matHeaderCellDef>重点部位名称</th>
-              <td mat-cell *matCellDef="let element">
-                {{element.name}}
-              </td>
-            </ng-container>
-            <ng-container matColumnDef="position">
-              <th mat-header-cell *matHeaderCellDef>重点部位所在位置</th>
-              <td mat-cell *matCellDef="let element">
-                {{element.position}}
-              </td>
-            </ng-container>
-            <ng-container matColumnDef="construction">
-              <th mat-header-cell *matHeaderCellDef>建筑结构</th>
-              <td mat-cell *matCellDef="let element">
-                {{element.structure}}
-              </td>
-            </ng-container>
-            <ng-container matColumnDef="nature">
-              <th mat-header-cell *matHeaderCellDef>使用性质</th>
-              <td mat-cell *matCellDef="let element">
-                {{element.nature}}
-              </td>
-            </ng-container>
-            <ng-container matColumnDef="danger">
-              <th mat-header-cell *matHeaderCellDef>主要危险性</th>
-              <td mat-cell *matCellDef="let element">
-                {{element.hazards}}
-              </td>
-            </ng-container>
-            <ng-container matColumnDef="img">
-              <th mat-header-cell *matHeaderCellDef>图片</th>
-              <td mat-cell *matCellDef="let element">
-                <a href="javascript:void(0);" (click)='seeImg(element.imageUrls)' style="color: blue;">查看图片</a>
-              </td>
-            </ng-container>
-            <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-            <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
-          </table>
-          <p style="text-align: center;" *ngIf="!allCompanyPosition.length">暂无数据,请前往平面图进行相关数据录入</p>
-        </div>
-        <div style="margin-top: 25px; text-align: left;">
-          <h3 style="text-align: center;font-weight: 550;">重点提示</h3>
-          <mat-icon title="保存" style="margin-left: 11%; cursor: pointer;" (click)='Preservation()'>description</mat-icon>
-          <p class="tips">
-            <textarea [(ngModel)]="companyInput" maxlength="5000"></textarea>
-          </p>
-        </div>
-
-      </div>
-    </mat-tab>
 
     <mat-tab label="{{item.name}}" *ngFor="let item of allBuilding">
       <div class="contentBox">
diff --git a/src/app/key-unit/key-site/key-site.component.ts b/src/app/key-unit/key-site/key-site.component.ts
index df76261..b72badc 100644
--- a/src/app/key-unit/key-site/key-site.component.ts
+++ b/src/app/key-unit/key-site/key-site.component.ts
@@ -20,8 +20,6 @@ export class KeySiteComponent implements OnInit {
   displayedColumns: string[] = ['mainname', 'position', 'construction', 'nature', 'danger', 'img'];
 
   ngOnInit(): void {
-    this.getCompanyPostion()
-    this.getCompanyTips()
     this.getAllBuilding()
   }
 
@@ -60,6 +58,11 @@ export class KeySiteComponent implements OnInit {
           element.companyInput = null })  //建筑重点提示数据
         this.getAllBuildingPositon()
         this.getAllBuildingTips()
+      } else {
+        const config = new MatSnackBarConfig();
+        config.verticalPosition = 'top';
+        config.duration = 3000
+        this.snackBar.open('暂无建筑数据','确定',config);
       }
     })
   }