优化

src/app/app-routing.module.ts

@@ -185,6 +185,12 @@ const routes: Routes = [
     path: "newStatistics",
     loadChildren: () => import("./views/new-statistics/new-statistics.module").then((m) => m.NewStatisticsModule),
   },
+  // 临时路由
+  {
+    path: "redirect",
+    redirectTo: '/',
+    pathMatch: 'full'
+  },
   // 管理端首页
   {
     path: '**',

src/app/views/new-statistics/maintenance-statistics/building-statistics/building-statistics.component.ts

@@ -34,8 +34,8 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 

src/app/views/new-statistics/maintenance-statistics/category-one-statistics/category-one-statistics.component.ts

@@ -34,8 +34,8 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 

src/app/views/new-statistics/maintenance-statistics/category-source-statistics/category-source-statistics.component.ts

@@ -34,8 +34,8 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 

src/app/views/new-statistics/maintenance-statistics/category-three-statistics/category-three-statistics.component.ts

@@ -45,8 +45,8 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 

src/app/views/new-statistics/maintenance-statistics/category-two-statistics/category-two-statistics.component.ts

@@ -44,8 +44,8 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 

src/app/views/new-statistics/maintenance-statistics/consumable-statistics/consumable-statistics.component.ts

@@ -44,8 +44,8 @@ export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 

src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/department-evaluate-statistics.component.ts

@@ -36,8 +36,8 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 

src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-statistics.component.ts

@@ -36,8 +36,8 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 

src/app/views/new-statistics/maintenance-statistics/department-source-statistics/department-source-statistics.component.ts

@@ -36,8 +36,8 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 

src/app/views/new-statistics/maintenance-statistics/floor-statistics/floor-statistics.component.ts

@@ -44,8 +44,8 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 

src/app/views/new-statistics/maintenance-statistics/group-statistics/group-statistics.component.ts

@@ -34,8 +34,8 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 

src/app/views/new-statistics/maintenance-statistics/incident-statistics/incident-statistics.component.ts

@@ -44,8 +44,8 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 

src/app/views/new-statistics/maintenance-statistics/maintenance-statistics.component.less

@@ -51,6 +51,8 @@
       .icon_transport{
         color: #666666;
         font-size: 24px;
+        position: relative;
+        top: 2px;
       }
     }
   }

src/app/views/new-statistics/maintenance-statistics/maintenance-statistics.component.ts

@@ -25,7 +25,7 @@ export class MaintenanceStatisticsComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy(){
-    this.sessionRemove();
+    // this.sessionRemove();
     this.tabService.deleteAllRouteSnapshot();
   }
 
@@ -70,6 +70,14 @@ export class MaintenanceStatisticsComponent implements OnInit, OnDestroy {
   queryType;//查询范围
   // 初始化院区、部门显示
   initHospitalAndDuty(hospitalOrDuty){
+    let sessionData = JSON.parse(sessionStorage.getItem('maintenanceStatistics'));
+    console.log(sessionData);
+    if(sessionData){
+      this.hospital = sessionData.hospital;
+      this.duty = sessionData.duty;
+      this.queryType = sessionData.queryType;
+      return;
+    }
     let type = 'hospital';//默认是院区
     if(hospitalOrDuty.type){
       // 当前是责任部门
@@ -108,7 +116,7 @@ export class MaintenanceStatisticsComponent implements OnInit, OnDestroy {
 
   // 缓存数据
   sessionSave(){
-    sessionStorage.setItem('maintenanceStatistics', JSON.stringify({queryType: this.queryType, hospitalId: this.hospital ? this.hospital.id : undefined, dutyId: this.duty ? this.duty.id : undefined}))
+    sessionStorage.setItem('maintenanceStatistics', JSON.stringify({queryType: this.queryType, hospitalId: this.hospital ? this.hospital.id : undefined, dutyId: this.duty ? this.duty.id : undefined, hospital: this.hospital, duty: this.duty}));
   }
 
   // 清除缓存数据
@@ -131,7 +139,14 @@ export class MaintenanceStatisticsComponent implements OnInit, OnDestroy {
     this.queryRangeFlag = false;
 
     this.sessionSave();
-    this.router.navigate([`newStatistics/${this.route.parent.snapshot.routeConfig.path}/${this.activeSecondMenuLink}`], { replaceUrl: true });
+    // this.tabService.deleteRouteSnapshot(`/newStatistics/${this.route.parent.snapshot.routeConfig.path}/${this.activeSecondMenuLink}`);
+    // this.router.navigate([`/newStatistics/${this.route.parent.snapshot.routeConfig.path}/${this.activeSecondMenuLink}`], { replaceUrl: true });
+
+    this.router.navigateByUrl('/redirect', {
+      skipLocationChange: true
+    }).then(() => {
+      this.router.navigate([`/newStatistics/${this.route.parent.snapshot.routeConfig.path}/${this.activeSecondMenuLink}`], { replaceUrl: true });
+    });
   }
   cancelQueryRange() {
     this.queryRangeFlag = false;

src/app/views/new-statistics/maintenance-statistics/tripartite-company-statistics/tripartite-company-statistics.component.ts

@@ -44,8 +44,8 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 

src/app/views/new-statistics/maintenance-statistics/user-statistics/user-statistics.component.ts

@@ -44,8 +44,8 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 

src/app/views/new-statistics/maintenance-statistics/work-hour-statistics/work-hour-statistics.component.ts

@@ -44,8 +44,8 @@ export class WorkHourStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 

src/app/views/new-statistics/services/tab.service.ts

@@ -22,6 +22,8 @@ export class TabService {
       	console.log('event:', event)
         if(event.urlAfterRedirects.startsWith('/newStatistics/')){
           this.updateTabs(event.urlAfterRedirects);
+        }else if(event.urlAfterRedirects !== '/'){
+          sessionStorage.removeItem('maintenanceStatistics')
         }
       });
   }
@@ -33,6 +35,10 @@ export class TabService {
     this.tabs = [];
   }
 
+  public deleteRouteSnapshot(path){
+    SimpleReuseStrategy.deleteRouteSnapshot(path);
+  }
+
   private updateTabs(url: string) {
     const normalizedUrl = this.getNormalizedUrl(url);
     const existingTab = this.tabs.find(t => t.path === normalizedUrl);