[修正] 广西BUG→上海同步BUG修正 [完善] 所有页面高度完善

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({

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; // 数据 是否改动
 

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"">

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;
 }
 

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.六熟悉记录">
+    <!-- <mat-tab label="9.unity平面图">
       <ng-template matTabContent>
-            <app-six-familiar-list></app-six-familiar-list>
+        <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="10.实战演练记录">
-        <ng-template matTabContent>
-            功能开发中~~
-        </ng-template>
-    </mat-tab>  
+    </mat-tab> -->
 </mat-tab-group>
 

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>
-            功能开发中~~
+            <app-collection-tools></app-collection-tools>
         </ng-template>
     </mat-tab>
-    <mat-tab label="10.作战部署">
+    <!-- <mat-tab label="9.unity作战部署">
       <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>
+          <iframe id="main" src="/unityApp2/index.html" name="unityApp" frameborder="0" width="100%" height="98%"></iframe>
       </ng-template>
-    </mat-tab> 
+    </mat-tab>  -->
 </mat-tab-group>

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 {

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 {

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;

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;

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{

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{

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 {

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 {

src/app/key-unit/uploading-cad-look/uploading-cad.component.html

@@ -1,9 +1,5 @@
-<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 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>
@@ -16,9 +12,9 @@
       <mat-progress-bar mode="determinate" [value]="downloadProgress" class="progress" style="left: 52px;top: 13px;"></mat-progress-bar>
     </div>
   
-</div>
+  </div>
   
-<div style="overflow-y: auto;height: 90%; padding: 10px; box-sizing: border-box;overflow-x: hidden;">
+  <div style="padding: 10px;">
     <table mat-table [dataSource]="CADList">
   
       <ng-container matColumnDef="checked">
@@ -61,4 +57,6 @@
       <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>

src/app/key-unit/uploading-cad/uploading-cad.component.html

@@ -1,4 +1,5 @@
-<div class="header">
+<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>
@@ -16,9 +17,9 @@
       <mat-progress-bar mode="determinate" [value]="downloadProgress" class="progress" style="left: 52px;top: 13px;"></mat-progress-bar>
     </div>
   
-</div>
+  </div>
   
-<div style="overflow-y: auto;height: 90%; padding: 10px; box-sizing: border-box;overflow-x: hidden;">
+  <div style="padding: 10px;">
     <table mat-table [dataSource]="CADList">
   
       <ng-container matColumnDef="checked">
@@ -61,4 +62,6 @@
       <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>

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.六熟悉记录">
+    <mat-tab label="8.作战部署">
         <ng-template matTabContent>
-            功能开发中~~
-        </ng-template>
-    </mat-tab>
-    <mat-tab label="9.实战演练记录">
-        <ng-template matTabContent>
-            功能开发中~~
+          <app-collection-tools></app-collection-tools>
         </ng-template>
     </mat-tab>
-    <mat-tab label="10.作战部署">
+    <!-- <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> -->
+        <iframe id="main" src="/unityApp2/index.html" name="unityApp" frameborder="0" width="100%" height="98%"></iframe>
       </ng-template>
-    </mat-tab>  
+    </mat-tab>  -->
 </mat-tab-group>
 

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.六熟悉记录">
+    <!-- <mat-tab label="9.unity平面图">
       <ng-template matTabContent>
-          <app-six-familiar-list></app-six-familiar-list>
+        <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="10.实战演练记录">
-        <ng-template matTabContent>
-          功能开发中~~
-        </ng-template>
-    </mat-tab>  
+    </mat-tab>  -->
 </mat-tab-group>
 

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`);
-  }
+
 
 
 }

src/app/plan-audit/detachment-level/detachment-level.component.html

@@ -1,4 +1,5 @@
-<div class="header">
+<div style="height: 100%; overflow-y: auto;">
+  <div class="header">
     <form (ngSubmit)="onSubmit(form.value)" #form="ngForm">
       <div class="queryBox">
         <div class="queryField">
@@ -75,10 +76,10 @@
         <button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button>
       </div>
     </form>
-</div>
-<mat-divider></mat-divider>
+  </div>
+  <mat-divider></mat-divider>
   
-<div class="body">
+  <div class="body">
     <div class="tablebox">
       <table mat-table [dataSource]="tabledataSource">
   
@@ -158,4 +159,5 @@
           (page)="chagePage($event)">
       </mat-paginator>
     </div>
+  </div>
 </div>

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`);
   }
 
   //预案公开

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

@@ -1,4 +1,5 @@
-<div class="header">
+<div style="height: 100%; overflow-y: auto;">
+  <div class="header">
     <form (ngSubmit)="onSubmit(form.value)" #form="ngForm">
       <div class="queryBox">
         <div class="queryField">
@@ -87,10 +88,10 @@
         <button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button>
       </div>
     </form>
-</div>
-<mat-divider></mat-divider>
+  </div>
+  <mat-divider></mat-divider>
   
-<div class="body">
+  <div class="body">
     <div class="tablebox">
       <table mat-table [dataSource]="tabledataSource">
   
@@ -170,4 +171,5 @@
           (page)="chagePage($event)">
       </mat-paginator>
     </div>
+  </div>
 </div>

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`);
   }
 
   //预案公开

src/app/plan-audit/plan-pass/plan-pass.component.html

@@ -1,3 +1,4 @@
+<div style="height: 100%; overflow: hidden;">
   
 <mat-accordion>
   <mat-expansion-panel disabled>
@@ -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,7 +30,7 @@
   </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">
@@ -62,4 +63,6 @@
       <iframe [src]='thirdPartyURL' frameborder="0" width="100%" height="100%" id="iframe"></iframe>
     </div>
 
+  </div>
+
 </div>

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.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

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){

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){

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;

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;

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;

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;

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;

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;

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>

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;

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;

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;

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>

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;

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;

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;

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;

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;

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>
 
 

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;

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;

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;

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>

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 {

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;

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;

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>

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">
   

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;

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; }