综合统计更多

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

@@ -23,8 +23,8 @@
     <tr>
       <th nzWidth="10%">楼栋名称</th>
       <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
       <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>

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

@@ -1,3 +1,4 @@
+import { TabService } from './../../services/tab.service';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } from 'date-fns';
 import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
@@ -13,6 +14,7 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -23,6 +25,7 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
 
   ngOnInit() {
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -39,6 +42,14 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO;
     return flag ? 21 : 0;

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

@@ -26,8 +26,8 @@
     <tr>
       <th nzWidth="10%">故障现象</th>
       <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
       <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>

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

@@ -1,3 +1,4 @@
+import { TabService } from './../../services/tab.service';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } from 'date-fns';
 import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
@@ -13,6 +14,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -23,6 +25,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 
   ngOnInit() {
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -39,6 +42,14 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.companyDTO || this.fieldConfig.fields.repairDeptDTO;
     return flag ? 21 : 0;

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

@@ -1,3 +1,4 @@
+import { TabService } from './../../services/tab.service';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } from 'date-fns';
 import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
@@ -13,6 +14,7 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -23,6 +25,7 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
 
   ngOnInit() {
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -39,6 +42,14 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO;
     return flag ? 21 : 0;

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

@@ -46,8 +46,8 @@
     <tr>
       <th nzWidth="10%">故障现象</th>
       <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
       <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>

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

@@ -1,3 +1,4 @@
+import { TabService } from './../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
@@ -15,6 +16,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -34,6 +36,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
       fun.call(this, v[1]);
     });
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -50,6 +53,14 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.companyDTO || this.fieldConfig.fields.repairDeptDTO;
     return flag ? 21 : 0;

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

@@ -36,8 +36,8 @@
     <tr>
       <th nzWidth="10%">故障现象</th>
       <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
       <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>

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

@@ -1,3 +1,4 @@
+import { TabService } from './../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
@@ -15,6 +16,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -33,6 +35,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
       fun.call(this, v[1]);
     });
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -49,6 +52,14 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.companyDTO || this.fieldConfig.fields.repairDeptDTO;
     return flag ? 21 : 0;

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

@@ -1,3 +1,4 @@
+import { TabService } from './../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
@@ -15,6 +16,7 @@ export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -33,6 +35,7 @@ export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
       fun.call(this, v[1]);
     });
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -49,6 +52,14 @@ export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.companyDTO;
     return flag ? 21 : 0;

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

@@ -1,3 +1,4 @@
+import { TabService } from './../../services/tab.service';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } from 'date-fns';
 import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
@@ -13,6 +14,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -25,6 +27,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
   ngOnInit() {
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -41,6 +44,14 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO;
     return flag ? 21 : 0;

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

@@ -38,8 +38,8 @@
     <tr>
       <th nzWidth="10%">科室名称(编码)</th>
       <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
       <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>

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

@@ -1,3 +1,4 @@
+import { TabService } from './../../services/tab.service';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } from 'date-fns';
 import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
@@ -13,6 +14,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -25,6 +27,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 
   ngOnInit() {
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -41,6 +44,14 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO;
     return flag ? 21 : 0;

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

@@ -1,3 +1,4 @@
+import { TabService } from './../../services/tab.service';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } from 'date-fns';
 import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
@@ -13,6 +14,7 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -25,6 +27,7 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
 
   ngOnInit() {
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -41,6 +44,14 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO;
     return flag ? 21 : 0;

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

@@ -34,8 +34,8 @@
     <tr>
       <th nzWidth="10%">楼栋楼层名称</th>
       <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
       <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>

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

@@ -1,3 +1,4 @@
+import { TabService } from './../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
@@ -15,6 +16,7 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -33,6 +35,7 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
       fun.call(this, v[1]);
     });
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -49,6 +52,14 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO;
     return flag ? 21 : 0;

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

@@ -25,8 +25,8 @@
     <tr>
       <th nzWidth="10%">分组名称</th>
       <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
       <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>

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

@@ -1,3 +1,4 @@
+import { TabService } from './../../services/tab.service';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } from 'date-fns';
 import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
@@ -13,6 +14,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -23,6 +25,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 
   ngOnInit() {
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -39,6 +42,14 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO;
     return flag ? 21 : 0;

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

@@ -37,8 +37,8 @@
     <tr>
       <th nzWidth="10%" nzShowSort nzSortKey="startDate" [(nzSort)]="sortCurrent.startDate">时间</th>
       <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
       <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>

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

@@ -1,3 +1,4 @@
+import { TabService } from './../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
@@ -15,6 +16,7 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -33,6 +35,7 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
       fun.call(this, v[1]);
     });
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -49,6 +52,14 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.sourceDTO;
     return flag ? 21 : 0;

src/app/views/new-statistics/maintenance-statistics/synthesize-statistics/synthesize-statistics.component.html

@@ -58,7 +58,7 @@
 					<div class="statistics-select-list" [ngClass]="{'activeClass': activeIndex == 0}" (click)="selectCheck(0)">维修人员</div>
 					<div class="statistics-select-list" [ngClass]="{'activeClass': activeIndex == 1}" (click)="selectCheck(1)">维修组</div>
 				</div>
-				<div class="more" (click)="toPath(1)">更多></div>
+				<div class="more" *ngIf="showMore(activeIndex == 0 ? 'userStatistics' : 'groupStatistics')" (click)="toPath(activeIndex == 0 ? '/newStatistics/maintenanceStatistics/userStatistics' : '/newStatistics/maintenanceStatistics/groupStatistics')">更多></div>
 			</div>
 			<div class="table">
 				<div class="td">
@@ -67,7 +67,7 @@
 					<div class="table-td" *ngIf="activeIndex==1">维修组</div>
 					<div class="table-td">工单量</div>
 					<div class="table-td">平均接单时长</div>
-					<div class="table-td">平均处理时长</div>
+					<div class="table-td">平均解决时长</div>
 					<div class="table-td">超时单</div>
 				</div>
 				<div class="th" *ngFor="let item of maintainData; let index = index;">
@@ -88,8 +88,8 @@
 		<div class="statistics width-40">
 			<div class="statistics-box">
 				<div class="sign-green"></div>
-				<div class="statistics-title">报修来源</div>
-				<div class="more" (click)="toPath(2)">更多></div>
+				<div class="statistics-title">故障来源</div>
+				<div class="more" *ngIf="showMore('categorySourceStatistics')" (click)="toPath('/newStatistics/maintenanceStatistics/categorySourceStatistics')">更多></div>
 			</div>
 			<div class="echarts-repairs">
 			  <div echarts class="echarts" [options]='repairsOptions'></div>
@@ -101,7 +101,7 @@
 			<div class="statistics-box">
 				<div class="sign-green"></div>
 				<div class="statistics-title">一级故障现象Top5</div>
-				<div class="more" (click)="toPath(3)">更多></div>
+				<div class="more" *ngIf="showMore('categoryOneStatistics')" (click)="toPath('/newStatistics/maintenanceStatistics/categoryOneStatistics')">更多></div>
 			</div>
 			<div class="echarts-repairs">
 				<div echarts class="echarts" [options]='malfunctionOptions'></div>
@@ -111,7 +111,7 @@
 			<div class="statistics-box">
 				<div class="sign-green"></div>
 				<div class="statistics-title">楼栋报修Top5</div>
-				<div class="more" (click)="toPath(4)">更多></div>
+				<div class="more" *ngIf="showMore('buildingStatistics')" (click)="toPath('/newStatistics/maintenanceStatistics/buildingStatistics')">更多></div>
 			</div>
 			<div class="echarts-repairs">
 				<div echarts class="echarts" [options]='buildingOptions'></div>
@@ -123,7 +123,7 @@
 			<div class="statistics-box">
 				<div class="sign-green"></div>
 				<div class="statistics-title">科室费用Top5</div>
-				<div class="more" (click)="toPath(5)">更多></div>
+				<div class="more" *ngIf="showMore('departmentIncidentStatistics')" (click)="toPath('/newStatistics/maintenanceStatistics/departmentIncidentStatistics')">更多></div>
 			</div>
 			<div class="table">
 				<div class="td">
@@ -144,7 +144,7 @@
 			<div class="statistics-box">
 				<div class="sign-green"></div>
 				<div class="statistics-title">耗材Top5</div>
-				<div class="more" (click)="toPath(6)">更多></div>
+				<div class="more" *ngIf="showMore('consumableStatistics')" (click)="toPath('/newStatistics/maintenanceStatistics/consumableStatistics')">更多></div>
 			</div>
 			<div class="table">
 				<div class="td">

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

@@ -1,6 +1,8 @@
+import { Router } from '@angular/router';
 import { format, addMonths, startOfMonth, endOfMonth } from 'date-fns';
 import { Component, OnInit } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
+import { TabService } from '../../services/tab.service';
 @Component({
   selector: "app-synthesize-statistics",
   templateUrl: "./synthesize-statistics.component.html",
@@ -9,8 +11,10 @@ import { MainService } from 'src/app/services/main.service';
 export class SynthesizeStatisticsComponent implements OnInit {
   constructor(
     private mainService: MainService,
+    private tabService: TabService,
+    public router: Router,
   ) {}
-	
+
 	isLoading:Boolean = false;
 	workData:any = []; //工单统计
   listOfData: any[] = []; //表格数据
@@ -59,13 +63,13 @@ export class SynthesizeStatisticsComponent implements OnInit {
   ngOnInit() {
     this.search();
   }
-	
+
 	// 维修处理类型切换
 	selectCheck(type){
 		this.activeIndex = type
 		this.getMaintainData();
 	}
-	
+
 	// 报修来源
 	repairsChart() {
 		let postData:any = {
@@ -109,7 +113,7 @@ export class SynthesizeStatisticsComponent implements OnInit {
 							},
 							label: {
 									show: true,
-									formatter: '{b}: {c} {d}%'  
+									formatter: '{b}: {c} {d}%'
 							},
 				      itemStyle: {
 				        normal: {
@@ -130,7 +134,7 @@ export class SynthesizeStatisticsComponent implements OnInit {
 				};
 		  });
 	}
-	
+
 	// 一级故障
 	malfunctionChart(){
 		let postData:any = {
@@ -195,7 +199,7 @@ export class SynthesizeStatisticsComponent implements OnInit {
 				}
 		  });
 	}
-	
+
 	// 楼栋报修
 	buildingChart(){
 		let postData:any = {
@@ -260,7 +264,7 @@ export class SynthesizeStatisticsComponent implements OnInit {
 		    }
 		  });
 	}
-	
+
 	// 科室费用
 	getDeptCostData() {
 	  let postData:any = {
@@ -277,7 +281,7 @@ export class SynthesizeStatisticsComponent implements OnInit {
 	      this.deptCostData = result.data || [];
 	    });
 	}
-	
+
 	// 耗材
 	getConsumableData() {
 	  let postData:any = {
@@ -295,12 +299,21 @@ export class SynthesizeStatisticsComponent implements OnInit {
 	      this.consumableData = result.data || [];
 	    });
 	}
-	
+
 	// 更多跳转
-	toPath(type){
-		console.log(type)
+	toPath(path){
+    let flag = this.tabService.tabs.some(v => v.path === path);
+    flag && this.tabService.deleteRouteSnapshot(path);
+    this.tabService.setQueryParams('dateRange', this.dateRange);
+    this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
+  // 判断更多是否显示
+  showMore(path){
+    let menus = JSON.parse(localStorage.getItem("menu"));
+    return menus.find(v => v.link === 'maintenanceStatistics').childrens.some(v => v.link === path);
+  }
+
   // 初始化缓存数据
   queryType:any;
   hosId:any;
@@ -334,7 +347,7 @@ export class SynthesizeStatisticsComponent implements OnInit {
       this.dutyId = undefined;
       this.parentDutyId = dutyId;
     }
-		
+
 		this.isLoading = true
 		this.getWorkData();
 		this.getMaintainData();
@@ -369,7 +382,7 @@ export class SynthesizeStatisticsComponent implements OnInit {
         this.listLength = result.totalCount;
       });
   }
-	
+
 	// 头部工单数据
 	getWorkData() {
 	  let postData:any = {
@@ -386,7 +399,7 @@ export class SynthesizeStatisticsComponent implements OnInit {
 	      this.workData = result.data[0] || [];
 	    });
 	}
-	
+
 	// 维修处理
 	getMaintainData() {
 	  let postData:any = {
@@ -404,14 +417,14 @@ export class SynthesizeStatisticsComponent implements OnInit {
 	      this.maintainData = result.data || [];
 	    });
 	}
-	
+
 	// 重置
 	reset(){
 		this.dateRange = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')];
 		this.activeIndex = 0;
 		this.search();
 	}
-	
+
   // 搜索
   search() {
 		this.initSessionData();

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

@@ -36,8 +36,8 @@
     <tr>
       <th nzWidth="10%">公司名称</th>
       <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
       <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>

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

@@ -1,3 +1,4 @@
+import { TabService } from './../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
@@ -15,6 +16,7 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -33,6 +35,7 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
       fun.call(this, v[1]);
     });
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -49,6 +52,14 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO;
     return flag ? 21 : 0;

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

@@ -36,8 +36,8 @@
     <tr>
       <th nzWidth="10%">人员姓名(工号)</th>
       <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
       <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>

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

@@ -5,6 +5,7 @@ import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } fro
 import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
 import { ActivatedRoute } from '@angular/router';
+import { TabService } from '../../services/tab.service';
 @Component({
   selector: "app-user-statistics",
   templateUrl: "./user-statistics.component.html",
@@ -15,6 +16,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -33,6 +35,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
       fun.call(this, v[1]);
     });
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -49,6 +52,14 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO;
     return flag ? 21 : 0;

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

@@ -1,3 +1,4 @@
+import { TabService } from './../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
@@ -15,6 +16,7 @@ export class WorkHourStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -33,6 +35,7 @@ export class WorkHourStatisticsComponent implements OnInit, AfterViewInit {
       fun.call(this, v[1]);
     });
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -49,6 +52,14 @@ export class WorkHourStatisticsComponent implements OnInit, AfterViewInit {
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.companyDTO;
     return flag ? 21 : 0;

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

@@ -28,6 +28,19 @@ export class TabService {
       });
   }
 
+  public queryParams: any = {};
+  setQueryParams(key, value){
+    this.queryParams[key] = value;
+  }
+
+  getQueryParams(){
+    return this.queryParams;
+  }
+
+  clearQueryParams(){
+    this.queryParams = {};
+  }
+
   public deleteAllRouteSnapshot(){
     this.tabs.forEach(v => {
       SimpleReuseStrategy.deleteRouteSnapshot(v.path);