统计下钻开发

src/app/views/incident-management/incident-management.component.html

@@ -204,7 +204,7 @@
 				  <nz-form-label [nzSpan]="5" nzFor="busiParent">业务父级</nz-form-label>
 				  <nz-form-control [nzSpan]="19" nzErrorTip="请选择业务父级!">
 				    <nz-select nzAllowClear [nzDropdownMatchSelectWidth]="false" formControlName="busiParent" nzShowSearch
-				      nzPlaceHolder="请选择业务父级" nzServerSearch (nzOnSearch)="changeInp($event)"
+				      nzPlaceHolder="请选择业务父级" nzServerSearch (nzOnSearch)="changeDeptInp($event)"
 				      (nzOpenChange)="openDeptSelect($event)">
 				      <ng-container *ngFor="let data of allParentdepart">
 				        <nz-option *ngIf="!isLoading" [nzLabel]="data.dept" [nzValue]="data.id">

src/app/views/main/main-routing.module.ts

@@ -627,6 +627,11 @@ const routes: Routes = [
 			{
 			  path: "patientInspectLog",
 			  loadChildren: () => import("../patient-inspect-log/patient-inspect-log.module").then((m) => m.PatientInspectLogModule),
+			},
+			// 手术信息
+			{
+			  path: "operationSearch",
+			  loadChildren: () => import("../operation-search/operation-search.module").then((m) => m.OperationSearchModule),
 			}
     ],
   },

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

@@ -11,8 +11,8 @@ import { debounceTime, filter } from 'rxjs/operators';
 })
 export class CustomChangeDateComponent implements OnInit, OnDestroy {
   @Input() isShowType: boolean = true;
-	@Input() dateData1: any;
-	@Input() dateData2: any;
+	// @Input() dateData1: any;
+	// @Input() dateData2: any;
   @Input() name: string = '建单时间';
   constructor(
     private dateService: DateService,
@@ -74,13 +74,13 @@ export class CustomChangeDateComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
 		this.resetByDate();
-		this.router.events
-		  .pipe(filter(event => event instanceof NavigationEnd))
-		  .subscribe((event: NavigationEnd) => {
-		    if(event.urlAfterRedirects.endsWith('/incidentList')){
-					this.resetByDate();
-		    }
-		  });
+		// this.router.events
+		//   .pipe(filter(event => event instanceof NavigationEnd))
+		//   .subscribe((event: NavigationEnd) => {
+		//     if(event.urlAfterRedirects.endsWith('/incidentList')){
+		// 			this.resetByDate();
+		//     }
+		//   });
   }
 	
 	ngOnDestroy(){
@@ -91,22 +91,24 @@ export class CustomChangeDateComponent implements OnInit, OnDestroy {
   // 根据时间区间重置
   resetByDate(){
 		setTimeout(_=>{
-			console.log(2222,this.dateData1, this.dateData2)
-			if(this.dateData1 && this.dateData2){
-				this.dateRange = [this.dateData1, this.dateData2]
-			}else{
-				this.dateType = 'day';
-				this.changeDateType(this.dateType, 6);
-			}
+			// console.log(2222,this.dateData1, this.dateData2)
+			// if(this.dateData1 && this.dateData2){
+			// 	this.dateRange = [this.dateData1, this.dateData2]
+			// }else{
+			// 	this.dateType = 'day';
+			// 	this.changeDateType(this.dateType, 6);
+			// }
+			this.dateType = 'day';
+			this.changeDateType(this.dateType, 6);
 		})
   }
 
   // 根据时间区间初始化
-  initByDate(dateRange:any[]){
+  initByDate(dateRange:any[], dateNum:any= 6){
     setTimeout(() => {
       this.dateType = 'day';
       this.dateRange = dateRange;
-      this.changeDateType(this.dateType, null);
+      this.changeDateType(this.dateType, dateNum);
     }, 0)
   }
 

src/app/views/new-statistics/components/distribution-search-more/distribution-search-more.component.html

@@ -107,7 +107,7 @@
 				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择来源!">
 				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="sourceId" nzPlaceHolder="请选择来源">
 				      <ng-container *ngFor="let option of sourceList">
-				        <nz-option [nzLabel]="option.name " [nzValue]="option.name"></nz-option>
+				        <nz-option [nzLabel]="option.name " [nzValue]="option.sourceId"></nz-option>
 				      </ng-container>
 				    </nz-select>
 				  </nz-form-control>

src/app/views/new-statistics/components/distribution-search-more/distribution-search-more.component.ts

@@ -19,6 +19,7 @@ export class DistributionSearchMoreComponent implements OnInit {
   @Input() parentDutyId: any;
   @Input() dutyId: any;
   @Input() queryType: any;
+	@Input() going: boolean = false;
   validateForm: FormGroup;//表单
   searchTimerSubject = new Subject();
   constructor(
@@ -45,6 +46,7 @@ export class DistributionSearchMoreComponent implements OnInit {
       let fun = v[0];
       fun.call(this, v[1]);
     });
+		console.log(4444,this.fieldConfig)
     this.initForm();
     this.getSourceList();
 		this.getSourceDataList();
@@ -88,6 +90,32 @@ export class DistributionSearchMoreComponent implements OnInit {
 			codeNum: [this.fieldConfig.fields.codeNum || null],
 			timeFrameId: [this.fieldConfig.fields.timeFrameDTO ? this.fieldConfig.fields.timeFrameDTO.id  : null],
 		});
+		
+		
+		if(this.going && this.fieldConfig.fields.taskTypeId){
+			this.getTaskTypeList();
+		}
+		
+		if(this.going && this.fieldConfig.fields.deptId){
+			this.getRepairDeptList();
+		}
+		
+		if(this.going && this.fieldConfig.fields.sourceId){
+			this.getSourceList();
+		}
+		
+		if(this.going && this.fieldConfig.fields.evaluateId){
+			this.getWorkHourEvaluateList();
+		}
+		
+		if(this.going && this.fieldConfig.fields.executeUserId){
+			this.getExecuteUserList();
+		}
+		
+		if(this.going && this.fieldConfig.fields.timeFrameId){
+			this.getTimeFrameList();
+		}
+		
   }
   // 表单提交
   submitForm(): void {
@@ -385,19 +413,24 @@ export class DistributionSearchMoreComponent implements OnInit {
 	// 获取来源列表
 	sourceList:any[] = [];
 	getSourceDataList(keyword?){
-	  let postData:any = {
-	    idx: 0,
-	    sum: 9999,
-	    hosId: this.getHosId,
-	  };
-
-	  this.isLoading = true;
-	  this.mainService
-	    .postCustom("itsm/report", "sourceTransOrder", postData)
-	    .subscribe((result) => {
-	      this.isLoading = false;
-	      this.sourceList = result.dataList;
-	    });
+		this.sourceList = [
+			{
+				sourceId:1,
+				name:"服务台"
+			},
+			{
+				sourceId:2,
+				name:"护士端"
+			},
+			{
+				sourceId:3,
+				name:"系统自动"
+			},
+			{
+				sourceId:4,
+				name:"微信端"
+			},
+		]
 	}
 	
 	// =================评价===================

src/app/views/new-statistics/components/search-more/search-more.component.ts

@@ -741,7 +741,7 @@ export class SearchMoreComponent implements OnInit {
 	    sum: 20,
 			user: {
 			  name: keyword,
-			  engineer: 1,
+			  // engineer: 1,
 			  // simpleQuery: true,
 			},
 	  };

src/app/views/new-statistics/distribution-inspection-statistics/business-classify-statistics/business-classify-statistics.component.html

@@ -33,30 +33,30 @@
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.name }}</td>
-      <td>{{ data.totalCount }}</td>
+      <td class="text-sign" (click)="viewDetail1(data)">{{ data.totalCount }}</td>
       <td>{{ data.totalGrade }}</td>
 			<td>{{ data.totalPrice }}</td>
       <td>{{ data.response_time_num }}</td>
       <td>{{ data.execution_time_num }}</td>
       <td>{{ data.aveper }}</td>
       <td>{{ data.total_time }}</td>
-      <td>{{ data.five_count }}</td>
-      <td>{{ data.special_close }}</td>
+      <td class="text-sign" (click)="viewDetail2(data)">{{ data.five_count }}</td>
+      <td class="text-sign" (click)="viewDetail3(data)">{{ data.special_close }}</td>
     </tr>
   </tbody>
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
         <td style="width: 10%">{{ data.name }}</td>
-        <td style="width: 10%">{{ data.totalCount }}</td>
+        <td style="width: 10%" class="text-sign" (click)="viewDetail1(data,'all')">{{ data.totalCount }}</td>
         <td style="width: 10%">{{ data.totalGrade }}</td>
 				<td style="width: 10%">{{ data.totalPrice }}</td>
         <td style="width: 10%">{{ data.response_time_num }}</td>
         <td style="width: 10%">{{ data.execution_time_num }}</td>
         <td style="width: 10%">{{ data.aveper }}</td>
         <td style="width: 10%">{{ data.total_time }}</td>
-        <td style="width: 10%">{{ data.five_count }}</td>
-        <td style="width: 10%">{{ data.special_close }}</td>
+        <td style="width: 10%" class="text-sign" (click)="viewDetail2(data,'all')">{{ data.five_count }}</td>
+        <td style="width: 10%" class="text-sign" (click)="viewDetail3(data,'all')">{{ data.special_close }}</td>
       </tr>
     </table>
   </ng-template>

src/app/views/new-statistics/distribution-inspection-statistics/business-classify-statistics/business-classify-statistics.component.less

@@ -5,6 +5,10 @@
   right: 0;
   bottom: 0;
   left: 0;
+	.text-sign{
+		text-decoration: underline;
+		cursor: pointer;
+	}
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
     width: calc(100% - 15px);

src/app/views/new-statistics/distribution-inspection-statistics/business-classify-statistics/business-classify-statistics.component.ts

@@ -2,7 +2,7 @@ import { TabService } from './../../services/tab.service';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
   selector: "app-business-classify-statistics",
@@ -15,6 +15,7 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
   ) {}
 
@@ -45,7 +46,160 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
 
     }, 0)
   }
-
+	
+	// 数据下钻
+	viewDetail1(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+					deptId: this.fieldConfig.fields.deptId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: data.statisticsTypeId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+					deptId: this.fieldConfig.fields.deptId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+				}
+			}
+		}
+	
+		let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('distributionData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
+	}
+	
+	viewDetail2(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+					deptId: this.fieldConfig.fields.deptId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					minuteClose: 5,
+					minuteDTO: 5,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: data.statisticsTypeId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+					deptId: this.fieldConfig.fields.deptId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					minuteClose: 5,
+					minuteDTO: 5,
+				}
+			}
+		}
+	
+		let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('distributionData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
+	}
+	
+	viewDetail3(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+					deptId: this.fieldConfig.fields.deptId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					specialId: 1,
+					specialDTO: {
+						"name": "是",
+						"id": 1
+					},
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: data.statisticsTypeId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+					deptId: this.fieldConfig.fields.deptId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					specialId: 1,
+					specialDTO: {
+						"name": "是",
+						"id": 1
+					},
+				}
+			}
+		}
+	
+		let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('distributionData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
+	}
+	
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();

src/app/views/new-statistics/distribution-inspection-statistics/date-business-statistics/date-business-statistics.component.html

@@ -36,11 +36,11 @@
     <tbody>
       <tr *ngFor="let data of listOfData">
         <td>{{ data.date }}</td>
-        <td>{{ data.totalCount }}</td>
+        <td class="text-sign" (click)="viewDetail1(data)">{{ data.totalCount }}</td>
         <td>{{ data.totalGrade }}</td>
 				<td>{{ data.totalPrice }}</td>
         <ng-container *ngFor="let dictionary of dictionaryList">
-          <td>{{ data[dictionary.value + 'Count'] }}</td>
+          <td class="text-sign" (click)="viewDetail2(data, dictionary)">{{ data[dictionary.value + 'Count'] }}</td>
           <td>{{ data[dictionary.value + 'Grade'] }}</td>
 					<td>{{ data[dictionary.value + 'Score'] }}</td>
         </ng-container>
@@ -50,11 +50,11 @@
       <table class="footTable">
         <tr *ngFor="let data of listOfDataEnd">
           <td>{{ data.date }}</td>
-          <td>{{ data.totalCount }}</td>
+          <td class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.totalCount }}</td>
           <td>{{ data.totalGrade }}</td>
 					<td>{{ data.totalPrice }}</td>
           <ng-container *ngFor="let dictionary of dictionaryList">
-            <td>{{ data[dictionary.value + 'Count'] }}</td>
+            <td class="text-sign" (click)="viewDetail2(data, dictionary, 'all')">{{ data[dictionary.value + 'Count'] }}</td>
             <td>{{ data[dictionary.value + 'Grade'] }}</td>
 						<td>{{ data[dictionary.value + 'Score'] }}</td>
           </ng-container>

src/app/views/new-statistics/distribution-inspection-statistics/date-business-statistics/date-business-statistics.component.less

@@ -5,6 +5,10 @@
   right: 0;
   bottom: 0;
   left: 0;
+	.text-sign{
+		text-decoration: underline;
+		cursor: pointer;
+	}
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
     width: calc(100% - 15px);

src/app/views/new-statistics/distribution-inspection-statistics/date-business-statistics/date-business-statistics.component.ts

@@ -2,7 +2,7 @@ import { TabService } from './../../services/tab.service';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import cloneDeep from 'lodash-es/cloneDeep'
 import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
@@ -16,6 +16,7 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
   ) {}
 
@@ -45,7 +46,113 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
 
     }, 0)
   }
-
+	
+	// 数据下钻
+	viewDetail1(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO,
+					deptId: this.fieldConfig.fields.deptId,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}else{
+			query = {
+				startDate: data.date + ' ' + '00:00:00' || undefined,
+				endDate: data.date + ' ' + '23:59:59' || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO,
+					deptId: this.fieldConfig.fields.deptId,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [data.date + ' ' + '00:00:00', data.date + ' ' + '23:59:59']);
+			this.tabService.setQueryParams('defRange', null);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}
+	}
+	
+	// 数据下钻
+	viewDetail2(data, sublevel, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: Number(data[sublevel.value + 'StatisticsTypeId']) || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO,
+					deptId: this.fieldConfig.fields.deptId,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}else{
+			query = {
+				startDate: data.date + ' ' + '00:00:00' || undefined,
+				endDate: data.date + ' ' + '23:59:59' || undefined,
+				statisticsTypeId: Number(data[sublevel.value + 'StatisticsTypeId']) || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO,
+					deptId: this.fieldConfig.fields.deptId,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [data.date + ' ' + '00:00:00', data.date + ' ' + '23:59:59']);
+			this.tabService.setQueryParams('defRange', null);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}
+	}
+	
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();

src/app/views/new-statistics/distribution-inspection-statistics/date-quality-control-statistics/date-quality-control-statistics.component.html

@@ -46,7 +46,7 @@
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.date }}</td>
-      <td>{{ data.totalCount }}</td>
+      <td class="text-sign" (click)="viewDetail1(data)">{{ data.totalCount }}</td>
       <td>{{ data.totalGrade }}</td>
 			<td>{{ data.totalPrice }}</td>
       <td>{{ data.response_time_num }}</td>
@@ -54,15 +54,15 @@
       <td>{{ data.execution_time_num }}</td>
       <td>{{ data.aveper }}</td>
       <td>{{ data.total_time }}</td>
-      <td>{{ data.five_count }}</td>
-      <td>{{ data.special_close }}</td>
+      <td class="text-sign" (click)="viewDetail2(data)">{{ data.five_count }}</td>
+      <td class="text-sign" (click)="viewDetail3(data)">{{ data.special_close }}</td>
     </tr>
   </tbody>
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
         <td style="width: 10%">{{ data.date }}</td>
-        <td style="width: 9%">{{ data.totalCount }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.totalCount }}</td>
         <td style="width: 9%">{{ data.totalGrade }}</td>
 				<td style="width: 9%">{{ data.totalPrice }}</td>
         <td style="width: 9%">{{ data.response_time_num }}</td>
@@ -70,8 +70,8 @@
         <td style="width: 9%">{{ data.execution_time_num }}</td>
         <td style="width: 9%">{{ data.aveper }}</td>
         <td style="width: 9%">{{ data.total_time }}</td>
-        <td style="width: 9%">{{ data.five_count }}</td>
-        <td style="width: 9%">{{ data.special_close }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.five_count }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.special_close }}</td>
       </tr>
     </table>
   </ng-template>

src/app/views/new-statistics/distribution-inspection-statistics/date-quality-control-statistics/date-quality-control-statistics.component.less

@@ -5,6 +5,10 @@
   right: 0;
   bottom: 0;
   left: 0;
+	.text-sign{
+		text-decoration: underline;
+		cursor: pointer;
+	}
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
     width: calc(100% - 15px);

src/app/views/new-statistics/distribution-inspection-statistics/date-quality-control-statistics/date-quality-control-statistics.component.ts

@@ -2,7 +2,7 @@ import { TabService } from './../../services/tab.service';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
   selector: "app-date-quality-control-statistics",
@@ -15,6 +15,7 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
   ) {}
 
@@ -45,7 +46,193 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
 
     }, 0)
   }
-
+	
+	// 数据下钻
+	viewDetail1(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: this.statisticsTypeId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+					deptId: this.fieldConfig.fields.deptId || undefined,
+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: this.statisticsTypeId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+					deptId: this.fieldConfig.fields.deptId || undefined,
+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange',  [data.date + ' ' + '00:00:00', data.date + ' ' + '23:59:59']);
+			this.tabService.setQueryParams('defRange', null);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}
+	}
+	
+	viewDetail2(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: this.statisticsTypeId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+					deptId: this.fieldConfig.fields.deptId || undefined,
+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					minuteClose: 5,
+					minuteDTO: 5,
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: data.statisticsTypeId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+					deptId: this.fieldConfig.fields.deptId || undefined,
+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					minuteClose: 5,
+					minuteDTO: 5,
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange',  [data.date + ' ' + '00:00:00', data.date + ' ' + '23:59:59']);
+			this.tabService.setQueryParams('defRange', null);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}
+	}
+	
+	viewDetail3(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: this.statisticsTypeId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+					deptId: this.fieldConfig.fields.deptId || undefined,
+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					specialId: 1,
+					specialDTO: {
+						"name": "是",
+						"id": 1
+					},
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: this.statisticsTypeId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+					deptId: this.fieldConfig.fields.deptId || undefined,
+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					specialId: 1,
+					specialDTO: {
+						"name": "是",
+						"id": 1
+					},
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange',  [data.date + ' ' + '00:00:00', data.date + ' ' + '23:59:59']);
+			this.tabService.setQueryParams('defRange', null);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}
+	}
+	
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();

src/app/views/new-statistics/distribution-inspection-statistics/department-business-statistics/department-business-statistics.component.html

@@ -49,11 +49,11 @@
       <tr *ngFor="let data of listOfData">
 				<td class="width150" *ngIf="parent==1">{{ data.parentName || '无' }}</td>
         <td class="width150">{{ data.name }}</td>
-        <td>{{ data.totalCount }}</td>
+        <td class="text-sign" (click)="viewDetail1(data)">{{ data.totalCount }}</td>
         <td>{{ data.totalGrade }}</td>
 				<td>{{ data.totalPrice }}</td>
         <ng-container *ngFor="let dictionary of dictionaryList">
-          <td>{{ data[dictionary.value + 'Count'] }}</td>
+          <td class="text-sign" (click)="viewDetail2(data, dictionary)">{{ data[dictionary.value + 'Count'] }}</td>
           <td>{{ data[dictionary.value + 'Grade'] }}</td>
 					<td>{{ data[dictionary.value + 'Score'] }}</td>
         </ng-container>
@@ -65,11 +65,11 @@
 					<td class="width150" *ngIf="parent==1">{{ data.parentName }}</td>
 					<td class="width150" *ngIf="parent==0">{{ data.name }}</td>
 					<td class="width150" *ngIf="parent==1"></td>
-          <td>{{ data.totalCount }}</td>
+          <td class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.totalCount }}</td>
           <td>{{ data.totalGrade }}</td>
 					<td>{{ data.totalPrice }}</td>
           <ng-container *ngFor="let dictionary of dictionaryList">
-            <td>{{ data[dictionary.value + 'Count'] }}</td>
+            <td class="text-sign" (click)="viewDetail2(data, dictionary, 'all')">{{ data[dictionary.value + 'Count'] }}</td>
             <td>{{ data[dictionary.value + 'Grade'] }}</td>
 						<td>{{ data[dictionary.value + 'Score'] }}</td>
           </ng-container>

src/app/views/new-statistics/distribution-inspection-statistics/department-business-statistics/department-business-statistics.component.less

@@ -5,6 +5,10 @@
   right: 0;
   bottom: 0;
   left: 0;
+	.text-sign{
+		text-decoration: underline;
+		cursor: pointer;
+	}
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
     width: calc(100% - 15px);

src/app/views/new-statistics/distribution-inspection-statistics/department-business-statistics/department-business-statistics.component.ts

@@ -4,7 +4,7 @@ import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import cloneDeep from 'lodash-es/cloneDeep'
 import { ToolService } from "../../../../services/tool.service";
 import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
@@ -20,6 +20,7 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
 		private tool: ToolService,
   ) {}
@@ -62,7 +63,145 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
 
     }, 0)
   }
-
+	
+	// 数据下钻
+	viewDetail1(data, type){
+		let query = null
+		let item = null
+		if(this.deptId){
+			item = this.alldepart.find(i => i.id == this.deptId)
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: item,
+					deptId: this.deptId,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}else{
+			let arr = data.name.split('(')
+			let postData: any = {
+			  idx: 0,
+			  sum: 20,
+			  department: {
+			    dept: arr[0],
+			    searchType: 1,
+			  },
+			};
+			this.mainService.getFetchDataList("simple/data", "department", postData).subscribe(res => {
+				let item = res.list.find(i => i.id == data.deptId)
+				query = {
+					startDate: this.customChangeDateComponent.startDate || undefined,
+					endDate: this.customChangeDateComponent.endDate || undefined,
+					searchQuery:{
+						statusValue: 'close',
+						deptDTO: item,
+						deptId: data.deptId,
+						groupId: this.fieldConfig.fields.groupId || undefined,
+						groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+						userId: this.fieldConfig.fields.userId || undefined,
+						userDTO: this.fieldConfig.fields.userDTO || undefined,
+						buildingId: this.fieldConfig.fields.buildingId || undefined,
+						buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					}
+				}
+				let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+				let flag = this.tabService.tabs.some(v => v.path === path);
+				flag && this.tabService.deleteRouteSnapshot(path);
+				this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+				this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+				sessionStorage.setItem('distributionData', JSON.stringify(query))
+				this.router.navigate([path], { replaceUrl: true });
+			});
+		}
+	}
+	
+	// 数据下钻
+	viewDetail2(data, sublevel, type){
+		let query = null
+		let item = null
+		if(this.deptId){
+			item = this.alldepart.find(i => i.id == this.deptId)
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: Number(data[sublevel.value + 'StatisticsTypeId']) || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: item,
+					deptId: this.deptId,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}else{
+			let arr = data.name.split('(')
+			let postData: any = {
+			  idx: 0,
+			  sum: 20,
+			  department: {
+			    dept: arr[0],
+			    searchType: 1,
+			  },
+			};
+			this.mainService.getFetchDataList("simple/data", "department", postData).subscribe(res => {
+				let item = res.list.find(i => i.id == data.deptId)
+				query = {
+					startDate: this.customChangeDateComponent.startDate || undefined,
+					endDate: this.customChangeDateComponent.endDate || undefined,
+					statisticsTypeId: Number(data[sublevel.value + 'StatisticsTypeId']) || undefined,
+					searchQuery:{
+						statusValue: 'close',
+						deptDTO: item,
+						deptId: data.deptId,
+						groupId: this.fieldConfig.fields.groupId || undefined,
+						groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+						userId: this.fieldConfig.fields.userId || undefined,
+						userDTO: this.fieldConfig.fields.userDTO || undefined,
+						buildingId: this.fieldConfig.fields.buildingId || undefined,
+						buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					}
+				}
+				let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+				let flag = this.tabService.tabs.some(v => v.path === path);
+				flag && this.tabService.deleteRouteSnapshot(path);
+				this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+				this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+				sessionStorage.setItem('distributionData', JSON.stringify(query))
+				this.router.navigate([path], { replaceUrl: true });
+			});
+		}
+	}
+	
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();

src/app/views/new-statistics/distribution-inspection-statistics/department-quality-control-statistics/department-quality-control-statistics.component.html

@@ -49,7 +49,7 @@
 			<tr *ngFor="let data of listOfData">
 				<td *ngIf="parent==1">{{ data.parentName || '无' }}</td>
 				<td>{{ data.name }}</td>
-				<td>{{ data.totalCount }}</td>
+				<td class="text-sign" (click)="viewDetail1(data)">{{ data.totalCount }}</td>
 				<td>{{ data.totalGrade }}</td>
 				<td>{{ data.totalPrice }}</td>
 				<td>{{ data.response_time_num }}</td>
@@ -57,8 +57,8 @@
 				<td>{{ data.execution_time_num }}</td>
 				<td>{{ data.aveper }}</td>
 				<td>{{ data.total_time }}</td>
-				<td>{{ data.five_count }}</td>
-				<td>{{ data.special_close }}</td>
+				<td class="text-sign" (click)="viewDetail2(data)">{{ data.five_count }}</td>
+				<td class="text-sign" (click)="viewDetail3(data)">{{ data.special_close }}</td>
 			</tr>
 		</tbody>
 		<ng-template #footerTpl>
@@ -67,7 +67,7 @@
 					<td style="width: 12%" *ngIf="parent==1">{{ data.parentName }}</td>
 					<td style="width: 10%" *ngIf="parent==0">{{ data.name }}</td>
 					<td style="width: 8%" *ngIf="parent==1"></td>
-					<td [ngStyle]="{width: parent==1 ? '8%' : '9%'}">{{ data.totalCount }}</td>
+					<td [ngStyle]="{width: parent==1 ? '8%' : '9%'}" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.totalCount }}</td>
 					<td [ngStyle]="{width: parent==1 ? '8%' : '9%'}">{{ data.totalGrade }}</td>
 					<td [ngStyle]="{width: parent==1 ? '8%' : '9%'}">{{ data.totalPrice }}</td>
 					<td [ngStyle]="{width: parent==1 ? '8%' : '9%'}">{{ data.response_time_num }}</td>
@@ -75,8 +75,8 @@
 					<td [ngStyle]="{width: parent==1 ? '8%' : '9%'}">{{ data.execution_time_num }}</td>
 					<td [ngStyle]="{width: parent==1 ? '8%' : '9%'}">{{ data.aveper }}</td>
 					<td [ngStyle]="{width: parent==1 ? '8%' : '9%'}">{{ data.total_time }}</td>
-					<td [ngStyle]="{width: parent==1 ? '8%' : '9%'}">{{ data.five_count }}</td>
-					<td [ngStyle]="{width: parent==1 ? '8%' : '9%'}">{{ data.special_close }}</td>
+					<td [ngStyle]="{width: parent==1 ? '8%' : '9%'}" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.five_count }}</td>
+					<td [ngStyle]="{width: parent==1 ? '8%' : '9%'}" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.special_close }}</td>
 				</tr>
 			</table>
 		</ng-template>

src/app/views/new-statistics/distribution-inspection-statistics/department-quality-control-statistics/department-quality-control-statistics.component.less

@@ -5,6 +5,10 @@
   right: 0;
   bottom: 0;
   left: 0;
+	.text-sign{
+		text-decoration: underline;
+		cursor: pointer;
+	}
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
     width: calc(100% - 15px);

src/app/views/new-statistics/distribution-inspection-statistics/department-quality-control-statistics/department-quality-control-statistics.component.ts

@@ -4,7 +4,7 @@ import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { ToolService } from "../../../../services/tool.service";
 import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
@@ -18,6 +18,7 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
 		private tool: ToolService,
   ) {}
@@ -59,7 +60,250 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 
     }, 0)
   }
-
+	
+	// 数据下钻
+	viewDetail1(data, type){
+		let query = null
+		let item = null
+		if(this.deptId){
+			item = this.alldepart.find(i => i.id == this.deptId)
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: item || undefined,
+					deptId: this.deptId || undefined,
+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}else{
+			let arr = data.name.split('(')
+			let postData: any = {
+			  idx: 0,
+			  sum: 20,
+			  department: {
+			    dept: arr[0],
+			    searchType: 1,
+			  },
+			};
+			this.mainService.getFetchDataList("simple/data", "department", postData)
+			  .subscribe((res) => {
+			    if (res.status == 200) {
+						let item = res.list.find(i =>i.id == data.deptId)
+			      query = {
+			      	startDate: this.customChangeDateComponent.startDate || undefined,
+			      	endDate: this.customChangeDateComponent.endDate || undefined,
+			      	statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+							searchQuery:{
+			      		statusValue: 'close',
+			      		deptDTO: item || undefined,
+			      		deptId: data.deptId || undefined,
+			      		taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+			      		taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
+			      		groupId: this.fieldConfig.fields.groupId || undefined,
+			      		groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+			      		userId: this.fieldConfig.fields.userId || undefined,
+			      		userDTO: this.fieldConfig.fields.userDTO || undefined,
+			      		buildingId: this.fieldConfig.fields.buildingId || undefined,
+			      		buildingDTO: this.fieldConfig.fields.buildingDTO || undefined
+			      	}
+			      }
+						let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('distributionData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+			    }
+			  });
+		}
+	}
+	
+	viewDetail2(data, type){
+		let query = null
+		let item = null
+		if(this.deptId){
+			item = this.alldepart.find(i => i.id == this.deptId)
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: item || undefined,
+					deptId: data.deptId || undefined,
+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					minuteClose: 5,
+					minuteDTO: 5,
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}else{
+			let arr = data.name.split('(')
+			let postData: any = {
+			  idx: 0,
+			  sum: 20,
+			  department: {
+			    dept: arr[0],
+			    searchType: 1,
+			  },
+			};
+			this.mainService.getFetchDataList("simple/data", "department", postData)
+				.subscribe((res) => {
+					if (res.status == 200) {
+						let item = res.list.find(i =>i.id == data.deptId)
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+							searchQuery:{
+								statusValue: 'close',
+								deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+								deptId: this.fieldConfig.fields.deptId || undefined,
+								taskTypeId: data.taskTypeId || undefined,
+								taskTypeDTO: item,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userId: this.fieldConfig.fields.userId || undefined,
+								userDTO: this.fieldConfig.fields.userDTO || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								minuteClose: 5,
+								minuteDTO: 5
+							}
+						}
+						let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('distributionData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+					}
+				});
+		}
+	}
+	
+	viewDetail3(data, type){
+		let query = null
+		let item = null
+		if(this.deptId){
+			item = this.alldepart.find(i => i.id == this.deptId)
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: item || undefined,
+					deptId: this.deptId || undefined,
+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					specialId: 1,
+					specialDTO: {
+						"name": "是",
+						"id": 1
+					},
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}else{
+			let arr = data.name.split('(')
+			let postData: any = {
+			  idx: 0,
+			  sum: 20,
+			  department: {
+			    dept: arr[0],
+			    searchType: 1,
+			  },
+			};
+			this.mainService.getFetchDataList("simple/data", "department", postData)
+				.subscribe((res) => {
+					if (res.status == 200) {
+						let item = res.list.find(i =>i.id == data.deptId)
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+							searchQuery:{
+								statusValue: 'close',
+								deptDTO: item || undefined,
+								deptId: data.deptId || undefined,
+								taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+								taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userId: this.fieldConfig.fields.userId || undefined,
+								userDTO: this.fieldConfig.fields.userDTO || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								specialId: 1,
+								specialDTO: {
+									"name": "是",
+									"id": 1
+								}
+							}
+						}
+						let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('distributionData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+					}
+				});
+		}
+	}
+	
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();

src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.component.html

@@ -46,13 +46,13 @@
     <tr *ngFor="let data of listOfData">
 			<td *ngIf="parent==1">{{ data.parentName || '无' }}</td>
       <td>{{ data.name }}</td>
-      <td>{{ data.totalCount }}</td>
+      <td class="text-sign" (click)="viewDetail1(data)">{{ data.totalCount }}</td>
       <td>{{ data.evaCount }}</td>
-      <td>{{ data.eva1 }}</td>
-      <td>{{ data.eva2 }}</td>
-      <td>{{ data.eva3 }}</td>
-      <td>{{ data.eva4 }}</td>
-      <td>{{ data.eva5 }}</td>
+      <td class="text-sign" (click)="viewDetail2(data)">{{ data.eva1 }}</td>
+      <td class="text-sign" (click)="viewDetail3(data)">{{ data.eva2 }}</td>
+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.eva3 }}</td>
+      <td class="text-sign" (click)="viewDetail5(data)">{{ data.eva4 }}</td>
+      <td class="text-sign" (click)="viewDetail6(data)">{{ data.eva5 }}</td>
       <td>{{ data.avgCount }}</td>
     </tr>
   </tbody>
@@ -62,13 +62,13 @@
 				<td [ngStyle]="{width: widthStyle}" *ngIf="parent==1">{{ data.parentName }}</td>
 				<td [ngStyle]="{width: widthStyle}" *ngIf="parent==0">{{ data.name }}</td>
 				<td [ngStyle]="{width: widthStyle}" *ngIf="parent==1"></td>
-        <td [ngStyle]="{width: widthThStyle}">{{ data.totalCount }}</td>
+        <td [ngStyle]="{width: widthThStyle}" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.totalCount }}</td>
         <td [ngStyle]="{width: widthThStyle}">{{ data.evaCount }}</td>
-        <td [ngStyle]="{width: widthThStyle}">{{ data.eva1 }}</td>
-        <td [ngStyle]="{width: widthThStyle}">{{ data.eva2 }}</td>
-        <td [ngStyle]="{width: widthThStyle}">{{ data.eva3 }}</td>
-        <td [ngStyle]="{width: widthThStyle}">{{ data.eva4 }}</td>
-        <td [ngStyle]="{width: widthThStyle}">{{ data.eva5 }}</td>
+        <td [ngStyle]="{width: widthThStyle}" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.eva1 }}</td>
+        <td [ngStyle]="{width: widthThStyle}" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.eva2 }}</td>
+        <td [ngStyle]="{width: widthThStyle}" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.eva3 }}</td>
+        <td [ngStyle]="{width: widthThStyle}" class="text-sign" (click)="viewDetail5(data, 'all')">{{ data.eva4 }}</td>
+        <td [ngStyle]="{width: widthThStyle}" class="text-sign" (click)="viewDetail6(data, 'all')">{{ data.eva5 }}</td>
         <td [ngStyle]="{width: widthThStyle}">{{ data.avgCount }}</td>
       </tr>
     </table>

src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.component.less

@@ -5,6 +5,10 @@
   right: 0;
   bottom: 0;
   left: 0;
+	.text-sign{
+		text-decoration: underline;
+		cursor: pointer;
+	}
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
     width: calc(100% - 15px);

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

@@ -4,7 +4,7 @@ import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
   selector: "app-distribution-department-evaluate-statistics",
@@ -17,6 +17,7 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
   ) {}
 
@@ -57,7 +58,543 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
 
     }, 0)
   }
-
+	
+	// 数据下钻
+	viewDetail1(data, type){
+		let query = null
+		let item = null
+		if(this.deptId){
+			item = this.alldepart.find(i => i.id == this.deptId)
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: item || undefined,
+					deptId: this.deptId || undefined,
+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}else{
+			let arr = data.name.split('(')
+			let postData: any = {
+			  idx: 0,
+			  sum: 20,
+			  department: {
+			    dept: arr[0],
+			    searchType: 1,
+			  },
+			};
+			this.mainService.getFetchDataList("simple/data", "department", postData)
+			  .subscribe((res) => {
+			    if (res.status == 200) {
+						let item = res.list.find(i =>i.id == data.deptId)
+			      query = {
+			      	startDate: this.customChangeDateComponent.startDate || undefined,
+			      	endDate: this.customChangeDateComponent.endDate || undefined,
+			      	statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+							searchQuery:{
+			      		statusValue: 'close',
+			      		deptDTO: item || undefined,
+			      		deptId: data.deptId || undefined,
+			      		taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+			      		taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
+			      		groupId: this.fieldConfig.fields.groupId || undefined,
+			      		groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+			      		userId: this.fieldConfig.fields.userId || undefined,
+			      		userDTO: this.fieldConfig.fields.userDTO || undefined,
+			      		buildingId: this.fieldConfig.fields.buildingId || undefined,
+			      		buildingDTO: this.fieldConfig.fields.buildingDTO || undefined
+			      	}
+			      }
+						let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('distributionData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+			    }
+			  });
+		}
+	}
+	
+	viewDetail2(data, type){
+		let query = null
+		let item = null
+		if(this.deptId){
+			item = this.alldepart.find(i => i.id == this.deptId)
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: item || undefined,
+					deptId: data.deptId || undefined,
+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					evaluateId: 358,
+					evaluateDTO: {
+							"id": 358,
+							"key": "workorderEvaluation",
+							"name": "极差",
+							"value": "1",
+							"desc": "工单评价"
+					}
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}else{
+			let arr = data.name.split('(')
+			let postData: any = {
+			  idx: 0,
+			  sum: 20,
+			  department: {
+			    dept: arr[0],
+			    searchType: 1,
+			  },
+			};
+			this.mainService.getFetchDataList("simple/data", "department", postData)
+				.subscribe((res) => {
+					if (res.status == 200) {
+						let item = res.list.find(i =>i.id == data.deptId)
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+							searchQuery:{
+								statusValue: 'close',
+								deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+								deptId: this.fieldConfig.fields.deptId || undefined,
+								taskTypeId: data.taskTypeId || undefined,
+								taskTypeDTO: item,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userId: this.fieldConfig.fields.userId || undefined,
+								userDTO: this.fieldConfig.fields.userDTO || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								evaluateId: 358,
+								evaluateDTO: {
+										"id": 358,
+										"key": "workorderEvaluation",
+										"name": "极差",
+										"value": "1",
+										"desc": "工单评价"
+								}
+							}
+						}
+						let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('distributionData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+					}
+				});
+		}
+	}
+	
+	viewDetail3(data, type){
+		let query = null
+		let item = null
+		if(this.deptId){
+			item = this.alldepart.find(i => i.id == this.deptId)
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: item || undefined,
+					deptId: this.deptId || undefined,
+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					evaluateId: 357,
+					evaluateDTO: {
+							"id": 357,
+							"key": "workorderEvaluation",
+							"name": "差",
+							"value": "2",
+							"desc": "工单评价"
+					}
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}else{
+			let arr = data.name.split('(')
+			let postData: any = {
+			  idx: 0,
+			  sum: 20,
+			  department: {
+			    dept: arr[0],
+			    searchType: 1,
+			  },
+			};
+			this.mainService.getFetchDataList("simple/data", "department", postData)
+				.subscribe((res) => {
+					if (res.status == 200) {
+						let item = res.list.find(i =>i.id == data.deptId)
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+							searchQuery:{
+								statusValue: 'close',
+								deptDTO: item || undefined,
+								deptId: data.deptId || undefined,
+								taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+								taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userId: this.fieldConfig.fields.userId || undefined,
+								userDTO: this.fieldConfig.fields.userDTO || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								evaluateId: 357,
+								evaluateDTO: {
+										"id": 357,
+										"key": "workorderEvaluation",
+										"name": "差",
+										"value": "2",
+										"desc": "工单评价"
+								}
+							}
+						}
+						let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('distributionData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+					}
+				});
+		}
+	}
+	
+	viewDetail4(data, type){
+		let query = null
+		let item = null
+		if(this.deptId){
+			item = this.alldepart.find(i => i.id == this.deptId)
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: item || undefined,
+					deptId: this.deptId || undefined,
+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					evaluateId: 356,
+					evaluateDTO: {
+						"id": 356,
+						"key": "workorderEvaluation",
+						"name": "一般",
+						"value": "3",
+						"desc": "工单评价"
+					}
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}else{
+			let arr = data.name.split('(')
+			let postData: any = {
+			  idx: 0,
+			  sum: 20,
+			  department: {
+			    dept: arr[0],
+			    searchType: 1,
+			  },
+			};
+			this.mainService.getFetchDataList("simple/data", "department", postData)
+				.subscribe((res) => {
+					if (res.status == 200) {
+						let item = res.list.find(i =>i.id == data.deptId)
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+							searchQuery:{
+								statusValue: 'close',
+								deptDTO: item || undefined,
+								deptId: data.deptId || undefined,
+								taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+								taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userId: this.fieldConfig.fields.userId || undefined,
+								userDTO: this.fieldConfig.fields.userDTO || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								evaluateId: 356,
+								evaluateDTO: {
+										"id": 356,
+										"key": "workorderEvaluation",
+										"name": "一般",
+										"value": "3",
+										"desc": "工单评价"
+								}
+							}
+						}
+						let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('distributionData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+					}
+				});
+		}
+	}
+	
+	viewDetail5(data, type){
+		let query = null
+		let item = null
+		if(this.deptId){
+			item = this.alldepart.find(i => i.id == this.deptId)
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: item || undefined,
+					deptId: this.deptId || undefined,
+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					evaluateId: 355,
+					evaluateDTO: {
+							"id": 355,
+							"key": "workorderEvaluation",
+							"name": "好评",
+							"value": "4",
+							"desc": "工单评价"
+					}
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}else{
+			let arr = data.name.split('(')
+			let postData: any = {
+			  idx: 0,
+			  sum: 20,
+			  department: {
+			    dept: arr[0],
+			    searchType: 1,
+			  },
+			};
+			this.mainService.getFetchDataList("simple/data", "department", postData)
+				.subscribe((res) => {
+					if (res.status == 200) {
+						let item = res.list.find(i =>i.id == data.deptId)
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+							searchQuery:{
+								statusValue: 'close',
+								deptDTO: item || undefined,
+								deptId: data.deptId || undefined,
+								taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+								taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userId: this.fieldConfig.fields.userId || undefined,
+								userDTO: this.fieldConfig.fields.userDTO || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								evaluateId: 355,
+								evaluateDTO: {
+										"id": 355,
+										"key": "workorderEvaluation",
+										"name": "好评",
+										"value": "4",
+										"desc": "工单评价"
+								}
+							}
+						}
+						let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('distributionData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+					}
+				});
+		}
+	}
+	
+	viewDetail6(data, type){
+		let query = null
+		let item = null
+		if(this.deptId){
+			item = this.alldepart.find(i => i.id == this.deptId)
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: item || undefined,
+					deptId: this.deptId || undefined,
+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					evaluateId: 354,
+					evaluateDTO: {
+						"id": 354,
+						"key": "workorderEvaluation",
+						"name": "非常好评",
+						"value": "5",
+						"desc": "工单评价"
+					}
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}else{
+			let arr = data.name.split('(')
+			let postData: any = {
+			  idx: 0,
+			  sum: 20,
+			  department: {
+			    dept: arr[0],
+			    searchType: 1,
+			  },
+			};
+			this.mainService.getFetchDataList("simple/data", "department", postData)
+				.subscribe((res) => {
+					if (res.status == 200) {
+						let item = res.list.find(i =>i.id == data.deptId)
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+							searchQuery:{
+								statusValue: 'close',
+								deptDTO: item || undefined,
+								deptId: data.deptId || undefined,
+								taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+								taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userId: this.fieldConfig.fields.userId || undefined,
+								userDTO: this.fieldConfig.fields.userDTO || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								evaluateId: 354,
+								evaluateDTO: {
+									"id": 354,
+									"key": "workorderEvaluation",
+									"name": "非常好评",
+									"value": "5",
+									"desc": "工单评价"
+								}
+							}
+						}
+						let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('distributionData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+					}
+				});
+		}
+	}
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();
@@ -225,7 +762,7 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
 		this.sortCurrentValue = "descend";
 		this.sortCurrent = {totalCount: 'descend'};
     this.dateRange = []
-    this.buildingId = undefined;
+    this.deptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined, buildingId: undefined};
     this.customChangeDateComponent.resetByDate();
     this.search();

src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-source-statistics/distribution-department-source-statistics.component.html

@@ -42,10 +42,10 @@
     <tr *ngFor="let data of listOfData">
 			<td *ngIf="parent==1">{{ data.parentName || '无' }}</td>
       <td>{{ data.name }}</td>
-      <td>{{ data.service }}</td>
-      <td>{{ data.nurse }}</td>
-      <td>{{ data.system }}</td>
-      <td>{{ data.wechat }}</td>
+      <td class="text-sign" (click)="viewDetail1(data)">{{ data.service }}</td>
+      <td class="text-sign" (click)="viewDetail2(data)">{{ data.nurse }}</td>
+      <td class="text-sign" (click)="viewDetail3(data)">{{ data.system }}</td>
+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.wechat }}</td>
     </tr>
   </tbody>
   <ng-template #footerTpl>
@@ -54,10 +54,10 @@
 				<td style="width: 20%" *ngIf="parent==1">{{ data.parentName }}</td>
 				<td style="width: 20%" *ngIf="parent==0">{{ data.name }}</td>
 				<td style="width: 20%" *ngIf="parent==1"></td>
-        <td style="width: 15%">{{ data.service }}</td>
-        <td style="width: 15%">{{ data.nurse }}</td>
-        <td style="width: 15%">{{ data.system }}</td>
-        <td style="width: 15%">{{ data.wechat }}</td>
+        <td style="width: 15%" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.service }}</td>
+        <td style="width: 15%" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.nurse }}</td>
+        <td style="width: 15%" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.system }}</td>
+        <td style="width: 15%" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.wechat }}</td>
       </tr>
     </table>
   </ng-template>

src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-source-statistics/distribution-department-source-statistics.component.less

@@ -5,6 +5,10 @@
   right: 0;
   bottom: 0;
   left: 0;
+	.text-sign{
+		text-decoration: underline;
+		cursor: pointer;
+	}
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
     width: calc(100% - 15px);

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

@@ -4,7 +4,7 @@ import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { ToolService } from "../../../../services/tool.service";
 import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
@@ -18,6 +18,7 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
 		private tool: ToolService,
   ) {}
@@ -59,7 +60,351 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
 
     }, 0)
   }
-
+	
+	viewDetail1(data, type){
+		let query = null
+		let item = null
+		if(this.deptId){
+			item = this.alldepart.find(i => i.id == this.deptId)
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: item || undefined,
+					deptId: data.deptId || undefined,
+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					sourceId: 1,
+					sourceDTO: {
+						sourceId: 1,
+						name:"微信端"
+					}
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}else{
+			let arr = data.name.split('(')
+			let postData: any = {
+			  idx: 0,
+			  sum: 20,
+			  department: {
+			    dept: arr[0],
+			    searchType: 1,
+			  },
+			};
+			this.mainService.getFetchDataList("simple/data", "department", postData)
+				.subscribe((res) => {
+					if (res.status == 200) {
+						let item = res.list.find(i =>i.id == data.deptId)
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+							searchQuery:{
+								statusValue: 'close',
+								deptDTO: item || undefined,
+								deptId: data.deptId || undefined,
+								taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+								taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userId: this.fieldConfig.fields.userId || undefined,
+								userDTO: this.fieldConfig.fields.userDTO || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								sourceId: 1,
+								sourceDTO: {
+									sourceId: 1,
+									name:"服务台"
+								}
+							}
+						}
+						let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('distributionData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+					}
+				});
+		}
+	}
+	
+	viewDetail2(data, type){
+		let query = null
+		let item = null
+		if(this.deptId){
+			item = this.alldepart.find(i => i.id == this.deptId)
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: item || undefined,
+					deptId: this.deptId || undefined,
+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					sourceId: 2,
+					sourceDTO: {
+						sourceId: 2,
+						name:"护士端"
+					}
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}else{
+			let arr = data.name.split('(')
+			let postData: any = {
+			  idx: 0,
+			  sum: 20,
+			  department: {
+			    dept: arr[0],
+			    searchType: 1,
+			  },
+			};
+			this.mainService.getFetchDataList("simple/data", "department", postData)
+				.subscribe((res) => {
+					if (res.status == 200) {
+						let item = res.list.find(i =>i.id == data.deptId)
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+							searchQuery:{
+								statusValue: 'close',
+								deptDTO: item || undefined,
+								deptId: data.deptId || undefined,
+								taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+								taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userId: this.fieldConfig.fields.userId || undefined,
+								userDTO: this.fieldConfig.fields.userDTO || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								sourceId: 2,
+								sourceDTO: {
+									sourceId: 2,
+									name:"护士端"
+								}
+							}
+						}
+						let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('distributionData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+					}
+				});
+		}
+	}
+	
+	viewDetail3(data, type){
+		let query = null
+		let item = null
+		if(this.deptId){
+			item = this.alldepart.find(i => i.id == this.deptId)
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: item || undefined,
+					deptId: this.deptId || undefined,
+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					sourceId: 3,
+					sourceDTO: {
+						sourceId: 3,
+						name:"系统自动"
+					}
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}else{
+			let arr = data.name.split('(')
+			let postData: any = {
+			  idx: 0,
+			  sum: 20,
+			  department: {
+			    dept: arr[0],
+			    searchType: 1,
+			  },
+			};
+			this.mainService.getFetchDataList("simple/data", "department", postData)
+				.subscribe((res) => {
+					if (res.status == 200) {
+						let item = res.list.find(i =>i.id == data.deptId)
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+							searchQuery:{
+								statusValue: 'close',
+								deptDTO: item || undefined,
+								deptId: data.deptId || undefined,
+								taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+								taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userId: this.fieldConfig.fields.userId || undefined,
+								userDTO: this.fieldConfig.fields.userDTO || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								sourceId: 3,
+								sourceDTO: {
+									sourceId: 3,
+									name:"系统自动"
+								}
+							}
+						}
+						let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('distributionData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+					}
+				});
+		}
+	}
+	
+	viewDetail4(data, type){
+		let query = null
+		let item = null
+		if(this.deptId){
+			item = this.alldepart.find(i => i.id == this.deptId)
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: item || undefined,
+					deptId: this.deptId || undefined,
+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					sourceId: 4,
+					sourceDTO: {
+						sourceId: 4,
+						name:"微信端"
+					}
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}else{
+			let arr = data.name.split('(')
+			let postData: any = {
+			  idx: 0,
+			  sum: 20,
+			  department: {
+			    dept: arr[0],
+			    searchType: 1,
+			  },
+			};
+			this.mainService.getFetchDataList("simple/data", "department", postData)
+				.subscribe((res) => {
+					if (res.status == 200) {
+						let item = res.list.find(i =>i.id == data.deptId)
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+							searchQuery:{
+								statusValue: 'close',
+								deptDTO: item || undefined,
+								deptId: data.deptId || undefined,
+								taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+								taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userId: this.fieldConfig.fields.userId || undefined,
+								userDTO: this.fieldConfig.fields.userDTO || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								sourceId: 4,
+								sourceDTO: {
+									sourceId: 4,
+									name:"微信端"
+								}
+							}
+						}
+						let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('distributionData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+					}
+				});
+		}
+	}
+	
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();

src/app/views/new-statistics/distribution-inspection-statistics/distribution-synthesize-statistics/distribution-synthesize-statistics.component.html

@@ -11,7 +11,7 @@
   <ng-container *ngIf="!isLoading">
     <div class="top1-statistics">
       <div class="top-list">
-        <div class="special-box">
+        <div class="special-box cursor" (click)="viewDetail1()">
           <div class="num">{{workData.totalCount || 0}}</div>
           <div class="describe">工单总数</div>
         </div>
@@ -37,7 +37,7 @@
         <div class="border"></div>
       </div>
       <div class="top-list">
-        <div class="special-box">
+        <div class="special-box cursor" (click)="viewDetail4()">
           <div class="num">{{workData.badCount || 0}}</div>
           <div class="describe">差评单数</div>
         </div>
@@ -103,7 +103,7 @@
               <span *ngIf="index !=0 && index !=1 && index !=2">{{index+1}}</span>
             </div>
             <div class="table-list-4 ellipsis-oneline" title="{{item.dept}}">{{item.dept}}</div>
-            <div class="table-list-4">{{item.sum || 0}}</div>
+            <div class="table-list-4 text-sign" (click)="viewMaintain1(item)">{{item.sum || 0}}</div>
             <div class="table-list-4">{{item.goodRate || '0%'}}</div>
           </div>
         </div>
@@ -129,7 +129,7 @@
               <span *ngIf="index !=0 && index !=1 && index !=2">{{index+1}}</span>
             </div>
             <div class="table-list-4 ellipsis-oneline" title="{{item.userName}}({{item.userAccount}})">{{item.userName}}<ng-container *ngIf="item.userAccount">({{item.userAccount}})</ng-container></div>
-            <div class="table-list-4">{{item.sum || 0}}</div>
+            <div class="table-list-4 text-sign" (click)="viewMaintain2(item)">{{item.sum || 0}}</div>
             <div class="table-list-4">{{item.totalGrade || 0}}</div>
           </div>
         </div>

src/app/views/new-statistics/distribution-inspection-statistics/distribution-synthesize-statistics/distribution-synthesize-statistics.component.less

@@ -5,6 +5,13 @@
   right: 0;
   bottom: 0;
   left: 0;
+	.cursor{
+		cursor: pointer;
+	}
+	.text-sign{
+		text-decoration: underline;
+		cursor: pointer;
+	}
 	.synthesize-box{
 		background: #F0F2F5 !important;
 		height: calc((100vh - 92px));

src/app/views/new-statistics/distribution-inspection-statistics/distribution-synthesize-statistics/distribution-synthesize-statistics.component.ts

@@ -62,7 +62,104 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 		}
 	] //人员top5
   ngOnInit() {}
-
+	
+	/*========= 数据下钻 ========*/
+	
+	// 汇总
+	viewDetail1(){
+		let query = {
+			
+		}
+		let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('distributionData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
+	}
+	
+	// 差评
+	viewDetail4(){
+		let query = {
+			startDate: this.customChangeDateComponent.startDate,
+			endDate: this.customChangeDateComponent.endDate,
+			searchQuery:{
+				evaluateId: 358,
+				evaluateDTO: {
+					desc: "工单评价",
+					id: 358,
+					key: "workorderEvaluation",
+					name: "极差",
+					value: "1"
+				}
+			}
+		}
+		let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('distributionData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
+	}
+	
+	// 科室top5
+	viewMaintain1(data){
+		let postData: any = {
+		  idx: 0,
+		  sum: 20,
+		  department: {
+		    statisticalHosId: this.getHosId,
+		    dept: data.dept,
+		    searchType: 1,
+		  },
+		};
+		this.mainService.getFetchDataList("simple/data", "department", postData).subscribe(res => {
+			let item = res.list.find(i => i.id == data.deptId)
+			let query = {
+				startDate: this.customChangeDateComponent.startDate,
+				endDate: this.customChangeDateComponent.endDate,
+				repairDeptId: data.deptId,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: item,
+					deptId: data.deptId
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		});
+	}
+	
+	// 人员top5
+	viewMaintain2(data){
+		let query = {
+			startDate: this.customChangeDateComponent.startDate,
+			endDate: this.customChangeDateComponent.endDate,
+			searchQuery:{
+				statusValue: 'close',
+				executeUserDTO: {
+					name: data.userName,
+					id: data.userId
+				},
+				executeUserId: data.userId
+			}
+		}
+		let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('distributionData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
+	}
+	
   ngAfterViewInit(){
     setTimeout(() => {
       this.search();
@@ -476,6 +573,7 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 		this.dateRange = [];
 		this.activeIndex = 'day';
     this.customChangeDateComponent.resetByDate();
+		sessionStorage.removeItem('distributionData');
 		this.search();
 	}
 

src/app/views/new-statistics/distribution-inspection-statistics/hour-quality-control-statistics/hour-quality-control-statistics.component.html

@@ -46,7 +46,7 @@
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.date }}</td>
-      <td>{{ data.totalCount }}</td>
+      <td class="text-sign" (click)="viewDetail1(data)">{{ data.totalCount }}</td>
       <td>{{ data.avgCount }}</td>
       <td>{{ data.totalGrade }}</td>
       <td>{{ data.response_time_num }}</td>
@@ -54,15 +54,15 @@
       <td>{{ data.execution_time_num }}</td>
       <td>{{ data.aveper }}</td>
       <td>{{ data.total_time }}</td>
-      <td>{{ data.five_count }}</td>
-      <td>{{ data.special_close }}</td>
+      <td class="text-sign" (click)="viewDetail2(data)">{{ data.five_count }}</td>
+      <td class="text-sign" (click)="viewDetail3(data)">{{ data.special_close }}</td>
     </tr>
   </tbody>
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
         <td style="width: 10%">{{ data.date }}</td>
-        <td style="width: 9%">{{ data.totalCount }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.totalCount }}</td>
         <td style="width: 9%">{{ data.avgCount }}</td>
         <td style="width: 9%">{{ data.totalGrade }}</td>
         <td style="width: 9%">{{ data.response_time_num }}</td>
@@ -70,8 +70,8 @@
         <td style="width: 9%">{{ data.execution_time_num }}</td>
         <td style="width: 9%">{{ data.aveper }}</td>
         <td style="width: 9%">{{ data.total_time }}</td>
-        <td style="width: 9%">{{ data.five_count }}</td>
-        <td style="width: 9%">{{ data.special_close }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.five_count }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.special_close }}</td>
       </tr>
     </table>
   </ng-template>

src/app/views/new-statistics/distribution-inspection-statistics/hour-quality-control-statistics/hour-quality-control-statistics.component.less

@@ -5,6 +5,10 @@
   right: 0;
   bottom: 0;
   left: 0;
+	.text-sign{
+		text-decoration: underline;
+		cursor: pointer;
+	}
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
     width: calc(100% - 15px);

src/app/views/new-statistics/distribution-inspection-statistics/hour-quality-control-statistics/hour-quality-control-statistics.component.ts

@@ -2,7 +2,7 @@ import { TabService } from './../../services/tab.service';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { ToolService } from "../../../../services/tool.service";
 import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
@@ -16,6 +16,7 @@ export class HourQualityControlStatisticsComponent implements OnInit, AfterViewI
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
 		private tool: ToolService,
   ) {}
@@ -48,7 +49,187 @@ export class HourQualityControlStatisticsComponent implements OnInit, AfterViewI
 
     }, 0)
   }
-
+	
+	// 数据下钻
+	viewDetail1(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: this.statisticsTypeId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+					deptId: this.fieldConfig.fields.deptId || undefined,
+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: this.statisticsTypeId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+					deptId: this.fieldConfig.fields.deptId || undefined,
+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					timeFrameId: data.date || undefined,
+					timeFrameDTO:{
+						"name": data.date,
+						"id": data.date
+					}
+				}
+			}
+		}
+		let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('distributionData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
+	}
+	
+	viewDetail2(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: this.statisticsTypeId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+					deptId: this.fieldConfig.fields.deptId || undefined,
+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					minuteClose: 5,
+					minuteDTO: 5,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: data.statisticsTypeId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+					deptId: this.fieldConfig.fields.deptId || undefined,
+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					minuteClose: 5,
+					minuteDTO: 5,
+					timeFrameId: data.date || undefined,
+					timeFrameDTO:{
+						"name": data.date,
+						"id": data.date
+					}
+				}
+			}
+		}
+		let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('distributionData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
+	}
+	
+	viewDetail3(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: this.statisticsTypeId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+					deptId: this.fieldConfig.fields.deptId || undefined,
+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					specialId: 1,
+					specialDTO: {
+						"name": "是",
+						"id": 1
+					},
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: this.statisticsTypeId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+					deptId: this.fieldConfig.fields.deptId || undefined,
+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					specialId: 1,
+					specialDTO: {
+						"name": "是",
+						"id": 1
+					},
+					timeFrameId: data.date || undefined,
+					timeFrameDTO:{
+						"name": data.date,
+						"id": data.date
+					}
+				}
+			}
+		}
+		let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('distributionData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
+	}
+	
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();

src/app/views/new-statistics/distribution-inspection-statistics/incident-list/incident-list.component.html

@@ -20,8 +20,11 @@
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
   </div>
 </div>
-<div class="moreFilter" *ngIf="fieldConfig.fields.deptDTO|| fieldConfig.fields.taskTypeDTO || fieldConfig.fields.sourceDTO || fieldConfig.fields.minuteDTO || fieldConfig.fields.specialDTO || fieldConfig.fields.overtimeIdDTO || fieldConfig.fields.abnormalDTO || fieldConfig.fields.evaluateDTO || fieldConfig.fields.executeUserDTO || fieldConfig.fields.codeNumDTO || fieldConfig.fields.timeFrameDTO">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.deptDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.taskTypeDTO || fieldConfig.fields.sourceDTO || fieldConfig.fields.minuteDTO || fieldConfig.fields.specialDTO || fieldConfig.fields.overtimeIdDTO || fieldConfig.fields.abnormalDTO || fieldConfig.fields.evaluateDTO || fieldConfig.fields.codeNumDTO || fieldConfig.fields.timeFrameDTO">
+	<span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
+	<span>{{fieldConfig.fields.userDTO?.name}}</span>
 	<span>{{fieldConfig.fields.taskTypeDTO?.taskName}}</span>
+	<span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
   <span>{{fieldConfig.fields.deptDTO?.dept}}</span>
 	<span>{{fieldConfig.fields.sourceDTO?.name}}</span>
 	<span>{{fieldConfig.fields.minuteDTO}}</span>
@@ -29,7 +32,6 @@
 	<span>{{fieldConfig.fields.overtimeDTO?.name}}</span>
 	<span>{{fieldConfig.fields.abnormalDTO?.name}}</span>
 	<span>{{fieldConfig.fields.evaluateDTO?.name}}</span>
-	<span>{{fieldConfig.fields.executeUserDTO?.name}}</span>
 	<span>{{fieldConfig.fields.codeNumDTO}}</span>
 	<span>{{fieldConfig.fields.timeFrameDTO?.name}}</span>
 </div>

src/app/views/new-statistics/distribution-inspection-statistics/incident-list/incident-list.component.ts

@@ -1,10 +1,10 @@
 import { TabService } from './../../services/tab.service';
-import { debounceTime } from 'rxjs/operators';
+import { debounceTime, filter } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
-import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
+import { Component, OnInit, HostListener, AfterViewInit, ViewChild, OnDestroy } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute, Router, NavigationEnd } from '@angular/router';
 import cloneDeep from 'lodash-es/cloneDeep'
 import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
@@ -12,7 +12,7 @@ import { CustomChangeDateComponent } from '../../components/custom-change-date/c
   templateUrl: "./incident-list.component.html",
   styleUrls: ["./incident-list.component.less"],
 })
-export class IncidentListComponent implements OnInit, AfterViewInit {
+export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
   @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
@@ -31,20 +31,22 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
   repairDeptId;//报修科室id
 
   searchTimerSubject = new Subject();
-
+	
   ngOnInit() {
+		// 数据下钻搜索
+		this.getRouteQuery()
     this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
       let fun = v[0];
       fun.call(this, v[1]);
     });
   }
-
+	
+	ngOnDestroy(){
+		sessionStorage.removeItem('distributionData')
+	}
+	
   ngAfterViewInit(){
     this.initSessionData();
-    this.getQueryParams();
-    setTimeout(() => {
-      this.search();
-    }, 0)
     this.onResize(0);
   }
 
@@ -56,14 +58,50 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
 
     }, 0)
   }
-
+	
+	goingType:boolean = false;
+	getRouteQuery(){
+		let data = sessionStorage.getItem('distributionData')
+		let query = null
+		if(data){
+			query = JSON.parse(data)
+			console.log('query==========',query)
+			setTimeout(_=>{
+				// 统计分类
+				if(query.statisticsTypeId){
+					this.getStatisticsTypeList();
+					this.statisticsTypeId = query.statisticsTypeId
+				}else{
+					this.statisticsTypeId = undefined
+				}
+				if(query.searchQuery){
+					this.goingType = true
+					this.fieldConfig.fields = query.searchQuery
+				}else{
+					this.goingType = false
+					this.fieldConfig.fields = {}
+				}
+				
+				this.getQueryParams();
+			},50)
+		}else{
+			setTimeout(_=>{
+				this.getQueryParams();
+			},50)
+		}
+	}
+	
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
-      this.customChangeDateComponent.initByDate(this.dateRange);
+      this.customChangeDateComponent.initByDate(this.dateRange, queryParams.defRange);
     }
+    setTimeout(_=>{
+    	this.search();
+    	this.onResize(37);
+    },50)
   }
 
   get getMoreFilter(){
@@ -129,14 +167,16 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
       endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.getHosId,
       deptId: this.fieldConfig.fields.deptId || undefined,
-      taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+			groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+			userId: this.fieldConfig.fields.userId || undefined,
+			taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+			buildingId: this.fieldConfig.fields.buildingId || undefined,
 			sourceId: this.fieldConfig.fields.sourceId || undefined,
 			minutesClose: this.fieldConfig.fields.minuteClose || undefined,
 			specialCloseFlag: this.fieldConfig.fields.specialId || undefined,
 			timeout: this.fieldConfig.fields.overtimeId || undefined,
 			abnormityType: this.fieldConfig.fields.abnormalId || undefined,
 			workOrderEvaluationId: this.fieldConfig.fields.evaluateId || undefined,
-			userId: this.fieldConfig.fields.executeUserId || undefined,
 			hour: this.fieldConfig.fields.timeFrameId || undefined,
 			gdCode: this.fieldConfig.fields.codeNum || undefined
     };
@@ -184,14 +224,16 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
       endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.getHosId,
       deptId: this.fieldConfig.fields.deptId || undefined,
-      taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+			groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+			userId: this.fieldConfig.fields.userId || undefined,
+			taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+			buildingId: this.fieldConfig.fields.buildingId || undefined,
     	sourceId: this.fieldConfig.fields.sourceId || undefined,
     	minutesClose: this.fieldConfig.fields.minuteClose || undefined,
     	specialCloseFlag: this.fieldConfig.fields.specialId || undefined,
     	timeout: this.fieldConfig.fields.overtimeId || undefined,
     	abnormityType: this.fieldConfig.fields.abnormalId || undefined,
     	workOrderEvaluationId: this.fieldConfig.fields.evaluateId || undefined,
-    	userId: this.fieldConfig.fields.executeUserId || undefined,
     	hour: this.fieldConfig.fields.timeFrameId || undefined,
     	gdCode: this.fieldConfig.fields.codeNum || undefined
     };
@@ -227,6 +269,7 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
     this.statisticsTypeId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined};
     this.customChangeDateComponent.resetByDate();
+		sessionStorage.removeItem('distributionData');
     this.search();
 		this.onResize(0);
   }
@@ -272,8 +315,8 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
 
   // 详细搜索
   fieldConfig:any = {
-		fields: { deptId: undefined, taskTypeId: undefined, sourceId: undefined, minuteId: undefined, specialId: undefined, overtimeId: undefined, abnormalId: undefined, evaluateId: undefined, executeUserId: undefined, codeNum: undefined, timeFrameId: undefined},
-		config: { dept: true, taskType: true, source: true, minute: true, special: true, overtime: true, abnormal: true, evaluate: true, executeUser:true, code: true, timeFrame: true},
+		fields: { deptId: undefined, taskTypeId: undefined, sourceId: undefined, minuteId: undefined, specialId: undefined, overtimeId: undefined, abnormalId: undefined, evaluateId: undefined, codeNum: undefined, timeFrameId: undefined, groupId: undefined, userId: undefined, buildingId: undefined},
+		config: { dept: true, taskType: true, source: true, minute: true, special: true, overtime: true, abnormal: true, evaluate: true, code: true, timeFrame: true, groupAndUser: true, building: true},
   }
   showSearchMore:boolean = false;
   showMore(){

src/app/views/new-statistics/distribution-inspection-statistics/taskType-quality-control-statistics/taskType-quality-control-statistics.component.html

@@ -44,30 +44,30 @@
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.taskName }}</td>
-      <td>{{ data.totalCount }}</td>
+      <td class="text-sign" (click)="viewDetail1(data)">{{ data.totalCount }}</td>
       <td>{{ data.totalGrade }}</td>
       <td>{{ data.response_time_num }}</td>
       <td>{{ data.arrive_time_num }}</td>
       <td>{{ data.execution_time_num }}</td>
       <td>{{ data.aveper }}</td>
       <td>{{ data.total_time }}</td>
-      <td>{{ data.five_count }}</td>
-      <td>{{ data.special_close }}</td>
+      <td class="text-sign" (click)="viewDetail2(data)">{{ data.five_count }}</td>
+      <td class="text-sign" (click)="viewDetail3(data)">{{ data.special_close }}</td>
     </tr>
   </tbody>
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
         <td style="width: 10%">{{ data.taskName }}</td>
-        <td style="width: 10%">{{ data.totalCount }}</td>
+        <td style="width: 10%" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.totalCount }}</td>
         <td style="width: 10%">{{ data.totalGrade }}</td>
         <td style="width: 10%">{{ data.response_time_num }}</td>
         <td style="width: 10%">{{ data.arrive_time_num }}</td>
         <td style="width: 10%">{{ data.execution_time_num }}</td>
         <td style="width: 10%">{{ data.aveper }}</td>
         <td style="width: 10%">{{ data.total_time }}</td>
-        <td style="width: 10%">{{ data.five_count }}</td>
-        <td style="width: 10%">{{ data.special_close }}</td>
+        <td style="width: 10%" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.five_count }}</td>
+        <td style="width: 10%" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.special_close }}</td>
       </tr>
     </table>
   </ng-template>

src/app/views/new-statistics/distribution-inspection-statistics/taskType-quality-control-statistics/taskType-quality-control-statistics.component.less

@@ -5,6 +5,10 @@
   right: 0;
   bottom: 0;
   left: 0;
+	.text-sign{
+		text-decoration: underline;
+		cursor: pointer;
+	}
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
     width: calc(100% - 15px);

src/app/views/new-statistics/distribution-inspection-statistics/taskType-quality-control-statistics/taskType-quality-control-statistics.component.ts

@@ -4,7 +4,7 @@ import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { ToolService } from "../../../../services/tool.service";
 import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
@@ -18,6 +18,7 @@ export class TaskTypeQualityControlStatisticsComponent implements OnInit, AfterV
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
 		private tool: ToolService,
   ) {}
@@ -56,7 +57,246 @@ export class TaskTypeQualityControlStatisticsComponent implements OnInit, AfterV
 
     }, 0)
   }
-
+	
+	// 数据下钻
+	viewDetail1(data, type){
+		let query = null
+		let item = null
+		if(this.taskTypeId){
+			item = this.taskTypeList.find(i => i.id == this.taskTypeId)
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+					deptId: this.fieldConfig.fields.deptId || undefined,
+					taskTypeId: this.taskTypeId || undefined,
+					taskTypeDTO: item,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}else{
+			let arr = data.taskName.split('-');
+			let postData = {
+			  idx: 0,
+			  sum: 10,
+			  taskType: {
+			    taskName: arr[arr.length-1],
+			  },
+			};
+			this.mainService
+			  .getFetchDataList("configuration", "taskType", postData)
+			  .subscribe((res) => {
+			    if (res.status == 200) {
+						let item = res.list.find(i =>i.id == data.taskTypeId)
+			      query = {
+			      	startDate: this.customChangeDateComponent.startDate || undefined,
+			      	endDate: this.customChangeDateComponent.endDate || undefined,
+			      	searchQuery:{
+			      		statusValue: 'close',
+			      		deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+			      		deptId: this.fieldConfig.fields.deptId || undefined,
+			      		taskTypeId: data.taskTypeId || undefined,
+			      		taskTypeDTO: item,
+			      		groupId: this.fieldConfig.fields.groupId || undefined,
+			      		groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+			      		userId: this.fieldConfig.fields.userId || undefined,
+			      		userDTO: this.fieldConfig.fields.userDTO || undefined,
+			      		buildingId: this.fieldConfig.fields.buildingId || undefined,
+			      		buildingDTO: this.fieldConfig.fields.buildingDTO || undefined
+			      	}
+			      }
+						let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('distributionData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+			    }
+			  });
+		}
+	}
+	
+	viewDetail2(data, type){
+		let query = null
+		let item = null
+		if(this.taskTypeId){
+			item = this.taskTypeList.find(i => i.id == this.taskTypeId)
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				taskTypeId: this.taskTypeId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+					deptId: this.fieldConfig.fields.deptId || undefined,
+					taskTypeId: this.taskTypeId || undefined,
+					taskTypeDTO: item,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					minuteClose: 5,
+					minuteDTO: 5,
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}else{
+			let arr = data.taskName.split('-');
+			let postData = {
+			  idx: 0,
+			  sum: 10,
+			  taskType: {
+			    taskName: arr[arr.length-1],
+			  }
+			};
+			this.mainService
+				.getFetchDataList("configuration", "taskType", postData)
+				.subscribe((res) => {
+					if (res.status == 200) {
+						let item = res.list.find(i =>i.id == data.taskTypeId)
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							searchQuery:{
+								statusValue: 'close',
+								deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+								deptId: this.fieldConfig.fields.deptId || undefined,
+								taskTypeId: data.taskTypeId || undefined,
+								taskTypeDTO: item,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userId: this.fieldConfig.fields.userId || undefined,
+								userDTO: this.fieldConfig.fields.userDTO || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								minuteClose: 5,
+								minuteDTO: 5
+							}
+						}
+						let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('distributionData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+					}
+				});
+		}
+	}
+	
+	viewDetail3(data, type){
+		let query = null
+		let item = null
+		if(this.taskTypeId){
+			item = this.taskTypeList.find(i => i.id == this.taskTypeId)
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				taskTypeId: this.taskTypeId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+					deptId: this.fieldConfig.fields.deptId || undefined,
+					taskTypeId: this.taskTypeId || undefined,
+					taskTypeDTO: item,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					specialId: 1,
+					specialDTO: {
+						"name": "是",
+						"id": 1
+					},
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}else{
+			let arr = data.taskName.split('-');
+			let postData = {
+			  idx: 0,
+			  sum: 10,
+			  taskType: {
+			    taskName: arr[arr.length-1],
+			  },
+			};
+			this.mainService
+				.getFetchDataList("configuration", "taskType", postData)
+				.subscribe((res) => {
+					if (res.status == 200) {
+						let item = res.list.find(i =>i.id == data.taskTypeId)
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							searchQuery:{
+								statusValue: 'close',
+								deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+								deptId: this.fieldConfig.fields.deptId || undefined,
+								taskTypeId: data.taskTypeId || undefined,
+								taskTypeDTO: item,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userId: this.fieldConfig.fields.userId || undefined,
+								userDTO: this.fieldConfig.fields.userDTO || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								specialId: 1,
+								specialDTO: {
+									"name": "是",
+									"id": 1
+								}
+							}
+						}
+						let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('distributionData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+					}
+				});
+		}
+	}
+	
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();

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

@@ -28,6 +28,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
   ngOnInit() {}
 
   ngAfterViewInit(){
+		this.getCategory1List();
     this.initSessionData();
     this.getQueryParams();
     setTimeout(() => {
@@ -48,6 +49,10 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 	// 数据下钻
 	viewDetail1(data, type){
 		let query = null
+		let item = null;
+		if(data.categoryId){
+		  item = this.category1List.find(item => item.id == data.categoryId);
+		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
@@ -88,17 +93,27 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					category1DTO: item || undefined,
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 数据下钻
 	viewDetail2(data, type){
 		let query = null
+		let item = null;
+		if(data.categoryId){
+		  item = this.category1List.find(item => item.id == data.categoryId);
+		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
@@ -118,6 +133,10 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					overtimeDTO:{
+						id: 1,
+						name: "是"
+					},
 				}
 			}
 		}else{
@@ -141,17 +160,31 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					overtimeDTO:{
+						id: 1,
+						name: "是"
+					},
+					category1DTO: item || undefined,
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 数据下钻
 	viewDetail3(data, type){
 		let query = null
+		let item = null;
+		if(data.categoryId){
+		  item = this.category1List.find(item => item.id == data.categoryId);
+		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
@@ -171,6 +204,10 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					isHangDTO: {
+						id: 1,
+						name: "是"
+					},
 				}
 			}
 		}else{
@@ -194,17 +231,31 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					isHangDTO: {
+						id: 1,
+						name: "是"
+					},
+					category1DTO: item || undefined,
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 数据下钻
 	viewDetail4(data, type){
 		let query = null
+		let item = null;
+		if(data.categoryId){
+		  item = this.category1List.find(item => item.id == data.categoryId);
+		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
@@ -224,6 +275,15 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					evaluateDTO: {
+							"id": 20424,
+							"key": "incident_degree",
+							"name": "不满意",
+							"value": "1",
+							"orders": 5,
+							"extra1": "",
+							"extra2": ""
+					},
 				}
 			}
 		}else{
@@ -247,12 +307,27 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					evaluateDTO: {
+							"id": 20424,
+							"key": "incident_degree",
+							"name": "不满意",
+							"value": "1",
+							"orders": 5,
+							"extra1": "",
+							"extra2": ""
+					},
+					category1DTO: item || undefined,
 				}
 			}
 		}
 		
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
   getQueryParams(){
@@ -307,7 +382,27 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
   get getHosId(){
     return this.parentDutyId || this.dutyId || this.hosId;
   }
-
+	
+	// 获取一级分类列表
+	category1List:any[] = [];
+	getCategory1List(keyword?) {
+	  let data = {
+	    category: {
+	      category: keyword,
+	      selectType: 'mutlQuery',
+	      statisticalHosId: this.getHosId,
+	      hierarchy: 1,
+	    },
+	  };
+	  this.isLoading = true;
+	  this.mainService
+	    .incidentPost("listIncidentCategory", data)
+	    .subscribe((data) => {
+	      this.isLoading = false;
+	      this.category1List = data.data;
+	    });
+	}
+	
   // 表格数据
   loading1 = false;
   getList(num?: number, field?: string, sort?: string) {

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

@@ -89,36 +89,143 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
 					category1DTO: item1 || undefined,
 					category2DTO: item2 || undefined,
+					category3DTO:{
+						category: data.category,
+						id: data.categoryId,
+					}
 				}
 			}
+			let path = '/newStatistics/maintenanceStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
 		}else{
-			query = {
-				startDate: this.customChangeDateComponent.startDate || undefined,
-				endDate: this.customChangeDateComponent.endDate || undefined,
-				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
-				searchQuery:{
-					statusValue: 'close',
-					hierarchy: data.hierarchy,
-					categoryId: data.categoryId,
-					groupId: this.fieldConfig.fields.groupId || undefined,
-					userId: this.fieldConfig.fields.userId || undefined,
-					buildingId: this.fieldConfig.fields.buildingId || undefined,
-					placeId: this.fieldConfig.fields.floorId || undefined,
-					floorId: this.fieldConfig.fields.floorId || undefined,
-					companyId: this.fieldConfig.fields.companyId || undefined,
-					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
-					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
-					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
-					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO: this.fieldConfig.fields.userDTO || undefined,
-					category1DTO: item1 || undefined,
-					category2DTO: item2 || undefined,
+			let category1 = null
+			let category2 = null
+			if(!item1 && !item2){
+				this.mainService
+				  .getFetchData("simple/data", "incidentCategory", data.categoryId)
+				  .subscribe((res) => {
+						category2 = res.data.parent;
+						category1 = res.data.parent.parent;
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+							searchQuery:{
+								statusValue: 'close',
+								hierarchy: data.hierarchy,
+								categoryId: data.categoryId,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								userId: this.fieldConfig.fields.userId || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								placeId: this.fieldConfig.fields.floorId || undefined,
+								floorId: this.fieldConfig.fields.floorId || undefined,
+								companyId: this.fieldConfig.fields.companyId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+								floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userDTO: this.fieldConfig.fields.userDTO || undefined,
+								category1DTO: category1 || undefined,
+								category2DTO: category2 || undefined,
+								category3DTO:{
+									category: data.category,
+									id: data.categoryId,
+								}
+							}
+						}
+						let path = '/newStatistics/maintenanceStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+				});	
+			}else if(item1){
+				let category1 = null
+				let category2 = null
+				this.mainService
+				  .getFetchData("simple/data", "incidentCategory", data.categoryId)
+				  .subscribe((res) => {
+						category2 = res.data.parent;
+						category1 = res.data.parent.parent;
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+							searchQuery:{
+								statusValue: 'close',
+								hierarchy: data.hierarchy,
+								categoryId: data.categoryId,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								userId: this.fieldConfig.fields.userId || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								placeId: this.fieldConfig.fields.floorId || undefined,
+								floorId: this.fieldConfig.fields.floorId || undefined,
+								companyId: this.fieldConfig.fields.companyId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+								floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userDTO: this.fieldConfig.fields.userDTO || undefined,
+								category1DTO: category1 || undefined,
+								category2DTO: category2 || undefined,
+								category3DTO: {
+									category: data.category,
+									id: data.categoryId,
+								},
+							}
+						}
+						let path = '/newStatistics/maintenanceStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+				});	
+			}else{
+				query = {
+					startDate: this.customChangeDateComponent.startDate || undefined,
+					endDate: this.customChangeDateComponent.endDate || undefined,
+					repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+					searchQuery:{
+						statusValue: 'close',
+						hierarchy: data.hierarchy,
+						categoryId: data.categoryId,
+						groupId: this.fieldConfig.fields.groupId || undefined,
+						userId: this.fieldConfig.fields.userId || undefined,
+						buildingId: this.fieldConfig.fields.buildingId || undefined,
+						placeId: this.fieldConfig.fields.floorId || undefined,
+						floorId: this.fieldConfig.fields.floorId || undefined,
+						companyId: this.fieldConfig.fields.companyId || undefined,
+						buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+						companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+						floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+						groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+						userDTO: this.fieldConfig.fields.userDTO || undefined,
+						category1DTO: item1 || undefined,
+						category2DTO: item2 || undefined,
+						category3DTO:{
+							category: data.category,
+							id: data.categoryId,
+						}
+					}
 				}
+				let path = '/newStatistics/maintenanceStatistics/incidentList'
+				let flag = this.tabService.tabs.some(v => v.path === path);
+				flag && this.tabService.deleteRouteSnapshot(path);
+				this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+				this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+				sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+				this.router.navigate([path], { replaceUrl: true });
 			}
 		}
-		
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
 	}
 	
 	// 数据下钻
@@ -155,37 +262,158 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
 					category1DTO: item1 || undefined,
 					category2DTO: item2 || undefined,
+					overtimeDTO:{
+						id: 1,
+						name: "是"
+					},
 				}
 			}
+			let path = '/newStatistics/maintenanceStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
 		}else{
-			query = {
-				startDate: this.customChangeDateComponent.startDate || undefined,
-				endDate: this.customChangeDateComponent.endDate || undefined,
-				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
-				searchQuery:{
-					statusValue: 'close',
-					hierarchy: data.hierarchy,
-					categoryId: data.categoryId,
-					overtimeId: 1,
-					groupId: this.fieldConfig.fields.groupId || undefined,
-					userId: this.fieldConfig.fields.userId || undefined,
-					buildingId: this.fieldConfig.fields.buildingId || undefined,
-					placeId: this.fieldConfig.fields.floorId || undefined,
-					floorId: this.fieldConfig.fields.floorId || undefined,
-					companyId: this.fieldConfig.fields.companyId || undefined,
-					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
-					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
-					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
-					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO: this.fieldConfig.fields.userDTO || undefined,
-					category1DTO: item1 || undefined,
-					category2DTO: item2 || undefined,
+			let category1 = null
+			let category2 = null
+			if(!item1 && !item2){
+				this.mainService
+				  .getFetchData("simple/data", "incidentCategory", data.categoryId)
+				  .subscribe((res) => {
+						category2 = res.data.parent;
+						category1 = res.data.parent.parent;
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+							searchQuery:{
+								statusValue: 'close',
+								hierarchy: data.hierarchy,
+								categoryId: data.categoryId,
+								overtimeId: 1,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								userId: this.fieldConfig.fields.userId || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								placeId: this.fieldConfig.fields.floorId || undefined,
+								floorId: this.fieldConfig.fields.floorId || undefined,
+								companyId: this.fieldConfig.fields.companyId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+								floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userDTO: this.fieldConfig.fields.userDTO || undefined,
+								category1DTO: category1 || undefined,
+								category2DTO: category2 || undefined,
+								category3DTO:{
+									category: data.category,
+									id: data.categoryId,
+								},
+								overtimeDTO:{
+									id: 1,
+									name: "是"
+								},
+							}
+						}
+						let path = '/newStatistics/maintenanceStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+				});	
+			}else if(item1){
+				let category1 = null
+				let category2 = null
+				this.mainService
+				  .getFetchData("simple/data", "incidentCategory", data.categoryId)
+				  .subscribe((res) => {
+						category2 = res.data.parent;
+						category1 = res.data.parent.parent;
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+							searchQuery:{
+								statusValue: 'close',
+								hierarchy: data.hierarchy,
+								categoryId: data.categoryId,
+								overtimeId: 1,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								userId: this.fieldConfig.fields.userId || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								placeId: this.fieldConfig.fields.floorId || undefined,
+								floorId: this.fieldConfig.fields.floorId || undefined,
+								companyId: this.fieldConfig.fields.companyId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+								floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userDTO: this.fieldConfig.fields.userDTO || undefined,
+								category1DTO: category1 || undefined,
+								category2DTO: category2 || undefined,
+								category3DTO: {
+									category: data.category,
+									id: data.categoryId,
+								},
+								overtimeDTO:{
+									id: 1,
+									name: "是"
+								},
+							}
+						}
+						let path = '/newStatistics/maintenanceStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+				});	
+			}else{
+				query = {
+					startDate: this.customChangeDateComponent.startDate || undefined,
+					endDate: this.customChangeDateComponent.endDate || undefined,
+					repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+					searchQuery:{
+						statusValue: 'close',
+						hierarchy: data.hierarchy,
+						categoryId: data.categoryId,
+						overtimeId: 1,
+						groupId: this.fieldConfig.fields.groupId || undefined,
+						userId: this.fieldConfig.fields.userId || undefined,
+						buildingId: this.fieldConfig.fields.buildingId || undefined,
+						placeId: this.fieldConfig.fields.floorId || undefined,
+						floorId: this.fieldConfig.fields.floorId || undefined,
+						companyId: this.fieldConfig.fields.companyId || undefined,
+						buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+						companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+						floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+						groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+						userDTO: this.fieldConfig.fields.userDTO || undefined,
+						category1DTO: item1 || undefined,
+						category2DTO: item2 || undefined,
+						category3DTO:{
+							category: data.category,
+							id: data.categoryId,
+						},
+						overtimeDTO:{
+							id: 1,
+							name: "是"
+						},
+					}
 				}
+				let path = '/newStatistics/maintenanceStatistics/incidentList'
+				let flag = this.tabService.tabs.some(v => v.path === path);
+				flag && this.tabService.deleteRouteSnapshot(path);
+				this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+				this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+				sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+				this.router.navigate([path], { replaceUrl: true });
 			}
 		}
-
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
 	}
 	
 	// 数据下钻
@@ -222,37 +450,158 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
 					category1DTO: item1 || undefined,
 					category2DTO: item2 || undefined,
+					isHangDTO:{
+						id: 1,
+						name: "是"
+					},
 				}
 			}
+			let path = '/newStatistics/maintenanceStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
 		}else{
-			query = {
-				startDate: this.customChangeDateComponent.startDate || undefined,
-				endDate: this.customChangeDateComponent.endDate || undefined,
-				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
-				searchQuery:{
-					statusValue: 'close',
-					hierarchy: data.hierarchy,
-					categoryId: data.categoryId,
-					isHangId: 1,
-					groupId: this.fieldConfig.fields.groupId || undefined,
-					userId: this.fieldConfig.fields.userId || undefined,
-					buildingId: this.fieldConfig.fields.buildingId || undefined,
-					placeId: this.fieldConfig.fields.floorId || undefined,
-					floorId: this.fieldConfig.fields.floorId || undefined,
-					companyId: this.fieldConfig.fields.companyId || undefined,
-					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
-					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
-					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
-					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO: this.fieldConfig.fields.userDTO || undefined,
-					category1DTO: item1 || undefined,
-					category2DTO: item2 || undefined,
+			let category1 = null
+			let category2 = null
+			if(!item1 && !item2){
+				this.mainService
+				  .getFetchData("simple/data", "incidentCategory", data.categoryId)
+				  .subscribe((res) => {
+						category2 = res.data.parent;
+						category1 = res.data.parent.parent;
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+							searchQuery:{
+								statusValue: 'close',
+								hierarchy: data.hierarchy,
+								categoryId: data.categoryId,
+								isHangId: 1,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								userId: this.fieldConfig.fields.userId || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								placeId: this.fieldConfig.fields.floorId || undefined,
+								floorId: this.fieldConfig.fields.floorId || undefined,
+								companyId: this.fieldConfig.fields.companyId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+								floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userDTO: this.fieldConfig.fields.userDTO || undefined,
+								category1DTO: category1 || undefined,
+								category2DTO: category2 || undefined,
+								category3DTO:{
+									category: data.category,
+									id: data.categoryId,
+								},
+								isHangDTO:{
+									id: 1,
+									name: "是"
+								},
+							}
+						}
+						let path = '/newStatistics/maintenanceStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+				});	
+			}else if(item1){
+				let category1 = null
+				let category2 = null
+				this.mainService
+				  .getFetchData("simple/data", "incidentCategory", data.categoryId)
+				  .subscribe((res) => {
+						category2 = res.data.parent;
+						category1 = res.data.parent.parent;
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+							searchQuery:{
+								statusValue: 'close',
+								hierarchy: data.hierarchy,
+								categoryId: data.categoryId,
+								isHangId: 1,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								userId: this.fieldConfig.fields.userId || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								placeId: this.fieldConfig.fields.floorId || undefined,
+								floorId: this.fieldConfig.fields.floorId || undefined,
+								companyId: this.fieldConfig.fields.companyId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+								floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userDTO: this.fieldConfig.fields.userDTO || undefined,
+								category1DTO: category1 || undefined,
+								category2DTO: category2 || undefined,
+								category3DTO: {
+									category: data.category,
+									id: data.categoryId,
+								},
+								isHangDTO:{
+									id: 1,
+									name: "是"
+								},
+							}
+						}
+						let path = '/newStatistics/maintenanceStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+				});	
+			}else{
+				query = {
+					startDate: this.customChangeDateComponent.startDate || undefined,
+					endDate: this.customChangeDateComponent.endDate || undefined,
+					repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+					searchQuery:{
+						statusValue: 'close',
+						hierarchy: data.hierarchy,
+						categoryId: data.categoryId,
+						isHangId: 1,
+						groupId: this.fieldConfig.fields.groupId || undefined,
+						userId: this.fieldConfig.fields.userId || undefined,
+						buildingId: this.fieldConfig.fields.buildingId || undefined,
+						placeId: this.fieldConfig.fields.floorId || undefined,
+						floorId: this.fieldConfig.fields.floorId || undefined,
+						companyId: this.fieldConfig.fields.companyId || undefined,
+						buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+						companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+						floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+						groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+						userDTO: this.fieldConfig.fields.userDTO || undefined,
+						category1DTO: item1 || undefined,
+						category2DTO: item2 || undefined,
+						category3DTO:{
+							category: data.category,
+							id: data.categoryId,
+						},
+						isHangDTO:{
+							id: 1,
+							name: "是"
+						},
+					}
 				}
+				let path = '/newStatistics/maintenanceStatistics/incidentList'
+				let flag = this.tabService.tabs.some(v => v.path === path);
+				flag && this.tabService.deleteRouteSnapshot(path);
+				this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+				this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+				sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+				this.router.navigate([path], { replaceUrl: true });
 			}
 		}
-
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
 	}
 	
 	// 数据下钻
@@ -289,37 +638,178 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
 					category1DTO: item1 || undefined,
 					category2DTO: item2 || undefined,
+					evaluateDTO: {
+							"id": 20424,
+							"key": "incident_degree",
+							"name": "不满意",
+							"value": "1",
+							"orders": 5,
+							"extra1": "",
+							"extra2": ""
+					},
 				}
 			}
+			let path = '/newStatistics/maintenanceStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
 		}else{
-			query = {
-				startDate: this.customChangeDateComponent.startDate || undefined,
-				endDate: this.customChangeDateComponent.endDate || undefined,
-				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
-				searchQuery:{
-					statusValue: 'close',
-					hierarchy: data.hierarchy,
-					categoryId: data.categoryId,
-					evaluateId: 20424,
-					groupId: this.fieldConfig.fields.groupId || undefined,
-					userId: this.fieldConfig.fields.userId || undefined,
-					buildingId: this.fieldConfig.fields.buildingId || undefined,
-					placeId: this.fieldConfig.fields.floorId || undefined,
-					floorId: this.fieldConfig.fields.floorId || undefined,
-					companyId: this.fieldConfig.fields.companyId || undefined,
-					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
-					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
-					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
-					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO: this.fieldConfig.fields.userDTO || undefined,
-					category1DTO: item1 || undefined,
-					category2DTO: item2 || undefined,
+			let category1 = null
+			let category2 = null
+			if(!item1 && !item2){
+				this.mainService
+				  .getFetchData("simple/data", "incidentCategory", data.categoryId)
+				  .subscribe((res) => {
+						category2 = res.data.parent;
+						category1 = res.data.parent.parent;
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+							searchQuery:{
+								statusValue: 'close',
+								hierarchy: data.hierarchy,
+								categoryId: data.categoryId,
+								evaluateId: 20424,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								userId: this.fieldConfig.fields.userId || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								placeId: this.fieldConfig.fields.floorId || undefined,
+								floorId: this.fieldConfig.fields.floorId || undefined,
+								companyId: this.fieldConfig.fields.companyId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+								floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userDTO: this.fieldConfig.fields.userDTO || undefined,
+								category1DTO: category1 || undefined,
+								category2DTO: category2 || undefined,
+								category3DTO:{
+									category: data.category,
+									id: data.categoryId,
+								},
+								evaluateDTO: {
+										"id": 20424,
+										"key": "incident_degree",
+										"name": "不满意",
+										"value": "1",
+										"orders": 5,
+										"extra1": "",
+										"extra2": ""
+								},
+							}
+						}
+						let path = '/newStatistics/maintenanceStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+				});	
+			}else if(item1){
+				let category1 = null
+				let category2 = null
+				this.mainService
+				  .getFetchData("simple/data", "incidentCategory", data.categoryId)
+				  .subscribe((res) => {
+						category2 = res.data.parent;
+						category1 = res.data.parent.parent;
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+							searchQuery:{
+								statusValue: 'close',
+								hierarchy: data.hierarchy,
+								categoryId: data.categoryId,
+								evaluateId: 20424,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								userId: this.fieldConfig.fields.userId || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								placeId: this.fieldConfig.fields.floorId || undefined,
+								floorId: this.fieldConfig.fields.floorId || undefined,
+								companyId: this.fieldConfig.fields.companyId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+								floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userDTO: this.fieldConfig.fields.userDTO || undefined,
+								category1DTO: category1 || undefined,
+								category2DTO: category2 || undefined,
+								category3DTO: {
+									category: data.category,
+									id: data.categoryId,
+								},
+								evaluateDTO: {
+										"id": 20424,
+										"key": "incident_degree",
+										"name": "不满意",
+										"value": "1",
+										"orders": 5,
+										"extra1": "",
+										"extra2": ""
+								},
+							}
+						}
+						let path = '/newStatistics/maintenanceStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+				});	
+			}else{
+				query = {
+					startDate: this.customChangeDateComponent.startDate || undefined,
+					endDate: this.customChangeDateComponent.endDate || undefined,
+					repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+					searchQuery:{
+						statusValue: 'close',
+						hierarchy: data.hierarchy,
+						categoryId: data.categoryId,
+						evaluateId: 20424,
+						groupId: this.fieldConfig.fields.groupId || undefined,
+						userId: this.fieldConfig.fields.userId || undefined,
+						buildingId: this.fieldConfig.fields.buildingId || undefined,
+						placeId: this.fieldConfig.fields.floorId || undefined,
+						floorId: this.fieldConfig.fields.floorId || undefined,
+						companyId: this.fieldConfig.fields.companyId || undefined,
+						buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+						companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+						floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+						groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+						userDTO: this.fieldConfig.fields.userDTO || undefined,
+						category1DTO: item1 || undefined,
+						category2DTO: item2 || undefined,
+						category3DTO:{
+							category: data.category,
+							id: data.categoryId,
+						},
+						evaluateDTO: {
+								"id": 20424,
+								"key": "incident_degree",
+								"name": "不满意",
+								"value": "1",
+								"orders": 5,
+								"extra1": "",
+								"extra2": ""
+						},
+					}
 				}
+				let path = '/newStatistics/maintenanceStatistics/incidentList'
+				let flag = this.tabService.tabs.some(v => v.path === path);
+				flag && this.tabService.deleteRouteSnapshot(path);
+				this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+				this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+				sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+				this.router.navigate([path], { replaceUrl: true });
 			}
 		}
-
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
 	}
 	
   getQueryParams(){

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

@@ -63,6 +63,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
 		if(this.category1Id){
 		  item = this.category1List.find(item => item.id == this.category1Id);
 		}
+		
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
@@ -86,33 +87,90 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
 					category1DTO: item || undefined,
 				}
 			}
+			let path = '/newStatistics/maintenanceStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
 		}else{
-			query = {
-				startDate: this.customChangeDateComponent.startDate || undefined,
-				endDate: this.customChangeDateComponent.endDate || undefined,
-				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
-				searchQuery:{
-					statusValue: 'close',
-					hierarchy: data.hierarchy,
-					categoryId: data.categoryId,
-					groupId: this.fieldConfig.fields.groupId || undefined,
-					userId: this.fieldConfig.fields.userId || undefined,
-					buildingId: this.fieldConfig.fields.buildingId || undefined,
-					placeId: this.fieldConfig.fields.floorId || undefined,
-					floorId: this.fieldConfig.fields.floorId || undefined,
-					companyId: this.fieldConfig.fields.companyId || undefined,
-					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
-					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
-					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
-					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO: this.fieldConfig.fields.userDTO || undefined,
-					category1DTO: item || undefined,
+			let category1 = null
+			if(!item){
+				this.mainService
+				  .getFetchData("simple/data", "incidentCategory", data.categoryId)
+				  .subscribe((res) => {
+						category1 = res.data.parent;
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+							searchQuery:{
+								statusValue: 'close',
+								hierarchy: data.hierarchy,
+								categoryId: data.categoryId,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								userId: this.fieldConfig.fields.userId || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								placeId: this.fieldConfig.fields.floorId || undefined,
+								floorId: this.fieldConfig.fields.floorId || undefined,
+								companyId: this.fieldConfig.fields.companyId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+								floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userDTO: this.fieldConfig.fields.userDTO || undefined,
+								category1DTO: category1,
+								category2DTO: {
+									category: data.category,
+									id: data.categoryId,
+								}
+							}
+						}
+						let path = '/newStatistics/maintenanceStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+					});
+			}else{
+				query = {
+					startDate: this.customChangeDateComponent.startDate || undefined,
+					endDate: this.customChangeDateComponent.endDate || undefined,
+					repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+					searchQuery:{
+						statusValue: 'close',
+						hierarchy: data.hierarchy,
+						categoryId: data.categoryId,
+						groupId: this.fieldConfig.fields.groupId || undefined,
+						userId: this.fieldConfig.fields.userId || undefined,
+						buildingId: this.fieldConfig.fields.buildingId || undefined,
+						placeId: this.fieldConfig.fields.floorId || undefined,
+						floorId: this.fieldConfig.fields.floorId || undefined,
+						companyId: this.fieldConfig.fields.companyId || undefined,
+						buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+						companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+						floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+						groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+						userDTO: this.fieldConfig.fields.userDTO || undefined,
+						category1DTO: item,
+						category2DTO: {
+							category: data.category,
+							id: data.categoryId,
+						}
+					}
 				}
+				let path = '/newStatistics/maintenanceStatistics/incidentList'
+				let flag = this.tabService.tabs.some(v => v.path === path);
+				flag && this.tabService.deleteRouteSnapshot(path);
+				this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+				this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+				sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+				this.router.navigate([path], { replaceUrl: true });
 			}
 		}
-
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
 	}
 	
 	// 数据下钻
@@ -144,36 +202,106 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
 					category1DTO: item || undefined,
+					overtimeDTO:{
+						id: 1,
+						name: "是"
+					},
 				}
 			}
+			let path = '/newStatistics/maintenanceStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
 		}else{
-			query = {
-				startDate: this.customChangeDateComponent.startDate || undefined,
-				endDate: this.customChangeDateComponent.endDate || undefined,
-				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
-				searchQuery:{
-					statusValue: 'close',
-					hierarchy: data.hierarchy,
-					categoryId: data.categoryId,
-					overtimeId: 1,
-					groupId: this.fieldConfig.fields.groupId || undefined,
-					userId: this.fieldConfig.fields.userId || undefined,
-					buildingId: this.fieldConfig.fields.buildingId || undefined,
-					placeId: this.fieldConfig.fields.floorId || undefined,
-					floorId: this.fieldConfig.fields.floorId || undefined,
-					companyId: this.fieldConfig.fields.companyId || undefined,
-					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
-					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
-					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
-					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO: this.fieldConfig.fields.userDTO || undefined,
-					category1DTO: item || undefined,
+			let category1 = null
+			if(!item){
+				this.mainService
+				  .getFetchData("simple/data", "incidentCategory", data.categoryId)
+				  .subscribe((res) => {
+						category1 = res.data.parent;
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+							searchQuery:{
+								statusValue: 'close',
+								hierarchy: data.hierarchy,
+								categoryId: data.categoryId,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								userId: this.fieldConfig.fields.userId || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								placeId: this.fieldConfig.fields.floorId || undefined,
+								floorId: this.fieldConfig.fields.floorId || undefined,
+								companyId: this.fieldConfig.fields.companyId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+								floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userDTO: this.fieldConfig.fields.userDTO || undefined,
+								overtimeDTO:{
+									id: 1,
+									name: "是"
+								},
+								overtimeId:1,
+								category1DTO: category1,
+								category2DTO: {
+									category: data.category,
+									id: data.categoryId,
+								},
+							}
+						}
+						let path = '/newStatistics/maintenanceStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+					});
+			}else{
+				query = {
+					startDate: this.customChangeDateComponent.startDate || undefined,
+					endDate: this.customChangeDateComponent.endDate || undefined,
+					repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+					searchQuery:{
+						statusValue: 'close',
+						hierarchy: data.hierarchy,
+						categoryId: data.categoryId,
+						groupId: this.fieldConfig.fields.groupId || undefined,
+						userId: this.fieldConfig.fields.userId || undefined,
+						buildingId: this.fieldConfig.fields.buildingId || undefined,
+						placeId: this.fieldConfig.fields.floorId || undefined,
+						floorId: this.fieldConfig.fields.floorId || undefined,
+						companyId: this.fieldConfig.fields.companyId || undefined,
+						buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+						companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+						floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+						groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+						userDTO: this.fieldConfig.fields.userDTO || undefined,
+						overtimeDTO:{
+							id: 1,
+							name: "是"
+						},
+						overtimeId:1,
+						category1DTO: item,
+						category2DTO: {
+							category: data.category,
+							id: data.categoryId,
+						},
+					}
 				}
+				let path = '/newStatistics/maintenanceStatistics/incidentList'
+				let flag = this.tabService.tabs.some(v => v.path === path);
+				flag && this.tabService.deleteRouteSnapshot(path);
+				this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+				this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+				sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+				this.router.navigate([path], { replaceUrl: true });
 			}
 		}
-
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
 	}
 	
 	// 数据下钻
@@ -205,36 +333,106 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
 					category1DTO: item || undefined,
+					isHangDTO: {
+						id: 1,
+						name: "是"
+					},
 				}
 			}
+			let path = '/newStatistics/maintenanceStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
 		}else{
-			query = {
-				startDate: this.customChangeDateComponent.startDate || undefined,
-				endDate: this.customChangeDateComponent.endDate || undefined,
-				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
-				searchQuery:{
-					statusValue: 'close',
-					hierarchy: data.hierarchy,
-					categoryId: data.categoryId,
-					isHangId: 1,
-					groupId: this.fieldConfig.fields.groupId || undefined,
-					userId: this.fieldConfig.fields.userId || undefined,
-					buildingId: this.fieldConfig.fields.buildingId || undefined,
-					placeId: this.fieldConfig.fields.floorId || undefined,
-					floorId: this.fieldConfig.fields.floorId || undefined,
-					companyId: this.fieldConfig.fields.companyId || undefined,
-					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
-					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
-					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
-					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO: this.fieldConfig.fields.userDTO || undefined,
-					category1DTO: item || undefined,
+			let category1 = null
+			if(!item){
+				this.mainService
+				  .getFetchData("simple/data", "incidentCategory", data.categoryId)
+				  .subscribe((res) => {
+						category1 = res.data.parent;
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+							searchQuery:{
+								statusValue: 'close',
+								hierarchy: data.hierarchy,
+								categoryId: data.categoryId,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								userId: this.fieldConfig.fields.userId || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								placeId: this.fieldConfig.fields.floorId || undefined,
+								floorId: this.fieldConfig.fields.floorId || undefined,
+								companyId: this.fieldConfig.fields.companyId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+								floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userDTO: this.fieldConfig.fields.userDTO || undefined,
+								isHangDTO: {
+									id: 1,
+									name: "是"
+								},
+								isHangId:1,
+								category1DTO: category1,
+								category2DTO: {
+									category: data.category,
+									id: data.categoryId,
+								},
+							}
+						}
+						let path = '/newStatistics/maintenanceStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+					});
+			}else{
+				query = {
+					startDate: this.customChangeDateComponent.startDate || undefined,
+					endDate: this.customChangeDateComponent.endDate || undefined,
+					repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+					searchQuery:{
+						statusValue: 'close',
+						hierarchy: data.hierarchy,
+						categoryId: data.categoryId,
+						groupId: this.fieldConfig.fields.groupId || undefined,
+						userId: this.fieldConfig.fields.userId || undefined,
+						buildingId: this.fieldConfig.fields.buildingId || undefined,
+						placeId: this.fieldConfig.fields.floorId || undefined,
+						floorId: this.fieldConfig.fields.floorId || undefined,
+						companyId: this.fieldConfig.fields.companyId || undefined,
+						buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+						companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+						floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+						groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+						userDTO: this.fieldConfig.fields.userDTO || undefined,
+						isHangDTO: {
+							id: 1,
+							name: "是"
+						},
+						isHangId:1,
+						category1DTO: item,
+						category2DTO: {
+							category: data.category,
+							id: data.categoryId,
+						},
+					}
 				}
+				let path = '/newStatistics/maintenanceStatistics/incidentList'
+				let flag = this.tabService.tabs.some(v => v.path === path);
+				flag && this.tabService.deleteRouteSnapshot(path);
+				this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+				this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+				sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+				this.router.navigate([path], { replaceUrl: true });
 			}
 		}
-
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
 	}
 	
 	// 数据下钻
@@ -266,36 +464,121 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
 					category1DTO: item || undefined,
+					evaluateDTO: {
+							"id": 20424,
+							"key": "incident_degree",
+							"name": "不满意",
+							"value": "1",
+							"orders": 5,
+							"extra1": "",
+							"extra2": ""
+					},
 				}
 			}
+			let path = '/newStatistics/maintenanceStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
 		}else{
-			query = {
-				startDate: this.customChangeDateComponent.startDate || undefined,
-				endDate: this.customChangeDateComponent.endDate || undefined,
-				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
-				searchQuery:{
-					statusValue: 'close',
-					hierarchy: data.hierarchy,
-					categoryId: data.categoryId,
-					evaluateId: 20424,
-					groupId: this.fieldConfig.fields.groupId || undefined,
-					userId: this.fieldConfig.fields.userId || undefined,
-					buildingId: this.fieldConfig.fields.buildingId || undefined,
-					placeId: this.fieldConfig.fields.floorId || undefined,
-					floorId: this.fieldConfig.fields.floorId || undefined,
-					companyId: this.fieldConfig.fields.companyId || undefined,
-					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
-					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
-					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
-					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO: this.fieldConfig.fields.userDTO || undefined,
-					category1DTO: item || undefined,
+			let category1 = null
+			if(!item){
+				this.mainService
+				  .getFetchData("simple/data", "incidentCategory", data.categoryId)
+				  .subscribe((res) => {
+						category1 = res.data.parent;
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+							searchQuery:{
+								statusValue: 'close',
+								hierarchy: data.hierarchy,
+								categoryId: data.categoryId,
+								evaluateId: 20424,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								userId: this.fieldConfig.fields.userId || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								placeId: this.fieldConfig.fields.floorId || undefined,
+								floorId: this.fieldConfig.fields.floorId || undefined,
+								companyId: this.fieldConfig.fields.companyId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+								floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userDTO: this.fieldConfig.fields.userDTO || undefined,
+								evaluateDTO: {
+										"id": 20424,
+										"key": "incident_degree",
+										"name": "不满意",
+										"value": "1",
+										"orders": 5,
+										"extra1": "",
+										"extra2": ""
+								},
+								category1DTO: category1,
+								category2DTO: {
+									category: data.category,
+									id: data.categoryId,
+								},
+							}
+						}
+						let path = '/newStatistics/maintenanceStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+					});
+			}else{
+				query = {
+					startDate: this.customChangeDateComponent.startDate || undefined,
+					endDate: this.customChangeDateComponent.endDate || undefined,
+					repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+					searchQuery:{
+						statusValue: 'close',
+						hierarchy: data.hierarchy,
+						categoryId: data.categoryId,
+						evaluateId: 20424,
+						groupId: this.fieldConfig.fields.groupId || undefined,
+						userId: this.fieldConfig.fields.userId || undefined,
+						buildingId: this.fieldConfig.fields.buildingId || undefined,
+						placeId: this.fieldConfig.fields.floorId || undefined,
+						floorId: this.fieldConfig.fields.floorId || undefined,
+						companyId: this.fieldConfig.fields.companyId || undefined,
+						buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+						companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+						floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+						groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+						userDTO: this.fieldConfig.fields.userDTO || undefined,
+						evaluateDTO: {
+								"id": 20424,
+								"key": "incident_degree",
+								"name": "不满意",
+								"value": "1",
+								"orders": 5,
+								"extra1": "",
+								"extra2": ""
+						},
+						category1DTO: item,
+						category2DTO: {
+							category: data.category,
+							id: data.categoryId,
+						},
+					}
 				}
+				let path = '/newStatistics/maintenanceStatistics/incidentList'
+				let flag = this.tabService.tabs.some(v => v.path === path);
+				flag && this.tabService.deleteRouteSnapshot(path);
+				this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+				this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+				sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+				this.router.navigate([path], { replaceUrl: true });
 			}
 		}
-
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
 	}
 	
   getQueryParams(){

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

@@ -116,8 +116,13 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 数据下钻
@@ -147,6 +152,15 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
 					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
+					evaluateDTO: {
+						"id": 20424,
+						"key": "incident_degree",
+						"name": "不满意",
+						"value": "1",
+						"orders": 5,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}else{
@@ -173,12 +187,26 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
 					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
+					evaluateDTO: {
+						"id": 20424,
+						"key": "incident_degree",
+						"name": "不满意",
+						"value": "1",
+						"orders": 5,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 数据下钻
@@ -208,6 +236,15 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
 					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
+					evaluateDTO: {
+						"id": 20423,
+						"key": "incident_degree",
+						"name": "一般",
+						"value": "2",
+						"orders": 4,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}else{
@@ -234,12 +271,26 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
 					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
+					evaluateDTO: {
+						"id": 20423,
+						"key": "incident_degree",
+						"name": "一般",
+						"value": "2",
+						"orders": 4,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 数据下钻
@@ -269,6 +320,15 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
 					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
+					evaluateDTO: {
+						"id": 20422,
+						"key": "incident_degree",
+						"name": "满意",
+						"value": "3",
+						"orders": 3,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}else{
@@ -295,12 +355,26 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
 					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
+					evaluateDTO: {
+						"id": 20422,
+						"key": "incident_degree",
+						"name": "满意",
+						"value": "3",
+						"orders": 3,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 数据下钻
@@ -330,6 +404,15 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
 					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
+					evaluateDTO: {
+						"id": 20421,
+						"key": "incident_degree",
+						"name": "较满意",
+						"value": "2",
+						"orders": 2,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}else{
@@ -356,12 +439,26 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
 					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
+					evaluateDTO: {
+						"id": 20421,
+						"key": "incident_degree",
+						"name": "较满意",
+						"value": "2",
+						"orders": 2,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 数据下钻
@@ -399,12 +496,26 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 					groupId: this.fieldConfig.fields.groupId || undefined,
 					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
+					evaluateDTO: {
+						"id": 20420,
+						"key": "incident_degree",
+						"name": "非常满意",
+						"value": "1",
+						"orders": 1,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
   getQueryParams(){

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

@@ -116,8 +116,13 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 数据下钻
@@ -147,6 +152,10 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
 					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
+					overtimeDTO:{
+						id: 1,
+						name: "是"
+					},
 				}
 			}
 		}else{
@@ -173,12 +182,21 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
 					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
+					overtimeDTO:{
+						id: 1,
+						name: "是"
+					},
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 数据下钻
@@ -208,6 +226,10 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
 					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
+					isHangDTO:{
+						id: 1,
+						name: "是"
+					},
 				}
 			}
 		}else{
@@ -234,12 +256,21 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
 					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
+					isHangDTO:{
+						id: 1,
+						name: "是"
+					},
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 数据下钻
@@ -269,6 +300,15 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
 					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
+					evaluateDTO: {
+						"id": 20424,
+						"key": "incident_degree",
+						"name": "不满意",
+						"value": "1",
+						"orders": 5,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}else{
@@ -295,12 +335,26 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
 					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
+					evaluateDTO: {
+						"id": 20424,
+						"key": "incident_degree",
+						"name": "不满意",
+						"value": "1",
+						"orders": 5,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
   getQueryParams(){

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

@@ -83,12 +83,21 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO:{
+						groupName: data.groupName,
+						id: data.groupId ? data.groupId : -1,
+					}
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 数据下钻
@@ -111,6 +120,10 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					overtimeDTO:{
+						id: 1,
+						name: "是"
+					},
 				}
 			}
 		}else{
@@ -131,12 +144,25 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO:{
+						groupName: data.groupName,
+						id: data.groupId ? data.groupId : -1,
+					},
+					overtimeDTO:{
+						id: 1,
+						name: "是"
+					},
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 数据下钻
@@ -159,6 +185,10 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					isHangDTO:{
+						id: 1,
+						name: "是"
+					},
 				}
 			}
 		}else{
@@ -179,12 +209,25 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO:{
+						groupName: data.groupName,
+						id: data.groupId ? data.groupId : -1,
+					},
+					isHangDTO:{
+						id: 1,
+						name: "是"
+					},
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 数据下钻
@@ -207,6 +250,15 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					evaluateDTO: {
+						"id": 20424,
+						"key": "incident_degree",
+						"name": "不满意",
+						"value": "1",
+						"orders": 5,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}else{
@@ -227,12 +279,30 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO:{
+						groupName: data.groupName,
+						id: data.groupId ? data.groupId : -1,
+					},
+					evaluateDTO: {
+						"id": 20424,
+						"key": "incident_degree",
+						"name": "不满意",
+						"value": "1",
+						"orders": 5,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
   getQueryParams(){

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

@@ -1,6 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <app-custom-change-date #customChangeDate [isShowType]="false" [dateData1]="dateData1" [dateData2]="dateData2"></app-custom-change-date>
+    <app-custom-change-date #customChangeDate [isShowType]="false"></app-custom-change-date>
     <div class="searchDataItem">
       <span class="label">报修科室</span>：
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">

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

@@ -37,13 +37,14 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
   ngOnInit() {
 		// 数据下钻搜索
 		this.getRouteQuery()
-		this.router.events
-		  .pipe(filter(event => event instanceof NavigationEnd))
-		  .subscribe((event: NavigationEnd) => {
-		    if(event.urlAfterRedirects.endsWith('/incidentList')){
-					this.getRouteQuery()
-		    }
-		  });
+		// this.router.events
+		//   .pipe(filter(event => event instanceof NavigationEnd))
+		//   .subscribe((event: NavigationEnd) => {
+		//     if(event.urlAfterRedirects=='/newStatistics/maintenanceStatistics/incidentList'){
+		// 			console.log('维修=================')
+		// 			this.getRouteQuery()
+		//     }
+		//   });
 
     this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
       let fun = v[0];
@@ -57,10 +58,6 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 	
   ngAfterViewInit(){
     this.initSessionData();
-    this.getQueryParams();
-    setTimeout(() => {
-      this.search();
-    }, 0)
     this.onResize(0);
   }
 
@@ -80,15 +77,6 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 			query = JSON.parse(data)
 			console.log('query==========',query)
 			setTimeout(_=>{
-				// console.log(777,this.customChangeDateComponent)
-				if(query.startDate){
-					this.dateData1 = query.startDate
-					this.customChangeDateComponent.startDate = query.startDate
-				}
-				if(query.endDate){
-					this.dateData2 = query.endDate
-					this.customChangeDateComponent.endDate = query.endDate
-				}
 				if(query.repairDeptId){
 					this.getRepairDeptList();
 					this.repairDeptId = query.repairDeptId
@@ -102,20 +90,27 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 					this.goingType = false
 					this.fieldConfig.fields = {}
 				}
-				
-				this.search();
-				this.onResize(37);
-			})
+				this.getQueryParams();
+			},50)
+		}else{
+			setTimeout(_=>{
+				this.getQueryParams();
+			},50)
 		}
 	}
 	
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();
+		console.log(8989898,queryParams)
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
-      this.customChangeDateComponent.initByDate(this.dateRange);
+      this.customChangeDateComponent.initByDate(this.dateRange, queryParams.defRange);
     }
+		setTimeout(_=>{
+			this.search();
+			this.onResize(37);
+		},50)
   }
 
   get getMoreFilter(){
@@ -175,7 +170,7 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
-      dateType: this.customChangeDateComponent.dateType,
+      dateType: this.customChangeDateComponent.dateType || undefined,
       startDate: this.customChangeDateComponent.startDate || undefined,
       endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.hosId || undefined,
@@ -193,8 +188,8 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 			companyId: this.fieldConfig.fields.companyId || undefined,
 			repairUserId: this.fieldConfig.fields.repairUserId || undefined,
 			consumableId: this.fieldConfig.fields.consumableId || undefined,
-			timeout: this.fieldConfig.fields.overtimeId==0 ? undefined : this.fieldConfig.fields.overtimeId,
-			hangUp: this.fieldConfig.fields.isHangId==0 ? undefined : this.fieldConfig.fields.isHangId,
+			timeout: this.fieldConfig.fields.overtimeId,
+			hangUp: this.fieldConfig.fields.isHangId,
 			incidentSign: this.fieldConfig.fields.codeNum,
 			wxDegreeId: this.fieldConfig.fields.evaluateId,
 			statusValue: this.fieldConfig.fields.statusValue || undefined,
@@ -264,8 +259,8 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
     	companyId: this.fieldConfig.fields.companyId || undefined,
     	repairUserId: this.fieldConfig.fields.repairUserId || undefined,
     	consumableId: this.fieldConfig.fields.consumableId || undefined,
-    	timeout: this.fieldConfig.fields.overtimeId==0 ? undefined : this.fieldConfig.fields.overtimeId,
-    	hangUp: this.fieldConfig.fields.isHangId==0 ? undefined : this.fieldConfig.fields.isHangId,
+    	timeout: this.fieldConfig.fields.overtimeId,
+    	hangUp: this.fieldConfig.fields.isHangId,
     	incidentSign: this.fieldConfig.fields.codeNum,
 			wxDegreeId: this.fieldConfig.fields.evaluateId,
 			statusValue: this.fieldConfig.fields.statusValue || undefined,
@@ -307,12 +302,14 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
     this.dateRange = []
+		this.dateData1 = null;
+		this.dateData2 = null;
     this.repairDeptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined};
     this.customChangeDateComponent.resetByDate();
+		sessionStorage.removeItem('maintenanceData');
     this.search();
 		this.onResize(0);
-		sessionStorage.removeItem('maintenanceData');
   }
 
   // 科室搜索

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

@@ -55,7 +55,7 @@
       <td>{{ data.consumablePrice }}</td>
       <td>{{ data.workHourPrice }}</td>
       <td>{{ data.totalPrice }}</td>
-      <td class="text-sign" (click)="viewDetail3(data)">{{ data.negativeNum }}</td>
+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.negativeNum }}</td>
       <td>{{ data.favorableRate }}</td>
     </tr>
   </tbody>

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

@@ -79,6 +79,13 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
 					userDTO: this.fieldConfig.fields.userDTO,
 				}
 			}
+			let path = '/newStatistics/maintenanceStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
 		}else{
 			 query = {
 				startDate: data.startDate + ' ' + '00:00:00',
@@ -99,10 +106,14 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
 					userDTO: this.fieldConfig.fields.userDTO,
 				}
 			}
+			let path = '/newStatistics/maintenanceStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [data.startDate + ' ' + '00:00:00', data.startDate + ' ' + '23:59:59']);
+			this.tabService.setQueryParams('defRange', null);
+			sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
 		}
-
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
 	}
 	
 	// 数据下钻
@@ -127,8 +138,19 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
 					groupDTO: this.fieldConfig.fields.groupDTO,
 					sourceDTO: this.fieldConfig.fields.sourceDTO,
 					userDTO: this.fieldConfig.fields.userDTO,
+					overtimeDTO:{
+						id: 1,
+						name: "是"
+					},
 				}
 			}
+			let path = '/newStatistics/maintenanceStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
 		}else{
 			query = {
 				startDate: data.startDate + ' ' + '00:00:00',
@@ -148,12 +170,20 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
 					groupDTO: this.fieldConfig.fields.groupDTO,
 					sourceDTO: this.fieldConfig.fields.sourceDTO,
 					userDTO: this.fieldConfig.fields.userDTO,
+					overtimeDTO:{
+						id: 1,
+						name: "是"
+					},
 				}
 			}
+			let path = '/newStatistics/maintenanceStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [data.startDate + ' ' + '00:00:00', data.startDate + ' ' + '23:59:59']);
+			this.tabService.setQueryParams('defRange', null);
+			sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
 		}
-
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
 	}
 	
 	// 数据下钻
@@ -178,8 +208,19 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
 					groupDTO: this.fieldConfig.fields.groupDTO,
 					sourceDTO: this.fieldConfig.fields.sourceDTO,
 					userDTO: this.fieldConfig.fields.userDTO,
+					isHangDTO: {
+						id: 1,
+						name: "是"
+					},
 				}
 			}
+			let path = '/newStatistics/maintenanceStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
 		}else{
 			query = {
 				startDate: data.startDate + ' ' + '00:00:00',
@@ -199,12 +240,20 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
 					groupDTO: this.fieldConfig.fields.groupDTO,
 					sourceDTO: this.fieldConfig.fields.sourceDTO,
 					userDTO: this.fieldConfig.fields.userDTO,
+					isHangDTO: {
+						id: 1,
+						name: "是"
+					},
 				}
 			}
+			let path = '/newStatistics/maintenanceStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [data.startDate + ' ' + '00:00:00', data.startDate + ' ' + '23:59:59']);
+			this.tabService.setQueryParams('defRange', null);
+			sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
 		}
-
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
 	}
 	
 	// 数据下钻
@@ -229,8 +278,24 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
 					groupDTO: this.fieldConfig.fields.groupDTO,
 					sourceDTO: this.fieldConfig.fields.sourceDTO,
 					userDTO: this.fieldConfig.fields.userDTO,
+					evaluateDTO: {
+						"id": 20424,
+						"key": "incident_degree",
+						"name": "不满意",
+						"value": "1",
+						"orders": 5,
+						"extra1": "",
+						"extra2": ""
+					},
 				}
 			}
+			let path = '/newStatistics/maintenanceStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
 		}else{
 			query = {
 				startDate: data.startDate + ' ' + '00:00:00',
@@ -250,12 +315,25 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
 					groupDTO: this.fieldConfig.fields.groupDTO,
 					sourceDTO: this.fieldConfig.fields.sourceDTO,
 					userDTO: this.fieldConfig.fields.userDTO,
+					evaluateDTO: {
+						"id": 20424,
+						"key": "incident_degree",
+						"name": "不满意",
+						"value": "1",
+						"orders": 5,
+						"extra1": "",
+						"extra2": ""
+					},
 				}
 			}
+			let path = '/newStatistics/maintenanceStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [data.startDate + ' ' + '00:00:00', data.startDate + ' ' + '23:59:59']);
+			this.tabService.setQueryParams('defRange', null);
+			sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
 		}
-
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
 	}
 	
   getQueryParams(){

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

@@ -75,11 +75,16 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 	// 汇总
 	viewDetail1(){
 		let query = {
-			startDate: this.customChangeDateComponent.startDate,
-			endDate: this.customChangeDateComponent.endDate
+			
 		}
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		this.router.navigate([path], { replaceUrl: true });
+		// this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
 	}
 	
 	// 挂起
@@ -88,11 +93,20 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 			startDate: this.customChangeDateComponent.startDate,
 			endDate: this.customChangeDateComponent.endDate,
 			searchQuery:{
-				isHangId: 1
+				isHangId: 1,
+				isHangDTO:{
+					id: 1,
+					name: "是"
+				}
 			}
 		}
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 超时
@@ -101,11 +115,20 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 			startDate: this.customChangeDateComponent.startDate,
 			endDate: this.customChangeDateComponent.endDate,
 			searchQuery:{
-				overtimeId: 1
+				overtimeId: 1,
+				overtimeDTO:{
+					id: 1,
+					name: "是"
+				}
 			}
 		}
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 差评
@@ -114,11 +137,25 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 			startDate: this.customChangeDateComponent.startDate,
 			endDate: this.customChangeDateComponent.endDate,
 			searchQuery:{
-				evaluateId: 20424
+				evaluateId: 20424,
+				evaluateDTO: {
+						"id": 20424,
+						"key": "incident_degree",
+						"name": "不满意",
+						"value": "1",
+						"orders": 5,
+						"extra1": "",
+						"extra2": ""
+				}
 			}
 		}
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 维修处理top5
@@ -129,18 +166,35 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 			searchQuery:{
 				statusValue: 'close',
 				groupId:null,
-				userId:null
+				groupDTO:null,
+				userId:null,
+				userDTO:null
 			}
 		}
 		if(this.activeIndex==0){
 			query.searchQuery.userId = data.userId ? data.userId : -1
+			query.searchQuery.userDTO = {
+				name: data.name,
+				id: data.userId
+			}
 			delete query.searchQuery.groupId
+			delete query.searchQuery.groupDTO
 		}else{
 			query.searchQuery.groupId = data.groupId ? data.groupId: -1
+			query.searchQuery.groupDTO = {
+				groupName: data.name,
+				id: data.groupId
+			}
 			delete query.searchQuery.userId
+			delete query.searchQuery.userDTO
 		}
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	viewMaintain2(data){
@@ -151,18 +205,40 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 				statusValue: 'close',
 				groupId:null,
 				userId:null,
-				overtimeId: 1
+				groupDTO:null,
+				userDTO:null,
+				overtimeId: 1,
+				overtimeDTO:{
+					id: 1,
+					name: "是"
+				}
 			}
 		}
+		
 		if(this.activeIndex==0){
 			query.searchQuery.userId = data.userId ? data.userId : -1
+			query.searchQuery.userDTO = {
+				name: data.name,
+				id: data.userId
+			}
 			delete query.searchQuery.groupId
+			delete query.searchQuery.groupDTO
 		}else{
 			query.searchQuery.groupId = data.groupId ? data.groupId: -1
+			query.searchQuery.groupDTO = {
+				groupName: data.name,
+				id: data.groupId
+			}
 			delete query.searchQuery.userId
+			delete query.searchQuery.userDTO
 		}
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 课科室费用top5
@@ -175,8 +251,13 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 				statusValue: 'close',
 			}
 		}
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 维修处理类型切换
@@ -457,6 +538,7 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
     let flag = this.tabService.tabs.some(v => v.path === path);
     flag && this.tabService.deleteRouteSnapshot(path);
     this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+    this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
     this.router.navigate([path], { replaceUrl: true });
 	}
 
@@ -575,7 +657,10 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 		this.dateRange = [];
 		this.activeIndex = 0;
     this.customChangeDateComponent.resetByDate();
-		this.search();
+		sessionStorage.removeItem('maintenanceData');
+		setTimeout(_=>{
+			this.search();
+		})
 	}
 
   // 搜索

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

@@ -102,13 +102,21 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
-					companyDTO: item || undefined,
+					companyDTO:{
+						name: data.companyName,
+						id: data.companyId ? data.companyId : -1,
+					}
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 数据下钻
@@ -139,6 +147,10 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					companyDTO: item || undefined,
+					overtimeDTO:{
+						id: 1,
+						name: "是"
+					},
 				}
 			}
 		}else{
@@ -161,13 +173,25 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
-					companyDTO: item || undefined,
+					companyDTO:{
+						name: data.companyName,
+						id: data.companyId ? data.companyId : -1,
+					},
+					overtimeDTO:{
+						id: 1,
+						name: "是"
+					},
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 数据下钻
@@ -198,6 +222,10 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					companyDTO: item || undefined,
+					isHangDTO:{
+						id: 1,
+						name: "是"
+					},
 				}
 			}
 		}else{
@@ -220,13 +248,25 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
-					companyDTO: item || undefined,
+					companyDTO:{
+						name: data.companyName,
+						id: data.companyId ? data.companyId : -1,
+					},
+					isHangDTO:{
+						id: 1,
+						name: "是"
+					},
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 数据下钻
@@ -257,6 +297,15 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					companyDTO: item || undefined,
+					evaluateDTO: {
+						"id": 20424,
+						"key": "incident_degree",
+						"name": "不满意",
+						"value": "1",
+						"orders": 5,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}else{
@@ -279,13 +328,30 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
-					companyDTO: item || undefined,
+					companyDTO:{
+						name: data.companyName,
+						id: data.companyId ? data.companyId : -1,
+					},
+					evaluateDTO: {
+						"id": 20424,
+						"key": "incident_degree",
+						"name": "不满意",
+						"value": "1",
+						"orders": 5,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
   getQueryParams(){

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

@@ -1,7 +1,7 @@
 <div class="searchDataWrap">
   <div class="searchData">
     <app-custom-change-date #customChangeDate [isShowType]="false"></app-custom-change-date>
-    <div class="searchDataItem">
+<!--    <div class="searchDataItem">
       <span class="label">维修人员</span>：
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeUserInp($event)" nzAllowClear nzPlaceHolder="请选择维修人员" [(ngModel)]="userId" (nzOpenChange)="openChangeUser($event)">
         <ng-container *ngFor="let option of userList">
@@ -11,7 +11,7 @@
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
         </nz-option>
       </nz-select>
-    </div>
+    </div> -->
   </div>
   <div class="operation">
     <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
@@ -20,8 +20,9 @@
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
   </div>
 </div>
-<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.repairDeptDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO || fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.repairDeptDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO || fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO">
   <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
+	<span>{{fieldConfig.fields.userDTO?.name}}</span>
   <span>{{fieldConfig.fields.category1DTO?.category}}</span>
   <span>{{fieldConfig.fields.category2DTO?.category}}</span>
   <span>{{fieldConfig.fields.category3DTO?.category}}</span>

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

@@ -75,7 +75,7 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					floorId: this.fieldConfig.fields.floorId || undefined,
 					groupId: this.fieldConfig.fields.groupId || undefined,
-					userId: this.userId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
 					placeId: this.fieldConfig.fields.floorId || undefined,
 					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
 					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
@@ -83,7 +83,7 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO : item || undefined,
+					userDTO : this.fieldConfig.fields.userDTO || undefined,
 				}
 			}
 		}else{
@@ -106,13 +106,21 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO : item || undefined,
+					userDTO:{
+						name: data.userName,
+						id: data.userId ? data.userId : -1,
+					},
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 数据下钻
@@ -135,7 +143,7 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					floorId: this.fieldConfig.fields.floorId || undefined,
 					groupId: this.fieldConfig.fields.groupId || undefined,
-					userId: this.userId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
 					placeId: this.fieldConfig.fields.floorId || undefined,
 					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
 					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
@@ -143,7 +151,16 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO : item || undefined,
+					userDTO : this.fieldConfig.fields.userDTO || undefined,
+					evaluateDTO: {
+						"id": 20424,
+						"key": "incident_degree",
+						"name": "不满意",
+						"value": "1",
+						"orders": 5,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}else{
@@ -167,13 +184,30 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO : item || undefined,
+					userDTO:{
+						name: data.userName,
+						id: data.userId ? data.userId : -1,
+					},
+					evaluateDTO: {
+						"id": 20424,
+						"key": "incident_degree",
+						"name": "不满意",
+						"value": "1",
+						"orders": 5,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 数据下钻
@@ -196,7 +230,7 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					floorId: this.fieldConfig.fields.floorId || undefined,
 					groupId: this.fieldConfig.fields.groupId || undefined,
-					userId: this.userId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
 					placeId: this.fieldConfig.fields.floorId || undefined,
 					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
 					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
@@ -204,7 +238,16 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO : item || undefined,
+					userDTO : this.fieldConfig.fields.userDTO || undefined,
+					evaluateDTO: {
+						"id": 20423,
+						"key": "incident_degree",
+						"name": "一般",
+						"value": "2",
+						"orders": 4,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}else{
@@ -228,13 +271,30 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO : item || undefined,
+					userDTO:{
+						name: data.userName,
+						id: data.userId ? data.userId : -1,
+					},
+					evaluateDTO: {
+						"id": 20423,
+						"key": "incident_degree",
+						"name": "一般",
+						"value": "2",
+						"orders": 4,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 数据下钻
@@ -257,7 +317,7 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					floorId: this.fieldConfig.fields.floorId || undefined,
 					groupId: this.fieldConfig.fields.groupId || undefined,
-					userId: this.userId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
 					placeId: this.fieldConfig.fields.floorId || undefined,
 					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
 					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
@@ -265,7 +325,16 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO : item || undefined,
+					userDTO : this.fieldConfig.fields.userDTO || undefined,
+					evaluateDTO: {
+						"id": 20422,
+						"key": "incident_degree",
+						"name": "满意",
+						"value": "3",
+						"orders": 3,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}else{
@@ -289,13 +358,30 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO : item || undefined,
+					userDTO:{
+						name: data.userName,
+						id: data.userId ? data.userId : -1,
+					},
+					evaluateDTO: {
+						"id": 20422,
+						"key": "incident_degree",
+						"name": "满意",
+						"value": "3",
+						"orders": 3,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 数据下钻
@@ -318,7 +404,7 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					floorId: this.fieldConfig.fields.floorId || undefined,
 					groupId: this.fieldConfig.fields.groupId || undefined,
-					userId: this.userId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
 					placeId: this.fieldConfig.fields.floorId || undefined,
 					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
 					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
@@ -326,7 +412,16 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO : item || undefined,
+					userDTO : this.fieldConfig.fields.userDTO || undefined,
+					evaluateDTO: {
+						"id": 20421,
+						"key": "incident_degree",
+						"name": "较满意",
+						"value": "2",
+						"orders": 2,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}else{
@@ -350,13 +445,30 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO : item || undefined,
+					userDTO:{
+						name: data.userName,
+						id: data.userId ? data.userId : -1,
+					},
+					evaluateDTO: {
+						"id": 20421,
+						"key": "incident_degree",
+						"name": "较满意",
+						"value": "2",
+						"orders": 2,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 数据下钻
@@ -379,7 +491,7 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					floorId: this.fieldConfig.fields.floorId || undefined,
 					groupId: this.fieldConfig.fields.groupId || undefined,
-					userId: this.userId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
 					placeId: this.fieldConfig.fields.floorId || undefined,
 					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
 					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
@@ -387,7 +499,7 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO : item || undefined,
+					userDTO : this.fieldConfig.fields.userDTO || undefined,
 				}
 			}
 		}else{
@@ -411,13 +523,30 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO : item || undefined,
+					userDTO:{
+						name: data.userName,
+						id: data.userId ? data.userId : -1,
+					},
+					evaluateDTO: {
+						"id": 20420,
+						"key": "incident_degree",
+						"name": "非常满意",
+						"value": "1",
+						"orders": 1,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
   getQueryParams(){
@@ -487,12 +616,12 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
-      userId: this.userId || undefined,
+      userId: this.fieldConfig.fields.userId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       hierarchy: this.fieldConfig.fields.hierarchy || undefined,
-      groupId: this.fieldConfig.fields.groupId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
     };
     if (field && sort) {
@@ -540,12 +669,12 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
-      userId: this.userId || undefined,
+      userId: this.fieldConfig.fields.userId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       hierarchy: this.fieldConfig.fields.hierarchy || undefined,
-      groupId: this.fieldConfig.fields.groupId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
@@ -628,8 +757,8 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 
   // 详细搜索
   fieldConfig:any = {
-    fields: {buildingId: undefined, floorId: undefined, categoryId: undefined, groupId: undefined, repairDeptId: undefined},
-    config: {buildingAndFloor: true, category123: true, group: true, repairDept: true},
+    fields: {buildingId: undefined, floorId: undefined, categoryId: undefined, groupId: undefined, repairDeptId: undefined, userId: undefined},
+    config: {buildingAndFloor: true, category123: true, groupAndUser: true, repairDept: true},
   }
   showSearchMore:boolean = false;
   showMore(){

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

@@ -1,7 +1,7 @@
 <div class="searchDataWrap">
   <div class="searchData">
     <app-custom-change-date #customChangeDate [isShowType]="false"></app-custom-change-date>
-    <div class="searchDataItem">
+ <!--   <div class="searchDataItem">
       <span class="label">维修人员</span>：
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeUserInp($event)" nzAllowClear nzPlaceHolder="请选择维修人员" [(ngModel)]="userId" (nzOpenChange)="openChangeUser($event)">
         <ng-container *ngFor="let option of userList">
@@ -11,7 +11,7 @@
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
         </nz-option>
       </nz-select>
-    </div>
+    </div> -->
   </div>
   <div class="operation">
     <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
@@ -20,8 +20,9 @@
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
   </div>
 </div>
-<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO || fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO || fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO">
   <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
+	<span>{{fieldConfig.fields.userDTO?.name}}</span>
   <span>{{fieldConfig.fields.category1DTO?.category}}</span>
   <span>{{fieldConfig.fields.category2DTO?.category}}</span>
   <span>{{fieldConfig.fields.category3DTO?.category}}</span>

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

@@ -59,17 +59,13 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 	// 数据下钻
 	viewDetail1(data, type){
 		let query = null
-		let item = null;
-		if(this.userId){
-		  item = this.userList.find(item => item.id == this.userId);
-		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
 				searchQuery:{
 					statusValue: 'close',
-					userId: this.userId,
+					userId: this.fieldConfig.fields.userId || undefined,
 					categoryId: this.fieldConfig.fields.categoryId || undefined,
 					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
@@ -82,7 +78,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO : item || undefined
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
 				}
 			}
 		}else{
@@ -91,7 +87,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 				endDate: this.customChangeDateComponent.endDate || undefined,
 				searchQuery:{
 					statusValue: 'close',
-					userId: data.userId ? data.userId : -1,
+					userId: data.userId ? data.userId : -1 || undefined,
 					categoryId: this.fieldConfig.fields.categoryId || undefined,
 					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
@@ -104,22 +100,30 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO : item || undefined
+					userDTO:{
+						name: data.userName,
+						id: data.userId ? data.userId : -1,
+					}
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 数据下钻
 	viewDetail2(data, type){
 		let query = null
-		let item = null;
-		if(this.userId){
-		  item = this.userList.find(item => item.id == this.userId);
-		}
+		// let item = null;
+		// if(this.userId){
+		//   item = this.userList.find(item => item.id == this.userId);
+		// }
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
@@ -127,7 +131,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 				searchQuery:{
 					statusValue: 'close',
 					overtimeId: 1,
-					userId: this.userId,
+					userId: this.fieldConfig.fields.userId || undefined,
 					categoryId: this.fieldConfig.fields.categoryId || undefined,
 					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
@@ -140,7 +144,11 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO : item || undefined
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					overtimeDTO:{
+						id: 1,
+						name: "是"
+					},
 				}
 			}
 		}else{
@@ -163,22 +171,34 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO : item || undefined
+					userDTO:{
+						name: data.userName,
+						id: data.userId ? data.userId : -1,
+					},
+					overtimeDTO:{
+						id: 1,
+						name: "是"
+					},
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 数据下钻
 	viewDetail3(data, type){
 		let query = null
-		let item = null;
-		if(this.userId){
-		  item = this.userList.find(item => item.id == this.userId);
-		}
+		// let item = null;
+		// if(this.userId){
+		//   item = this.userList.find(item => item.id == this.userId);
+		// }
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
@@ -186,7 +206,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 				searchQuery:{
 					statusValue: 'close',
 					isHangId: 1,
-					userId: this.userId,
+					userId: this.fieldConfig.fields.userId || undefined,
 					categoryId: this.fieldConfig.fields.categoryId || undefined,
 					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
@@ -199,7 +219,11 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO : item || undefined
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					isHangDTO:{
+						id: 1,
+						name: "是"
+					},
 				}
 			}
 		}else{
@@ -222,13 +246,25 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO : item || undefined
+					userDTO:{
+						name: data.userName,
+						id: data.userId ? data.userId : -1,
+					},
+					isHangDTO:{
+						id: 1,
+						name: "是"
+					},
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
 	// 数据下钻
@@ -245,7 +281,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 				searchQuery:{
 					statusValue: 'close',
 					evaluateId: 20424,
-					userId: this.userId,
+					userId: this.fieldConfig.fields.userId || undefined,
 					categoryId: this.fieldConfig.fields.categoryId || undefined,
 					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
@@ -258,7 +294,16 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO : item || undefined
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					evaluateDTO: {
+						"id": 20424,
+						"key": "incident_degree",
+						"name": "不满意",
+						"value": "1",
+						"orders": 5,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}else{
@@ -281,13 +326,30 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
-					userDTO : item || undefined
+					userDTO:{
+						name: data.userName,
+						id: data.userId ? data.userId : -1,
+					},
+					evaluateDTO: {
+						"id": 20424,
+						"key": "incident_degree",
+						"name": "不满意",
+						"value": "1",
+						"orders": 5,
+						"extra1": "",
+						"extra2": ""
+					}
 				}
 			}
 		}
 
-		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let path = '/newStatistics/maintenanceStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
 	}
 	
   getQueryParams(){
@@ -357,12 +419,12 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
-      userId: this.userId || undefined,
+      userId: this.fieldConfig.fields.userId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       hierarchy: this.fieldConfig.fields.hierarchy || undefined,
-      groupId: this.fieldConfig.fields.groupId || undefined,
+			groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
     };
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
@@ -409,12 +471,12 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
-      userId: this.userId || undefined,
+      userId: this.fieldConfig.fields.userId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       hierarchy: this.fieldConfig.fields.hierarchy || undefined,
-      groupId: this.fieldConfig.fields.groupId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
@@ -448,7 +510,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
     this.dateRange = []
-    this.userId = undefined;
+    // this.userId = undefined;
     this.fieldConfig.fields = {buildingId: undefined, floorId: undefined, categoryId: undefined, groupId: undefined};
     this.customChangeDateComponent.resetByDate();
 		sessionStorage.removeItem('maintenanceData');
@@ -496,8 +558,8 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 
   // 详细搜索
   fieldConfig:any = {
-    fields: {buildingId: undefined, floorId: undefined, categoryId: undefined, groupId: undefined},
-    config: {buildingAndFloor: true, category123: true, group: true},
+    fields: {buildingId: undefined, floorId: undefined, categoryId: undefined, groupId: undefined, userId: undefined},
+    config: {buildingAndFloor: true, category123: true, groupAndUser: true},
   }
   showSearchMore:boolean = false;
   showMore(){

src/app/views/operation-config/operation-config.component.html

@@ -89,6 +89,16 @@
 				  <nz-form-label class="label">是否开启病理申请单</nz-form-label>
 				  <nz-checkbox-group [(ngModel)]="isPathologyForm"></nz-checkbox-group>
 				</div>
+				<!-- 是否根据首台标识 -->
+				<div class="display_flex align-items_center mb8">
+				  <nz-form-label class="label">是否根据首台标识</nz-form-label>
+				  <nz-checkbox-group [(ngModel)]="firstOperation"></nz-checkbox-group>
+				</div>
+				<!-- 限定时间 -->
+				<div class="display_flex align-items_center mb8">
+				  <nz-form-label class="label">限定时间</nz-form-label>
+					<nz-time-picker [(ngModel)]="firstOperationLimitTime" nzFormat="HH:mm" nzPlaceHolder="限定时间"></nz-time-picker>
+				</div>
       </div>
       <!-- 自动建单配置 -->
       <div *ngIf="tabModalName=='automaticOrderCreation'">

src/app/views/operation-config/operation-config.component.ts

@@ -52,6 +52,12 @@ export class OperationConfigComponent implements OnInit {
 	isFrozenSpecimen:any[] = [
 	  {label:'是否开启',value: 0}
 	];
+	// 是否根据首台标识
+	firstOperation:any[] = [
+	  {label:'是否开启',value: 0}
+	];
+	// 限定时间
+	firstOperationLimitTime: Date | null = null;
   // 建单时间
   autoTime:Date | null = null;
   tasktype1Id:any;
@@ -154,6 +160,8 @@ export class OperationConfigComponent implements OnInit {
 			isPathologyForm: this.isPathologyForm[0].checked ? 1 : 0,
 			isFrozenSpecimen: this.isFrozenSpecimen[0].checked ? 1 : 0,
       cleanTypeId: this.cleanTypeId || undefined,
+			firstOperation: this.firstOperation[0].checked ? 1 : 0,
+			firstOperationLimitTime: this.firstOperationLimitTime ? format(startOfMinute(this.firstOperationLimitTime), 'yyyy-MM-dd HH:mm:ss') : undefined
     };
     let postData = Object.assign({}, this.configs, editData);
     console.log(postData);
@@ -343,6 +351,8 @@ export class OperationConfigComponent implements OnInit {
                 this.surgeryBegin[0].checked = this.configs.surgeryBegin == 1;
 								this.isPathologyForm[0].checked = this.configs.isPathologyForm == 1;
 								this.isFrozenSpecimen[0].checked = this.configs.isFrozenSpecimen == 1;
+								this.firstOperation[0].checked = this.configs.firstOperation == 1;
+								this.firstOperationLimitTime = this.configs.firstOperationLimitTime ? new Date(this.configs.firstOperationLimitTime) : null;
 							}
             });
         }else{

src/app/views/operation-notice/operation-notice.component.html

@@ -24,7 +24,7 @@
             <label class="tabContent_checkbox" nz-checkbox [(ngModel)]="tab.phoneFlag">短信通知内容</label>
             <div class="tabContent_textarea">
               <textarea rows="4" nz-input [(ngModel)]="tab.phoneContent"></textarea>
-              <p>备注：[$变量名称$]可添加<span *ngFor="let item of variableNames; let last = last;" (click)="writeIn(tab, item, $event, 'phoneContent')"><strong>{{item}}</strong><em *ngIf="!last">、</em><em *ngIf="last">。</em></span></p>
+              <p>字段：[$变量名称$]可添加<span *ngFor="let item of variableNames; let last = last;" (click)="writeIn(tab, item, $event, 'phoneContent')"><strong>{{item}}</strong><em *ngIf="!last">、</em><em *ngIf="last">。</em></span></p>
             </div>
           </div>
 
@@ -32,9 +32,36 @@
             <label class="tabContent_checkbox" nz-checkbox [(ngModel)]="tab.wechatFlag">微信通知内容</label>
             <div class="tabContent_textarea">
               <textarea rows="4" nz-input [(ngModel)]="tab.wechatContent"></textarea>
-              <p>备注：[$变量名称$]可添加<span *ngFor="let item of variableNames; let last = last;" (click)="writeIn(tab, item, $event, 'wechatContent')"><strong>{{item}}</strong><em *ngIf="!last">、</em><em *ngIf="last">。</em></span></p>
+              <p>字段：[$变量名称$]可添加<span *ngFor="let item of variableNames; let last = last;" (click)="writeIn(tab, item, $event, 'wechatContent')"><strong>{{item}}</strong><em *ngIf="!last">、</em><em *ngIf="last">。</em></span></p>
             </div>
           </div>
+					
+					<div class="tabContent">
+					  <label class="tabContent_checkbox" nz-checkbox [(ngModel)]="tab.outsideFlag">站外消息通知</label>
+					</div>
+					
+					<div class="tabContent">
+					  <label class="tabContent_checkbox">自定义标题</label>
+					  <div class="tabContent_textarea">
+					    <input rows="4" nz-input [(ngModel)]="tab.outsideTitle"/>
+					    <p>字段：[$变量名称$]可添加<span *ngFor="let item of variableNames; let last = last;" (click)="writeIn(tab, item, $event, 'outsideTitle')"><strong>{{item}}</strong><em *ngIf="!last">、</em><em *ngIf="last">。</em></span></p>
+					  </div>
+					</div>
+					
+					<div class="tabContent">
+					  <label class="tabContent_checkbox">消息内容</label>
+					  <div class="tabContent_textarea">
+					    <textarea rows="4" nz-input [(ngModel)]="tab.outsideContent"></textarea>
+					    <p>字段：[$变量名称$]可添加<span *ngFor="let item of variableNames; let last = last;" (click)="writeIn(tab, item, $event, 'outsideContent')"><strong>{{item}}</strong><em *ngIf="!last">、</em><em *ngIf="last">。</em></span></p>
+					  </div>
+					</div>
+					
+					<div class="tabContent" *ngIf="currentChoice.id != 1">
+					  <label class="tabContent_checkbox label">发送时间</label>
+					  <div class="tabContent_textarea">
+							<nz-time-picker [(ngModel)]="tab.sendTime" nzFormat="HH:mm" nzPlaceHolder="发送时间"></nz-time-picker>
+					  </div>
+					</div>
         </div>
       </ng-container>
 

src/app/views/operation-notice/operation-notice.component.less

@@ -185,7 +185,13 @@
       .tabContent{
         margin-bottom: 30px;
         display: flex;
-
+				
+				.label{
+					width: 116px !important;
+					display: flex;
+					align-items: center;
+				}
+				
         .tabContent_checkbox{
           width: 130px;
         }

src/app/views/operation-notice/operation-notice.component.ts

@@ -3,6 +3,7 @@ import { ToolService } from 'src/app/services/tool.service';
 import { MainService } from 'src/app/services/main.service';
 import { ActivatedRoute } from '@angular/router';
 import { KeyValue } from '@angular/common';
+import { format, startOfMinute } from 'date-fns';
 
 @Component({
   selector: 'app-operation-notice',
@@ -30,6 +31,10 @@ export class OperationNoticeComponent implements OnInit {
       wechatFlag: false,
       wechatContent: '',
       orders: 1,
+			sendTime: new Date(),
+			outsideFlag: false,
+			outsideContent: '',
+			outsideTitle:'',
     },
     {
       role: 'docAssistant',
@@ -38,6 +43,10 @@ export class OperationNoticeComponent implements OnInit {
       wechatFlag: false,
       wechatContent: '',
       orders: 2,
+			sendTime: new Date(),
+			outsideFlag: false,
+			outsideContent: '',
+			outsideTitle:'',
     },
     {
       role: 'anesthetist',
@@ -46,6 +55,10 @@ export class OperationNoticeComponent implements OnInit {
       wechatFlag: false,
       wechatContent: '',
       orders: 3,
+			sendTime: new Date(),
+			outsideFlag: false,
+			outsideContent: '',
+			outsideTitle:'',
     },
     {
       role: 'patient',
@@ -54,6 +67,10 @@ export class OperationNoticeComponent implements OnInit {
       wechatFlag: false,
       wechatContent: '',
       orders: 4,
+			sendTime: new Date(),
+			outsideFlag: false,
+			outsideContent: '',
+			outsideTitle:'',
     },
   ];
   tabNames = {
@@ -81,11 +98,23 @@ export class OperationNoticeComponent implements OnInit {
 
   //通知类型列表
   getAllTaskType() {
-    this.allTaskType = [{
+    this.allTaskType = [
+			{
       id: 1,
       taskName: '手术即将开始通知',
       code: 'surgery_begin',
-    }];
+    },
+		{
+		  id: 2,
+		  taskName: '下一日首台通知',
+		  code: 'next_day_first_surgery',
+		},
+		{
+		  id: 3,
+		  taskName: '当日首台通知',
+		  code: 'today_first_surgery',
+		}
+		];
     if (this.allTaskType.length) {
       this.itemChoice(this.allTaskType[0]);
     }
@@ -115,6 +144,8 @@ export class OperationNoticeComponent implements OnInit {
           result.list.forEach(v => {
             v.phoneFlag = v.phoneFlag === 1;
             v.wechatFlag = v.wechatFlag === 1;
+						v.outsideFlag = v.outsideFlag === 1;
+						v.sendTime = v.sendTime ? new Date(v.sendTime) : null; 
           })
           let tabs = result.list || [];
           if(tabs.length){
@@ -178,6 +209,8 @@ export class OperationNoticeComponent implements OnInit {
     this.tabs.forEach(v => {
       v.phoneFlag = v.phoneFlag ? 1 : 0;
       v.wechatFlag = v.wechatFlag ? 1 : 0;
+			v.outsideFlag = v.outsideFlag ? 1 : 0;
+			v.sendTime = v.sendTime ? format(startOfMinute(v.sendTime), 'yyyy-MM-dd HH:mm:ss') : null
     })
     this.mainService
       .simplePost("addListData", "transportMessage", this.tabs)

src/app/views/operation-search/operation-search-routing.module.ts

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { OperationSearchComponent } from './operation-search.component';
+
+
+const routes: Routes = [
+  { path: '', component: OperationSearchComponent }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class OperationSearchRoutingModule { }

src/app/views/operation-search/operation-search.component.html

@@ -0,0 +1,183 @@
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzXl="18" class="list-template__searchBox">
+				<div class="list-template__searchItem">
+				  <span class="label" style="width: 110px;">手术时间范围：</span>
+				  <nz-range-picker [(ngModel)]="searchCriteria.dateRange" (ngModelChange)="changeDate($event)"></nz-range-picker>
+				</div>
+				
+        <div class="list-template__searchItem">
+          <span class="label">申请科室：</span>
+          <nz-select
+            [nzDropdownMatchSelectWidth]="false"
+            class="formItem"
+            nzServerSearch
+            nzShowSearch
+            nzAllowClear
+            nzPlaceHolder="请选择申请科室"
+            [(ngModel)]="searchCriteria.department"
+            (nzOnSearch)="changeInp($event, 'search')"
+            (nzOpenChange)="changeSearch($event)"
+          >
+            <ng-container *ngFor="let data of departmentSearch">
+              <nz-option
+                *ngIf="!isLoading"
+                nzLabel="{{ data.dept }}"
+                nzValue="{{ data.id }}"
+              ></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
+				
+				<div class="list-template__searchItem">
+				  <span class="label">手术室：</span>
+				  <nz-select
+				    [nzDropdownMatchSelectWidth]="false"
+				    class="formItem"
+				    nzServerSearch
+				    nzShowSearch
+				    nzAllowClear
+				    nzPlaceHolder="请选择手术室"
+				    [(ngModel)]="searchCriteria.department"
+				    (nzOnSearch)="changeOperatingRoomInp($event, 'search')"
+				    (nzOpenChange)="changeSearch2($event)"
+				  >
+				    <ng-container *ngFor="let data of operatingRoomDept">
+				      <nz-option
+				        *ngIf="!isLoading"
+				        nzLabel="{{ data.dept }}"
+				        nzValue="{{ data.id }}"
+				      ></nz-option>
+				    </ng-container>
+				    <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+				      <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+				    </nz-option>
+				  </nz-select>
+				</div>
+				
+        <div class="list-template__searchItem">
+          <span class="label">状态：</span>
+          <nz-select
+            [nzDropdownMatchSelectWidth]="false"
+            class="formItem"
+            nzServerSearch
+            nzShowSearch
+            nzAllowClear
+            nzPlaceHolder="请选择状态"
+            [(ngModel)]="searchCriteria.speState"
+            (nzOpenChange)="changeSearch1($event)"
+          >
+            <ng-container *ngFor="let data of types">
+              <nz-option
+                *ngIf="!isLoading1"
+                nzLabel="{{ data.name }}"
+                nzValue="{{ data.id }}"
+              ></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading1" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
+				
+				<div class="list-template__searchItem">
+				  <span class="label">是否首台：</span>
+					<label nz-checkbox [(ngModel)]="searchCriteria.firstOperation"></label>
+				</div>
+      </div>
+      <div nz-col nzXl="6" class="list-template__btns">
+        <button nz-button class="btn default ml8" (click)="reset()">
+          重置
+        </button>
+        <button nz-button class="btn default ml8" (click)="getList(1)">
+          搜索
+        </button>
+      </div>
+    </div>
+    <div class="list-template__bottom">
+      <nz-table
+        class="list-template__nzTable"
+        #headerTable
+        [nzData]="listOfData"
+        nzSize="middle"
+        [nzShowPagination]="false"
+        [nzLoading]="loading1"
+      >
+        <thead (nzSortChange)="sort($event)" nzSingleSort>
+          <tr class="thead">
+            <th nzWidth="4%">序号</th>
+            <th nzWidth="8%">申请科室</th>
+            <th nzWidth="7%">患者姓名</th>
+            <th nzWidth="5%">标本编码</th>
+            <th nzWidth="8%">检验项目</th>
+            <th nzWidth="8%">标本类型</th>
+            <th nzWidth="5%">状态</th>
+            <th nzWidth="8%" nzShowSort nzSortKey="arrive_time" [(nzSort)]="sortCurrent.arrive_time">收取时间</th>
+            <th nzWidth="8%">收取人</th>
+            <th nzWidth="8%">中转时间</th>
+            <th nzWidth="8%">送达时间</th>
+            <th nzWidth="8%">送达人</th>
+            <th nzWidth="8%">终点科室</th>
+            <th nzWidth="7%"></th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData; let i = index">
+            <td>{{i+(pageIndex-1) * pageSize + 1}}</td>
+            <td>{{ data.sickRoom ? data.sickRoom.dept : "-" }}</td>
+            <td>{{ data.patientName}}<span *ngIf="data.bedNum">({{data.bedNum}})</span><br>{{data.residenceNo}}</td>
+            <td>{{ data.scode || "-" }}</td>
+            <td>{{ data.specimenDesc || "-" }}</td>
+            <td>{{ data.stype ? data.stype.name : "-" }}</td>
+            <td>{{ data.speState ? data.speState.name : "-" }}</td>
+            <td>{{ data.arriveTime || "-" }}</td>
+            <td>{{ data.receiverName || "-" }}</td>
+            <td>{{ data.transTime || '-' }}</td>
+            <td>{{ data.sendTime || '-' }}</td>
+            <td>{{ data.delivererName || "-" }}</td>
+            <td>{{ data.checkDept ? data.checkDept.dept : "-" }}</td>
+            <td><button (click)="viewSpecimenHistory(data)">查看</button></td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="list-template__pagination">
+        <nz-pagination
+          [(nzPageIndex)]="pageIndex"
+          [(nzTotal)]="listLength"
+          [(nzPageSize)]="pageSize"
+          (nzPageIndexChange)="getList(0, sortCurrentKey, sortCurrentValue)"
+          (nzPageSizeChange)="getList(0, sortCurrentKey, sortCurrentValue)"
+        >
+        </nz-pagination>
+      </div>
+    </div>
+  </div>
+</div>
+<!-- 清空标本模态框 -->
+<app-dialog-delete
+  [delModal]="delModal"
+  (hideDelModalEvent)="hideDelModal()"
+  [btnLoading]="btnLoading"
+  (confirmDelEvent)="confirmDel()"
+  [content]="tipsMsg1"
+></app-dialog-delete>
+<!-- 标本历史记录查看 -->
+<app-history-prompt-modal
+  *ngIf="historyPromptModalShow"
+  [show]="historyPromptModalShow"
+  [scode]="scode"
+  (closeModelHs)="closeModelHistory($event)"
+></app-history-prompt-modal>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal
+  *ngIf="promptModalShow"
+  [content]="promptContent"
+  [success]="ifSuccess"
+  [show]="promptModalShow"
+  [info]="promptInfo"
+>
+</app-prompt-modal>

src/app/views/operation-search/operation-search.component.less

@@ -0,0 +1,173 @@
+@import "../../../../src/theme.less";
+:host ::ng-deep .on {
+  color: #fff !important;
+}
+.list-template__checkBoxes{
+  display: flex;
+  justify-content: space-between;
+}
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 350px;
+    height: 220px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 310px;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      & > div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 18px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+      .roundRobinTips {
+        font-size: 12px;
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+        max-height: 497px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+
+            .desc {
+              margin-top: 5px;
+            }
+          }
+
+          .datesControl {
+            margin-top: -16px;
+
+            .ant-form-item-label {
+              line-height: 40px;
+            }
+          }
+
+          .timer {
+            .ant-form-item-label {
+              width: 100%;
+              text-align: left;
+            }
+
+            .numInp {
+              margin-right: 5px;
+            }
+
+            .line {
+              margin-right: 5px;
+            }
+          }
+
+          .timer2 {
+            .ant-form-item-label {
+              line-height: 20px;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}

src/app/views/operation-search/operation-search.component.ts

@@ -0,0 +1,390 @@
+import { Component, OnInit } from "@angular/core";
+import { MainService } from "../../services/main.service";
+import { ToolService } from "../../services/tool.service";
+import { Subject } from "rxjs";
+import { debounceTime } from "rxjs/operators";
+import { format } from "date-fns";
+@Component({
+  selector: "app-operation-search",
+  templateUrl: "./operation-search.component.html",
+  styleUrls: ["./operation-search.component.less"],
+})
+export class OperationSearchComponent implements OnInit {
+  constructor(private mainService: MainService, private tool: ToolService) {}
+
+  currentUserAccount: any = JSON.parse(localStorage.getItem("user")).user.account; //当前登录人账号
+  searchCriteria = {
+    //搜索条件
+		firstOperation:false,
+    scode: "",
+    parent: "",
+    hospital: null,
+    department: null,
+    speState: null,
+    receiverName: null,
+    dateRange: [],
+    checkDept: null,
+  };
+  types = []; // 类型列表(搜索框)
+  departmentSearch = []; // 院区下的科室列表(搜索框)
+  userSearch = []; // 院区下的人员列表(搜索框)
+  allHospital: any = []; //院区下拉框
+  listOfData: any[] = []; //表格数据
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 10; //表格每页展示条数
+  listLength: number = 10; //表格总数据量
+  checkOptionsOne: Array<any> = [
+    { label: "服务中心收取", value: "0", checked: true },
+  ];
+  changeInpSubject = new Subject();
+  changeInp2Subject = new Subject();
+	changeRoomInpSubject = new Subject();
+  ngOnInit() {
+    this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+      this.searchDepartment(v[0], v[1]);
+    });
+    this.changeInp2Subject.pipe(debounceTime(500)).subscribe((v) => {
+      this.searchUser(v[0], v[1]);
+    });
+		this.changeRoomInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  this.operatingRoom(v[0], v[1]);
+		});
+    this.getAllHospital();
+  }
+  // 表格筛选
+  log(value: object[]): void {
+    console.log(value);
+    this.getList(1, this.sortCurrentKey, this.sortCurrentValue);
+  }
+  // 搜索类型
+  isLoading1 = false;
+  searchTypes() {
+    this.isLoading1 = true;
+    this.mainService.getDictionary("list", "surgery_trans_state").subscribe((res) => {
+      this.isLoading1 = false;
+      this.types = res;
+    });
+  }
+  // 清空标本
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  showDelModal(tipsMsg1: string) {
+    this.delModal = true;
+    this.tipsMsg1 = tipsMsg1;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认
+  btnLoading: boolean = false; //提交按钮loading状态
+  confirmDel() {
+    this.btnLoading = true;
+    this.mainService
+      .coopDataM("api/emptySpecimenData", { hosId: 1, isEmpty: "ok" })
+      .subscribe((data) => {
+        this.btnLoading = false;
+        this.delModal = false;
+        if (data.status == 200) {
+          this.showPromptModal("标本清空", true, "");
+        } else {
+          this.showPromptModal("标本清空", false, "");
+        }
+      });
+  }
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList(0, this.sortCurrentKey, this.sortCurrentValue);
+  }
+  // 查看标本历史记录
+  historyPromptModalShow = false; //标本历史记录弹窗开关
+  scode = ""; //查看历史记录携带
+  viewSpecimenHistory(data) {
+    this.scode = data.scode;
+    this.historyPromptModalShow = true;
+  }
+  // 关闭标本历史记录弹窗
+  closeModelHistory(e) {
+    this.historyPromptModalShow = JSON.parse(e).show;
+  }
+  // 日期选择
+  startDate: string; //发起时间开始
+  endDate: string; //发起时间结束
+  changeDate(result?): void {
+    if (!result) {
+      this.startDate = this.endDate = "";
+      return;
+    }
+    this.startDate =
+      result[0].getFullYear() +
+      "-" +
+      (result[0].getMonth() + 1) +
+      "-" +
+      result[0].getDate() +
+      " " +
+      "00:00:00";
+    this.endDate =
+      result[1].getFullYear() +
+      "-" +
+      (result[1].getMonth() + 1) +
+      "-" +
+      result[1].getDate() +
+      " " +
+      "23:59:59";
+  }
+  // 重置
+  reset() {
+    this.searchCriteria = {
+      //搜索条件
+      scode: "",
+      parent: "",
+      hospital: this.allHospital[0] ? this.allHospital[0]["id"] + "" : null,
+      department: null,
+      speState: null,
+      receiverName: null,
+      dateRange: [],
+      checkDept: null,
+    };
+    this.sortCurrentKey = "";
+    this.sortCurrentValue = "";
+    this.sortCurrent = {
+      arrive_time: null,
+    };
+    this.getList(1, this.sortCurrentKey, this.sortCurrentValue);
+  }
+  // 选择院区
+  changeHospital(id, type) {
+    if (type === "search") {
+      this.searchCriteria.department = null;
+    }
+  }
+  // 打开搜索框
+  changeSearch1(flag) {
+    if (flag) {
+      this.searchTypes();
+    }
+  }
+  // 打开搜索框
+  changeSearch(flag) {
+    if (flag) {
+      this.changeInp("no", "search");
+    }
+  }
+  // 打开搜索框
+  changeSearch2(flag) {
+    if (flag) {
+      this.changeOperatingRoomInp("no", "search");
+    }
+  }
+  // 边输边搜节流阀
+  isLoading = false;
+  deptKey = "";
+  changeInp(dept, type) {
+    if (!dept) {
+      return;
+    }
+    if (dept === "no") {
+      dept = "";
+    }
+    this.deptKey = dept;
+    this.isLoading = true;
+    this.changeInpSubject.next([dept, type]);
+  }
+	
+	changeOperatingRoomInp(dept, type) {
+    if (!dept) {
+      return;
+    }
+    if (dept === "no") {
+      dept = "";
+    }
+    this.deptKey = dept;
+    this.isLoading = true;
+    this.changeRoomInpSubject.next([dept, type]);
+  }
+	
+  // 搜索科室
+  searchDepartment(dept, type) {
+    let data = {
+      department: {
+        dept,
+        hospital: {
+          id: this.searchCriteria.hospital,
+        },
+      },
+      idx: 0,
+      sum: 10,
+    };
+    this.mainService
+      .getFetchDataList("data", "department", data)
+      .subscribe((data) => {
+        if (data.status == 200) {
+          if (type === "search") {
+            if (this.deptKey === dept) {
+              this.isLoading = false;
+              this.departmentSearch = data.list;
+            }
+          }
+        }
+      });
+  }
+	
+	// 手术室
+	operatingRoomDept:any;
+	operatingRoom(dept, type) {
+		var that = this;
+		that.mainService.getDictionary("list", "dept_type").subscribe((res2) => {
+			let item1 = res2.find(i=>i.name=='手术室科室')
+			let data1 = {
+			  idx: 0,
+			  sum: 9999,
+			  department: {
+					dept,
+			    hospital: { id: that.searchCriteria.hospital || "" },
+			    type: { id: item1.id || "" },
+			  },
+			};
+
+			that.mainService
+			  .getFetchDataList("data", "department", data1)
+			  .subscribe((res) => {
+					if (type === "search") {
+					  if (this.deptKey === dept) {
+					    this.isLoading = false;
+					    that.operatingRoomDept = res.list;
+					  }
+					}
+			  });
+		});
+	}
+	
+  // 边输边搜节流阀
+  userKey = "";
+  changeInp2(keyword, type) {
+    if (!keyword) {
+      return;
+    }
+    if (keyword === "no") {
+      keyword = "";
+    }
+    this.userKey = keyword;
+    this.isLoading = true;
+    this.changeInp2Subject.next([keyword, type]);
+  }
+  // 搜索科室
+  searchUser(keyword, type) {
+    let data = {
+      user: {
+        usertype: { id: 106 },
+        name: keyword,
+        hospital: {
+          id: this.searchCriteria.hospital,
+        },
+      },
+      idx: 0,
+      sum: 10,
+    };
+    this.mainService
+      .getFetchDataList("data", "user", data)
+      .subscribe((data) => {
+        if (data.status == 200) {
+          if (type === "search") {
+            if (this.userKey === keyword) {
+              this.isLoading = false;
+              this.userSearch = data.list;
+            }
+          }
+        }
+      });
+  }
+
+  // 获取所有院区
+  /**
+   *
+   *
+   * @memberof RoundRobinComponent
+   */
+  getAllHospital() {
+    this.allHospital = [this.tool.getCurrentHospital()];
+    this.searchCriteria.hospital = this.tool.getCurrentHospital().id + "";
+    this.getList(1, this.sortCurrentKey, this.sortCurrentValue);
+    this.changeHospital(this.searchCriteria.hospital, "search");
+  }
+
+  // 表格数据
+  loading1 = false;
+  getList(type, field?: string, sort?: string) {
+    console.log(this.searchCriteria.dateRange);
+    if (type == 1) {
+      this.pageIndex = 1;
+    }
+    let postData: any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      specimen: {
+        firstOperation: this.searchCriteria.firstOperation ? 1 : 0,
+        hosId: this.searchCriteria.hospital,
+        dept: this.searchCriteria.checkDept
+          ? {
+              id: this.searchCriteria.checkDept,
+            }
+          : undefined,
+        receiverName: this.searchCriteria.receiverName
+          ? this.searchCriteria.receiverName
+          : undefined,
+        scode: !this.searchCriteria.scode
+          ? undefined
+          : this.searchCriteria.scode,
+        keyWord: !this.searchCriteria.parent
+          ? undefined
+          : this.searchCriteria.parent,
+        speState: this.searchCriteria.speState
+          ? { id: this.searchCriteria.speState }
+          : undefined,
+      },
+    };
+    if (field && sort) {
+      postData.specimen.orderBy = sort === "ascend" ? field : `${field} desc`;
+    }
+    if (this.searchCriteria.dateRange.length) {
+      postData.specimen.startArriveTime =
+        format(this.searchCriteria.dateRange[0], "yyyy-MM-dd ") + "00:00:00";
+      postData.specimen.endArriveTime =
+        format(this.searchCriteria.dateRange[1], "yyyy-MM-dd ") + "23:59:59";
+    }
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "specimen", postData)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          this.listOfData = data.list;
+          this.listLength = data.totalNum;
+        }
+      });
+  }
+
+  // 列表排序
+  sortCurrent = {
+    arrive_time: 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);
+  }
+}

src/app/views/operation-search/operation-search.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { OperationSearchRoutingModule } from './operation-search-routing.module';
+import { OperationSearchComponent } from './operation-search.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    OperationSearchComponent
+  ],
+  imports: [
+    CommonModule,
+    OperationSearchRoutingModule,
+    ShareModule
+  ]
+})
+export class OperationSearchModule { }

src/app/views/order-management/order-management.component.html

@@ -152,7 +152,7 @@
 					  <nz-form-label [nzSpan]="6" nzFor="busiParent">业务父级</nz-form-label>
 					  <nz-form-control [nzSpan]="18" nzErrorTip="请选择业务父级!">
 					    <nz-select nzAllowClear [nzDropdownMatchSelectWidth]="false" formControlName="busiParent" nzShowSearch
-					      nzPlaceHolder="请选择业务父级" nzServerSearch (nzOnSearch)="changeInp($event)"
+					      nzPlaceHolder="请选择业务父级" nzServerSearch (nzOnSearch)="changeDeptInp($event)"
 					      (nzOpenChange)="openDeptSelect($event)">
 					      <ng-container *ngFor="let data of allParentdepart">
 					        <nz-option *ngIf="!isLoading" [nzLabel]="data.dept" [nzValue]="data.id">