故障工单统计

src/app/views/new-statistics/components/custom-tabs/custom-tabs.component.ts

@@ -31,7 +31,9 @@ export class CustomTabsComponent implements OnInit {
     // console.log('params:', params)
     // console.log('routePath:', routePath)
     this.selectTabEmit.emit(routePath.split('/').reverse()[0])
-    this.router.navigate([routePath], params).catch(err => {
+    this.router.navigate([routePath], {
+      replaceUrl: true
+    }).catch(err => {
       console.error('导航失败:', err);
       // 处理无效页签
       this.tabService.closeTab(path);

src/app/views/new-statistics/components/query-range/query-range.component.html

@@ -1,15 +1,43 @@
-<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="queryRangeFlag">
+<div class="save add display_flex align-items_center justify-content_flex-center">
   <div class="modalBody">
     <div class="title">查询范围<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
     </div>
     <div class="content">
       <form nz-form [formGroup]="validateForm" class="addForm">
-        <nz-form-item>
-          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="affiliatedHospital">所属院区</nz-form-label>
-          <nz-form-control nzErrorTip="请选择所属院区!">
-            <nz-select [nzDropdownMatchSelectWidth]="false" type="affiliatedHospital" nzShowSearch
-              formControlName="affiliatedHospital" nzPlaceHolder="请选择所属院区">
-              <nz-option nzLabel="{{data['hosName']}}" nzValue="{{data['id']}}" *ngFor="let data of allHospital">
+        <nz-form-item class="mb0">
+          <nz-form-label [nzSpan]="4" nzRequired nzFor="queryType">查询范围</nz-form-label>
+          <nz-form-control [nzSpan]="20" nzErrorTip="请选择查询范围!">
+            <nz-radio-group formControlName="queryType" (ngModelChange)="changeQueryType($event)">
+              <label nz-radio [nzValue]="1">全院查询</label>
+              <label nz-radio [nzValue]="2">院区查询</label>
+              <label nz-radio [nzValue]="3">部门查询</label>
+              <label nz-radio [nzValue]="4">垂直部门查询</label>
+            </nz-radio-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item [hidden]="!(validateForm.value.queryType == 2 || validateForm.value.queryType == 3)">
+          <nz-form-label [nzSpan]="4" nzRequired nzFor="hospital">院<span style="visibility: hidden;">囧囧</span>区</nz-form-label>
+          <nz-form-control [nzSpan]="20" nzErrorTip="请选择院区!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="hospital" nzPlaceHolder="请选择院区" (ngModelChange)="changeHospital($event)">
+              <nz-option [nzLabel]="data.hosName" [nzValue]="data.id" *ngFor="let data of hospitalList">
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item [hidden]="validateForm.value.queryType != 3">
+          <nz-form-label [nzSpan]="4" nzRequired nzFor="duty">责任部门</nz-form-label>
+          <nz-form-control [nzSpan]="20" nzErrorTip="请选择责任部门!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="duty" nzPlaceHolder="请选择责任部门">
+              <nz-option [nzLabel]="data.hosName" [nzValue]="data.id" *ngFor="let data of dutyList">
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item [hidden]="validateForm.value.queryType != 4">
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="dutyOne">一级责任部门</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择一级责任部门!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="dutyOne" nzPlaceHolder="请选择一级责任部门">
+              <nz-option [nzLabel]="data.hosName" [nzValue]="data.id" *ngFor="let data of dutyOneList">
               </nz-option>
             </nz-select>
           </nz-form-control>
@@ -17,8 +45,8 @@
       </form>
     </div>
     <div class="display_flex justify-content_flex-center">
+      <button nz-button nzType="default" (click)="hideModal()">取消</button>
       <button nzType="primary" nz-button (click)="submitForm()">确认</button>
-      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
     </div>
   </div>
 </div>

src/app/views/new-statistics/components/query-range/query-range.component.less

@@ -17,17 +17,18 @@
     .title {
       width: 100%;
       text-align: center;
-      font-size: 18px;
+      font-size: 16px;
       position: relative;
+      padding: 16px 0;
 
       i {
         position: absolute;
         right: 0;
-        top: 0;
+        top: 50%;
         font-size: 20px;
         color: #666;
         cursor: pointer;
-        padding: 0 5px;
+        transform: translateY(-50%);
       }
     }
 
@@ -38,7 +39,6 @@
       border: 1px solid #e5e9ed;
       border-radius: 5px;
       overflow: hidden;
-      margin-top: 12px;
 
       div {
         text-align: center;
@@ -75,10 +75,7 @@
 
     button {
       margin-top: 10px;
-
-      &.btn {
-        margin-left: 8px;
-      }
+      margin-bottom: 10px;
     }
   }
 
@@ -86,39 +83,33 @@
   &.add {
     .modalBody {
       width: 578px;
-      height: 286px;
+      padding: 0 24px;
 
       .content {
         width: 100%;
+        min-height: 166px;
+        padding: 10px 24px 0;
         height: auto;
-        padding: 19px 14px 0 14px;
-        max-height: 500px;
         overflow-y: auto;
 
         .addForm {
           .ant-form-item {
             margin-bottom: 14px;
-
             .ant-form-item-label {
-              line-height: 14px;
               text-align: left;
             }
-          }
-        }
-
-        .editForm {
-          .ant-form-item {
-            margin-bottom: 14px;
-
-            .ant-form-item-label {
-              line-height: 0;
+            &.mb0{
+              margin-bottom: 6px;
+            }
+            .ant-radio-wrapper{
+              margin-right: 0;
             }
           }
         }
       }
 
       button:nth-child(1) {
-        margin-right: 20px;
+        margin-right: 8px;
       }
     }
   }

src/app/views/new-statistics/components/query-range/query-range.component.ts

@@ -2,6 +2,7 @@ import { ToolService } from './../../../../services/tool.service';
 import { Component, OnInit, Output, Input } from '@angular/core';
 import { FormGroup, FormBuilder, Validators } from '@angular/forms';
 import { EventEmitter } from '@angular/core';
+import { MainService } from 'src/app/services/main.service';
 
 @Component({
   selector: 'app-query-range',
@@ -11,25 +12,33 @@ import { EventEmitter } from '@angular/core';
 export class QueryRangeComponent implements OnInit {
   @Output() submitQueryRange = new EventEmitter();
   @Output() cancelQueryRange = new EventEmitter();
-  @Input() queryRangeFlag: boolean = false;//模态框
+  @Input() queryType: number;
+  @Input() hospital: any;
+  @Input() duty: any;
   validateForm: FormGroup;//表单
-  allHospital: any;//所有院区
-  hosLoading: boolean = false;//确定按钮的loading
-  constructor(private fb: FormBuilder, private tool: ToolService) { }
+  constructor(
+    private fb: FormBuilder,
+    private tool: ToolService,
+    private mainService: MainService,
+  ) { }
 
   ngOnInit() {
-    this.allHospital = this.tool.getHospitalList();
-    this.initForm()
+    this.getHospitalList();
+    this.queryType == 3 && this.getDutyList(this.hospital.id);
+    this.getDutyOneList();
+    this.initForm();
   }
   // 隐藏模态框
   hideModal() {
     this.cancelQueryRange.emit()
-    this.initForm()
   }
   // 初始化新增form表单
   initForm() {
     this.validateForm = this.fb.group({
-      affiliatedHospital: [this.tool.getCurrentHospital().id + '', [Validators.required]]
+      queryType: [this.queryType, [Validators.required]],
+      hospital: [(this.hospital && (this.queryType == 2 || this.queryType == 3)) ? this.hospital.id : null],
+      duty: [(this.duty && this.queryType == 3) ? this.duty.id : null],
+      dutyOne: [(this.duty && this.queryType == 4) ? this.duty.id : null],
     });
   }
   // 表单提交
@@ -39,9 +48,132 @@ export class QueryRangeComponent implements OnInit {
       this.validateForm.controls[i].updateValueAndValidity();
     }
     if (this.validateForm.invalid) return;
-    let id = this.validateForm.value.affiliatedHospital;
-    this.hosLoading = true;
-    this.submitQueryRange.emit(id);
+    let queryType = this.validateForm.value.queryType;
+    let hospital;
+    let duty;
+    switch (queryType) {
+      case 1:
+        break;
+      case 2:
+        hospital = this.hospitalList.find(v => v.id == this.validateForm.value.hospital);
+        break;
+      case 3:
+        hospital = this.hospitalList.find(v => v.id == this.validateForm.value.hospital);
+        duty = this.dutyList.find(v => v.id == this.validateForm.value.duty);
+        break;
+      case 4:
+        hospital = this.dutyOneList.find(v => v.id == this.validateForm.value.dutyOne).parent;
+        duty = this.dutyOneList.find(v => v.id == this.validateForm.value.dutyOne);
+        break;
+    }
+    this.submitQueryRange.emit({queryType, hospital, duty});
     this.hideModal();
   }
+
+  // 选择查询范围
+  changeQueryType(queryType){
+    this.validateForm.controls.hospital.setValue(null);
+    this.validateForm.controls.duty.setValue(null);
+    this.validateForm.controls.dutyOne.setValue(null);
+    this.dutyList = [];
+    switch (queryType) {
+      case 1:
+        this.requiredChange(false, 'hospital');
+        this.requiredChange(false, 'duty');
+        this.requiredChange(false, 'dutyOne');
+        break;
+      case 2:
+        this.requiredChange(true, 'hospital');
+        this.requiredChange(false, 'duty');
+        this.requiredChange(false, 'dutyOne');
+        break;
+      case 3:
+        this.requiredChange(true, 'hospital');
+        this.requiredChange(true, 'duty');
+        this.requiredChange(false, 'dutyOne');
+        break;
+      case 4:
+        this.requiredChange(false, 'hospital');
+        this.requiredChange(false, 'duty');
+        this.requiredChange(true, 'dutyOne');
+        break;
+    }
+  }
+
+  // 选择院区
+  changeHospital(hosId){
+    if(this.validateForm.value.queryType == 3){
+      this.getDutyList(hosId);
+    }
+  }
+
+  requiredChange(required: boolean, field: string): void {
+    if (!required) {
+      this.validateForm.get(field)!.clearValidators();
+      this.validateForm.get(field)!.markAsPristine();
+    } else {
+      this.validateForm.get(field)!.setValidators(Validators.required);
+      this.validateForm.get(field)!.markAsDirty();
+    }
+    this.validateForm.get(field)!.updateValueAndValidity();
+  }
+
+  // 获取所有的院区
+  hospitalList:any[] = [];
+  getHospitalList(){
+    let postData: any = {
+      idx: 0,
+      sum: 99999,
+      hospital: {
+        selectType: "level1",
+      },
+    };
+    this.mainService.getFetchDataList("data", "hospital", postData).subscribe(result => {
+      if(result.status == 200){
+        this.hospitalList = result.list || [];
+      }else{
+        this.hospitalList = [];
+      }
+    });
+  }
+
+  // 获取所有的责任部门
+  dutyList:any[] = [];
+  getDutyList(parentId){
+    let postData: any = {
+      idx: 0,
+      sum: 99999,
+      hospital: {
+        parent: { id: parentId },
+        selectType: "branch",
+      },
+    };
+    this.mainService.getFetchDataList("data", "hospital", postData).subscribe(result => {
+      if(result.status == 200){
+        this.dutyList = result.list || [];
+      }else{
+        this.dutyList = [];
+      }
+    });
+  }
+
+  // 获取所有的一级责任部门
+  dutyOneList:any[] = [];
+  getDutyOneList(){
+    let postData: any = {
+      idx: 0,
+      sum: 99999,
+      hospital: {
+        selectType: "verticalBranch",
+      },
+    };
+    this.mainService.getFetchDataList("data", "hospital", postData).subscribe(result => {
+      if(result.status == 200){
+        this.dutyOneList = result.list || [];
+      }else{
+        this.dutyOneList = [];
+      }
+    });
+  }
+
 }

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

@@ -1 +1,49 @@
-故障工单统计<input type="text">
+<div class="searchDataWrap">
+  <div class="searchData">
+    <div class="searchDataItem">
+      <span class="label">建单时间</span>：
+      <nz-range-picker [(ngModel)]="dateRange" [nzAllowClear]="false" (ngModelChange)="changeDate($event)" (nzOnCalendarChange)="onCalendarChangeDate($event)">
+      </nz-range-picker>
+    </div>
+  </div>
+  <div class="operation">
+    <button nz-button class="btn default" (click)="search(1)">搜索</button>
+    <button nz-button class="btn default ml8" (click)="excelExport()">导出</button>
+    <button nz-button class="btn default ml8" (click)="reset()">重置</button>
+  </div>
+</div>
+<nz-table [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1">
+  <thead (nzSortChange)="sort($event)" nzSingleSort>
+    <tr>
+      <th nzWidth="10%">时间</th>
+      <th nzWidth="9%">工单总数</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="byOrderNum" [(nzSort)]="sortCurrent.byOrderNum">平均响应时间</th>
+      <th nzWidth="9%">平均解决时间</th>
+      <th nzWidth="9%">超时单数</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="completionRate" [(nzSort)]="sortCurrent.completionRate">挂起单数</th>
+      <th nzWidth="9%">耗材费用(元)</th>
+      <th nzWidth="9%">工时费用(元)</th>
+      <th nzWidth="9%">总费用(元)</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="byIntegral" [(nzSort)]="sortCurrent.byIntegral">差评单数</th>
+      <th nzWidth="9%">好评率</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr *ngFor="let data of listOfData; let index = index">
+      <td>{{ index + (pageIndex - 1) * 10 + 1 }}</td>
+      <td>{{ data.name }}</td>
+      <td>{{ data.total || 0 }}</td>
+      <td>{{ data.total || 0 }}</td>
+      <td>{{ data.total || 0 }}</td>
+      <td>{{ data.fiveTimeNum || 0 }}<br>{{ data.specialCloseNum }}</td>
+      <td>{{ data.arriveTime }}<br>{{ data.completeTime }}</td>
+      <td>{{ data.avePer + "%" }}</td>
+      <td>{{ data.buildingGrade }}<br>{{ data.inspectModeGrade }}</td>
+      <td>{{ data.order || 0 }}</td>
+      <td>{{ data.order || 0 }}</td>
+    </tr>
+  </tbody>
+</nz-table>
+<div>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+</div>

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

@@ -5,4 +5,17 @@
   right: 0;
   bottom: 0;
   left: 0;
+  .searchDataWrap{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .searchData{
+      padding: 16px;
+      .searchDataItem{
+        .label{
+          font-size: 16px;
+        }
+      }
+    }
+  }
 }

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

@@ -1,13 +1,134 @@
+import { format, addMonths, startOfMonth, endOfMonth } from 'date-fns';
 import { Component, OnInit } from "@angular/core";
+import { MainService } from 'src/app/services/main.service';
 @Component({
   selector: "app-incident-statistics",
   templateUrl: "./incident-statistics.component.html",
   styleUrls: ["./incident-statistics.component.less"],
 })
 export class IncidentStatisticsComponent implements OnInit {
-  constructor() {}
+  constructor(
+    private mainService: MainService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 10; //表格每页展示条数
+  listLength: number = 10; //表格总数据量
 
   ngOnInit() {
-    console.log('初始化')
+    this.initSessionData();
+    this.search();
+  }
+
+  // 初始化缓存数据
+  queryType:any;
+  hosId:any;
+  dutyId:any;
+  parentDutyId:any;
+  initSessionData(){
+    let queryType:any = sessionStorage.getItem('maintenance_statistics_queryType');
+    let hosId:any = sessionStorage.getItem('maintenance_statistics_hospitalId');
+    let dutyId:any = sessionStorage.getItem('maintenance_statistics_dutyId');
+
+    queryType = queryType ? +queryType : undefined;
+    hosId = hosId ? +hosId : undefined;
+    dutyId = dutyId ? +dutyId : undefined;
+
+    this.queryType = queryType;
+    if(queryType == 1){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 2){
+      this.hosId = hosId;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 3){
+      this.hosId = undefined;
+      this.dutyId = dutyId;
+      this.parentDutyId = undefined;
+    }else if(queryType == 4){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = dutyId;
+    }
+  }
+
+  // 表格数据
+  loading1 = false;
+  getList(num?: number, field?: string, sort?: string) {
+    if (num !== undefined) {
+      this.pageIndex = num;
+    }
+    let postData:any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      startDate: this.dateRange[0],
+      endDate: this.dateRange[1],
+      hosId: this.hosId,
+      dutyId: this.dutyId,
+      parentDutyId: this.parentDutyId,
+    };
+    if (field && sort) {
+      postData[field] = sort === "ascend" ? `asc` : `desc`;
+    }
+    this.loading1 = true;
+    this.mainService
+      .postCustom("itsm/report", "incidentWorkOrder", postData)
+      .subscribe((result) => {
+        this.loading1 = false;
+        this.listOfData = result.dataList || [];
+        this.listLength = result.totalCount;
+      });
+  }
+
+  // 列表排序
+  sortCurrent = {
+    byOrderNum: null,
+    byIntegral: null,
+		completionRate: null,
+  };
+  sortCurrentKey: string = "";
+  sortCurrentValue: string | null = "";
+  sort(e) {
+    const { key, value } = e;
+    this.sortCurrentKey = key;
+    this.sortCurrentValue = value;
+    this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 搜索
+  search(num?: number) {
+    if (num !== undefined) {
+      this.getList(num, this.sortCurrentKey, this.sortCurrentValue);
+    } else {
+      this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
+    }
+  }
+
+  // 日期选择 日
+  dateRange: any = [format(startOfMonth(addMonths(new Date(), -2)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]; //发起时间区间 天
+  changeDate(result?): void {
+    console.log(this.dateRange);
+    console.log(result);
+    result[0] = format(result[0], 'yyyy-MM-dd HH:mm:ss');
+    result[1] = format(result[1], 'yyyy-MM-dd HH:mm:ss');
+    this.dateRange = result;
+    this.search();
+  }
+
+  onCalendarChangeDate(dateArr){
+    console.log(dateArr)
+    if(dateArr.length == 2){
+      let dateStart = new Date(dateArr[0]);
+      let dateEnd = new Date(dateArr[1]);
+      dateStart.setHours(0,0,0);
+      dateEnd.setHours(23,59,59);
+      this.dateRange = [dateStart,dateEnd];
+    }
   }
+
+  excelExport(){}
+  reset(){}
 }

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

@@ -12,7 +12,7 @@
 <!-- content -->
 <div class="content">
   <virtual-scroller #osComponentRef1 [items]="secondMenuList" class="secondMenu">
-    <div class="secondMenuItem ellipsis-oneline" [ngClass]="{ active: activeSecondMenuLink == data.link }" title="故障工单统计" *ngFor="let data of osComponentRef1.viewPortItems" (click)="clickSecondMenu(data)">{{data.title}}</div>
+    <div class="secondMenuItem ellipsis-oneline" [ngClass]="{ active: activeSecondMenuLink == data.link }" [title]="data.title" *ngFor="let data of osComponentRef1.viewPortItems" (click)="clickSecondMenu(data)">{{data.title}}</div>
   </virtual-scroller>
   <div class="main">
     <app-custom-tabs (selectTabEmit)="selectTabEmit($event)"></app-custom-tabs>
@@ -21,4 +21,4 @@
 </div>
 
 <!-- 查询范围 -->
-<app-query-range (cancelQueryRange)="cancelQueryRange()" (submitQueryRange)="submitQueryRange($event)" [queryRangeFlag]="queryRangeFlag"></app-query-range>
+<app-query-range [hospital]="hospital" [duty]="duty" [queryType]="queryType" (cancelQueryRange)="cancelQueryRange()" (submitQueryRange)="submitQueryRange($event)" *ngIf="queryRangeFlag"></app-query-range>

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

@@ -15,6 +15,12 @@
   ::ng-deep .ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-nav-container{
     height: 36px!important;
   }
+  ::ng-deep .ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab{
+    background: #E9EAEC;
+  }
+  ::ng-deep .ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab-active{
+    background: #fff;
+  }
   .header{
     height: 48px;
     background-color: #fff;

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

@@ -1,12 +1,12 @@
 import { ActivatedRoute, Router } from '@angular/router';
-import { Component, OnInit } from "@angular/core";
+import { Component, OnInit, OnDestroy } from "@angular/core";
 import { ToolService } from 'src/app/services/tool.service';
 @Component({
   selector: "app-maintenance-statistics",
   templateUrl: "./maintenance-statistics.component.html",
   styleUrls: ["./maintenance-statistics.component.less"],
 })
-export class MaintenanceStatisticsComponent implements OnInit {
+export class MaintenanceStatisticsComponent implements OnInit, OnDestroy {
   constructor(
     public tool: ToolService,
     public route: ActivatedRoute,
@@ -22,6 +22,10 @@ export class MaintenanceStatisticsComponent implements OnInit {
     console.log('this.menuList:', this.menuList)
   }
 
+  ngOnDestroy(){
+    this.sessionRemove();
+  }
+
   getMenuList(){
     this.menuList = this.tool.getMenuAutoType(this.route);
     this.menuList.length && this.clickMenu(this.menuList[0]);
@@ -39,7 +43,8 @@ export class MaintenanceStatisticsComponent implements OnInit {
   activeSecondMenuLink:string;
   clickSecondMenu(data){
     this.activeSecondMenuLink = data.link;
-    this.router.navigateByUrl(`newStatistics/${this.route.parent.snapshot.routeConfig.path}/${data.link}`).finally();
+    // this.router.navigateByUrl(`newStatistics/${this.route.parent.snapshot.routeConfig.path}/${this.activeSecondMenuLink}`).finally();
+    this.router.navigate([`newStatistics/${this.route.parent.snapshot.routeConfig.path}/${this.activeSecondMenuLink}`], { replaceUrl: true });
   }
 
   // 回显二级菜单
@@ -85,6 +90,22 @@ export class MaintenanceStatisticsComponent implements OnInit {
     }else{
       this.queryType = 1;
     }
+
+    this.sessionSave();
+  }
+
+  // 缓存数据
+  sessionSave(){
+    sessionStorage.setItem('maintenance_statistics_queryType', this.queryType);
+    sessionStorage.setItem('maintenance_statistics_hospitalId', this.hospital ? this.hospital.id : '');
+    sessionStorage.setItem('maintenance_statistics_dutyId', this.duty ? this.duty.id : '');
+  }
+
+  // 清除缓存数据
+  sessionRemove(){
+    sessionStorage.removeItem('maintenance_statistics_queryType');
+    sessionStorage.removeItem('maintenance_statistics_hospitalId');
+    sessionStorage.removeItem('maintenance_statistics_dutyId');
   }
 
   // 查询范围
@@ -92,8 +113,17 @@ export class MaintenanceStatisticsComponent implements OnInit {
   queryRangeClick(){
     this.queryRangeFlag = true;
   }
-  submitQueryRange(id) {
+  submitQueryRange({queryType, hospital, duty}) {
+    console.log('queryType:', queryType)
+    console.log('hospital:', hospital)
+    console.log('duty:', duty)
+    this.queryType = queryType;
+    this.hospital = hospital;
+    this.duty = duty;
     this.queryRangeFlag = false;
+
+    this.sessionSave();
+    this.router.navigate([`newStatistics/${this.route.parent.snapshot.routeConfig.path}/${this.activeSecondMenuLink}`], { replaceUrl: true });
   }
   cancelQueryRange() {
     this.queryRangeFlag = false;

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

@@ -18,7 +18,7 @@ export class TabService {
     this.router.events
       .pipe(filter(event => event instanceof NavigationEnd))
       .subscribe((event: NavigationEnd) => {
-        this.updateTabs(event.urlAfterRedirects);
+        event.urlAfterRedirects.startsWith('/newStatistics/') && this.updateTabs(event.urlAfterRedirects);
       });
   }
 
@@ -85,7 +85,9 @@ export class TabService {
     if (newActiveTab) {
       this.currentTab = newActiveTab;
       this.tabs.forEach(t => t.active = t.path === newActiveTab!.path);
-      this.router.navigate([newActiveTab.path]);
+      this.router.navigate([newActiveTab.path], {
+        replaceUrl: true
+      });
     }
   }