diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 66ed8d5..a704b1f 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import { LoginComponent } from './pages/login/login.component';
 import { NavigationComponent } from './navigation/navigation.component';
-import { LockscreenComponent } from './pages/lockscreen/lockscreen.component';
 import {HomeComponent} from './home/home.component'
 
 //路由守卫
@@ -11,13 +10,10 @@ import {MTokenK1Component} from './m-token-k1/m-token-k1.component' //K1秘钥
 
 
 
-
 const routes: Routes = [
   {path:'',redirectTo:'login',pathMatch:'full'},
   {
-    path:'',
-    component:NavigationComponent,
-    canActivate: [AuthGuard],//守卫验证
+    path:'',component:NavigationComponent,canActivate: [AuthGuard],//守卫验证
     children:[
       {path:'ui',loadChildren:() => import('./ui/ui.module').then(m => m.UiModule)},
       {path:'keyUnit',loadChildren:() => import('./key-unit/key-unit.module').then(m => m.KeyUnitModule)},
@@ -30,15 +26,9 @@ const routes: Routes = [
       {path:'dataCollection',loadChildren:() => import('./data-collection/data-collection.module').then(m => m.DataCollectionModule)},
     ]
   },
-  {path:'login',
-  component:LoginComponent},
-
-  {path:'getNoMToken',
-  component:MTokenK1Component, canActivate: [AuthGuard],}, //K1秘钥验证失败是跳转页面
 
-  {path:'lockscreen',
-  component:LockscreenComponent,
-  canActivate: [AuthGuard]}//守卫验证
+  {path:'login',component:LoginComponent},
+  {path:'getNoMToken',component:MTokenK1Component, canActivate: [AuthGuard],}, //K1秘钥验证失败是跳转页面
 ];
 
 @NgModule({
diff --git a/src/app/canvas-share-data.service.ts b/src/app/canvas-share-data.service.ts
index 62c8cc0..b69d6c5 100644
--- a/src/app/canvas-share-data.service.ts
+++ b/src/app/canvas-share-data.service.ts
@@ -8,7 +8,6 @@ import { GameMode } from './working-area/model/gameMode';
 export class CanvasShareDataService {
   constructor() { }
   private _sendMessage: ReplaySubject<any> = new ReplaySubject<any>(1);
-  GameMode: any;
 
   isChange = false; // 数据 是否改动
 
diff --git a/src/app/gis-management/gis-labeling/gis-labeling.component.ts b/src/app/gis-management/gis-labeling/gis-labeling.component.ts
index 90d0e05..f2438e7 100644
--- a/src/app/gis-management/gis-labeling/gis-labeling.component.ts
+++ b/src/app/gis-management/gis-labeling/gis-labeling.component.ts
@@ -285,7 +285,7 @@ export class GisLabelingComponent implements OnInit {
         `<div style="font-size: 14px" id="gispopupbox">
           <div style="color: #0080FF;"><span style="margin-left:8px">${item.name}</span><label style="font-size: 12px; color: #999; margin-left: 10px">${item.address}</label> </div>
           <div style="display: flex; margin-top: 10px;margin-left:8px">
-            <div style="width:240px; overflow: hidden;">单位性质: <label style="margin-left: 10px;font-size: 12px;">${item.buildingTypes[0].name || "暂无数据"}</label></div>
+            <div style="width:240px; overflow: hidden;">单位性质: <label style="margin-left: 10px;font-size: 12px;">${item.buildingTypes.length? item.buildingTypes[0].name : "暂无数据"}</label></div>
             <div style="flex: 1; margin-left: 25px;">消防负责人: <label style="margin-left: 10px;font-size: 12px;">${item.contacts || "暂无数据"}</label></div>
           </div>
           <div style="display: flex; margin-top: 10px;margin-left:8px"">
diff --git a/src/app/key-unit/allaround/allaround.component.scss b/src/app/key-unit/allaround/allaround.component.scss
index 3f723b9..4ac5e3b 100644
--- a/src/app/key-unit/allaround/allaround.component.scss
+++ b/src/app/key-unit/allaround/allaround.component.scss
@@ -1,7 +1,8 @@
 .content {
   width: 100%;
-  height: 90%;
+  height: 100%;
   padding: 10px;
+  box-sizing: border-box;
   overflow-y: auto;
 }
 
diff --git a/src/app/key-unit/edit-plan-info/edit-plan-info.component.html b/src/app/key-unit/edit-plan-info/edit-plan-info.component.html
index f05cd1d..53f811f 100644
--- a/src/app/key-unit/edit-plan-info/edit-plan-info.component.html
+++ b/src/app/key-unit/edit-plan-info/edit-plan-info.component.html
@@ -10,7 +10,6 @@
     <mat-tab label="2.平面图">
         <ng-template matTabContent>
             <app-collection-tools-plan></app-collection-tools-plan>
-            <!-- <iframe id="main" src="/unityApp2Basic/index.html" name="unityApp" frameborder="0" width="96%" height="100%" style="margin-left: 2%;"></iframe> -->
         </ng-template>
     </mat-tab>
     <mat-tab label="3.四周毗邻">
@@ -43,15 +42,10 @@
             <app-uploading-cad></app-uploading-cad>
         </ng-template>
     </mat-tab>
-    <mat-tab label="9.六熟悉记录">
-        <ng-template matTabContent>
-            <app-six-familiar-list></app-six-familiar-list>
-        </ng-template>
-    </mat-tab>
-    <mat-tab label="10.实战演练记录">
-        <ng-template matTabContent>
-            功能开发中~~
-        </ng-template>
-    </mat-tab>  
+    <!-- <mat-tab label="9.unity平面图">
+      <ng-template matTabContent>
+        <iframe id="main" src="/unityApp2Basic/index.html" name="unityApp" frameborder="0" width="96%" height="100%" style="margin-left: 2%;"></iframe>
+      </ng-template>
+    </mat-tab> -->
 </mat-tab-group>
 
diff --git a/src/app/key-unit/edit-unit-info/edit-unit-info.component.html b/src/app/key-unit/edit-unit-info/edit-unit-info.component.html
index e0d9853..1a48832 100644
--- a/src/app/key-unit/edit-unit-info/edit-unit-info.component.html
+++ b/src/app/key-unit/edit-unit-info/edit-unit-info.component.html
@@ -41,20 +41,14 @@
           <app-uploading-cad></app-uploading-cad>
         </ng-template>
     </mat-tab>
-    <mat-tab label="8.六熟悉记录">
+    <mat-tab label="8.作战部署">
         <ng-template matTabContent>
-            功能开发中~~
-        </ng-template>
-    </mat-tab>
-    <mat-tab label="9.实战演练记录">
-        <ng-template matTabContent>
-            功能开发中~~
-        </ng-template>
-    </mat-tab>  
-    <mat-tab label="10.作战部署">
-        <ng-template matTabContent>
-            <!-- <iframe id="main" src="/unityApp2/index.html" name="unityApp" frameborder="0" width="100%" height="98%"></iframe> -->
             <app-collection-tools></app-collection-tools>
         </ng-template>
-    </mat-tab> 
+    </mat-tab>
+    <!-- <mat-tab label="9.unity作战部署">
+      <ng-template matTabContent>
+          <iframe id="main" src="/unityApp2/index.html" name="unityApp" frameborder="0" width="100%" height="98%"></iframe>
+      </ng-template>
+    </mat-tab>  -->
 </mat-tab-group>
diff --git a/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.scss b/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.scss
index 3ea1f32..7248739 100644
--- a/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.scss
+++ b/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.scss
@@ -1,6 +1,6 @@
 .content {
   width: 100%;
-  height: 90%;
+  height: 100%;
   padding: 10px;
   overflow-y: auto;
   .contentBox {
diff --git a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.scss b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.scss
index 3ea1f32..7248739 100644
--- a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.scss
+++ b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.scss
@@ -1,6 +1,6 @@
 .content {
   width: 100%;
-  height: 90%;
+  height: 100%;
   padding: 10px;
   overflow-y: auto;
   .contentBox {
diff --git a/src/app/key-unit/function-division-look/function-division.component.scss b/src/app/key-unit/function-division-look/function-division.component.scss
index e74bcf1..0fa0a04 100644
--- a/src/app/key-unit/function-division-look/function-division.component.scss
+++ b/src/app/key-unit/function-division-look/function-division.component.scss
@@ -1,6 +1,6 @@
 .content {
   width: 100%;
-  height: 90%;
+  height: 100%;
   overflow-y: auto;
   padding: 10px 0 0 10px;
   display: flex;
diff --git a/src/app/key-unit/function-division/function-division.component.scss b/src/app/key-unit/function-division/function-division.component.scss
index e74bcf1..0fa0a04 100644
--- a/src/app/key-unit/function-division/function-division.component.scss
+++ b/src/app/key-unit/function-division/function-division.component.scss
@@ -1,6 +1,6 @@
 .content {
   width: 100%;
-  height: 90%;
+  height: 100%;
   overflow-y: auto;
   padding: 10px 0 0 10px;
   display: flex;
diff --git a/src/app/key-unit/key-site-look/key-site.component.scss b/src/app/key-unit/key-site-look/key-site.component.scss
index 3fbf2eb..08d9639 100644
--- a/src/app/key-unit/key-site-look/key-site.component.scss
+++ b/src/app/key-unit/key-site-look/key-site.component.scss
@@ -1,6 +1,6 @@
 .content {
   width: 100%;
-  height: 90%;
+  height: 100%;
   padding: 10px;
   overflow-y: auto;
   .contentBox{
diff --git a/src/app/key-unit/key-site/key-site.component.scss b/src/app/key-unit/key-site/key-site.component.scss
index 3fbf2eb..08d9639 100644
--- a/src/app/key-unit/key-site/key-site.component.scss
+++ b/src/app/key-unit/key-site/key-site.component.scss
@@ -1,6 +1,6 @@
 .content {
   width: 100%;
-  height: 90%;
+  height: 100%;
   padding: 10px;
   overflow-y: auto;
   .contentBox{
diff --git a/src/app/key-unit/realistic-picture-look/realistic-picture.component.scss b/src/app/key-unit/realistic-picture-look/realistic-picture.component.scss
index cfbc003..075375c 100644
--- a/src/app/key-unit/realistic-picture-look/realistic-picture.component.scss
+++ b/src/app/key-unit/realistic-picture-look/realistic-picture.component.scss
@@ -1,7 +1,7 @@
 .content {
   margin: 0 0 0 10px;
   width: 100%;
-  height: 90%;
+  height: 100%;
   overflow-y: auto;
   display: flex;
   .leftBox {
diff --git a/src/app/key-unit/realistic-picture/realistic-picture.component.scss b/src/app/key-unit/realistic-picture/realistic-picture.component.scss
index cfbc003..075375c 100644
--- a/src/app/key-unit/realistic-picture/realistic-picture.component.scss
+++ b/src/app/key-unit/realistic-picture/realistic-picture.component.scss
@@ -1,7 +1,7 @@
 .content {
   margin: 0 0 0 10px;
   width: 100%;
-  height: 90%;
+  height: 100%;
   overflow-y: auto;
   display: flex;
   .leftBox {
diff --git a/src/app/key-unit/uploading-cad-look/uploading-cad.component.html b/src/app/key-unit/uploading-cad-look/uploading-cad.component.html
index 166f0de..25c3f1a 100644
--- a/src/app/key-unit/uploading-cad-look/uploading-cad.component.html
+++ b/src/app/key-unit/uploading-cad-look/uploading-cad.component.html
@@ -1,64 +1,62 @@
-<div class="header">
-  <!-- <button mat-raised-button color="primary" (click)="openReadFile()" *ngIf="!uploadisLoading">上传</button>
-  <button mat-raised-button color="primary" (click)='readFile()' *ngIf="!downloadisLoading">下载</button>
-  <button mat-raised-button color="primary" (click)='editFile()'>编辑</button>
-  <button mat-raised-button color="primary" (click)='deleteCAD()' style="margin-right: 25px;">删除</button> -->
-
-  <div class="progressBox" *ngIf="uploadisLoading">
-    <button mat-raised-button style="margin-right: 5px;" (click)="cancel()">取消上传</button>
-    <span style="font-size: 12px;">上传中...</span>
-    <mat-progress-bar mode="determinate" [value]="uploadProgress" class="progress"></mat-progress-bar>
+<div style="height: 100%; overflow-y: auto;">
+  <div class="header">
+    <div class="progressBox" *ngIf="uploadisLoading">
+      <button mat-raised-button style="margin-right: 5px;" (click)="cancel()">取消上传</button>
+      <span style="font-size: 12px;">上传中...</span>
+      <mat-progress-bar mode="determinate" [value]="uploadProgress" class="progress"></mat-progress-bar>
+    </div>
+  
+    <div class="progressBox" *ngIf="downloadisLoading">
+      <!-- <button mat-raised-button style="margin-right: 5px;" (click)="cancelDowload()">取消下载</button> -->
+      <span style="font-size: 12px;">下载中...</span>
+      <mat-progress-bar mode="determinate" [value]="downloadProgress" class="progress" style="left: 52px;top: 13px;"></mat-progress-bar>
+    </div>
+  
   </div>
-
-  <div class="progressBox" *ngIf="downloadisLoading">
-    <!-- <button mat-raised-button style="margin-right: 5px;" (click)="cancelDowload()">取消下载</button> -->
-    <span style="font-size: 12px;">下载中...</span>
-    <mat-progress-bar mode="determinate" [value]="downloadProgress" class="progress" style="left: 52px;top: 13px;"></mat-progress-bar>
+  
+  <div style="padding: 10px;">
+    <table mat-table [dataSource]="CADList">
+  
+      <ng-container matColumnDef="checked">
+        <th mat-header-cell *matHeaderCellDef></th>
+        <td mat-cell *matCellDef="let element">
+          <mat-checkbox disabled (change)='checkedCAD($event,element)'></mat-checkbox>
+        </td>
+      </ng-container>
+  
+      <ng-container matColumnDef="name">
+        <th mat-header-cell *matHeaderCellDef>名称</th>
+        <td mat-cell *matCellDef="let element">
+          <mat-icon style="color: #FFC122;">insert_drive_file</mat-icon>{{element.name}}
+        </td>
+      </ng-container>
+  
+      <ng-container matColumnDef="time">
+        <th mat-header-cell *matHeaderCellDef>时间</th>
+        <td mat-cell *matCellDef="let element">
+          {{element.creationTime|date:'yyyy-MM-dd'}}
+        </td>
+      </ng-container>
+  
+      <ng-container matColumnDef="state">
+        <th mat-header-cell *matHeaderCellDef>状态</th>
+        <td mat-cell *matCellDef="let element">
+          <label *ngIf="!element.loading" ><mat-icon style="color: #00FF00;">check_circle</mat-icon></label>
+          <label *ngIf="element.loading" >正在下载...</label>
+        </td>
+      </ng-container>
+  
+      <ng-container matColumnDef="size">
+        <th mat-header-cell *matHeaderCellDef>大小</th>
+        <td mat-cell *matCellDef="let element">
+          {{element.fileLength}}MB
+        </td>
+      </ng-container>
+  
+      <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+      <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+    </table>
+    <p style="width: 100px; margin: 30px auto; text-align: center;" *ngIf="!CADList.length">暂无数据</p>
   </div>
-
-</div>
-
-<div style="overflow-y: auto;height: 90%; padding: 10px; box-sizing: border-box;overflow-x: hidden;">
-  <table mat-table [dataSource]="CADList">
-
-    <ng-container matColumnDef="checked">
-      <th mat-header-cell *matHeaderCellDef></th>
-      <td mat-cell *matCellDef="let element">
-        <mat-checkbox disabled (change)='checkedCAD($event,element)'></mat-checkbox>
-      </td>
-    </ng-container>
-
-    <ng-container matColumnDef="name">
-      <th mat-header-cell *matHeaderCellDef>名称</th>
-      <td mat-cell *matCellDef="let element">
-        <mat-icon style="color: #FFC122;">insert_drive_file</mat-icon>{{element.name}}
-      </td>
-    </ng-container>
-
-    <ng-container matColumnDef="time">
-      <th mat-header-cell *matHeaderCellDef>时间</th>
-      <td mat-cell *matCellDef="let element">
-        {{element.creationTime|date:'yyyy-MM-dd'}}
-      </td>
-    </ng-container>
-
-    <ng-container matColumnDef="state">
-      <th mat-header-cell *matHeaderCellDef>状态</th>
-      <td mat-cell *matCellDef="let element">
-        <label *ngIf="!element.loading" ><mat-icon style="color: #00FF00;">check_circle</mat-icon></label>
-        <label *ngIf="element.loading" >正在下载...</label>
-      </td>
-    </ng-container>
-
-    <ng-container matColumnDef="size">
-      <th mat-header-cell *matHeaderCellDef>大小</th>
-      <td mat-cell *matCellDef="let element">
-        {{element.fileLength}}MB
-      </td>
-    </ng-container>
-
-    <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-    <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
-  </table>
-  <p style="width: 100px; margin: 30px auto; text-align: center;" *ngIf="!CADList.length">暂无数据</p>
-</div>
+  
+</div>
\ No newline at end of file
diff --git a/src/app/key-unit/uploading-cad/uploading-cad.component.html b/src/app/key-unit/uploading-cad/uploading-cad.component.html
index 6909127..e9d77a5 100644
--- a/src/app/key-unit/uploading-cad/uploading-cad.component.html
+++ b/src/app/key-unit/uploading-cad/uploading-cad.component.html
@@ -1,64 +1,67 @@
-<div class="header">
-  <button mat-raised-button color="primary" (click)="openReadFile()" *ngIf="!uploadisLoading">上传</button>
-  <button mat-raised-button color="primary" (click)='readFile()' *ngIf="!downloadisLoading">下载</button>
-  <button mat-raised-button color="primary" (click)='editFile()'>编辑</button>
-  <button mat-raised-button color="primary" (click)='deleteCAD()' style="margin-right: 25px;">删除</button>
-
-  <div class="progressBox" *ngIf="uploadisLoading">
-    <button mat-raised-button style="margin-right: 5px;" (click)="cancel()">取消上传</button>
-    <span style="font-size: 12px;">上传中...</span>
-    <mat-progress-bar mode="determinate" [value]="uploadProgress" class="progress"></mat-progress-bar>
+<div style="height: 100%; overflow-y: auto;">
+  <div class="header">
+    <button mat-raised-button color="primary" (click)="openReadFile()" *ngIf="!uploadisLoading">上传</button>
+    <button mat-raised-button color="primary" (click)='readFile()' *ngIf="!downloadisLoading">下载</button>
+    <button mat-raised-button color="primary" (click)='editFile()'>编辑</button>
+    <button mat-raised-button color="primary" (click)='deleteCAD()' style="margin-right: 25px;">删除</button>
+  
+    <div class="progressBox" *ngIf="uploadisLoading">
+      <button mat-raised-button style="margin-right: 5px;" (click)="cancel()">取消上传</button>
+      <span style="font-size: 12px;">上传中...</span>
+      <mat-progress-bar mode="determinate" [value]="uploadProgress" class="progress"></mat-progress-bar>
+    </div>
+  
+    <div class="progressBox" *ngIf="downloadisLoading">
+      <!-- <button mat-raised-button style="margin-right: 5px;" (click)="cancelDowload()">取消下载</button> -->
+      <span style="font-size: 12px;">下载中...</span>
+      <mat-progress-bar mode="determinate" [value]="downloadProgress" class="progress" style="left: 52px;top: 13px;"></mat-progress-bar>
+    </div>
+  
   </div>
-
-  <div class="progressBox" *ngIf="downloadisLoading">
-    <!-- <button mat-raised-button style="margin-right: 5px;" (click)="cancelDowload()">取消下载</button> -->
-    <span style="font-size: 12px;">下载中...</span>
-    <mat-progress-bar mode="determinate" [value]="downloadProgress" class="progress" style="left: 52px;top: 13px;"></mat-progress-bar>
+  
+  <div style="padding: 10px;">
+    <table mat-table [dataSource]="CADList">
+  
+      <ng-container matColumnDef="checked">
+        <th mat-header-cell *matHeaderCellDef></th>
+        <td mat-cell *matCellDef="let element">
+          <mat-checkbox (change)='checkedCAD($event,element)'></mat-checkbox>
+        </td>
+      </ng-container>
+  
+      <ng-container matColumnDef="name">
+        <th mat-header-cell *matHeaderCellDef>名称</th>
+        <td mat-cell *matCellDef="let element">
+          <mat-icon style="color: #FFC122;">insert_drive_file</mat-icon>{{element.name}}
+        </td>
+      </ng-container>
+  
+      <ng-container matColumnDef="time">
+        <th mat-header-cell *matHeaderCellDef>时间</th>
+        <td mat-cell *matCellDef="let element">
+          {{element.creationTime|date:'yyyy-MM-dd'}}
+        </td>
+      </ng-container>
+  
+      <ng-container matColumnDef="state">
+        <th mat-header-cell *matHeaderCellDef>状态</th>
+        <td mat-cell *matCellDef="let element">
+          <label *ngIf="!element.loading" ><mat-icon style="color: #00FF00;">check_circle</mat-icon></label>
+          <label *ngIf="element.loading" >正在下载...</label>
+        </td>
+      </ng-container>
+  
+      <ng-container matColumnDef="size">
+        <th mat-header-cell *matHeaderCellDef>大小</th>
+        <td mat-cell *matCellDef="let element">
+          {{element.fileLength}}MB
+        </td>
+      </ng-container>
+  
+      <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+      <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+    </table>
+    <p style="width: 100px; margin: 30px auto; text-align: center;" *ngIf="!CADList.length">暂无数据</p>
   </div>
 
-</div>
-
-<div style="overflow-y: auto;height: 90%; padding: 10px; box-sizing: border-box;overflow-x: hidden;">
-  <table mat-table [dataSource]="CADList">
-
-    <ng-container matColumnDef="checked">
-      <th mat-header-cell *matHeaderCellDef></th>
-      <td mat-cell *matCellDef="let element">
-        <mat-checkbox (change)='checkedCAD($event,element)'></mat-checkbox>
-      </td>
-    </ng-container>
-
-    <ng-container matColumnDef="name">
-      <th mat-header-cell *matHeaderCellDef>名称</th>
-      <td mat-cell *matCellDef="let element">
-        <mat-icon style="color: #FFC122;">insert_drive_file</mat-icon>{{element.name}}
-      </td>
-    </ng-container>
-
-    <ng-container matColumnDef="time">
-      <th mat-header-cell *matHeaderCellDef>时间</th>
-      <td mat-cell *matCellDef="let element">
-        {{element.creationTime|date:'yyyy-MM-dd'}}
-      </td>
-    </ng-container>
-
-    <ng-container matColumnDef="state">
-      <th mat-header-cell *matHeaderCellDef>状态</th>
-      <td mat-cell *matCellDef="let element">
-        <label *ngIf="!element.loading" ><mat-icon style="color: #00FF00;">check_circle</mat-icon></label>
-        <label *ngIf="element.loading" >正在下载...</label>
-      </td>
-    </ng-container>
-
-    <ng-container matColumnDef="size">
-      <th mat-header-cell *matHeaderCellDef>大小</th>
-      <td mat-cell *matCellDef="let element">
-        {{element.fileLength}}MB
-      </td>
-    </ng-container>
-
-    <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-    <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
-  </table>
-  <p style="width: 100px; margin: 30px auto; text-align: center;" *ngIf="!CADList.length">暂无数据</p>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/key-unit/view-unit-details-plan/view-unit-details-plan.component.html b/src/app/key-unit/view-unit-details-plan/view-unit-details-plan.component.html
index 8e8a67a..c9b0b24 100644
--- a/src/app/key-unit/view-unit-details-plan/view-unit-details-plan.component.html
+++ b/src/app/key-unit/view-unit-details-plan/view-unit-details-plan.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group selectedIndex="9" style="height: 94%;" >
+<mat-tab-group selectedIndex="9" style="height: 99%;" >
     <mat-tab label="1.基本信息">
         <ng-template matTabContent>
             <app-basicinfo-look></app-basicinfo-look>
@@ -34,21 +34,16 @@
             <app-uploading-cad-look></app-uploading-cad-look>
         </ng-template>
     </mat-tab>
-    <mat-tab label="8.六熟悉记录">
-        <ng-template matTabContent>
-            功能开发中~~
-        </ng-template>
-    </mat-tab>
-    <mat-tab label="9.实战演练记录">
-        <ng-template matTabContent>
-            功能开发中~~
-        </ng-template>
-    </mat-tab>  
-    <mat-tab label="10.作战部署">
+    <mat-tab label="8.作战部署">
         <ng-template matTabContent>
           <app-collection-tools></app-collection-tools>
-          <!-- <iframe id="main" src="/unityApp2/index.html" name="unityApp" frameborder="0" width="100%" height="98%"></iframe> -->
         </ng-template>
-    </mat-tab>  
+    </mat-tab>
+    <!-- <mat-tab label="9.unity作战部署">
+      <ng-template matTabContent>
+        <app-collection-tools></app-collection-tools>
+        <iframe id="main" src="/unityApp2/index.html" name="unityApp" frameborder="0" width="100%" height="98%"></iframe>
+      </ng-template>
+    </mat-tab>  -->
 </mat-tab-group>
 
diff --git a/src/app/key-unit/view-unit-details/view-unit-details.component.html b/src/app/key-unit/view-unit-details/view-unit-details.component.html
index 3822365..8e0a997 100644
--- a/src/app/key-unit/view-unit-details/view-unit-details.component.html
+++ b/src/app/key-unit/view-unit-details/view-unit-details.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group selectedIndex="0" style="height:97%;" (selectedTabChange)="selectedtab($event)">
+<mat-tab-group selectedIndex="0" style="height:99%;" (selectedTabChange)="selectedtab($event)">
     <mat-tab label="1.基本信息">
         <ng-template matTabContent>
             <app-basicinfo-look></app-basicinfo-look>
@@ -6,7 +6,6 @@
     </mat-tab>
     <mat-tab label="2.平面图">
         <ng-template matTabContent>
-            <!-- <iframe id="main" src="/unityApp2Basic/index.html" name="unityApp" frameborder="0" width="96%" height="100%" style="margin-left:2%;"></iframe> -->
             <app-collection-tools-plan></app-collection-tools-plan>
         </ng-template>
     </mat-tab>
@@ -40,15 +39,10 @@
             <app-uploading-cad-look></app-uploading-cad-look>
         </ng-template>
     </mat-tab>
-    <mat-tab label="9.六熟悉记录">
-        <ng-template matTabContent>
-          <app-six-familiar-list></app-six-familiar-list>
-        </ng-template>
-    </mat-tab>
-    <mat-tab label="10.实战演练记录">
-        <ng-template matTabContent>
-          功能开发中~~
-        </ng-template>
-    </mat-tab>  
+    <!-- <mat-tab label="9.unity平面图">
+      <ng-template matTabContent>
+        <iframe id="main" src="/unityApp2Basic/index.html" name="unityApp" frameborder="0" width="96%" height="100%" style="margin-left:2%;"></iframe>
+      </ng-template>
+    </mat-tab>  -->
 </mat-tab-group>
 
diff --git a/src/app/navigation/navigation.component.ts b/src/app/navigation/navigation.component.ts
index 3f3ffca..41f64a4 100644
--- a/src/app/navigation/navigation.component.ts
+++ b/src/app/navigation/navigation.component.ts
@@ -51,10 +51,7 @@ export class NavigationComponent implements OnInit {
   redtheme(){
     this.darktheme = true
   }
-  toGis(){
-    // console.log(123)
-    window.open(`http://39.106.78.171:8000`);
-  }
+
 
 
 }
diff --git a/src/app/plan-audit/detachment-level/detachment-level.component.html b/src/app/plan-audit/detachment-level/detachment-level.component.html
index 4552c25..6cfb3e6 100644
--- a/src/app/plan-audit/detachment-level/detachment-level.component.html
+++ b/src/app/plan-audit/detachment-level/detachment-level.component.html
@@ -1,161 +1,163 @@
-<div class="header">
-  <form (ngSubmit)="onSubmit(form.value)" #form="ngForm">
-    <div class="queryBox">
-      <div class="queryField">
-        <label style="margin-right: 10px;">单位名称:</label>
-        <mat-form-field>
-          <input matInput placeholder="请输入单位名称" name="CompanyName" [(ngModel)]="CompanyName">
-        </mat-form-field>
-      </div>
-
-      <div class="queryField ordiv">
-        <label style="margin-right: 10px;">消防救援站:</label>
-        <mat-form-field>
-          <input readonly matInput placeholder="请选择消防救援站" [(ngModel)]="selectOrganizationIName" name="selectOrganizationIName" (focus)="openorganizationbox()">
-        </mat-form-field>
-        <mat-checkbox style="margin-left: 5px;" [(ngModel)]="HasChildrenOrganization" name="HasChildrenOrganization">包含下级</mat-checkbox>
-
-        <div class="organizationbox" *ngIf="isorganizationbox">
-            <div (click)="closediv()" class="closediv"><mat-icon>clear</mat-icon></div>
-            <mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
-              <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding  (click)='add(node)' class="organizationlist">
-                <button type="button" mat-icon-button disabled ></button>
-                <li>{{node.name}}</li>
-              </mat-tree-node>
-              <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding  (click)='add(node)'  class="organizationlist">
-                <button type="button" mat-icon-button matTreeNodeToggle [attr.aria-label]="'toggle ' + node.name">
-                <mat-icon class="mat-icon-rtl-mirror">
-                    {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
-                </mat-icon>
-                </button>
-                <li>{{node.name}}</li>
-              </mat-tree-node>
-            </mat-tree>  
+<div style="height: 100%; overflow-y: auto;">
+  <div class="header">
+    <form (ngSubmit)="onSubmit(form.value)" #form="ngForm">
+      <div class="queryBox">
+        <div class="queryField">
+          <label style="margin-right: 10px;">单位名称:</label>
+          <mat-form-field>
+            <input matInput placeholder="请输入单位名称" name="CompanyName" [(ngModel)]="CompanyName">
+          </mat-form-field>
         </div>
-
-      </div>
-
-      <div class="queryField">
-        <label style="margin-right: 10px;">单位类型:</label>
-        <mat-form-field>
-          <mat-select placeholder='请选择单位类型' [(ngModel)]="BuildingTypeId" name="BuildingTypeId">
-            <mat-option *ngFor="let unit of allunittype" [value]="unit.id" >
-              {{unit.name}}
-            </mat-option>
-          </mat-select>
-        </mat-form-field>
-      </div>
-
-      <div class="queryField">
-        <label style="margin-right: 10px;">预案类型:</label>
-        <mat-form-field class="maginleft">
-          <mat-select placeholder='请选择预案类型' [(ngModel)]="PlanType" name="PlanType">
-            <mat-option *ngFor="let plan of planpatterns" [value]="plan.value">
-              {{plan.name}}
-            </mat-option>
-          </mat-select>
-        </mat-form-field>
+  
+        <div class="queryField ordiv">
+          <label style="margin-right: 10px;">消防救援站:</label>
+          <mat-form-field>
+            <input readonly matInput placeholder="请选择消防救援站" [(ngModel)]="selectOrganizationIName" name="selectOrganizationIName" (focus)="openorganizationbox()">
+          </mat-form-field>
+          <mat-checkbox style="margin-left: 5px;" [(ngModel)]="HasChildrenOrganization" name="HasChildrenOrganization">包含下级</mat-checkbox>
+  
+          <div class="organizationbox" *ngIf="isorganizationbox">
+              <div (click)="closediv()" class="closediv"><mat-icon>clear</mat-icon></div>
+              <mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
+                <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding  (click)='add(node)' class="organizationlist">
+                  <button type="button" mat-icon-button disabled ></button>
+                  <li>{{node.name}}</li>
+                </mat-tree-node>
+                <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding  (click)='add(node)'  class="organizationlist">
+                  <button type="button" mat-icon-button matTreeNodeToggle [attr.aria-label]="'toggle ' + node.name">
+                  <mat-icon class="mat-icon-rtl-mirror">
+                      {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
+                  </mat-icon>
+                  </button>
+                  <li>{{node.name}}</li>
+                </mat-tree-node>
+              </mat-tree>  
+          </div>
+  
+        </div>
+  
+        <div class="queryField">
+          <label style="margin-right: 10px;">单位类型:</label>
+          <mat-form-field>
+            <mat-select placeholder='请选择单位类型' [(ngModel)]="BuildingTypeId" name="BuildingTypeId">
+              <mat-option *ngFor="let unit of allunittype" [value]="unit.id" >
+                {{unit.name}}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+        </div>
+  
+        <div class="queryField">
+          <label style="margin-right: 10px;">预案类型:</label>
+          <mat-form-field class="maginleft">
+            <mat-select placeholder='请选择预案类型' [(ngModel)]="PlanType" name="PlanType">
+              <mat-option *ngFor="let plan of planpatterns" [value]="plan.value">
+                {{plan.name}}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+        </div>
+  
+        <div class="queryField">
+          <label style="margin-right: 10px;">审核状态:</label>
+          <mat-form-field class="maginleft">
+            <mat-select placeholder='请选择审核状态' [(ngModel)]="AuditStatus" name="AuditStatus">
+              <mat-option *ngFor="let state of passstates" [value]="state.value">
+                {{state.name}}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+        </div>
+  
       </div>
-
-      <div class="queryField">
-        <label style="margin-right: 10px;">审核状态:</label>
-        <mat-form-field class="maginleft">
-          <mat-select placeholder='请选择审核状态' [(ngModel)]="AuditStatus" name="AuditStatus">
-            <mat-option *ngFor="let state of passstates" [value]="state.value">
-              {{state.name}}
-            </mat-option>
-          </mat-select>
-        </mat-form-field>
+  
+      <div style="width: 100%;text-align: center;">
+        <button mat-raised-button color="primary">查询</button>
+        <button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button>
       </div>
-
-    </div>
-
-    <div style="width: 100%;text-align: center;">
-      <button mat-raised-button color="primary">查询</button>
-      <button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button>
+    </form>
+  </div>
+  <mat-divider></mat-divider>
+  
+  <div class="body">
+    <div class="tablebox">
+      <table mat-table [dataSource]="tabledataSource">
+  
+        <ng-container matColumnDef="unitname">
+          <th mat-header-cell *matHeaderCellDef>单位名称</th>
+          <td mat-cell *matCellDef="let element">{{element.companyName}}</td>
+        </ng-container>
+  
+        <ng-container matColumnDef="planname">
+          <th mat-header-cell *matHeaderCellDef>预案名称</th>
+          <td mat-cell *matCellDef="let element">{{element.name}}</td>
+        </ng-container>
+  
+        <ng-container matColumnDef="addpeople">
+          <th mat-header-cell *matHeaderCellDef>添加人</th>
+          <td mat-cell *matCellDef="let element">{{element.creatorName}}</td>
+        </ng-container>
+  
+        <ng-container matColumnDef="addtime">
+          <th mat-header-cell *matHeaderCellDef>添加时间</th>
+          <td mat-cell *matCellDef="let element">
+            {{element.creationTime|date:'yyyy-MM-dd'}}
+          </td>
+        </ng-container>
+  
+        <ng-container matColumnDef="plantype">
+          <th mat-header-cell *matHeaderCellDef>预案类型</th>
+          <td mat-cell *matCellDef="let element">
+            <label *ngIf="element.planType==8">卡片预案</label>
+            <label *ngIf="element.planType==1">二维预案</label>
+            <label *ngIf="element.planType==2">三维预案</label>
+            <label *ngIf="element.planType==4">其他预案</label>
+          </td>
+        </ng-container>
+  
+        <ng-container matColumnDef="auditstate">
+          <th mat-header-cell *matHeaderCellDef>审核状态</th>
+          <td mat-cell *matCellDef="let element">
+            <label *ngIf="element.auditStatus==0">预案未审核</label>
+            <label *ngIf="element.auditStatus==1">审核中</label>
+            <label *ngIf="element.auditStatus==2">审核通过</label>
+            <label *ngIf="element.auditStatus==4">审核退回</label>
+          </td>
+        </ng-container>
+  
+        <ng-container matColumnDef="isopen">
+          <th mat-header-cell *matHeaderCellDef>是否公开</th>
+          <td mat-cell *matCellDef="let element">{{element.openRange}}</td>
+        </ng-container>
+  
+        <ng-container matColumnDef="preparethelevel">
+          <th mat-header-cell *matHeaderCellDef>编制级别</th>
+          <td mat-cell *matCellDef="let element">
+            <label *ngIf="element.planLevel==1">总队</label>
+            <label *ngIf="element.planLevel==2">支队</label>
+            <label *ngIf="element.planLevel==4">大队</label>
+            <label *ngIf="element.planLevel==8">中队</label>
+          </td>
+        </ng-container>
+  
+        <ng-container matColumnDef="operation">
+          <th mat-header-cell *matHeaderCellDef>操作</th>
+          <td mat-cell *matCellDef="let element">
+            <label style="color: #0000FF;cursor: pointer;" (click)='toExamine(element)' *ngIf="element.auditStatus!=4">预案审核</label>
+            <label style="color: #0000FF;margin-left: 10px;cursor: pointer;" (click)='openReserve(element)' *ngIf="element.auditStatus==2">预案公开</label>
+            <label style="color: #0000FF;margin-left: 10px;cursor: pointer;" (click)='closeReserve(element)' *ngIf="element.auditStatus==2">预案取消公开</label>
+            <label style="color: #999;"*ngIf="element.auditStatus==4">预案已驳回</label>
+          </td>
+        </ng-container>
+  
+          <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+          <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+      </table>
+      <mat-paginator [length]="length"
+          [pageSize]="pageSize"
+          [pageSizeOptions]="pageSizeOptions"
+          (page)="chagePage($event)">
+      </mat-paginator>
     </div>
-  </form>
-</div>
-<mat-divider></mat-divider>
-
-<div class="body">
-  <div class="tablebox">
-    <table mat-table [dataSource]="tabledataSource">
-
-      <ng-container matColumnDef="unitname">
-        <th mat-header-cell *matHeaderCellDef>单位名称</th>
-        <td mat-cell *matCellDef="let element">{{element.companyName}}</td>
-      </ng-container>
-
-      <ng-container matColumnDef="planname">
-        <th mat-header-cell *matHeaderCellDef>预案名称</th>
-        <td mat-cell *matCellDef="let element">{{element.name}}</td>
-      </ng-container>
-
-      <ng-container matColumnDef="addpeople">
-        <th mat-header-cell *matHeaderCellDef>添加人</th>
-        <td mat-cell *matCellDef="let element">{{element.creatorName}}</td>
-      </ng-container>
-
-      <ng-container matColumnDef="addtime">
-        <th mat-header-cell *matHeaderCellDef>添加时间</th>
-        <td mat-cell *matCellDef="let element">
-          {{element.creationTime|date:'yyyy-MM-dd'}}
-        </td>
-      </ng-container>
-
-      <ng-container matColumnDef="plantype">
-        <th mat-header-cell *matHeaderCellDef>预案类型</th>
-        <td mat-cell *matCellDef="let element">
-          <label *ngIf="element.planType==8">卡片预案</label>
-          <label *ngIf="element.planType==1">二维预案</label>
-          <label *ngIf="element.planType==2">三维预案</label>
-          <label *ngIf="element.planType==4">其他预案</label>
-        </td>
-      </ng-container>
-
-      <ng-container matColumnDef="auditstate">
-        <th mat-header-cell *matHeaderCellDef>审核状态</th>
-        <td mat-cell *matCellDef="let element">
-          <label *ngIf="element.auditStatus==0">预案未审核</label>
-          <label *ngIf="element.auditStatus==1">审核中</label>
-          <label *ngIf="element.auditStatus==2">审核通过</label>
-          <label *ngIf="element.auditStatus==4">审核退回</label>
-        </td>
-      </ng-container>
-
-      <ng-container matColumnDef="isopen">
-        <th mat-header-cell *matHeaderCellDef>是否公开</th>
-        <td mat-cell *matCellDef="let element">{{element.openRange}}</td>
-      </ng-container>
-
-      <ng-container matColumnDef="preparethelevel">
-        <th mat-header-cell *matHeaderCellDef>编制级别</th>
-        <td mat-cell *matCellDef="let element">
-          <label *ngIf="element.planLevel==1">总队</label>
-          <label *ngIf="element.planLevel==2">支队</label>
-          <label *ngIf="element.planLevel==4">大队</label>
-          <label *ngIf="element.planLevel==8">中队</label>
-        </td>
-      </ng-container>
-
-      <ng-container matColumnDef="operation">
-        <th mat-header-cell *matHeaderCellDef>操作</th>
-        <td mat-cell *matCellDef="let element">
-          <label style="color: #0000FF;cursor: pointer;" (click)='toExamine(element)' *ngIf="element.auditStatus!=4">预案审核</label>
-          <label style="color: #0000FF;margin-left: 10px;cursor: pointer;" (click)='openReserve(element)' *ngIf="element.auditStatus==2">预案公开</label>
-          <label style="color: #0000FF;margin-left: 10px;cursor: pointer;" (click)='closeReserve(element)' *ngIf="element.auditStatus==2">预案取消公开</label>
-          <label style="color: #999;"*ngIf="element.auditStatus==4">预案已驳回</label>
-        </td>
-      </ng-container>
-
-        <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-        <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
-    </table>
-    <mat-paginator [length]="length"
-        [pageSize]="pageSize"
-        [pageSizeOptions]="pageSizeOptions"
-        (page)="chagePage($event)">
-    </mat-paginator>
   </div>
 </div>
\ No newline at end of file
diff --git a/src/app/plan-audit/detachment-level/detachment-level.component.ts b/src/app/plan-audit/detachment-level/detachment-level.component.ts
index 6973614..3bb27c1 100644
--- a/src/app/plan-audit/detachment-level/detachment-level.component.ts
+++ b/src/app/plan-audit/detachment-level/detachment-level.component.ts
@@ -199,7 +199,7 @@ export class DetachmentLevelComponent implements OnInit {
 
   //预案审核
   toExamine (e) {
-    window.open(`/planAudit/planpass?id=${e.companyId}&companyName=${e.companyName}&auditPlanId=${e.id}&auditStatus=${e.auditStatus}`);
+    window.open(`/planAudit/planpass?id=${e.companyId}&companyName=${e.companyName}&auditPlanId=${e.id}&auditStatus=${e.auditStatus}&planType=1`);
   }
 
   //预案公开
diff --git a/src/app/plan-audit/plan-audit/plan-audit.component.html b/src/app/plan-audit/plan-audit/plan-audit.component.html
index c8cd10f..77d664b 100644
--- a/src/app/plan-audit/plan-audit/plan-audit.component.html
+++ b/src/app/plan-audit/plan-audit/plan-audit.component.html
@@ -1,173 +1,175 @@
-<div class="header">
-  <form (ngSubmit)="onSubmit(form.value)" #form="ngForm">
-    <div class="queryBox">
-      <div class="queryField">
-        <label style="margin-right: 10px;">单位名称:</label>
-        <mat-form-field>
-          <input matInput placeholder="请输入单位名称" name="CompanyName" [(ngModel)]="CompanyName">
-        </mat-form-field>
-      </div>
-
-      <div class="queryField ordiv">
-        <label style="margin-right: 10px;">消防救援站:</label>
-        <mat-form-field>
-          <input readonly matInput placeholder="请选择消防救援站" [(ngModel)]="selectOrganizationIName" name="selectOrganizationIName" (focus)="openorganizationbox()">
-        </mat-form-field>
-        <mat-checkbox style="margin-left: 5px;" [(ngModel)]="HasChildrenOrganization" name="HasChildrenOrganization">包含下级</mat-checkbox>
-
-        <div class="organizationbox" *ngIf="isorganizationbox">
-            <div (click)="closediv()" class="closediv"><mat-icon>clear</mat-icon></div>
-            <mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
-              <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding  (click)='add(node)' class="organizationlist">
-                <button type="button" mat-icon-button disabled ></button>
-                <li>{{node.name}}</li>
-              </mat-tree-node>
-              <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding  (click)='add(node)'  class="organizationlist">
-                <button type="button" mat-icon-button matTreeNodeToggle [attr.aria-label]="'toggle ' + node.name">
-                <mat-icon class="mat-icon-rtl-mirror">
-                    {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
-                </mat-icon>
-                </button>
-                <li>{{node.name}}</li>
-              </mat-tree-node>
-            </mat-tree>  
+<div style="height: 100%; overflow-y: auto;">
+  <div class="header">
+    <form (ngSubmit)="onSubmit(form.value)" #form="ngForm">
+      <div class="queryBox">
+        <div class="queryField">
+          <label style="margin-right: 10px;">单位名称:</label>
+          <mat-form-field>
+            <input matInput placeholder="请输入单位名称" name="CompanyName" [(ngModel)]="CompanyName">
+          </mat-form-field>
         </div>
-
-      </div>
-
-      <div class="queryField">
-        <label style="margin-right: 10px;">单位类型:</label>
-        <mat-form-field>
-          <mat-select placeholder='请选择单位类型' [(ngModel)]="BuildingTypeId" name="BuildingTypeId">
-            <mat-option *ngFor="let unit of allunittype" [value]="unit.id" >
-              {{unit.name}}
-            </mat-option>
-          </mat-select>
-        </mat-form-field>
-      </div>
-
-      <div class="queryField">
-        <label style="margin-right: 10px;">预案类型:</label>
-        <mat-form-field class="maginleft">
-          <mat-select placeholder='请选择预案类型' [(ngModel)]="PlanType" name="PlanType">
-            <mat-option *ngFor="let plan of planpatterns" [value]="plan.value">
-              {{plan.name}}
-            </mat-option>
-          </mat-select>
-        </mat-form-field>
-      </div>
-
-      <div class="queryField">
-        <label style="margin-right: 10px;">审核状态:</label>
-        <mat-form-field class="maginleft">
-          <mat-select placeholder='请选择审核状态' [(ngModel)]="AuditStatus" name="AuditStatus">
-            <mat-option *ngFor="let state of passstates" [value]="state.value">
-              {{state.name}}
-            </mat-option>
-          </mat-select>
-        </mat-form-field>
+  
+        <div class="queryField ordiv">
+          <label style="margin-right: 10px;">消防救援站:</label>
+          <mat-form-field>
+            <input readonly matInput placeholder="请选择消防救援站" [(ngModel)]="selectOrganizationIName" name="selectOrganizationIName" (focus)="openorganizationbox()">
+          </mat-form-field>
+          <mat-checkbox style="margin-left: 5px;" [(ngModel)]="HasChildrenOrganization" name="HasChildrenOrganization">包含下级</mat-checkbox>
+  
+          <div class="organizationbox" *ngIf="isorganizationbox">
+              <div (click)="closediv()" class="closediv"><mat-icon>clear</mat-icon></div>
+              <mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
+                <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding  (click)='add(node)' class="organizationlist">
+                  <button type="button" mat-icon-button disabled ></button>
+                  <li>{{node.name}}</li>
+                </mat-tree-node>
+                <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding  (click)='add(node)'  class="organizationlist">
+                  <button type="button" mat-icon-button matTreeNodeToggle [attr.aria-label]="'toggle ' + node.name">
+                  <mat-icon class="mat-icon-rtl-mirror">
+                      {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
+                  </mat-icon>
+                  </button>
+                  <li>{{node.name}}</li>
+                </mat-tree-node>
+              </mat-tree>  
+          </div>
+  
+        </div>
+  
+        <div class="queryField">
+          <label style="margin-right: 10px;">单位类型:</label>
+          <mat-form-field>
+            <mat-select placeholder='请选择单位类型' [(ngModel)]="BuildingTypeId" name="BuildingTypeId">
+              <mat-option *ngFor="let unit of allunittype" [value]="unit.id" >
+                {{unit.name}}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+        </div>
+  
+        <div class="queryField">
+          <label style="margin-right: 10px;">预案类型:</label>
+          <mat-form-field class="maginleft">
+            <mat-select placeholder='请选择预案类型' [(ngModel)]="PlanType" name="PlanType">
+              <mat-option *ngFor="let plan of planpatterns" [value]="plan.value">
+                {{plan.name}}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+        </div>
+  
+        <div class="queryField">
+          <label style="margin-right: 10px;">审核状态:</label>
+          <mat-form-field class="maginleft">
+            <mat-select placeholder='请选择审核状态' [(ngModel)]="AuditStatus" name="AuditStatus">
+              <mat-option *ngFor="let state of passstates" [value]="state.value">
+                {{state.name}}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+        </div>
+  
+        <div class="queryField">
+          <label style="margin-right: 10px;">编制级别:</label>
+          <mat-form-field class="maginleft">
+            <mat-select placeholder='请选择编制级别' [(ngModel)]="PlanLevel" name="PlanLevel">
+              <mat-option *ngFor="let level of preparelevels" [value]="level.value">
+                {{level.name}}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+          <mat-checkbox style="margin-left: 5px;" [(ngModel)]="HasChildrenPlanLevel" name="HasChildrenPlanLevel">包含下级</mat-checkbox>
+        </div>
+  
       </div>
-
-      <div class="queryField">
-        <label style="margin-right: 10px;">编制级别:</label>
-        <mat-form-field class="maginleft">
-          <mat-select placeholder='请选择编制级别' [(ngModel)]="PlanLevel" name="PlanLevel">
-            <mat-option *ngFor="let level of preparelevels" [value]="level.value">
-              {{level.name}}
-            </mat-option>
-          </mat-select>
-        </mat-form-field>
-        <mat-checkbox style="margin-left: 5px;" [(ngModel)]="HasChildrenPlanLevel" name="HasChildrenPlanLevel">包含下级</mat-checkbox>
+  
+      <div style="width: 100%;text-align: center;">
+        <button mat-raised-button color="primary">查询</button>
+        <button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button>
       </div>
-
-    </div>
-
-    <div style="width: 100%;text-align: center;">
-      <button mat-raised-button color="primary">查询</button>
-      <button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button>
+    </form>
+  </div>
+  <mat-divider></mat-divider>
+  
+  <div class="body">
+    <div class="tablebox">
+      <table mat-table [dataSource]="tabledataSource">
+  
+        <ng-container matColumnDef="unitname">
+          <th mat-header-cell *matHeaderCellDef>单位名称</th>
+          <td mat-cell *matCellDef="let element">{{element.companyName}}</td>
+        </ng-container>
+  
+        <ng-container matColumnDef="planname">
+          <th mat-header-cell *matHeaderCellDef>预案名称</th>
+          <td mat-cell *matCellDef="let element">{{element.name}}</td>
+        </ng-container>
+  
+        <ng-container matColumnDef="addpeople">
+          <th mat-header-cell *matHeaderCellDef>添加人</th>
+          <td mat-cell *matCellDef="let element">{{element.creatorName}}</td>
+        </ng-container>
+  
+        <ng-container matColumnDef="addtime">
+          <th mat-header-cell *matHeaderCellDef>添加时间</th>
+          <td mat-cell *matCellDef="let element">
+            {{element.creationTime|date:'yyyy-MM-dd'}}
+          </td>
+        </ng-container>
+  
+        <ng-container matColumnDef="plantype">
+          <th mat-header-cell *matHeaderCellDef>预案类型</th>
+          <td mat-cell *matCellDef="let element">
+            <label *ngIf="element.planType==8">卡片预案</label>
+            <label *ngIf="element.planType==1">二维预案</label>
+            <label *ngIf="element.planType==2">三维预案</label>
+            <label *ngIf="element.planType==4">其他预案</label>
+          </td>
+        </ng-container>
+  
+        <ng-container matColumnDef="auditstate">
+          <th mat-header-cell *matHeaderCellDef>审核状态</th>
+          <td mat-cell *matCellDef="let element">
+            <label *ngIf="element.auditStatus==0">预案未审核</label>
+            <label *ngIf="element.auditStatus==1">审核中</label>
+            <label *ngIf="element.auditStatus==2">审核通过</label>
+            <label *ngIf="element.auditStatus==4">审核退回</label>
+          </td>
+        </ng-container>
+  
+        <ng-container matColumnDef="isopen">
+          <th mat-header-cell *matHeaderCellDef>是否公开</th>
+          <td mat-cell *matCellDef="let element">{{element.openRange}}</td>
+        </ng-container>
+  
+        <ng-container matColumnDef="preparethelevel">
+          <th mat-header-cell *matHeaderCellDef>编制级别</th>
+          <td mat-cell *matCellDef="let element">
+            <label *ngIf="element.planLevel==1">总队</label>
+            <label *ngIf="element.planLevel==2">支队</label>
+            <label *ngIf="element.planLevel==4">大队</label>
+            <label *ngIf="element.planLevel==8">中队</label>
+          </td>
+        </ng-container>
+  
+        <ng-container matColumnDef="operation">
+          <th mat-header-cell *matHeaderCellDef>操作</th>
+          <td mat-cell *matCellDef="let element">
+            <label style="color: #0000FF;cursor: pointer;" (click)='toExamine(element)' *ngIf="element.auditStatus!=4">预案审核</label>
+            <label style="color: #0000FF;margin-left: 10px;cursor: pointer;" (click)='openReserve(element)' *ngIf="element.auditStatus==2">预案公开</label>
+            <label style="color: #0000FF;margin-left: 10px;cursor: pointer;" (click)='closeReserve(element)' *ngIf="element.auditStatus==2">预案取消公开</label>
+            <label style="color: #999;"*ngIf="element.auditStatus==4">预案已驳回</label>
+          </td>
+        </ng-container>
+  
+          <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+          <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+      </table>
+      <mat-paginator [length]="length"
+          [pageSize]="pageSize"
+          [pageSizeOptions]="pageSizeOptions"
+          (page)="chagePage($event)">
+      </mat-paginator>
     </div>
-  </form>
-</div>
-<mat-divider></mat-divider>
-
-<div class="body">
-  <div class="tablebox">
-    <table mat-table [dataSource]="tabledataSource">
-
-      <ng-container matColumnDef="unitname">
-        <th mat-header-cell *matHeaderCellDef>单位名称</th>
-        <td mat-cell *matCellDef="let element">{{element.companyName}}</td>
-      </ng-container>
-
-      <ng-container matColumnDef="planname">
-        <th mat-header-cell *matHeaderCellDef>预案名称</th>
-        <td mat-cell *matCellDef="let element">{{element.name}}</td>
-      </ng-container>
-
-      <ng-container matColumnDef="addpeople">
-        <th mat-header-cell *matHeaderCellDef>添加人</th>
-        <td mat-cell *matCellDef="let element">{{element.creatorName}}</td>
-      </ng-container>
-
-      <ng-container matColumnDef="addtime">
-        <th mat-header-cell *matHeaderCellDef>添加时间</th>
-        <td mat-cell *matCellDef="let element">
-          {{element.creationTime|date:'yyyy-MM-dd'}}
-        </td>
-      </ng-container>
-
-      <ng-container matColumnDef="plantype">
-        <th mat-header-cell *matHeaderCellDef>预案类型</th>
-        <td mat-cell *matCellDef="let element">
-          <label *ngIf="element.planType==8">卡片预案</label>
-          <label *ngIf="element.planType==1">二维预案</label>
-          <label *ngIf="element.planType==2">三维预案</label>
-          <label *ngIf="element.planType==4">其他预案</label>
-        </td>
-      </ng-container>
-
-      <ng-container matColumnDef="auditstate">
-        <th mat-header-cell *matHeaderCellDef>审核状态</th>
-        <td mat-cell *matCellDef="let element">
-          <label *ngIf="element.auditStatus==0">预案未审核</label>
-          <label *ngIf="element.auditStatus==1">审核中</label>
-          <label *ngIf="element.auditStatus==2">审核通过</label>
-          <label *ngIf="element.auditStatus==4">审核退回</label>
-        </td>
-      </ng-container>
-
-      <ng-container matColumnDef="isopen">
-        <th mat-header-cell *matHeaderCellDef>是否公开</th>
-        <td mat-cell *matCellDef="let element">{{element.openRange}}</td>
-      </ng-container>
-
-      <ng-container matColumnDef="preparethelevel">
-        <th mat-header-cell *matHeaderCellDef>编制级别</th>
-        <td mat-cell *matCellDef="let element">
-          <label *ngIf="element.planLevel==1">总队</label>
-          <label *ngIf="element.planLevel==2">支队</label>
-          <label *ngIf="element.planLevel==4">大队</label>
-          <label *ngIf="element.planLevel==8">中队</label>
-        </td>
-      </ng-container>
-
-      <ng-container matColumnDef="operation">
-        <th mat-header-cell *matHeaderCellDef>操作</th>
-        <td mat-cell *matCellDef="let element">
-          <label style="color: #0000FF;cursor: pointer;" (click)='toExamine(element)' *ngIf="element.auditStatus!=4">预案审核</label>
-          <label style="color: #0000FF;margin-left: 10px;cursor: pointer;" (click)='openReserve(element)' *ngIf="element.auditStatus==2">预案公开</label>
-          <label style="color: #0000FF;margin-left: 10px;cursor: pointer;" (click)='closeReserve(element)' *ngIf="element.auditStatus==2">预案取消公开</label>
-          <label style="color: #999;"*ngIf="element.auditStatus==4">预案已驳回</label>
-        </td>
-      </ng-container>
-
-        <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-        <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
-    </table>
-    <mat-paginator [length]="length"
-        [pageSize]="pageSize"
-        [pageSizeOptions]="pageSizeOptions"
-        (page)="chagePage($event)">
-    </mat-paginator>
   </div>
 </div>
\ No newline at end of file
diff --git a/src/app/plan-audit/plan-audit/plan-audit.component.ts b/src/app/plan-audit/plan-audit/plan-audit.component.ts
index fa9e7e9..81ce0ae 100644
--- a/src/app/plan-audit/plan-audit/plan-audit.component.ts
+++ b/src/app/plan-audit/plan-audit/plan-audit.component.ts
@@ -224,7 +224,7 @@ export class PlanAuditComponent implements OnInit {
 
   //预案审核
   toExamine (e) {
-    window.open(`/planAudit/planpass?id=${e.companyId}&companyName=${e.companyName}&auditPlanId=${e.id}&auditStatus=${e.auditStatus}`);
+    window.open(`/planAudit/planpass?id=${e.companyId}&companyName=${e.companyName}&auditPlanId=${e.id}&auditStatus=${e.auditStatus}&planType=1`);
   }
 
   //预案公开
diff --git a/src/app/plan-audit/plan-pass/plan-pass.component.html b/src/app/plan-audit/plan-pass/plan-pass.component.html
index f37ffb1..4f94c8a 100644
--- a/src/app/plan-audit/plan-pass/plan-pass.component.html
+++ b/src/app/plan-audit/plan-pass/plan-pass.component.html
@@ -1,4 +1,5 @@
-
+<div style="height: 100%; overflow: hidden;">
+  
 <mat-accordion>
   <mat-expansion-panel disabled>
     <mat-expansion-panel-header>
@@ -10,7 +11,7 @@
         </div>
         <div class="planBox">
           <span>消防救援站: </span>
-          <span>{{compantData.organizationName?compantData.organizationName : '暂无数据'}}</span>
+          <span>{{organizationName}}</span>
         </div>
         <div class="planBox">
           <span>单位类型: </span>
@@ -29,37 +30,39 @@
   </mat-expansion-panel>
 </mat-accordion>
 
-<div class="planBody" style="width: 100%;height: 100%;padding: 10px;box-sizing: border-box;overflow-y: auto;">
+  <div class="planBody" style="width: 100%;height: 100%;padding: 10px;box-sizing: border-box;overflow-y: auto;">
 
-  <div class="table" style="width: 100%;" *ngIf="planType==0">
-    <table mat-table [dataSource]="allFile">
+    <div class="table" style="width: 100%;" *ngIf="planType==0">
+      <table mat-table [dataSource]="allFile">
 
-      <ng-container matColumnDef="filename">
-        <th mat-header-cell *matHeaderCellDef>文件名称</th>
-        <td mat-cell *matCellDef="let element">{{element.fileName?element.fileName : compantData.name}}</td>
-      </ng-container>
-      <ng-container matColumnDef="addtime">
-        <th mat-header-cell *matHeaderCellDef>上传时间</th>
-        <td mat-cell *matCellDef="let element">{{element.lastModified | date:'yyyy-MM-dd'}}</td>
-      </ng-container>
-      <ng-container matColumnDef="operation">
-        <th mat-header-cell *matHeaderCellDef>操作</th>
-        <td mat-cell *matCellDef="let element">
-          <label style="color: #0000FF;cursor: pointer;" (click)='download(element)' *ngIf="!element.isLoading">下载</label>
-          <label *ngIf="element.isLoading">正在下载... {{element.progress}}</label>
-          <label></label>
-        </td>
-      </ng-container>
+        <ng-container matColumnDef="filename">
+          <th mat-header-cell *matHeaderCellDef>文件名称</th>
+          <td mat-cell *matCellDef="let element">{{element.fileName?element.fileName : compantData.name}}</td>
+        </ng-container>
+        <ng-container matColumnDef="addtime">
+          <th mat-header-cell *matHeaderCellDef>上传时间</th>
+          <td mat-cell *matCellDef="let element">{{element.lastModified | date:'yyyy-MM-dd'}}</td>
+        </ng-container>
+        <ng-container matColumnDef="operation">
+          <th mat-header-cell *matHeaderCellDef>操作</th>
+          <td mat-cell *matCellDef="let element">
+            <label style="color: #0000FF;cursor: pointer;" (click)='download(element)' *ngIf="!element.isLoading">下载</label>
+            <label *ngIf="element.isLoading">正在下载... {{element.progress}}</label>
+            <label></label>
+          </td>
+        </ng-container>
+
+          <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+          <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+      </table>
+    </div>
+    <div style="width: 100%; height: 100%;" *ngIf="planType==2">
+      <app-view-unit-details-plan></app-view-unit-details-plan>
+    </div>
+    <div style="width: 100%; height: 100%;" *ngIf="planType==3">
+      <iframe [src]='thirdPartyURL' frameborder="0" width="100%" height="100%" id="iframe"></iframe>
+    </div>
 
-        <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-        <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
-    </table>
-  </div>
-  <div style="width: 100%; height: 100%;" *ngIf="planType==2">
-    <app-view-unit-details-plan></app-view-unit-details-plan>
-  </div>
-  <div style="width: 100%; height: 100%;" *ngIf="planType==3">
-    <iframe [src]='thirdPartyURL' frameborder="0" width="100%" height="100%" id="iframe"></iframe>
   </div>
 
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/plan-audit/plan-pass/plan-pass.component.ts b/src/app/plan-audit/plan-pass/plan-pass.component.ts
index f853fdb..5ce008f 100644
--- a/src/app/plan-audit/plan-pass/plan-pass.component.ts
+++ b/src/app/plan-audit/plan-pass/plan-pass.component.ts
@@ -30,28 +30,22 @@ export class PlanPassComponent implements OnInit {
   constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,private tree: TreeService,public dialog: MatDialog,
     public snackBar: MatSnackBar,private sanitizer: DomSanitizer) { }
 
-    type:any //审核按钮是否出现
   ngOnInit(): void {
-  this.type =  this.route.snapshot.queryParams.type
+    this.type =  this.route.snapshot.queryParams.type
     this.getCompanyData()
     this.getPlanData()
   }
 
+  type:any //审核按钮是否出现
   displayedColumns: string[] = ['filename','addtime','operation']; //表头
   compantData:any = {name:'',organizationName: '', buildingTypes:[{name:''}], address:''}; //当前单位信息
+  organizationName:any = ''; //组织机构名称
   planData:any; //审核预案信息
 
   //获取当前单位信息
   getCompanyData () {
-    let header = { 
-      CompanyName: this.route.snapshot.queryParams.companyName || '',
-      PageSize: '100'}
-    this.http.get('/api/Plans',{params:header}).subscribe((data:any)=>{
-      data.items.forEach(element => {
-        if (element.companyId===this.route.snapshot.queryParams.id) {
-          this.compantData = element.company
-          return } });
-
+    this.http.get(`/api/Plans/${this.route.snapshot.queryParams.id}`).subscribe((data:any)=>{
+      data && data.company? this.compantData = data.company : null
     })
   }
 
@@ -62,19 +56,24 @@ export class PlanPassComponent implements OnInit {
       AuditStatus: this.route.snapshot.queryParams.auditStatus || '',
       PageSize: '100',
     }
-    this.http.get('/api/PlanAudits',{params:header}).subscribe((data:any)=>{
+    let api
+    this.route.snapshot.queryParams.planType == 1? api = '/api/PlanAudits' : api = '/api/PublicPlans' //1=预案审核 2=公开预案
+    this.http.get(api,{params:header}).subscribe((data:any)=>{
       data.items.forEach(element => {
         if (element.id===this.route.snapshot.queryParams.auditPlanId) {
           this.planData = element
+          this.organizationName = element.committerOrganizationName
           this.handleData()
-          return } });
-
+          return 
+        }
+      });
     })
   }
 
   planType:any; //展示预案类型
   allFile:any = []; //类型=0时所有文件
   thirdPartyURL:any; //类型=3时网址
+
   handleData () {
     this.planType = this.planData.planMode
     let data = this.planData
diff --git a/src/app/plan-management/open-plan/open-plan.component.ts b/src/app/plan-management/open-plan/open-plan.component.ts
index c7e4e3c..bb8ce5e 100644
--- a/src/app/plan-management/open-plan/open-plan.component.ts
+++ b/src/app/plan-management/open-plan/open-plan.component.ts
@@ -160,12 +160,10 @@ export class OpenPlanComponent implements OnInit {
       }
     )
   }
-  //跳转查看预案页面
+  //跳转查看预案页面 公开预案
   routerTo(element){
     sessionStorage.setItem("companyName",element.companyName)
-    // window.open(`/planManagement/entryPlandetail?unitId=${element.company.id}&unitTypeId=${element.company.buildingTypes.length == 0 ? null :element.company.buildingTypes[0].id}&operation=false&pagetype=openplan&unitName=${element.company.name}&orName=${element.company.organizationName}&unitType=${element.company.buildingTypes.length == 0 ? null :element.company.buildingTypes[0].name}&unitAdd=${element.company.address}`);
-    window.open(`/planAudit/planpass?id=${element.companyId}&companyName=${element.companyName}&auditPlanId=${element.id}&auditStatus=${element.auditStatus}&type=6`);
-
+    window.open(`/planAudit/planpass?id=${element.companyId}&companyName=${element.companyName}&auditPlanId=${element.id}&auditStatus=${element.auditStatus}&type=6&planType=2`);
   }
   //分页事件
   chagePage(e){
diff --git a/src/app/plan-management/pass-plan/pass-plan.component.ts b/src/app/plan-management/pass-plan/pass-plan.component.ts
index 45a4ec8..6a3bf37 100644
--- a/src/app/plan-management/pass-plan/pass-plan.component.ts
+++ b/src/app/plan-management/pass-plan/pass-plan.component.ts
@@ -169,12 +169,10 @@ export class PassPlanComponent implements OnInit {
       }
     )
   }
-  //跳转查看预案页面
+  //跳转查看预案页面 审核通过预案
   routerTo(element){
     sessionStorage.setItem("companyName",element.companyName)
-    // window.open(`/planManagement/entryPlandetail?unitId=${element.company.id}&unitTypeId=${element.company.buildingTypes.length == 0 ? null :element.company.buildingTypes[0].id}&operation=false&pagetype=passplan&unitName=${element.company.name}&orName=${element.company.organizationName}&unitType=${element.company.buildingTypes.length == 0 ? null :element.company.buildingTypes[0].name}&unitAdd=${element.company.address}`);
-    window.open(`/planAudit/planpass?id=${element.companyId}&companyName=${element.companyName}&auditPlanId=${element.id}&auditStatus=${element.auditStatus}&type=6`);
-
+    window.open(`/planAudit/planpass?id=${element.companyId}&companyName=${element.companyName}&auditPlanId=${element.id}&auditStatus=${element.auditStatus}&type=6&planType=1`);
   }
   //分页事件
   chagePage(e){
diff --git a/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.scss b/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.scss
index a627a23..8ec7d96 100644
--- a/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.scss
+++ b/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.scss
@@ -8,7 +8,7 @@
 }
 #indexBzt{
     width: 100%;
-    height: 93%;
+    height: 100%;
     padding-top: 3%;
     display: flex;
     flex-direction: row;
diff --git a/src/app/statistic-analysis/addUnit/add-unit-three-bar-details/add-unit-three-bar-details.component.scss b/src/app/statistic-analysis/addUnit/add-unit-three-bar-details/add-unit-three-bar-details.component.scss
index 5bedfb2..fdf24f1 100644
--- a/src/app/statistic-analysis/addUnit/add-unit-three-bar-details/add-unit-three-bar-details.component.scss
+++ b/src/app/statistic-analysis/addUnit/add-unit-three-bar-details/add-unit-three-bar-details.component.scss
@@ -1,6 +1,6 @@
 .box{
     width: 100%;
-    height: 92%;
+    height: 100%;
     display: flex;
     flex-direction: column;
     overflow: hidden;
diff --git a/src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.scss b/src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.scss
index 3140fa4..61f60d6 100644
--- a/src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.scss
+++ b/src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.scss
@@ -1,6 +1,6 @@
 .box{
     width: 100%;
-    height: 92%;
+    height: 100%;
     display: flex;
     flex-direction: column;
     overflow: hidden;
diff --git a/src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.scss b/src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.scss
index b2a431d..6904ade 100644
--- a/src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.scss
+++ b/src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.scss
@@ -1,6 +1,6 @@
 .box{
     width: 100%;
-    height: 92%;
+    height: 100%;
     display: flex;
     flex-direction: column;
     overflow: hidden;
diff --git a/src/app/statistic-analysis/addUnit/add-unit-two-type-details/add-unit-two-type-details.component.scss b/src/app/statistic-analysis/addUnit/add-unit-two-type-details/add-unit-two-type-details.component.scss
index 067157b..b6bb35f 100644
--- a/src/app/statistic-analysis/addUnit/add-unit-two-type-details/add-unit-two-type-details.component.scss
+++ b/src/app/statistic-analysis/addUnit/add-unit-two-type-details/add-unit-two-type-details.component.scss
@@ -1,6 +1,6 @@
 .box{
     width: 100%;
-    height: 92%;
+    height: 100%;
     display: flex;
     flex-direction: column;
     overflow: hidden;
diff --git a/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.scss b/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.scss
index efabe3c..79ae2c8 100644
--- a/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.scss
+++ b/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.scss
@@ -1,6 +1,6 @@
 .box{
     width: 100%;
-    height: 92%;
+    height: 100%;
     display: flex;
     flex-direction: column;
     overflow: hidden;
diff --git a/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.html b/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.html
index 744683f..b560d1b 100644
--- a/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.html
+++ b/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.html
@@ -1,4 +1,4 @@
 <body>
     <!--饼状图  -->
-    <div id="indexBzt" style="width: 100%;height: 93%;"></div>
+    <div id="indexBzt" style="width: 100%;height: 100%;"></div>
 </body>
\ No newline at end of file
diff --git a/src/app/statistic-analysis/buildingType/building-type-three-details/building-type-three-details.component.scss b/src/app/statistic-analysis/buildingType/building-type-three-details/building-type-three-details.component.scss
index 9a84115..890c20d 100644
--- a/src/app/statistic-analysis/buildingType/building-type-three-details/building-type-three-details.component.scss
+++ b/src/app/statistic-analysis/buildingType/building-type-three-details/building-type-three-details.component.scss
@@ -1,6 +1,6 @@
 .box{
     width: 100%;
-    height: 92%;
+    height: 100%;
     display: flex;
     flex-direction: column;
     overflow: hidden;
diff --git a/src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.scss b/src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.scss
index d6b322f..74dd847 100644
--- a/src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.scss
+++ b/src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.scss
@@ -1,6 +1,6 @@
 .box{
     width: 100%;
-    height: 92%;
+    height: 100%;
     display: flex;
     flex-direction: column;
     overflow: hidden;
diff --git a/src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.scss b/src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.scss
index aa420af..b0d4e4b 100644
--- a/src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.scss
+++ b/src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.scss
@@ -1,6 +1,6 @@
 .box{
     width: 100%;
-    height: 92%;
+    height: 100%;
     display: flex;
     flex-direction: column;
     overflow: hidden;
diff --git a/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.html b/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.html
index ebe06cc..58b9669 100644
--- a/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.html
+++ b/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.html
@@ -6,4 +6,4 @@
  * @LastEditors: sueRimn
  * @LastEditTime: 2020-09-05 11:28:26
 -->
-<div id="indexBzt" style="width: 100%;height: 93%;"></div>
+<div id="indexBzt" style="width: 100%;height: 100%;"></div>
diff --git a/src/app/statistic-analysis/deleteUnit/delete-there-line-details/delete-there-line-details.component.scss b/src/app/statistic-analysis/deleteUnit/delete-there-line-details/delete-there-line-details.component.scss
index 0520f0f..4d7c76c 100644
--- a/src/app/statistic-analysis/deleteUnit/delete-there-line-details/delete-there-line-details.component.scss
+++ b/src/app/statistic-analysis/deleteUnit/delete-there-line-details/delete-there-line-details.component.scss
@@ -1,6 +1,6 @@
 .box{
     width: 100%;
-    height: 92%;
+    height: 100%;
     display: flex;
     flex-direction: column;
     overflow: hidden;
diff --git a/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.scss b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.scss
index e8fd8e2..3cc5c76 100644
--- a/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.scss
+++ b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.scss
@@ -1,6 +1,6 @@
 .box{
   width: 100%;
-  height: 92%;
+  height: 100%;
   display: flex;
   flex-direction: column;
   overflow: hidden;
diff --git a/src/app/statistic-analysis/deleteUnit/delete-two-newadd/delete-two-newadd.component.scss b/src/app/statistic-analysis/deleteUnit/delete-two-newadd/delete-two-newadd.component.scss
index 72f849e..f7639ce 100644
--- a/src/app/statistic-analysis/deleteUnit/delete-two-newadd/delete-two-newadd.component.scss
+++ b/src/app/statistic-analysis/deleteUnit/delete-two-newadd/delete-two-newadd.component.scss
@@ -1,6 +1,6 @@
 .box{
     width: 100%;
-    height: 92%;
+    height: 100%;
     display: flex;
     flex-direction: column;
     overflow: hidden;
diff --git a/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.scss b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.scss
index 2eef948..973695b 100644
--- a/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.scss
+++ b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.scss
@@ -1,6 +1,6 @@
 .box{
   width: 100%;
-  height: 92%;
+  height: 100%;
   display: flex;
   flex-direction: column;
   overflow: hidden;
diff --git a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss
index a700a8f..88b7758 100644
--- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss
+++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss
@@ -27,7 +27,7 @@
 }
 .box{
   width: 100%;
-  height: 92%;
+  height: 100%;
   display: flex;
   flex-direction: column;
   overflow: hidden;
diff --git a/src/app/statistic-analysis/state/page-one/page-one.component.html b/src/app/statistic-analysis/state/page-one/page-one.component.html
index 3332b70..9ac3386 100644
--- a/src/app/statistic-analysis/state/page-one/page-one.component.html
+++ b/src/app/statistic-analysis/state/page-one/page-one.component.html
@@ -9,7 +9,7 @@
 
 <body>
     <!--饼状图  -->
-    <div id="indexBzt" style="width: 100%;height: 93%;"></div>
+    <div id="indexBzt" style="width: 100%;height: 100%;"></div>
 </body>
 
 
diff --git a/src/app/statistic-analysis/state/page-there-year/page-there-year.component.scss b/src/app/statistic-analysis/state/page-there-year/page-there-year.component.scss
index 0520f0f..4d7c76c 100644
--- a/src/app/statistic-analysis/state/page-there-year/page-there-year.component.scss
+++ b/src/app/statistic-analysis/state/page-there-year/page-there-year.component.scss
@@ -1,6 +1,6 @@
 .box{
     width: 100%;
-    height: 92%;
+    height: 100%;
     display: flex;
     flex-direction: column;
     overflow: hidden;
diff --git a/src/app/statistic-analysis/state/page-there/page-there.component.scss b/src/app/statistic-analysis/state/page-there/page-there.component.scss
index 3387989..fb3b6d7 100644
--- a/src/app/statistic-analysis/state/page-there/page-there.component.scss
+++ b/src/app/statistic-analysis/state/page-there/page-there.component.scss
@@ -1,6 +1,6 @@
 .box{
     width: 100%;
-    height: 92%;
+    height: 100%;
     display: flex;
     flex-direction: column;
     overflow: hidden;
diff --git a/src/app/statistic-analysis/state/page-two-time/page-two-time.component.scss b/src/app/statistic-analysis/state/page-two-time/page-two-time.component.scss
index b8b9d20..bc02d59 100644
--- a/src/app/statistic-analysis/state/page-two-time/page-two-time.component.scss
+++ b/src/app/statistic-analysis/state/page-two-time/page-two-time.component.scss
@@ -1,6 +1,6 @@
 .content {
   width: 100%;
-  height: 93%;
+  height: 100%;
   display: flex;
   flex-direction: column;
   overflow: hidden;
diff --git a/src/app/ui/authority/authority.component.html b/src/app/ui/authority/authority.component.html
index 8acc302..2425551 100644
--- a/src/app/ui/authority/authority.component.html
+++ b/src/app/ui/authority/authority.component.html
@@ -1,4 +1,4 @@
-<div style="height: 90%; overflow-y: auto;">
+<div style="height: 100%; overflow-y: auto;">
   <mat-tree [dataSource]="dataSource" [treeControl]="treeControl" >
     <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding>
       <button mat-icon-button disabled ></button>
diff --git a/src/app/ui/fire-fighting-facilities-formwork/fire-fighting-facilities-formwork.component.scss b/src/app/ui/fire-fighting-facilities-formwork/fire-fighting-facilities-formwork.component.scss
index 5ca7442..c6959ff 100644
--- a/src/app/ui/fire-fighting-facilities-formwork/fire-fighting-facilities-formwork.component.scss
+++ b/src/app/ui/fire-fighting-facilities-formwork/fire-fighting-facilities-formwork.component.scss
@@ -1,7 +1,7 @@
 .content {
   margin: 0 0 0 10px;
   width: 100%;
-  height: 90%;
+  height: 100%;
   overflow-y: auto;
   display: flex;
   .leftBox {
diff --git a/src/app/ui/fire-protection-elements/fire-protection-elements.component.scss b/src/app/ui/fire-protection-elements/fire-protection-elements.component.scss
index 12c709e..f1995a2 100644
--- a/src/app/ui/fire-protection-elements/fire-protection-elements.component.scss
+++ b/src/app/ui/fire-protection-elements/fire-protection-elements.component.scss
@@ -6,7 +6,7 @@
 
 .Box {
     width: 100%;
-    height: 90%;
+    height: 100%;
     overflow-y: auto;
     display: flex;
     padding-left: 10px;
diff --git a/src/app/ui/material-bank/material-bank.component.scss b/src/app/ui/material-bank/material-bank.component.scss
index a42d67c..5bdbccb 100644
--- a/src/app/ui/material-bank/material-bank.component.scss
+++ b/src/app/ui/material-bank/material-bank.component.scss
@@ -1,7 +1,7 @@
 .content {
     padding: 0 0 0 10px;
     width: 100%;
-    height: 90%;
+    height: 100%;
     overflow-x: hidden;
     overflow-y: auto;
     display: flex;
diff --git a/src/app/ui/navmenus/navmenus.component.html b/src/app/ui/navmenus/navmenus.component.html
index 967468b..a4b6735 100644
--- a/src/app/ui/navmenus/navmenus.component.html
+++ b/src/app/ui/navmenus/navmenus.component.html
@@ -1,4 +1,4 @@
-<div style="height: 90%; overflow-y: auto;">
+<div style="height: 100%; overflow-y: auto;">
   <mat-tree [dataSource]="dataSource" [treeControl]="treeControl" >
     <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding>
       <button mat-icon-button disabled ></button>
diff --git a/src/app/ui/role/role.component.html b/src/app/ui/role/role.component.html
index 3eeef51..ee1c85d 100644
--- a/src/app/ui/role/role.component.html
+++ b/src/app/ui/role/role.component.html
@@ -1,4 +1,4 @@
-<div style="height: 90%; overflow-y: auto;">
+<div style="height: 100%; overflow-y: auto;">
     <button mat-raised-button color="primary" (click)="createuser()" style=" margin: 10px">创建角色</button>
     <table mat-table [dataSource]="dataSource">
   
diff --git a/src/app/ui/unit-information/unit-information.component.scss b/src/app/ui/unit-information/unit-information.component.scss
index fd0abd5..6131605 100644
--- a/src/app/ui/unit-information/unit-information.component.scss
+++ b/src/app/ui/unit-information/unit-information.component.scss
@@ -1,7 +1,7 @@
 .content {
     margin: 0 0 0 10px;
     width: 100%;
-    height: 90%;
+    height: 100%;
     overflow-x: hidden;
     overflow-y: auto;
     display: flex;
diff --git a/src/assets/css/newStyle.css b/src/assets/css/newStyle.css
index 843324d..0ac2d32 100644
--- a/src/assets/css/newStyle.css
+++ b/src/assets/css/newStyle.css
@@ -367,7 +367,7 @@ iframe { display: block; }
 .num-item .num-text { color: #93FCFF; font-weight: 500; font-family: 'digiface'; font-size: 50px; line-height: 62px; letter-spacing: 0.1em; }
 .num-item .num-text .unit { font-size: 34px; margin-left: 10px; }
 
-.main { display: flex; flex-direction: column; padding: 0 30px 10px; height: 93%; }
+.main { display: flex; flex-direction: column; padding: 0 30px 10px; height: 100%; }
 
 .main-top { flex: 2; display: flex; padding: 30px 0 0; max-height: 699px; }