解决冲突代码

src/app/components/configurationCenter/configuration-drug/configuration-drug.component.html

@@ -82,6 +82,11 @@
                         <nz-option *ngFor="let item of drugsManualList" [nzLabel]="item.label" [nzValue]="item.value"></nz-option>
                       </nz-select>
                     </div>
+										<!-- 支持拍照留存 -->
+										<div class="display_flex align-items_center mb8">
+										  <nz-form-label class="label">支持拍照留存</nz-form-label>
+										  <nz-checkbox-group [(ngModel)]="item.postData.drugsEndPhoto"></nz-checkbox-group>
+										</div>
                   </ng-container>
 									<!-- 药单显示患者 -->
 									<div class="display_flex align-items_center mb8">
@@ -102,6 +107,17 @@
                 <!-- 自动建单配置 -->
                 <div *ngIf="tabModalName=='automaticOrderCreation'">
                   <!-- 自动建单 -->
+									<div class="display_flex align-items_center mb8">
+									  <nz-form-label class="label">是否自动建单</nz-form-label>
+									  <nz-checkbox-group [(ngModel)]="item.postData.autoCreate"></nz-checkbox-group>
+									</div>
+									<!-- 药品自动建单状态 -->
+									<div class="display_flex align-items_center mb8" *ngIf="item.postData.autoCreate[0].checked">
+									  <nz-form-label class="label">药品自动建单状态</nz-form-label>
+										<nz-select class="w320px" nzPlaceHolder="请选择" [(ngModel)]="item.postData.autoCreateState" nzAllowClear>
+										  <nz-option *ngFor="let item of drugStateData" [nzLabel]="item.name" [nzValue]="item.id"></nz-option>
+										</nz-select>
+									</div>
                 </div>
                 <div class="bottom">
                   <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>

src/app/components/configurationCenter/configuration-drug/configuration-drug.component.ts

@@ -32,6 +32,7 @@ export class ConfigurationDrugComponent implements OnInit {
   ngOnInit():void {
     this.activeDictionary = this.dictionaryKeyList[0];
     this.init();
+		this.getDrugState();
   }
 
   // 工单模式
@@ -63,7 +64,9 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
 				showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
-      }
+				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
+				autoCreateState: undefined // 药品自动建单状态
+			}
     },
     {
       name: '西药',
@@ -83,7 +86,9 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
-      }
+				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
+				autoCreateState: undefined // 药品自动建单状态
+			}
     },
     {
       name: '退药',
@@ -103,7 +108,9 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
-      }
+				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
+				autoCreateState: undefined // 药品自动建单状态
+			}
     },
     {
       name: '毒麻',
@@ -123,7 +130,9 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
-      }
+				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
+				autoCreateState: undefined // 药品自动建单状态
+			}
     },
     {
       name: '中草药',
@@ -143,10 +152,21 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
-      }
+				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
+				autoCreateState: undefined // 药品自动建单状态
+			}
     },
   ];
-
+	
+	
+	// 获取药品状态
+	drugStateData:any = []
+	getDrugState(){
+		this.mainService.getDictionary("list", "drug_state").subscribe((data) => {
+			this.drugStateData = data
+		});
+	}
+	
   // 点击数据字典key
   activeDictionary:any;
   clickDictionaryKey(item){
@@ -218,6 +238,10 @@ export class ConfigurationDrugComponent implements OnInit {
 			showPatientInfo: this.activeDictionary.postData.showPatientInfo[0].checked ? 1 : 0,
 			showDrugsBagTypeCount: this.activeDictionary.postData.showDrugsBagTypeCount[0].checked ? 1 : 0,
 			showDrugsBagDetails: this.activeDictionary.postData.showDrugsBagDetails[0].checked ? 1 : 0,
+			autoCreate: this.activeDictionary.postData.autoCreate[0].checked ? 1 : 0,
+			autoCreateState:{
+				id:this.activeDictionary.postData.autoCreateState || undefined
+			}
 		};
     this.btnLoading = true;
     this.mainService
@@ -315,6 +339,8 @@ export class ConfigurationDrugComponent implements OnInit {
 					this.activeDictionary.postData.showPatientInfo[0].checked = this.configs.showPatientInfo == 1;
 					this.activeDictionary.postData.showDrugsBagTypeCount[0].checked = this.configs.showDrugsBagTypeCount == 1;
 					this.activeDictionary.postData.showDrugsBagDetails[0].checked = this.configs.showDrugsBagDetails == 1;
+					this.activeDictionary.postData.autoCreate[0].checked = this.configs.autoCreate == 1;
+					this.activeDictionary.postData.autoCreateState = this.configs.autoCreateState && this.configs.autoCreateState.id || undefined;
 				}
       });
   }

src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component.html

@@ -13,7 +13,7 @@
 			</div>
       <overlay-scrollbars #osComponentRef1 class="contentBody">
         <nz-spin nzSimple [nzSpinning]="categoryLoading1" class="mt8 text_align_center"></nz-spin>
-        <div [hidden]="categoryLoading1" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory1.id }" (click)="clickCategory(item, 1)" *ngFor="let item of categoryList1">{{ item.workName }} - {{item.workUnit}} - {{item.wage}}元 - {{item.integral.value}}分 - {{item.disableType==0?'停用':'启用'}}</div>
+        <div [hidden]="categoryLoading1" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory1.id }" (click)="clickCategory(item, 1)" *ngFor="let item of categoryList1">{{ item.workName }} - {{item.workUnit}} - {{item.wage}}元 - {{item.integral?item.integral.value:''}}分 - {{item.disableType==0?'停用':'启用'}}</div>
       </overlay-scrollbars>
     </div>
     <div class="address">
@@ -28,7 +28,7 @@
 			</div>
       <overlay-scrollbars #osComponentRef2 class="contentBody">
         <nz-spin nzSimple [nzSpinning]="categoryLoading2" class="mt8 text_align_center"></nz-spin>
-        <div [hidden]="categoryLoading2" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory2.id }" (click)="clickCategory(item, 2)" *ngFor="let item of categoryList2">{{ item.workName }} - {{item.workUnit}} - {{item.wage}}元 - {{item.integral.value}}分 - {{item.disableType==0?'停用':'启用'}}</div>
+        <div [hidden]="categoryLoading2" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory2.id }" (click)="clickCategory(item, 2)" *ngFor="let item of categoryList2">{{ item.workName }} - {{item.workUnit}} - {{item.wage}}元 - {{item.integral?item.integral.value:''}}分 - {{item.disableType==0?'停用':'启用'}}</div>
       </overlay-scrollbars>
     </div>
   </div>
@@ -155,7 +155,7 @@
 	            	<td>{{ data.operationType ? data.operationType.name : '-' }}</td>
 	            	<td>{{ data.operationTime|date:'yyyy-MM-dd HH:mm'}}</td>
 	            	<td>{{ data.operationUserDTO ? data.operationUserDTO.name : '-' }}</td>
-	            	<td>{{ data.logRemark ? data.logRemark : '-' }} <span *ngIf="data.operationType.value==6">单价:{{ data.currentPrice }} &nbsp;&nbsp;积分:{{ data.currentScore.value }}</span></td>
+	            	<td>{{ data.logRemark ? data.logRemark : '-' }} <span *ngIf="data.operationType.value==6">单价:{{ data.currentPrice }} &nbsp;&nbsp;积分:{{ data.currentScore?data.currentScore.value:'' }}</span></td>
 	            </tr>
 	          </tbody>
 	        </nz-table>

src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component.html

@@ -85,6 +85,75 @@
                   <nz-form-label class="label">默认扫描标本进入标本扫描页</nz-form-label>
                   <nz-checkbox-group [(ngModel)]="defaultScanSpe"></nz-checkbox-group>
                 </div>
+								
+								<!-- 是否开通收取限制 -->
+								<div class="display_flex align-items_center mb8">
+								  <nz-form-label class="label">是否开通收取限制</nz-form-label>
+								  <nz-checkbox-group [(ngModel)]="speCollectLimit" (ngModelChange)="changeSpeCollect($event)"></nz-checkbox-group>
+								</div>
+								
+								<!-- 是否支持非起点科室收取 -->
+								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
+								  <nz-form-label class="label">是否支持非起点科室收取</nz-form-label>
+								  <nz-checkbox-group [(ngModel)]="speCollectSupportNotStartDept"></nz-checkbox-group>
+								</div>
+								
+								<!-- 限制标本状态收取 -->
+								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
+									<nz-form-label class="label">限制标本状态收取</nz-form-label>
+									<nz-select class="formItem" nzMode="multiple" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear nzPlaceHolder="请选择限制标本状态收取" [(ngModel)]="speCollectLimitState">
+										<ng-container *ngFor="let option of specimenStateData">
+											<nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+										</ng-container>
+									</nz-select>
+								</div>
+								
+								<!-- 限制终点科室收取 -->
+								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
+									<nz-form-label class="label">限制终点科室收取</nz-form-label>
+									<nz-select nzMode="multiple" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear
+									  (nzOnSearch)="changeEndDept($event)" nzPlaceHolder="请选择限制终点科室收取" [(ngModel)]="speCollectLimitEndDept">
+									  <ng-container *ngFor="let option of endDeptData">
+									    <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.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="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
+									<nz-form-label class="label">限制普通或紧急收取</nz-form-label>
+									<nz-select class="formItem" nzMode="multiple" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择限制普通或紧急收取" [(ngModel)]="speCollectLimitUrgent">
+										<ng-container *ngFor="let option of astrictData">
+											<nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+										</ng-container>
+									</nz-select>
+								</div>
+								
+								<!-- 是否限制重复收取标本 -->
+								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
+								  <nz-form-label class="label">是否限制重复收取标本</nz-form-label>
+									<nz-checkbox-group [(ngModel)]="speCollectLimitRepeat"></nz-checkbox-group>
+								</div>
+								
+								<!-- 是否限制试管类型收取标本 -->
+								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
+								  <nz-form-label class="label">是否限制试管类型收取标本</nz-form-label>
+									<nz-select class="formItem" nzMode="multiple" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择是否限制重复收取标本" [(ngModel)]="speCollectLimitTubeType">
+										<ng-container *ngFor="let option of repetitionData">
+											<nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+										</ng-container>
+									</nz-select>
+								</div>
+								
+								<!-- 是否开始收取前进入配置页 -->
+								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
+								  <nz-form-label class="label">是否开始收取前进入配置页</nz-form-label>
+								  <nz-checkbox-group [(ngModel)]="speStartCollectShowConfig"></nz-checkbox-group>
+								</div>
+								
               </div>
               <!-- 自动建单配置 -->
               <div *ngIf="tabModalName=='automaticOrderCreation'">

src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component.ts

@@ -116,6 +116,38 @@ export class ConfigurationSpecimenComponent implements OnInit {
     {label:'是否开启',value: 0}
   ];
 
+	// 是否开通收取限制
+	speCollectLimit:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+
+	// 是否支持非起点科室收取
+	speCollectSupportNotStartDept:any[] = [
+	  {label:'是否开启',value: 0}
+	];
+
+	// 限制标本状态收取
+	speCollectLimitState:any = [];
+
+	// 限制终点科室收取
+	speCollectLimitEndDept:any = [];
+
+	// 限制普通或紧急收取
+	speCollectLimitUrgent:any = [];
+
+	// 是否限制重复收取标本
+	speCollectLimitRepeat:any[]= [
+	  {label:'是否开启',value: 0}
+	];
+
+	// 是否限制试管类型收取标本
+	speCollectLimitTubeType:any[];
+
+	// 是否开始收取前进入配置页
+	speStartCollectShowConfig:any[] = [
+	  {label:'是否开启',value: 0}
+	];
+
 	// 速冻标本数量控制
 	pathologyFrozenSpecimenNum:any = '0';
 
@@ -129,6 +161,13 @@ export class ConfigurationSpecimenComponent implements OnInit {
   configs:any = {};
   // 任务类型
   tasktype:any = {};
+	specimenStateData:any = [];
+	endDeptData:any = [];
+	repetitionData:any = [];
+	astrictData:any = [
+		{name:'普通',id:'0'},
+		{name:'紧急',id:'1'},
+	]
   searchTimerSubject = new Subject();
   constructor(private mainService: MainService,private tool: ToolService,private msg: NzMessageService) {}
 
@@ -138,10 +177,63 @@ export class ConfigurationSpecimenComponent implements OnInit {
       let fun = v[0];
       fun.call(this, v[1]);
     });
+		this.getDeptDic();
     this.getDeptList();
     this.getTaskType();
   }
 
+
+	// 获取科室类型
+	deptItem:any;
+	getDeptDic(e:string = ''){
+		this.mainService.getDictionary("list", "speState").subscribe((res) => {
+			this.specimenStateData = res
+		})
+		this.mainService.getDictionary("list", "specimen_tube_type").subscribe((res) => {
+			this.repetitionData = res
+		})
+		this.mainService.getDictionary("list", "dept_type").subscribe((res2) => {
+			this.deptItem = res2.find(i=>i.name=='检验科室')
+			let data1 = {
+			  idx: 0,
+			  sum: 9999,
+			  department: {
+			    hospital: { id: this.hosId || "" },
+			    type: { id: this.deptItem.id || "" },
+					dept: e,
+			  },
+			};
+			this.mainService
+			  .getFetchDataList("data", "department", data1)
+			  .subscribe((res) => {
+			    this.endDeptData = res.list;
+			  });
+		})
+	}
+
+	getEndDeptData(e){
+		let data1 = {
+		  idx: 0,
+		  sum: 9999,
+		  department: {
+		    hospital: { id: this.hosId || "" },
+		    type: { id: this.deptItem.id || "" },
+				dept: e,
+		  },
+		};
+		this.mainService
+		  .getFetchDataList("data", "department", data1)
+		  .subscribe((res) => {
+				 this.isLoading = false;
+		    this.endDeptData = res.list;
+		  });
+	}
+
+	// 搜索起点科室
+	changeEndDept(e){
+		this.searchTimer(this.getEndDeptData, e);
+	}
+
 	// 点击数据字典key
 	activeDictionaryKey:any = 'examine';
 	clickDictionaryKey(item){
@@ -175,6 +267,12 @@ export class ConfigurationSpecimenComponent implements OnInit {
 		}
 	}
 
+	changeSpeCollect(e){
+		if(!e[0].checked){
+
+		}
+	}
+
   // 扫描时指定科室不提醒勾选项
   changeDeptNotAlert(e){
     console.log(e);
@@ -287,8 +385,33 @@ export class ConfigurationSpecimenComponent implements OnInit {
       bigScanArriveNotOwner: this.bigScanArriveNotOwner[0].checked ? 1 : 0,
       bigScanShowCreateBtn: this.bigScanShowCreateBtn[0].checked ? 1 : 0,
       defaultScanSpe: this.defaultScanSpe[0].checked ? 1 : 0,
-      deptNotAlertIds: this.deptNotAlertIds.length ? this.deptNotAlertIds.toString() : undefined,
-    };
+      deptNotAlertIds: this.deptNotAlertIds && this.deptNotAlertIds.length>0 ? this.deptNotAlertIds.toString() : undefined,
+			speCollectLimit: this.speCollectLimit[0].checked ? 1 : 0,
+			speCollectSupportNotStartDept: null,
+			speCollectLimitRepeat: null,
+			speCollectLimitTubeType: null,
+			speStartCollectShowConfig: null,
+			speCollectLimitState: null,
+			speCollectLimitEndDept: null,
+			speCollectLimitUrgent: null,
+		};
+		if(this.speCollectLimit[0].checked){
+			postData.speCollectSupportNotStartDept = this.speCollectSupportNotStartDept[0].checked ? 1 : 0;
+			postData.speCollectLimitRepeat = this.speCollectLimitRepeat[0].checked ? 1 : 0;
+			postData.speCollectLimitTubeType = this.speCollectLimitTubeType && this.speCollectLimitTubeType.length>0 ? this.speCollectLimitTubeType.toString() : undefined;
+			postData.speStartCollectShowConfig = this.speStartCollectShowConfig[0].checked ? 1 : 0;
+			postData.speCollectLimitState = this.speCollectLimitState && this.speCollectLimitState.length>0 ? this.speCollectLimitState.toString() : undefined;
+			postData.speCollectLimitEndDept = this.speCollectLimitEndDept && this.speCollectLimitEndDept.length>0 ? this.speCollectLimitEndDept.toString() : undefined;
+			postData.speCollectLimitUrgent = this.speCollectLimitUrgent && this.speCollectLimitUrgent.length>0 ? this.speCollectLimitUrgent.toString() : undefined;
+		}else{
+			postData.speCollectSupportNotStartDept = undefined;
+			postData.speCollectLimitRepeat = undefined;
+			postData.speCollectLimitTubeType = undefined;
+			postData.speStartCollectShowConfig = undefined;
+			postData.speCollectLimitState = undefined;
+			postData.speCollectLimitEndDept = undefined;
+			postData.speCollectLimitUrgent = undefined;
+		}
     this.btnLoading = true;
     this.mainService
       .simplePost("addData", "taskTypeConfig", postData)
@@ -487,15 +610,25 @@ export class ConfigurationSpecimenComponent implements OnInit {
 						this.defaultScanSpe[0].checked = this.configs.defaultScanSpe == 1;
 						this.deptNotAlertIds = this.configs.deptNotAlertIds ? this.configs.deptNotAlertIds.split(',').map(v => +v) : [];
 						this.deptList = this.configs.deptNotAlertList || [];
+            this.speCollectLimit[0].checked = this.configs.speCollectLimit == 1;
+						if(this.configs.speCollectLimit == 1){
+							this.speCollectSupportNotStartDept[0].checked = this.configs.speCollectSupportNotStartDept == 1;
+							this.speCollectLimitRepeat[0].checked  = this.configs.speCollectLimitRepeat == 1;
+							this.speCollectLimitTubeType = this.configs.speCollectLimitTubeType ? this.configs.speCollectLimitTubeType.split(',').map(v => +v) : [];
+							this.speStartCollectShowConfig[0].checked = this.configs.speStartCollectShowConfig == 1;
+							this.speCollectLimitState = this.configs.speCollectLimitState ? this.configs.speCollectLimitState.split(',').map(v => +v) : [];
+							this.speCollectLimitEndDept = this.configs.speCollectLimitEndDept ? this.configs.speCollectLimitEndDept.split(',').map(v => +v) : [];
+							this.speCollectLimitUrgent = this.configs.speCollectLimitUrgent ? this.configs.speCollectLimitUrgent.split(',').map(v => v) : [];
+						}
 					}else if(this.activeDictionaryKey=='pathology'){
-						// 病理标本
+            // 病理标本
 						this.autoCreate[0].checked = this.configs.autoCreate == 1;
 						this.outpatientCreatePathologyForm[0].checked = this.configs.outpatientCreatePathologyForm == 1;
 						this.outpatientInVitroFixation[0].checked = this.configs.outpatientInVitroFixation == 1;
 						this.pathologyBarCode = this.configs.pathologyBarCode;
 						this.pathologyFrozenSpecimenNum = this.configs.pathologyFrozenSpecimenNum;
 						this.prompt = this.configs.prompt || '';
-						this.outpatientPathologyLabelSize = this.configs.outpatientPathologyLabelSize.id; //门诊病理标签样式
+            this.outpatientPathologyLabelSize = this.configs.outpatientPathologyLabelSize.id; //门诊病理标签样式
 						this.surgeryPathologyLabelSize = this.configs.surgeryPathologyLabelSize.id //手术病理标签样式
 					}else if(this.activeDictionaryKey=='specimenPackage'){
 						// 标本打包

src/app/components/order-scope/order-scope.component.ts

@@ -3,7 +3,7 @@ import { EventEmitter } from '@angular/core';
 import { MainService } from 'src/app/services/main.service';
 import { ToolService } from 'src/app/services/tool.service';
 import { NzMessageService } from 'ng-zorro-antd';
-import { Router } from "@angular/router";
+import { Router, ActivatedRoute } from "@angular/router";
 
 @Component({
   selector: 'app-order-scope',
@@ -29,7 +29,8 @@ export class OrderScopeComponent implements OnInit {
     private mainService: MainService,
     private tool: ToolService,
     private message: NzMessageService,
-		public router: Router
+		public router: Router,
+		public route: ActivatedRoute
   ) { }
 
   user = JSON.parse(localStorage.getItem("user")); //用户信息
@@ -49,6 +50,8 @@ export class OrderScopeComponent implements OnInit {
 	menuList:any;
 
   ngOnInit() {
+		let btn = this.tool.initCoopBtns(this.route)
+		console.log(77777,btn)
 		let menuItem = JSON.parse(localStorage.getItem("menuItem"))
 		this.menuList = menuItem.find(i=>i.link=='gongdanfanwei')
     this.initItsm();

src/app/services/tool.service.ts

@@ -314,6 +314,7 @@ export class ToolService {
 				  break;
 				case "log":
 				  coopBtns.log = true; //日志
+					break
 				case "viewGd":
 				  coopBtns.viewGd = true; //查看工单
 				  break;

src/app/share/businessData-detail-info-modal/businessData-detail-info-modal.component.html

@@ -17,8 +17,9 @@
           <thead>
             <tr class="thead">
               <th nzWidth="5%">序号</th>
-              <th nzWidth="85%">药品名称+规格</th>
+              <th nzWidth="65%">药品名称+规格</th>
               <th nzWidth="10%">数量</th>
+							<th nzWidth="20%" *ngIf="configs.showPatientInfo==1">患者信息</th>
             </tr>
           </thead>
           <tbody>
@@ -26,6 +27,9 @@
               <td>{{i+1}}</td>
               <td>{{ data.drugsInfo }} {{ data.model }}</td>
               <td>{{ data.drugsNum }}</td>
+							<td nz-tooltip [nzTooltipTitle]="data.patientNames" *ngIf="configs.showPatientInfo==1">
+								{{ data.patientNames }}
+							</td>
             </tr>
           </tbody>
         </nz-table>

src/app/share/businessData-detail-modal/businessData-detail-modal.component.html

@@ -46,20 +46,19 @@
         <thead>
           <tr class="thead">
             <th nzWidth="5%">序号</th>
-						<th *ngIf="configs.showPatientInfo==1">患者信息</th>
             <th nzWidth="65%">药品名称+规格</th>
             <th nzWidth="10%">数量</th>
+						<th nzWidth="20%" *ngIf="configs.showPatientInfo==1">患者信息</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of drugsBugSingleList;let i = index;">
             <td>{{i+1}}</td>
-						<td *ngIf="configs.showPatientInfo==1">
-							<div>{{ data.patientName }}{{(data.bedNum)}}</div>
-							<div>{{data.residenceNo}}</div>
-						</td>
             <td>{{ data.drugsInfo }} {{ data.model }}</td>
             <td>{{ data.drugsNum }}</td>
+						<td nz-tooltip [nzTooltipTitle]="data.patientNames" *ngIf="configs.showPatientInfo==1">
+							{{ data.patientNames }}
+						</td>
           </tr>
         </tbody>
       </nz-table>
@@ -84,10 +83,9 @@
         <tbody>
           <tr *ngFor="let data of drugsBugMultipleList;let i = index;" (click)="viewDetail(type, data.id)" [ngStyle]="{ 'cursor': configs.showDrugsBagDetails == 1 ? 'pointer' : '' }">
             <td>{{i+1}}</td>
-            <td [ngStyle]="{ 'text-decoration': configs.showDrugsBagDetails == 1 ? 'underline' : '' }">{{ data.packid }}</td>
-						<td *ngIf="configs.showPatientInfo==1">
-							<div>{{ data.patientName }}{{(data.bedNum)}}</div>
-							<div>{{data.residenceNo}}</div>
+						<td [ngStyle]="{ 'text-decoration': configs.showDrugsBagDetails == 1 ? 'underline' : '' }">{{ data.packid }}</td>
+						<td nz-tooltip [nzTooltipTitle]="data.patientNames" *ngIf="configs.showPatientInfo==1">
+							{{ data.patientNames }}
 						</td>
             <td *ngIf="configs.showDrugsBagTypeCount==1">{{ data.drugsTypeCount }}</td>
             <td *ngIf="configs.showDrugsBagTypeCount==1">{{ data.drugsCount }}</td>

src/app/share/businessData-detail-modal/businessData-detail-modal.component.less

@@ -68,12 +68,22 @@
   }
 
   .modalBody {
-		height: calc(100vh - 40px);
-    width: 700px;
-    background: #fff;
-    border-radius: 5px;
-    color: #333;
+		// height: calc(100vh - 40px);
+  //   width: 700px;
+  //   background: #fff;
+  //   border-radius: 5px;
+  //   color: #333;
+		// position: relative;
+		
+		height: calc(100vh - 100px);
+		min-height: 580px;
+		border-radius: 5px;
+		background: #fff;
+		color: #333;
+		font-size: 14px;
+		padding: 12px 20px;
 		position: relative;
+		padding-bottom: 70px;
     &.modalBody-search {
       width: 480px;
       min-height: 250px;

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

@@ -7,7 +7,7 @@
           <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false" nzAllowClear
             nzPlaceHolder="请选择工单类型" [(ngModel)]="taskType">
             <ng-container *ngFor="let data of allTaskType">
-              <nz-option nzLabel="{{data.taskName}}" nzValue="{{data.id}}"></nz-option>
+              <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}"></nz-option>
             </ng-container>
           </nz-select>
         </div>
@@ -42,6 +42,10 @@
             <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of handleStatus"></nz-option>
           </nz-select>
         </div>
+				<div class="list-template__searchItem">
+				  <span class="label">单号</span>：
+				  <input class="formItem" nz-input placeholder="请输入单号" [(ngModel)]="orderNo" />
+				</div>
       </div>
       <div nz-col nzXl='6' class="list-template__btns">
         <button nz-button class="btn default" (click)='search()'>搜索</button>
@@ -57,7 +61,7 @@
 						<th>工单类型</th>
             <th>单号</th>
             <th>申请科室</th>
-            <th>发起时间</th>
+            <!-- <th>发起时间</th> -->
 						<th>执行人</th>
 						<th>评价时间</th>
             <th>评价等级</th>
@@ -73,8 +77,8 @@
 						<td>{{data.orderType?data.orderType.name:'-'}}</td>
             <td>{{data.orderNo}}</td>
             <td>{{ data.startDept.dept }}</td>
-            <td>{{timestampToTime(data.startTime)}}</td>
-						<td>{{data.mediationUser?data.mediationUser.name:''}}</td>
+            <!-- <td>{{timestampToTime(data.startTime)}}</td> -->
+						<td>{{data.worker?data.worker.name:''}}</td>
 						<td>{{ data.evaluationTime?timestampToTime(data.evaluationTime):'-'}}</td>
 						<td>{{ data.evaluationLevel ? data.evaluationLevel.name:'-' }}</td>
 						<td>

src/app/views/appraise-management/appraise-management.component.ts

@@ -29,6 +29,7 @@ export class AppraiseManagementComponent implements OnInit {
   department: any; //所属科室
   mediUser: number; //调解人
   taskType: number; //工单类型
+	orderNo:any;
   allTaskType: any; //所有工单类型
   allHospital: any; //所有院区
   pageIndex: number = 1; //页码
@@ -70,7 +71,6 @@ export class AppraiseManagementComponent implements OnInit {
     this.worker = null;
     this.mediUser = null;
     this.status = null;
-    this.getAllTaskType();
     this.getAllWorker();
     this.getAllMediUser();
   }
@@ -123,7 +123,6 @@ export class AppraiseManagementComponent implements OnInit {
       user: {
         name: e || "",
         hospital: { id: that.hospital },
-        usertype: { id: 107 }, //服务台
       },
       idx: 0,
       sum: 20,
@@ -167,6 +166,11 @@ export class AppraiseManagementComponent implements OnInit {
       .subscribe((data) => {
         that.handleStatus = data;
       });
+		that.mainService
+		  .getDictionary("list", "order_type")
+		  .subscribe((data) => {
+		    that.allTaskType = data;
+		  });
   }
 
   // 搜索
@@ -178,6 +182,7 @@ export class AppraiseManagementComponent implements OnInit {
   reset() {
     this.pageIndex = 1;
     this.taskType = null;
+		this.orderNo = null;
     this.worker = null;
     this.mediUser = null;
     this.status = null;
@@ -191,15 +196,18 @@ export class AppraiseManagementComponent implements OnInit {
       idx: that.pageIndex - 1,
       sum: that.pageSize,
       badEvaluationHandle: {
-        taskType: that.taskType || "",
+				orderNo: that.orderNo || "",
+        orderType: {
+					id: that.taskType || "",
+				},
         worker: { id: that.worker || "" },
         handleStatus: { id: that.status || "" },
         hosId: that.hospital,
         mediationUser: { id: that.mediUser },
       },
     };
-    if (!data.badEvaluationHandle.taskType) {
-      delete data.badEvaluationHandle.taskType;
+    if (!data.badEvaluationHandle.orderType) {
+      delete data.badEvaluationHandle.orderType;
     }
     if (!data.badEvaluationHandle.worker.id) {
       delete data.badEvaluationHandle.worker;

src/app/views/building-floor/building-floor.component.html

@@ -109,7 +109,14 @@
             <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="floorName">楼层名称</nz-form-label>
             <nz-form-control nzErrorTip="请输入楼层名称!">
               <nz-input-group>
-                <input nz-input formControlName="floorName" placeholder="请输入楼层名称" />
+                <nz-input-number 
+								[nzMin]="0"
+								[nzPrecision]="0"
+								[nzMax]="999999"
+								[nzStep]="1"
+								formControlName="floorName" 
+								placeholder="请输入楼层名称">
+								</nz-input-number>
               </nz-input-group>
             </nz-form-control>
           </nz-form-item>

src/app/views/building-floor/building-floor.component.less

@@ -260,6 +260,9 @@
                 line-height: 0;
                 text-align: left;
               }
+							.ant-input-number{
+								width: 100% !important;
+							}
             }
           }
 

src/app/views/fuwutai/fuwutai.component.html

@@ -118,7 +118,7 @@
                   <div class="gongdan" (click)="batchDispatchSelect(!data.checked, data.data.id, $event)">
                     <span class="left mr8" *ngIf="!flagList.itsmFlag1 && flagList.hsmsFlag1"><label nz-checkbox [ngModel]="data.checked" (ngModelChange)="batchDispatchSelect($event, data.data.id)"></label></span>
                     <span class="left gongdan_name" nz-tooltip [nzTooltipTitle]="data.data.taskType.taskName + (data.data.goodsRemark?'-'+data.data.goodsRemark:'')+'(' + data.data.gdcode + ')'">
-                      <strong>{{ data.data.taskType.taskName }}</strong><ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
+                      <strong [ngStyle]="{color: data.data.taskType?data.data.taskType.renderColors:'#333'}">{{ data.data.taskType.taskName }}</strong><ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
                     </span>
                     <div class="right_all">
                       <span nz-tooltip [nzTooltipTitle]="data.data.worker ? data.data.worker.phone : ''" class="right_all_name">{{ data.data.worker ? data.data.worker.name : "" }}</span>
@@ -315,7 +315,7 @@
                       <label nz-checkbox [ngModel]="data.checked" (ngModelChange)="batchWithdrawalSelect($event, data.data.id)"></label>
                     </span>
                     <span class="left gongdan_name" nz-tooltip [nzTooltipTitle]="data.data.taskType.taskName + (data.data.goodsRemark?'-'+data.data.goodsRemark:'')+'(' + data.data.gdcode + ')'">
-                      <strong>{{ data.data.taskType.taskName }}</strong><ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
+                      <strong [ngStyle]="{color: data.data.taskType?data.data.taskType.renderColors:'#333'}">{{ data.data.taskType.taskName }}</strong><ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
                     </span>
                     <div class="right_all">
                       <span nz-tooltip [nzTooltipTitle]="data.data.worker ? data.data.worker.phone : ''" class="right_all_name">{{ data.data.worker ? data.data.worker.name : "" }}</span>
@@ -500,7 +500,7 @@
                       <label nz-checkbox [ngModel]="data.checked" (ngModelChange)="batchWithdrawalSelect($event, data.data.id)"></label>
                     </span>
                     <span class="left gongdan_name" nz-tooltip [nzTooltipTitle]="data.data.taskType.taskName + (data.data.goodsRemark?'-'+data.data.goodsRemark:'')+'(' + data.data.gdcode + ')'">
-                      <strong>{{ data.data.taskType.taskName }}</strong><ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
+                      <strong [ngStyle]="{color: data.data.taskType?data.data.taskType.renderColors:'#333'}">{{ data.data.taskType.taskName }}</strong><ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
                     </span>
                     <div class="right_all">
                       <span nz-tooltip [nzTooltipTitle]="data.data.worker ? data.data.worker.phone : ''" class="right_all_name">{{ data.data.worker ? data.data.worker.name : "" }}</span>
@@ -1859,6 +1859,21 @@
     (confirmDelEvent)="confirmLogout()"
     content="您确认要退出系统吗？"
   ></app-dialog-delete>
+	<!-- 重复建单策略 -->
+	<app-dialog-delete
+	  [delModal]="repeatModal"
+	  (hideDelModalEvent)="hideRepeatModal()"
+	  [btnLoading]="loadingRepeat"
+	  (confirmDelEvent)="confirmRepeat()"
+	  [content]="repeatMsg"
+	  confirmTxt="是"
+	  cancelTxt="否"
+	  (cancelDelEvent)="hideRepeatModal()"
+	></app-dialog-delete>
+	
+	<!-- 是否限制业务发起时间模态框 -->
+	<app-dialog-delete [delModal]="limitTimeModal" (hideDelModalEvent)="hideLimitTimeModal()" [btnLoading]="limitTimeLoading"
+	(confirmDelEvent)="confirmLimitTime()" [content]="limitTimeInfo" confirmTxt="继续建单" [isShowConfirm]="isShowConfirm" [isShowConfirmInfo]="isShowConfirmInfo"></app-dialog-delete>
 </div>
 <!-- 绑定分机 -->
 <app-bind-extension-number [hsmsData]="hsmsData" [itsmData]="itsmData" [coopBtns]="coopBtns" [websocketLoading]="websocketLoading" *ngIf="showBindExtensionNumberModal" (confirmModal)="checkIn($event)" (cancelModal)="cancelBindExtensionNumber($event)"></app-bind-extension-number>

src/app/views/fuwutai/fuwutai.component.ts

@@ -441,6 +441,7 @@ export class FuwutaiComponent implements OnInit {
         console.log(data);
         this.isOkLoading = false;
         this.isGoLoading = false;
+				this.dataStatus = data["status"];
         if (data["status"] == 200) {
           this.newOrderShow = false; //关闭弹窗
           if (go === "&go&") {
@@ -454,9 +455,23 @@ export class FuwutaiComponent implements OnInit {
             }
             this.showPromptModal("建单", true, "", "close");
           }
-        } else {
-          this.showPromptModal("建单", false, data["msg"]);
-        }
+        } 
+				else if(data["status"] == 1000033){
+					this.newOrderShow = false; //关闭弹窗
+					if (go === "&go&") {
+					  this.applyDept = data["startDept"].id;
+					  this.applyStartDept = data["startDept"];
+					  this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
+					}
+					//重复建单那策略
+					this.repeatMsg = data["msg"];
+					this.showRepeatModal(postData, "transport", go);
+				}else if (data["status"] == 100043){
+					this.showPromptModal("建单", true, data["msg"]);
+				}
+				else{
+					this.showPromptModal("建单", false, data["msg"]);
+				}
       });
     }
   }
@@ -525,6 +540,7 @@ export class FuwutaiComponent implements OnInit {
         console.log(data);
         this.isOkLoading = false;
         this.isGoLoading = false;
+				this.dataStatus = data["status"];
         if (data["status"] == 200) {
           this.newOrderShow = false; //关闭弹窗
           if (go === "&go&") {
@@ -540,14 +556,36 @@ export class FuwutaiComponent implements OnInit {
           }
         } else if(data["status"] == 100042){
           this.newOrderShow = false; //关闭弹窗
-          this.showPromptModal("建单", false, data["msg"]);
-        } else {
-          this.showPromptModal("建单", false, data["msg"]);
-        }
+					if (go === "&go&") {
+						this.applyDept = data["startDept"].id;
+						this.applyStartDept = data["startDept"];
+						this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
+						this.showPromptModal("建单", false, data["msg"], "closeGo");
+					}else{
+						this.showPromptModal("建单", false, data["msg"]);
+					}
+        } 
+				else if(data["status"] == 1000033){
+					this.newOrderShow = false; //关闭弹窗
+					if (go === "&go&") {
+						this.applyDept = data["startDept"].id;
+						this.applyStartDept = data["startDept"];
+						this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
+					}
+					//重复建单那策略
+					this.repeatMsg = data["msg"];
+					this.showRepeatModal(postData, "inspection", go);					
+				}else if (data["status"] == 100043){
+					this.showPromptModal("建单", true, data["msg"]);
+				}
+				else{
+					this.showPromptModal("建单", false, data["msg"]);
+				}
       });
     }
   }
   // 标本配送表单提交
+	dataStatus:any;
   submitFormBbps(go?) {
     let postData = {
       workOrder: {
@@ -567,6 +605,7 @@ export class FuwutaiComponent implements OnInit {
     this.mainService.buildOrder(postData).subscribe((data) => {
       this.isOkLoading = false;
       this.isGoLoading = false;
+			this.dataStatus = data["status"];
       if (data["status"] == 200) {
         this.newOrderShow = false; //关闭弹窗
         if (go === "&go&") {
@@ -580,9 +619,21 @@ export class FuwutaiComponent implements OnInit {
           }
           this.showPromptModal("建单", true, "", "close");
         }
-      } else {
-        this.showPromptModal("建单", false, data["msg"]);
-      }
+      }else if(data["status"] == 1000033){
+				 this.newOrderShow = false; //关闭弹窗
+				 if (go === "&go&") {
+				 	this.applyDept = data["startDept"].id;
+				 	this.applyStartDept = data["startDept"];
+				 	this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
+				 }
+				 //重复建单那策略
+				 this.repeatMsg = data["msg"];
+				 this.showRepeatModal(postData, "specimen", go);
+			}else if (data["status"] == 100043){
+				this.showPromptModal("建单", true, data["msg"]);
+			} else{
+				this.showPromptModal("建单", false, data["msg"]);
+			}
     });
   }
   // 其他表单提交
@@ -629,6 +680,7 @@ export class FuwutaiComponent implements OnInit {
     this.mainService.buildOrder(postData).subscribe((data) => {
       this.isOkLoading = false;
       this.isGoLoading = false;
+			this.dataStatus = data["status"];
       if (data["status"] == 200) {
         this.newOrderShow = false; //关闭弹窗
         if (go === "&go&") {
@@ -642,9 +694,24 @@ export class FuwutaiComponent implements OnInit {
           }
           this.showPromptModal("建单", true, "", "close");
         }
-      } else {
-        this.showPromptModal("建单", false, data["msg"]);
-      }
+      } 
+			else if(data["status"] == 1000033){
+				this.newOrderShow = false; //关闭弹窗
+				if (go === "&go&") {
+					this.applyDept = data["startDept"].id;
+					this.applyStartDept = data["startDept"];
+					this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
+				}
+				//重复建单那策略
+				this.repeatMsg = data["msg"];
+				this.showRepeatModal(postData, "other", go);
+				
+			}else if (data["status"] == 100043){
+				this.showPromptModal("建单", true, data["msg"]);
+			}
+			else{
+				this.showPromptModal("建单", false, data["msg"]);
+			}
     });
   }
   // 万能交接表单提交
@@ -683,6 +750,7 @@ export class FuwutaiComponent implements OnInit {
     this.mainService.buildOrder(postData).subscribe((data) => {
       this.isOkLoading = false;
       this.isGoLoading = false;
+			this.dataStatus = data["status"];
       if (data["status"] == 200) {
         this.newOrderShow = false; //关闭弹窗
         if (go === "&go&") {
@@ -696,9 +764,23 @@ export class FuwutaiComponent implements OnInit {
           }
           this.showPromptModal("建单", true, "", "close");
         }
-      } else {
-        this.showPromptModal("建单", false, data["msg"]);
-      }
+      } 
+			else if(data["status"] == 1000033){
+				this.newOrderShow = false; //关闭弹窗
+				if (go === "&go&") {
+					this.applyDept = data["startDept"].id;
+					this.applyStartDept = data["startDept"];
+					this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
+				}
+				//重复建单那策略
+				this.repeatMsg = data["msg"];
+				this.showRepeatModal(postData, "ordinary", go);
+			}else if (data["status"] == 100043){
+				this.showPromptModal("建单", true, data["msg"]);
+			}
+			else{
+				this.showPromptModal("建单", false, data["msg"]);
+			}
     });
   }
   // 核酸打印
@@ -752,6 +834,7 @@ export class FuwutaiComponent implements OnInit {
     })
   }
   //获取检查页面任务类型
+	allTaskType:any;
   getInspectAndPatientTransportConfigTasktype() {
     if(!this.hsmsData.hsmsSwitch){
       return;
@@ -778,6 +861,23 @@ export class FuwutaiComponent implements OnInit {
           this.getInspectAndPatientTransportConfig(tasktype);
         }
       });
+			// let query = {
+			//   idx: 0,
+			//   sum: 9999,
+			//   taskType: {
+			//     hosId: {
+			//       id: this.checkedHos
+			//     }
+			//   }
+			// };
+			// this.mainService
+			//   .getFetchDataList("simple/data", "taskType", query)
+			//   .subscribe((result) => {
+			//     if (result.status == 200) {
+			//       this.allTaskType = result.list || {};
+			// 			this.initControlView();
+			//     }
+			//   });
   }
   // 获取检查页面信息配置
   getInspectAndPatientTransportConfig(tasktype) {
@@ -805,8 +905,10 @@ export class FuwutaiComponent implements OnInit {
         }
       });
   }
+	currentDept:any;
   ngOnInit() {
     this.websocketLoading = true;
+		this.currentDept = this.tool.getCurrentUserDept();
     this.coopBtns = this.tool.initCoopBtns(this.route);
 		// console.log(8989899,this.coopBtns)
     //防抖
@@ -869,7 +971,7 @@ export class FuwutaiComponent implements OnInit {
     this.initOrderScope();
     this.getVisitList();
     this.getMessageList();
-    this.initControlView();
+		this.initControlView();
     this.moveMenu("fixedMenu");
     this.moveMenu("fixedMenuLeft");
     this.moveMenuAll("fixedMenuAll");
@@ -2202,8 +2304,12 @@ export class FuwutaiComponent implements OnInit {
               item.computedReceiveFlag = this.computedReceive(item.data)
               item.computedEditFlag = this.computedEdit(item.data)
             }
+						// else{
+						// 	item.taskTypeConfig = this.allTaskType.find(i=>i.id == item.data.taskType.id)
+						// }
           });
           this.unassignedList = unassignedList;
+					console.log(5555,unassignedList)
           this.batchType = false;
           this.allUnassignedList = false;
           this.unassignedListClone = cloneDeep(this.unassignedList);
@@ -2228,6 +2334,9 @@ export class FuwutaiComponent implements OnInit {
               item.computedReceiveFlag = this.computedReceive(item.data)
               item.computedEditFlag = this.computedEdit(item.data)
             }
+						// else{
+						// 	item.taskTypeConfig = this.allTaskType.find(i=>i.id == item.data.taskType.id)
+						// }
           });
           this.arriveList = arriveList;
           this.batchType1 = false;
@@ -2243,6 +2352,9 @@ export class FuwutaiComponent implements OnInit {
               item.computedHandleFlag = this.computedHandle(item.data)
               item.computedEditFlag = this.computedEdit(item.data)
             }
+						// else{
+						// 	item.taskTypeConfig = this.allTaskType.find(i=>i.id == item.data.taskType.id)
+						// }
           });
           this.executionList = executionList;
           this.loading3 = false;
@@ -2524,6 +2636,7 @@ export class FuwutaiComponent implements OnInit {
       },0)
     }
     this.buildType = buildType;
+		console.log(123,buildType)
     if(this.itsmData.mdv2Switch){
       if(this.buildType !== '继续建单' && this.buildType !== '编辑事件' && this.buildType !== '报修转事件'){
         this.resetOrderData();
@@ -4073,6 +4186,7 @@ export class FuwutaiComponent implements OnInit {
       if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
         this.jry_shixian();
       }
+			this.goType = null;
       this.newOrderShow = false; //关闭弹窗
       this.newOrderShowOpen = false; //此时可出现新的弹窗
       this.showPromptModal("操作", true, "", "");
@@ -4612,6 +4726,7 @@ export class FuwutaiComponent implements OnInit {
     console.log(this.workTypesArrange[index].value);
     let taskType = this.workTypesArrange[index].value.find(v => v.id == value);
     let patientCode;
+		// this.taskType = taskType.associationTypeValue?taskType.associationTypeValue:null
     if(taskType.associationTypeValue === 'inspect'){
       patientCode = this.patientZy;
       this.requiredConfigChange('validateFormZy', 'startDept', false);
@@ -4749,11 +4864,16 @@ export class FuwutaiComponent implements OnInit {
   }
 
 	psValue:any;
+	taskType:any;
   radioChangeQt(value) {
     //任务类型id
     if (value === "" || value === null) {
       return;
     }
+		let index = this.tabIndex;
+		// let item = this.workTypesArrange[1].value.find(v => v.id == value);
+		// console.log(788787,item)
+		// this.taskType = item.associationTypeValue?item.associationTypeValue:null
 		this.psValue = value
     this.startDeptQt = null;
     this.endDeptQt = null;
@@ -4815,26 +4935,33 @@ export class FuwutaiComponent implements OnInit {
 
   //新建工单->确定提交
   isGoLoading = false;
+	goType:any;
   newOrderOk(go?): void {
+		this.goType = go
     console.log(this.radioValueQt);
     let arr = this.workTypesArrange.find(v => v.key === this.currentTabIndex);
     let objQt = arr.value.find(v => v.id == this.radioValueQt);
     let objZy = arr.value.find(v => v.id == this.radioValueZy);
     if (this.isYyInspect && objQt && objQt.associationTypeValue === 'other') {
       this.clickYYFlag = true;
+			console.log(110)
     } else {
+			console.log(111)
       this.clickYYFlag = false;
     }
     if (this.isYyInspect && objZy && (objZy.associationTypeValue === 'patientTransport' || objZy.associationTypeValue === 'inspect')) {
       this.clickYYZyFlag = true;
+			console.log(112)
     } else {
       this.clickYYZyFlag = false;
+			console.log(113)
     }
 
     if (
       (!this.yyTime && objQt && objQt.associationTypeValue === 'other' && this.isYyInspect) ||
       (!this.yyTimeZy && objZy && (objZy.associationTypeValue === 'patientTransport' || objZy.associationTypeValue === 'inspect') && this.isYyInspect)
     ) {
+			console.log(114)
       return;
     }
 
@@ -4875,6 +5002,7 @@ export class FuwutaiComponent implements OnInit {
     this.currentTabIndex = "";
     this.fixedTab = "";
     this.fixedMenuShangla();
+		this.goType = null;
     this.radioValueQt = null;
     this.startDeptQt = null;
     this.endDeptQt = null;
@@ -5027,16 +5155,202 @@ export class FuwutaiComponent implements OnInit {
         },
       },
     };
-    this.mainService.buildOrder(postData).subscribe((result) => {
+    this.mainService.buildOrder(postData).subscribe((result:any) => {
       this.createLoading = false;
       this.deptFlag = false;
+			this.dataStatus = result["status"];
       if (result["status"] == 200) {
         this.showPromptModal("建单", true, "");
-      } else {
-        this.showPromptModal("建单", false, result["msg"]);
-      }
+      } 
+			else if(result["status"] == 1000033){
+				if (this.goType === "&go&") {
+					this.applyDept = result["startDept"].id;
+					this.applyStartDept = result["startDept"];
+					this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = result["phone"];
+				}
+				//重复建单那策略
+				this.repeatMsg = result["msg"];
+				this.showRepeatModal(postData, "ordinary", this.goType);
+      }else if (result["status"] == 100043){
+				this.showPromptModal("建单", true, result["msg"]);
+			}
+			else{
+				this.showPromptModal("建单", false, result["msg"]);
+			}
     });
   }
+	
+	limitTimeModal: boolean = false; //模态框
+	limitTimeInfo:string = '';
+	limitTimeItem: any = {};
+	hideLimitTimeModal() {
+	  this.limitTimeModal = false;
+	}
+	
+	// 建单判断时间-护士端建单通用方法
+	isShowConfirm:boolean = true;
+	isShowConfirmInfo:string = '';
+	newOrderTimeFun(order, fun1, fun2){
+	  fun2.call(this)
+	}
+	
+	repeatModal: boolean = false; //删除模态框
+	repeatMsg = "";
+	loadingRepeat = false;
+	repeatPostData;
+	sourceType;
+	showRepeatModal(postData, sourceType, go) {
+	  this.repeatModal = true;
+	  this.repeatPostData = postData;
+	  this.sourceType = sourceType;
+		// if(this.goType=='&go&'){
+		// 	this.showRepetitionModal("建单", true, "", "closeGo");
+		// }
+	}
+	hideRepeatModal() {
+	  this.repeatModal = false;
+	  this.btnLoading = false;
+		this.confirmType = false;
+		if(this.goType=='&go&'){
+			console.log('fou222222')
+			this.showNewOrder("&go&");
+			// this.showRepetitionModal("建单", true, "", "closeGo");
+		}
+	}
+	
+	confirmType:boolean = false;
+	confirmRepeat() {
+		this.confirmType = true;
+	  this.loadingRepeat = true;
+	  this.repeatPostData.tipsCreateOder = 1;
+		let url = null;
+		if(this.isYyInspect){
+			url = this.mainService.postCustom("api", "appointmentOrder", this.repeatPostData)
+		}else{
+			url = this.mainService.buildOrder(this.repeatPostData)
+		}
+	 url.subscribe((data) => {
+	    this.loadingRepeat = false;
+	    this.repeatModal = false;
+			if(this.currentDept.typeValue == 'recovery'){
+			  this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.repeatPostData.workOrder.patient.patientCode}).subscribe((resultData) => {
+			    this.confirmRepeatFun(data);
+			  });
+			}else{
+			  this.confirmRepeatFun(data);
+			}
+	    
+	  });
+	}
+	confirmRepeatFun(data){
+		console.log(10087,this.sourceType)
+	  if (this.sourceType === "specimen") {
+	    // 标本建单
+			if (data.status == 200){
+				this.showRepetitionModal("创建", true, "");
+			}else if(data.status == 100043){
+				this.showRepetitionModal("创建", true, data.msg);
+			}else{
+				this.showRepetitionModal("创建", false, data.msg);
+			}
+	  //   if (data.status == 200 && (this.taskType == "other" || this.taskType == "ordinary")) {
+	  //     this.showRepetitionModal("创建", true, "", this.taskType);
+	  //   } else if (data.status == 200 && this.taskType == "bb") {
+	  //     this.showRepetitionModal("创建", true, "", "bb");
+	  //   } else if (this.taskType == "bb" && data.status == 100043) {
+	  //     this.showRepetitionModal("创建", true, data.msg);
+	  //   } else if (data.status == 100043){
+	  //     this.showRepetitionModal("创建", true, data.msg);
+	  //   } else {
+			// 	this.showRepetitionModal("创建", false, data.msg);
+			// }
+	  } else if (this.sourceType === "other" || this.sourceType === "ordinary") {
+			// 其他建单
+			if (data.status == 200){
+				this.showRepetitionModal("创建", true, "");
+			}else if(data.status == 100043){
+				this.showRepetitionModal("创建", true, data.msg);
+			}else{
+				this.showRepetitionModal("创建", false, data.msg);
+			}
+	    // if (data.status == 200 && (this.taskType == "other" || this.taskType == "ordinary")) {
+	    //   this.showRepetitionModal("创建", true, "", this.taskType);
+	    // } else if (data.status == 200 && this.taskType == "bb") {
+	    //   this.showRepetitionModal("创建", true, "", "bb");
+	    // } else if (this.taskType == "bb" && data.status == 100043) {
+	    //   this.showRepetitionModal("创建", true, data.msg);
+	    // } else if (data.status == 100043){
+	    //   this.showRepetitionModal("创建", true, data.msg);
+	    // } else {
+	    //   this.showRepetitionModal("创建", false, data.msg);
+	    // }
+	  } else if (this.sourceType === "transport") {
+	    // 转运
+	    if (data.status == 200) {
+	      this.showRepetitionModal("创建", true, "");
+	    } else if (data.status == 100042) {
+	      this.showRepetitionModal("创建", false, data.msg);
+	    } else {
+	      this.showRepetitionModal("创建", false, data.msg);
+	    }
+	  } else if (this.sourceType === "accompany1") {
+	    // 陪检
+	    if (data.status == 200) {
+	      this.showRepetitionModal("创建", true, "");
+	    } else if (data.status == 100042) {
+	      this.showRepetitionModal("创建", false, data.msg);
+	    } else {
+	      this.showRepetitionModal("创建", false, data.msg);
+	    }
+	  } else if (this.sourceType === "accompany2") {
+	    // 陪检
+	    if (data.status == 200) {
+	      this.showRepetitionModal("创建", true, "");
+	    } else if (data.status == 100042) {
+	      this.showRepetitionModal("创建", false, data.msg);
+	    } else {
+	      this.showRepetitionModal("创建", false, data.msg);
+	    }
+	  } else if (this.sourceType === "accompany3") {
+	    // 陪检
+	    if (data.status == 200) {
+	      this.showRepetitionModal("创建", true, "");
+	    } else if (data.status == 100042) {
+	      this.showRepetitionModal("创建", false, data.msg);
+	    } else {
+	      this.showRepetitionModal("创建", false, data.msg);
+	    }
+	  } else if (this.sourceType === "accompany4") {
+	    // 陪检
+	    if (data.status == 200) {
+	      this.showRepetitionModal("创建", true, "");
+	    } else if (data.status == 100042) {
+	      this.showRepetitionModal("创建", false, data.msg);
+	    } else {
+	      this.showRepetitionModal("创建", false, data.msg);
+	    }
+	  } else if (this.sourceType === "accompany5") {
+	    // 陪检
+	    if (data.status == 200) {
+	      this.showRepetitionModal("创建", true, "");
+	    } else if (data.status == 100042) {
+	      this.showRepetitionModal("创建", false, data.msg);
+	    } else {
+	      this.showRepetitionModal("创建", false, data.msg);
+	    }
+	  } else {
+			if (data.status == 200) {
+			  this.showRepetitionModal("创建", true, "");
+			} else if (data.status == 100042) {
+			  this.showRepetitionModal("创建", false, data.msg);
+			} else if (data.status == 100043) {
+			  this.showRepetitionModal("创建", true, data.msg);
+			} else {
+			  this.showRepetitionModal("创建", false, data.msg);
+			}
+		}
+	}
+	
   // 隐藏选择转入科室的模态框
   deptFlagHand(e) {
     this.deptFlag = false;
@@ -5129,14 +5443,48 @@ export class FuwutaiComponent implements OnInit {
         }
       });
   }
-
+	
+	// 确认
+	jdFlagId;
+	limitTimeLoading:boolean = false;
+	confirmLimitTime() {
+	  console.log(this.limitTimeItem);
+	  this.limitTimeModal = false;
+	  this.jdFlagId = this.msg.loading("正在加载中..", {
+	    nzDuration: 0,
+	  }).messageId;
+	  this.limitTimeItem.fun2.call(this);
+	}
+	
   closeModel(e) {
+		console.log(99999,e)
     if (e === "close") {
+			this.goType = null;
       this.newOrderShowOpen = false; //此时可出现新的弹窗
     } else if (e === "closeGo") {
+			console.log(1111)
       this.showNewOrder("&go&");
-    }
+    }else if(this.dataStatus==1000033 && this.goType=='&go&'){
+			console.log(2222)
+			this.showNewOrder("&go&");
+		}
   }
+	
+	// 重复建单提示框
+	showRepetitionModal(con, success, promptInfo?, back?){
+		this.promptModalShow = false;
+		this.promptContent = con;
+		this.ifSuccess = success;
+		this.promptInfo = promptInfo;
+		this.back = back || "";
+		setTimeout(() => {
+			if(this.confirmType || this.goType=='&go&'){
+				this.showPromptModalRefresh();
+				this.promptModalShow = true;
+			}
+		}, 100);
+	}
+	
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
   showPromptModal(con, success, promptInfo?, back?) {
     this.promptModalShow = false;
@@ -5151,6 +5499,8 @@ export class FuwutaiComponent implements OnInit {
   }
 
   showPromptModalRefresh(){
+		// this.goType = null;
+		// this.confirmType = false;
     this.getUnassignedBuilding2();
     this.resetList();
     this.getOrderList(1);
@@ -5167,6 +5517,8 @@ export class FuwutaiComponent implements OnInit {
     } else if (this.currentRTab === 3) {
       this.getDictionaryList();
     }
+		// this.newOrderShow = false;
+		// this.newOrderShowOpen = false;
     this.fixedTab = "";
     this.fixedMenuShangla();
   }

src/app/views/home/home.component.html

@@ -214,11 +214,15 @@
                   </div>
                   <div [title]="data.evaluationContent"
                     [ngClass]="{'over':true,'noOver':(isOpen&&coopOpenId==data.id)}">
-                    意见内容：{{data.evaluationContent}}</div>
-                  <div class="up">
+                    评价内容：{{data.evaluationContent}}</div>
+                  <!-- <div class="up">
                     <span (click)="more(data.id)">{{(isOpen&&coopOpenId==data.id)?'收起 <<':'展开>>'}}</span>
-                  </div>
-                  <div class="time">发起时间：{{data.startTime|date:'yyyy-MM-dd HH:mm:ss'}}</div>
+                  </div> -->
+									 <div class="flex">
+										 <div>评价时间：{{data.evaluationTime|date:'yyyy-MM-dd HH:mm:ss' || ''}}</div>
+										 <div>评价等级：{{data.evaluationLevel ? data.evaluationLevel.name : '-'}}</div>
+									 </div>
+                  <!-- <div class="time">发起时间：{{data.startTime|date:'yyyy-MM-dd HH:mm:ss'}}</div> -->
                 </div>
                 <div class="btns display_flex">
                   <div class="btn flex_1" (click)="designate(data.id,data.hosId)">指派</div>

src/app/views/home/home.component.less

@@ -421,7 +421,12 @@
                   width: 100%;
                   padding: 16px 16px 8px 16px;
                   font-size: 12px;
-
+									
+									.flex{
+										display: flex;
+										justify-content: space-between;
+									}
+									
                   .title {
                     color: #333;
 
@@ -445,6 +450,7 @@
                     &.noOver {
                       -webkit-line-clamp: unset;
                     }
+										
                   }
 
                   .up {

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/jp-search/jp-search.component.html

@@ -4,7 +4,7 @@
       <div nz-col nzXl='16' class="list-template__searchBox">
         <div class="list-template__searchItem">
           <span class="label">静配标识：</span>
-          <input nz-input class="formItem" placeholder="请输入静配标识" [(ngModel)]="searchCriteria.id" />
+          <input nz-input class="formItem" placeholder="请输入静配标识" [(ngModel)]="searchCriteria.packid" />
         </div>
         <div class="list-template__searchItem">
           <span class="label">发药科室：</span>
@@ -82,7 +82,7 @@
             <td>{{ data.target?.dept }}</td>
             <td>{{ data.creatTime }}</td>
             <td>{{ data.jpstate?.name }}</td>
-            <td>{{data.id}}</td>
+            <td>{{data.packid}}</td>
           </tr>
         </tbody>
       </nz-table>

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

@@ -14,7 +14,7 @@ export class JpSearchComponent implements OnInit {
 
   searchCriteria = {
     //搜索条件
-    id: "", //静配标识
+    packid: "", //静配标识
     launch: null, //发药科室
     target: null, //发药科室
     jpstate: null,
@@ -52,7 +52,7 @@ export class JpSearchComponent implements OnInit {
   reset() {
     this.searchCriteria = {
       //搜索条件
-      id: "",
+      packid: "",
       launch: null,
       target: null,
       jpstate: null,
@@ -134,8 +134,8 @@ export class JpSearchComponent implements OnInit {
     if (this.searchCriteria.launch) {
       postData.jPBag.launch = { id: this.searchCriteria.launch };
     }
-    if (this.searchCriteria.id) {
-      postData.jPBag.id = this.searchCriteria.id;
+    if (this.searchCriteria.packid) {
+      postData.jPBag.packid = this.searchCriteria.packid;
     }
     this.loading1 = true;
     this.mainService

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

@@ -632,6 +632,11 @@ const routes: Routes = [
 			{
 			  path: "specimenPackage",
 			  loadChildren: () => import("../specimen-package/specimen-package.module").then((m) => m.SpecimenPackageModule),
+      },
+			// 手术信息
+			{
+			  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

@@ -1,17 +1,22 @@
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, OnInit, Input, OnDestroy } from '@angular/core';
 import { differenceInCalendarDays, endOfMonth, endOfYear, startOfDay, format, endOfDay, startOfMonth, startOfYear } from "date-fns";
 import { DateService } from 'src/app/services/date.service';
+import { ActivatedRoute, Router, NavigationEnd  } from '@angular/router';
+import { debounceTime, filter } from 'rxjs/operators';
 
 @Component({
   selector: 'app-custom-change-date',
   templateUrl: './custom-change-date.component.html',
   styleUrls: ['./custom-change-date.component.less']
 })
-export class CustomChangeDateComponent implements OnInit {
+export class CustomChangeDateComponent implements OnInit, OnDestroy {
   @Input() isShowType: boolean = true;
+	// @Input() dateData1: any;
+	// @Input() dateData2: any;
   @Input() name: string = '建单时间';
   constructor(
     private dateService: DateService,
+		private router: Router,
   ) { }
 
   dateType: string = "day"; //选中时间维度
@@ -68,21 +73,42 @@ export class CustomChangeDateComponent implements OnInit {
   yearRangeEnd: any; //发起时间 年 止
 
   ngOnInit() {
-    this.resetByDate();
+		this.resetByDate();
+		// this.router.events
+		//   .pipe(filter(event => event instanceof NavigationEnd))
+		//   .subscribe((event: NavigationEnd) => {
+		//     if(event.urlAfterRedirects.endsWith('/incidentList')){
+		// 			this.resetByDate();
+		//     }
+		//   });
   }
-
+	
+	ngOnDestroy(){
+		// this.dateData1 = null 
+		// this.dateData2 = null
+	}
+	
   // 根据时间区间重置
   resetByDate(){
-    this.dateType = 'day';
-    this.changeDateType(this.dateType, 6);
+		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);
+			// }
+			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

@@ -6,7 +6,7 @@
       <form nz-form [formGroup]="validateForm" class="addForm">
         <nz-form-item [hidden]="!fieldConfig.config.group">
           <nz-form-label [nzSpan]="6" nzFor="groupId">分<span style="visibility: hidden;">囧囧</span>组</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择分组!">
+          <nz-form-control [nzSpan]="17" nzErrorTip="请选择分组!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeGroupInp($event)" formControlName="groupId" nzPlaceHolder="请选择分组" (nzOpenChange)="openChangeGroup($event)" (ngModelChange)="changeGroup($event)">
               <ng-container *ngFor="let option of groupList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.groupName" [nzValue]="option.id"></nz-option>
@@ -20,7 +20,7 @@
 
         <nz-form-item [hidden]="!fieldConfig.config.groupAndUser">
           <nz-form-label [nzSpan]="6" nzFor="groupId">分<span style="visibility: hidden;">囧囧</span>组</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择分组!">
+          <nz-form-control [nzSpan]="17" nzErrorTip="请选择分组!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeGroupInp($event)" formControlName="groupId" nzPlaceHolder="请选择分组" (nzOpenChange)="openChangeGroup($event)" (ngModelChange)="changeGroup($event)">
               <ng-container *ngFor="let option of groupList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.groupName" [nzValue]="option.id"></nz-option>
@@ -34,7 +34,7 @@
 
         <nz-form-item [hidden]="!fieldConfig.config.groupAndUser">
           <nz-form-label [nzSpan]="6" nzFor="userId">人<span style="visibility: hidden;">囧囧</span>员</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择人员!">
+          <nz-form-control [nzSpan]="17" nzErrorTip="请选择人员!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeUserInp($event)" formControlName="userId" nzPlaceHolder="请选择人员" (nzOpenChange)="openChangeUser($event)" (ngModelChange)="setIsSelecting(true)">
               <ng-container *ngFor="let option of userList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
@@ -48,7 +48,7 @@
 
         <nz-form-item [hidden]="!fieldConfig.config.statisticsType">
           <nz-form-label [nzSpan]="6" nzFor="statisticsTypeId">统计分类</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择统计分类!">
+          <nz-form-control [nzSpan]="17" nzErrorTip="请选择统计分类!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="statisticsTypeId" nzPlaceHolder="请选择统计分类">
               <ng-container *ngFor="let option of statisticsTypeList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
@@ -62,7 +62,7 @@
 
         <nz-form-item [hidden]="!fieldConfig.config.taskType">
           <nz-form-label [nzSpan]="6" nzFor="taskTypeId">任务类型</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择任务类型!">
+          <nz-form-control [nzSpan]="17" nzErrorTip="请选择任务类型!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeTaskTypeInp($event)" formControlName="taskTypeId" nzPlaceHolder="请选择任务类型" (nzOpenChange)="openChangeTaskType($event)" (ngModelChange)="setIsSelecting(true)">
               <ng-container *ngFor="let option of taskTypeList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.hosId.hosName + '-' + option.taskName" [nzValue]="option.id"></nz-option>
@@ -76,7 +76,7 @@
 
         <nz-form-item [hidden]="!fieldConfig.config.building">
           <nz-form-label [nzSpan]="6" nzFor="buildingId">楼<span style="visibility: hidden;">囧囧</span>栋</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择楼栋!">
+          <nz-form-control [nzSpan]="17" nzErrorTip="请选择楼栋!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeBuildingInp($event)" formControlName="buildingId" nzPlaceHolder="请选择楼栋" (nzOpenChange)="openChangeBuilding($event)" (ngModelChange)="setIsSelecting(true)">
               <ng-container *ngFor="let option of buildingList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName + '-' + option.buildingName" [nzValue]="option.id"></nz-option>
@@ -90,7 +90,7 @@
 
         <nz-form-item [hidden]="!fieldConfig.config.dept">
           <nz-form-label [nzSpan]="6" nzFor="deptId">科<span style="visibility: hidden;">囧囧</span>室</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择科室!">
+          <nz-form-control [nzSpan]="17" nzErrorTip="请选择科室!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" formControlName="deptId" nzPlaceHolder="请选择科室" (nzOpenChange)="openChangeRepairDept($event)" (ngModelChange)="setIsSelecting(true)">
               <ng-container *ngFor="let option of deptList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
@@ -104,17 +104,17 @@
 				
 				<nz-form-item [hidden]="!fieldConfig.config.source">
 				  <nz-form-label [nzSpan]="6" nzFor="sourceId">来<span style="visibility: hidden;">囧囧</span>源</nz-form-label>
-				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择来源!">
+				  <nz-form-control [nzSpan]="17" 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>
 				</nz-form-item>
 				
 				<nz-form-item [hidden]="!fieldConfig.config.minute">
-				  <nz-form-label [nzSpan]="7" nzFor="minuteClose">分钟内关单</nz-form-label>
+				  <nz-form-label [nzSpan]="6" nzFor="minuteClose">分钟内关单</nz-form-label>
 				  <nz-form-control [nzSpan]="17" nzErrorTip="请输入分钟内关单!">
 						<nz-input-number
 							class="width-200"
@@ -129,9 +129,9 @@
 				</nz-form-item>
 				
 				<nz-form-item [hidden]="!fieldConfig.config.special">
-				  <nz-form-label [nzSpan]="8" nzFor="specialId">特殊情况关闭</nz-form-label>
-				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择特殊情况关闭!">
-				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="specialId" nzPlaceHolder="请选择特殊情况关闭">
+				  <nz-form-label [nzSpan]="6" nzFor="specialId">特殊关闭</nz-form-label>
+				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择特殊关闭!">
+				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="specialId" nzPlaceHolder="请选择特殊关闭">
 				      <ng-container *ngFor="let option of specialList">
 				        <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
 				      </ng-container>
@@ -139,31 +139,31 @@
 				  </nz-form-control>
 				</nz-form-item>
 				
-				<nz-form-item [hidden]="!fieldConfig.config.overtime">
+			<!-- 	<nz-form-item [hidden]="!fieldConfig.config.overtime">
 				  <nz-form-label [nzSpan]="6" nzFor="overtimeId">超时工单</nz-form-label>
-				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择超时工单!">
+				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择超时工单!">
 				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="overtimeId" nzPlaceHolder="请选择超时工单">
 				      <ng-container *ngFor="let option of overtimeList">
 				        <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
 				      </ng-container>
 				    </nz-select>
 				  </nz-form-control>
-				</nz-form-item>
+				</nz-form-item> -->
 				
-				<nz-form-item [hidden]="!fieldConfig.config.abnormal">
+			<!-- 	<nz-form-item [hidden]="!fieldConfig.config.abnormal">
 				  <nz-form-label [nzSpan]="6" nzFor="abnormalId">异常工单</nz-form-label>
-				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择异常工单!">
+				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择异常工单!">
 				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="abnormalId" nzPlaceHolder="请选择异常工单">
 				      <ng-container *ngFor="let option of abnormalList">
 				        <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
 				      </ng-container>
 				    </nz-select>
 				  </nz-form-control>
-				</nz-form-item>
+				</nz-form-item> -->
 				
 				<nz-form-item [hidden]="!fieldConfig.config.evaluate">
 				  <nz-form-label [nzSpan]="6" nzFor="evaluateId">评<span style="visibility: hidden;">囧囧</span>价</nz-form-label>
-				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择评价!">
+				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择评价!">
 				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="evaluateId" nzPlaceHolder="请选择评价">
 				      <ng-container *ngFor="let option of evaluateList">
 				        <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
@@ -177,7 +177,7 @@
 				
 				<nz-form-item [hidden]="!fieldConfig.config.executeUser">
 				  <nz-form-label [nzSpan]="6" nzFor="executeUserId">执行人</nz-form-label>
-				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择人员!">
+				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择人员!">
 				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeExecuteUserInp($event)" formControlName="executeUserId" nzPlaceHolder="请选择人员" (nzOpenChange)="openChangeExecuteUser($event)" (ngModelChange)="setIsSelecting(true)">
 				      <ng-container *ngFor="let option of executeUserList">
 				        <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
@@ -191,7 +191,7 @@
 				
 				<nz-form-item [hidden]="!fieldConfig.config.timeFrame">
 				  <nz-form-label [nzSpan]="6" nzFor="timeFrameId">时<span style="visibility: hidden;">囧囧</span>段</nz-form-label>
-				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择人员!">
+				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择人员!">
 				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzShowSearch formControlName="timeFrameId" nzPlaceHolder="请选择时段">
 				      <ng-container *ngFor="let option of timeFrameList">
 				        <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
@@ -202,7 +202,7 @@
 				
 				<nz-form-item [hidden]="!fieldConfig.config.code">
 				  <nz-form-label [nzSpan]="6" nzFor="codeNum">单<span style="visibility: hidden;">囧囧</span>号</nz-form-label>
-				  <nz-form-control [nzSpan]="18" nzErrorTip="请输入单号!">
+				  <nz-form-control [nzSpan]="17" nzErrorTip="请输入单号!">
 				    <input class="width-200" type="text" placeHolder="请输入单号" nz-input formControlName="codeNum" />
 				  </nz-form-control>
 				</nz-form-item>

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

@@ -82,18 +82,23 @@
   // 新增
   &.add {
     .modalBody {
-      width: 400px;
+      width: 80%;
       padding: 0 24px;
 
       .content {
         width: 100%;
-        padding: 10px 24px 0;
+        padding: 10px 10px 0;
 				 max-height: calc(100vh - 120px);
 				 overflow-y: auto;
 
         .addForm {
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: start;
           .ant-form-item {
-            margin-bottom: 14px;
+          	width: 33%;
+            // margin-bottom: 14px;
+						margin: 0 3px 14px 0;
             .ant-form-item-label {
               text-align: left;
             }

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 {
@@ -224,8 +252,8 @@ export class DistributionSearchMoreComponent implements OnInit {
 
   changeGroup(id){
     this.setIsSelecting(true);
-    this.userList = [];
-    this.validateForm.controls.userId.setValue(null);
+    // this.userList = [];
+    // this.validateForm.controls.userId.setValue(null);
     this.getUserList();
   }
 
@@ -239,24 +267,31 @@ export class DistributionSearchMoreComponent implements OnInit {
   // 获取人员列表
   userList:any[] = [];
   getUserList(keyword = ''){
-    if(!this.validateForm.value.groupId){
-      this.isLoading = false;
-      this.userList = [];
-      return;
-    }
+    // if(!this.validateForm.value.groupId){
+    //   this.isLoading = false;
+    //   this.userList = [];
+    //   return;
+    // }
     let postData: any = {
       idx: 0,
       sum: 20,
       user: {
         name: keyword,
         simpleQuery: true,
-        groupdata: { id: this.validateForm.value.groupId },
+				statisticalHosId: this.getHosId,
+        // groupdata: { id: this.validateForm.value.groupId },
       },
     };
     this.isLoading = true;
     this.mainService.getFetchDataList("simple/data", "user", postData).subscribe(result => {
       this.isLoading = false;
       if(result.status == 200){
+				if(!result.list.find(i=> i.id == -1)){
+					result.list.push({
+						name:'未知',
+						id:-1
+					})
+				}
         this.userList = result.list || [];
       }else{
         this.userList = [];
@@ -385,19 +420,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:"微信端"
+			},
+		]
 	}
 	
 	// =================评价===================
@@ -455,10 +495,11 @@ export class DistributionSearchMoreComponent implements OnInit {
 	// 获取时段列表
 	timeFrameList:any[] = [];
 	getTimeFrameList(){
+		this.timeFrameList = [];
 	  for(let i=0; i<24; i++){
 			this.timeFrameList.push({
-				name: i,
-				id: i
+				name: i < 10 ? '0'+i.toString() : i.toString(),
+				id: i < 10 ? '0'+i.toString() : i.toString(),
 			})
 		}
 	}

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

@@ -6,7 +6,7 @@
       <form nz-form [formGroup]="validateForm" class="addForm">
         <nz-form-item [hidden]="!fieldConfig.config.workHourParent">
           <nz-form-label [nzSpan]="6" nzFor="workHourParentId">工时大类</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择工时大类!">
+          <nz-form-control [nzSpan]="16" nzErrorTip="请选择工时大类!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeWorkHourParentInp($event)" formControlName="workHourParentId" nzPlaceHolder="请选择工时大类" (nzOpenChange)="openChangeWorkHourParent($event)" (ngModelChange)="setIsSelecting(true)">
               <ng-container *ngFor="let option of workHourParentList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.workName" [nzValue]="option.id"></nz-option>
@@ -20,7 +20,7 @@
 				
 				<nz-form-item [hidden]="!fieldConfig.config.workHourSmall">
 				  <nz-form-label [nzSpan]="6" nzFor="workHourSmallId">工时小类</nz-form-label>
-				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择工时小类!">
+				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择工时小类!">
 				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeWorkHourSmallInp($event)" formControlName="workHourSmallId" nzPlaceHolder="请选择工时小类" (nzOpenChange)="openChangeWorkHourSmall($event)" (ngModelChange)="setIsSelecting(true)">
 				      <ng-container *ngFor="let option of workHourSmallList">
 				        <nz-option *ngIf="!isLoading" [nzLabel]="option.workName" [nzValue]="option.id"></nz-option>
@@ -34,7 +34,7 @@
 				
         <nz-form-item [hidden]="!fieldConfig.config.group">
           <nz-form-label [nzSpan]="6" nzFor="groupId">维修分组</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择维修分组!">
+          <nz-form-control [nzSpan]="16" nzErrorTip="请选择维修分组!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeGroupInp($event)" formControlName="groupId" nzPlaceHolder="请选择维修分组" (nzOpenChange)="openChangeGroup($event)" (ngModelChange)="changeGroup($event)">
               <ng-container *ngFor="let option of groupList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.groupName" [nzValue]="option.id"></nz-option>
@@ -48,7 +48,7 @@
 
         <nz-form-item [hidden]="!fieldConfig.config.groupAndUser">
           <nz-form-label [nzSpan]="6" nzFor="groupId">维修分组</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择维修分组!">
+          <nz-form-control [nzSpan]="16" nzErrorTip="请选择维修分组!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeGroupInp($event)" formControlName="groupId" nzPlaceHolder="请选择维修分组" (nzOpenChange)="openChangeGroup($event)" (ngModelChange)="changeGroup($event)">
               <ng-container *ngFor="let option of groupList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.groupName" [nzValue]="option.id"></nz-option>
@@ -62,7 +62,7 @@
 
         <nz-form-item [hidden]="!fieldConfig.config.groupAndUser">
           <nz-form-label [nzSpan]="6" nzFor="userId">维修人员</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择维修人员!">
+          <nz-form-control [nzSpan]="16" nzErrorTip="请选择维修人员!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeUserInp($event)" formControlName="userId" nzPlaceHolder="请选择维修人员" (nzOpenChange)="openChangeUser($event)" (ngModelChange)="setIsSelecting(true)">
               <ng-container *ngFor="let option of userList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
@@ -76,7 +76,7 @@
 
         <nz-form-item [hidden]="!fieldConfig.config.category123">
           <nz-form-label [nzSpan]="6" nzFor="category1Id">一级分类</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择一级分类!">
+          <nz-form-control [nzSpan]="16" nzErrorTip="请选择一级分类!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeCategory1Inp($event)" formControlName="category1Id" nzPlaceHolder="请选择一级分类" (nzOpenChange)="openChangeCategory1($event)" (ngModelChange)="changeCategory1($event)">
               <ng-container *ngFor="let option of category1List">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.category" [nzValue]="option.id"></nz-option>
@@ -90,7 +90,7 @@
 
         <nz-form-item [hidden]="!fieldConfig.config.category123">
           <nz-form-label [nzSpan]="6" nzFor="category2Id">二级分类</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择二级分类!">
+          <nz-form-control [nzSpan]="16" nzErrorTip="请选择二级分类!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeCategory2Inp($event)" formControlName="category2Id" nzPlaceHolder="请选择二级分类" (nzOpenChange)="openChangeCategory2($event)" (ngModelChange)="changeCategory2($event)">
               <ng-container *ngFor="let option of category2List">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.category" [nzValue]="option.id"></nz-option>
@@ -104,7 +104,7 @@
 
         <nz-form-item [hidden]="!fieldConfig.config.category123">
           <nz-form-label [nzSpan]="6" nzFor="category3Id">三级分类</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择三级分类!">
+          <nz-form-control [nzSpan]="16" nzErrorTip="请选择三级分类!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeCategory3Inp($event)" formControlName="category3Id" nzPlaceHolder="请选择三级分类" (nzOpenChange)="openChangeCategory3($event)" (ngModelChange)="setIsSelecting(true)">
               <ng-container *ngFor="let option of category3List">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.category" [nzValue]="option.id"></nz-option>
@@ -118,7 +118,7 @@
 
         <nz-form-item [hidden]="!fieldConfig.config.source">
           <nz-form-label [nzSpan]="6" nzFor="sourceId">故障来源</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择故障来源!">
+          <nz-form-control [nzSpan]="16" nzErrorTip="请选择故障来源!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="sourceId" nzPlaceHolder="请选择故障来源">
               <ng-container *ngFor="let option of sourceList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
@@ -132,7 +132,7 @@
 
         <nz-form-item [hidden]="!fieldConfig.config.buildingAndFloor">
           <nz-form-label [nzSpan]="6" nzFor="buildingId">楼<span style="visibility: hidden;">囧囧</span>栋</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择楼栋!">
+          <nz-form-control [nzSpan]="16" nzErrorTip="请选择楼栋!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeBuildingInp($event)" formControlName="buildingId" nzPlaceHolder="请选择楼栋" (nzOpenChange)="openChangeBuilding($event)" (ngModelChange)="changeBuilding($event)">
               <ng-container *ngFor="let option of buildingList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName + '-' + option.buildingName" [nzValue]="option.id"></nz-option>
@@ -146,7 +146,7 @@
 
         <nz-form-item [hidden]="!fieldConfig.config.buildingAndFloor">
           <nz-form-label [nzSpan]="6" nzFor="floorId">楼<span style="visibility: hidden;">囧囧</span>层</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择楼层!">
+          <nz-form-control [nzSpan]="16" nzErrorTip="请选择楼层!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeFloorInp($event)" formControlName="floorId" nzPlaceHolder="请选择楼层" (nzOpenChange)="openChangeFloor($event)" (ngModelChange)="setIsSelecting(true)">
               <ng-container *ngFor="let option of floorList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.floorName" [nzValue]="option.id"></nz-option>
@@ -160,7 +160,7 @@
 
         <nz-form-item [hidden]="!fieldConfig.config.company">
           <nz-form-label [nzSpan]="6" nzFor="companyId">三方公司</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择三方公司!">
+          <nz-form-control [nzSpan]="16" nzErrorTip="请选择三方公司!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeCompanyInp($event)" formControlName="companyId" nzPlaceHolder="请选择三方公司" (nzOpenChange)="openChangeCompany($event)" (ngModelChange)="setIsSelecting(true)">
               <ng-container *ngFor="let option of companyList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
@@ -174,7 +174,7 @@
 
         <nz-form-item [hidden]="!fieldConfig.config.repairDept">
           <nz-form-label [nzSpan]="6" nzFor="repairDeptId">报修科室</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择报修科室!">
+          <nz-form-control [nzSpan]="16" nzErrorTip="请选择报修科室!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" formControlName="repairDeptId" nzPlaceHolder="请选择报修科室" (nzOpenChange)="openChangeRepairDept($event)" (ngModelChange)="setIsSelecting(true)">
               <ng-container *ngFor="let option of repairDeptList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
@@ -188,10 +188,10 @@
 				
 				<nz-form-item [hidden]="!fieldConfig.config.repairUser">
 				  <nz-form-label [nzSpan]="6" nzFor="repairUserId">报修人</nz-form-label>
-				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择报修人!">
+				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择报修人!">
 				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changerepairUserInp($event)" formControlName="repairUserId" nzPlaceHolder="请选择报修人" (nzOpenChange)="openChangerepairUser($event)" (ngModelChange)="setIsSelecting(true)">
 				      <ng-container *ngFor="let option of repairUserList">
-				        <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+				        <nz-option *ngIf="!isLoading" [nzLabel]="option.name +'('+ option.account +')'" [nzValue]="option.id"></nz-option>
 				      </ng-container>
 				      <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
 				        <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -202,7 +202,7 @@
 				
 				<nz-form-item [hidden]="!fieldConfig.config.deptType">
 				  <nz-form-label [nzSpan]="6" nzFor="deptTypeId">科室类型</nz-form-label>
-				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择科室类型!">
+				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择科室类型!">
 				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzShowSearch formControlName="deptTypeId" nzPlaceHolder="请选择科室类型" (nzOpenChange)="openChangeDeptType($event)">
 				      <ng-container *ngFor="let option of deptTypeList">
 				        <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
@@ -216,7 +216,7 @@
 				
 				<nz-form-item [hidden]="!fieldConfig.config.evaluate">
 				  <nz-form-label [nzSpan]="6" nzFor="evaluateId">评价</nz-form-label>
-				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择评价!">
+				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择评价!">
 				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="evaluateId" nzPlaceHolder="请选择评价">
 				      <ng-container *ngFor="let option of evaluateList">
 				        <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
@@ -230,10 +230,10 @@
 				
 				<nz-form-item [hidden]="!fieldConfig.config.consumable">
 				  <nz-form-label [nzSpan]="6" nzFor="consumableId">耗材</nz-form-label>
-				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择耗材!">
+				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择耗材!">
 				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeConsumableInp($event)" formControlName="consumableId" nzPlaceHolder="请选择耗材" (nzOpenChange)="openChangeConsumable($event)" (ngModelChange)="setIsSelecting(true)">
 				      <ng-container *ngFor="let option of consumableList">
-				        <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+				        <nz-option *ngIf="!isLoading" [nzLabel]="option.name +'-'+ option.model +'-'+ option.unit +'-'+ option.price" [nzValue]="option.id"></nz-option>
 				      </ng-container>
 				      <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
 				        <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -244,7 +244,7 @@
 				
 				<nz-form-item [hidden]="!fieldConfig.config.isHang">
 				  <nz-form-label [nzSpan]="6" nzFor="isHangId">是否挂起</nz-form-label>
-				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择是否挂起!">
+				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择是否挂起!">
 				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="isHangId" nzPlaceHolder="请选择是否挂起">
 				      <ng-container *ngFor="let option of isHangList">
 				        <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
@@ -255,14 +255,14 @@
 				
 				<nz-form-item [hidden]="!fieldConfig.config.code">
 				  <nz-form-label [nzSpan]="6" nzFor="codeNum">单号</nz-form-label>
-				  <nz-form-control [nzSpan]="18" nzErrorTip="请输入单号!">
+				  <nz-form-control [nzSpan]="16" nzErrorTip="请输入单号!">
 				    <input class="width-200" type="text" placeHolder="请输入单号" nz-input formControlName="codeNum" />
 				  </nz-form-control>
 				</nz-form-item>
 				
 				<nz-form-item [hidden]="!fieldConfig.config.overtime">
 				  <nz-form-label [nzSpan]="6" nzFor="overtimeId">超时工单</nz-form-label>
-				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择超时工单!">
+				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择超时工单!">
 				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="overtimeId" nzPlaceHolder="请选择超时工单">
 				      <ng-container *ngFor="let option of overtimeList">
 				        <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>

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

@@ -82,18 +82,23 @@
   // 新增
   &.add {
     .modalBody {
-      width: 400px;
+      width: 80%;
       padding: 0 24px;
 
       .content {
         width: 100%;
-        padding: 10px 24px 0;
+        padding: 10px 10px 0;
         max-height: calc(100vh - 120px);
         overflow-y: auto;
 
         .addForm {
+					display: flex;
+					flex-wrap: wrap;
+					justify-content: start;
           .ant-form-item {
-            margin-bottom: 14px;
+						width: 33%;
+            // margin-bottom: 14px;
+						margin: 0 3px 14px 0;
             .ant-form-item-label {
               text-align: left;
             }

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

@@ -19,6 +19,7 @@ export class SearchMoreComponent implements OnInit {
   @Input() parentDutyId: any;
   @Input() dutyId: any;
   @Input() queryType: any;
+	@Input() going: boolean = false;
   validateForm: FormGroup;//表单
   searchTimerSubject = new Subject();
   constructor(
@@ -91,6 +92,40 @@ export class SearchMoreComponent implements OnInit {
 			codeNum: [this.fieldConfig.fields.codeNum || null],
 			overtimeId: [this.fieldConfig.fields.overtimeDTO ? this.fieldConfig.fields.overtimeDTO.id  : null],
 		});
+		
+		if(this.going && this.fieldConfig.fields.groupId){
+			this.getGroupList();
+		}
+		
+		if(this.going && this.fieldConfig.fields.userId){
+			this.getUserList();
+		}
+		
+		if(this.going && this.fieldConfig.fields.category1DTO){
+			this.getCategory1List();
+		}
+		
+		if(this.going && this.fieldConfig.fields.category2DTO){
+			this.getCategory2List();
+		}
+		
+		if(this.going && this.fieldConfig.fields.category3DTO){
+			this.getCategory3List();
+		}
+		
+		if(this.going && this.fieldConfig.fields.buildingId){
+			this.getBuildingList();
+		}
+		
+		if(this.going && this.fieldConfig.fields.floorId){
+			this.getFloorList();
+		}
+		
+		if(this.going && this.fieldConfig.fields.companyId){
+			this.getCompanyList();
+		}
+		
+		
   }
   // 表单提交
   submitForm(): void {
@@ -287,18 +322,18 @@ export class SearchMoreComponent implements OnInit {
   // 获取维修人员列表
   userList:any[] = [];
   getUserList(keyword = ''){
-    if(!this.validateForm.value.groupId){
-      this.isLoading = false;
-      this.userList = [];
-      return;
-    }
+    // if(!this.validateForm.value.groupId){
+    //   this.isLoading = false;
+    //   this.userList = [];
+    //   return;
+    // }
     let postData: any = {
       idx: 0,
       sum: 20,
       user: {
         name: keyword,
         simpleQuery: true,
-        groupdata: { id: this.validateForm.value.groupId },
+        // groupdata: { id: this.validateForm.value.groupId },
         roleCodes: 'first-line support,second-line support,incident manager',
         engineer: 1,
       },
@@ -644,6 +679,11 @@ export class SearchMoreComponent implements OnInit {
 	// 获取工时小类列表
 	workHourSmallList:any[] = [];
 	getWorkHourSmallList(keyword?){
+		if(!this.validateForm.value.workHourParentId){
+		  this.isLoading = false;
+		  this.workHourSmallList = [];
+		  return;
+		}
 	  let postData: any = {
 	    idx: 0,
 	    sum: 20,
@@ -701,9 +741,8 @@ export class SearchMoreComponent implements OnInit {
 	    sum: 20,
 			user: {
 			  name: keyword,
-			  hospital: { id: this.tool.getCurrentHospital().id },
-			  engineer: 1,
-			  simpleQuery: true,
+			  // engineer: 1,
+			  // simpleQuery: true,
 			},
 	  };
 	  this.isLoading = true;
@@ -736,7 +775,6 @@ export class SearchMoreComponent implements OnInit {
 	    sum: 20,
 	    consumable: {
 				name: keyword,
-	      hosId: this.tool.getCurrentHospital().id,
 	      quoteOther: 0,
 	    },
 	  };

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();
@@ -198,7 +352,9 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
     this.dateRange = []
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, deptId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 防抖

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: data[sublevel.value + 'StatisticsTypeId'] ? Number(data[sublevel.value + 'StatisticsTypeId']) : -1,
+				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: data[sublevel.value + 'StatisticsTypeId'] ? Number(data[sublevel.value + 'StatisticsTypeId']) : -1,
+				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();
@@ -104,13 +211,16 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
   dictionaryList: any[] = [];
   getList(num?: number, field?: string, sort?: string) {
     this.mainService.getDictionary('list', 'statistics_date_type').subscribe((data) => {
-      let dictionaryList = data || [];
-      dictionaryList = cloneDeep(dictionaryList);
-      let flag = dictionaryList.some((item) => item.value === 'dateOther');
-      !flag && dictionaryList.push({id: 0, name: '未知', value: 'dateOther'});
-      this.dictionaryList = dictionaryList;
+      this.dictionaryList = data || [];
+      // this.dictionaryList = cloneDeep(dictionaryList);
+      let flag = this.dictionaryList.some((item) => item.value === 'dateOther');
+			// if(!dictionaryList.find(i=> i.id == -1)){
+			// 	dictionaryList.push({id: -1, name: '未知', value: 'dateOther'});
+			// }
+      !flag && this.dictionaryList.push({id: -1, name: '未知', value: 'dateOther'});
+      // this.dictionaryList = dictionaryList;
       this.widthConfig = new Array(this.dictionaryList.length * 3 + 3).fill('100px');
-      if (num !== undefined) {
+			if (num !== undefined) {
         this.pageIndex = num;
       }
       let postData:any = {
@@ -209,7 +319,9 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
     this.dateRange = []
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, deptId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 防抖

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();
@@ -205,7 +392,9 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
     this.statisticsTypeId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, taskTypeId: undefined, buildingId: undefined, deptId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 防抖

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: data[sublevel.value + 'StatisticsTypeId'] ? Number(data[sublevel.value + 'StatisticsTypeId']) : -1,
+				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: data[sublevel.value + 'StatisticsTypeId'] ? Number(data[sublevel.value + 'StatisticsTypeId']) : -1,
+					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();
@@ -124,11 +263,14 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
 	widthValue:any;
   getList(num?: number, field?: string, sort?: string) {
     this.mainService.getDictionary('list', 'statistics_date_type').subscribe((data) => {
-      let dictionaryList = data || [];
-      dictionaryList = cloneDeep(dictionaryList);
-      let flag = dictionaryList.some((item) => item.value === 'dateOther');
-      !flag && dictionaryList.push({id: 0, name: '未知', value: 'dateOther'});
-      this.dictionaryList = dictionaryList;
+     this.dictionaryList = data || [];
+     // this.dictionaryList = cloneDeep(dictionaryList);
+     let flag = this.dictionaryList.some((item) => item.value === 'dateOther');
+     // if(!dictionaryList.find(i=> i.id == -1)){
+     // 	dictionaryList.push({id: -1, name: '未知', value: 'dateOther'});
+     // }
+     !flag && this.dictionaryList.push({id: -1, name: '未知', value: 'dateOther'});
+     // this.dictionaryList = dictionaryList;
       this.widthConfig = new Array(this.dictionaryList.length * 3 + 3).fill('100px').map((v, i) => { return (i == 0 || i == 1 && this.parent==1) || (i == 0 && this.parent==0) ? '150px' : '100px' });
       if(this.parent==1){
 				this.widthValue = this.widthConfig.length * 100 + 300 * 1 + 20
@@ -235,7 +377,9 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
     this.deptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 楼栋搜索

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: this.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: 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 });
+					}
+				});
+		}
+	}
+	
+	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();
@@ -221,7 +465,9 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
     this.deptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined, buildingId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 楼栋搜索

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: 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 });
+					}
+				});
+		}
+	}
+	
+	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,10 +762,12 @@ 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();
+    setTimeout(_=>{
+    	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();
@@ -221,7 +566,9 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
 		this.deptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined, buildingId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 楼栋搜索

src/app/views/new-statistics/distribution-inspection-statistics/distribution-inspection-statistics-routing.module.ts

@@ -135,12 +135,12 @@ const routes: Routes = [
 			  }
 			},
 			{
-			  // 故障工单列表
+			  // 工单列表
 			  path: 'incidentList',
 			  loadChildren: () => import('./incident-list/incident-list.module').then(m => m.IncidentListModule),
 			  data: {
 			    reuse: true,
-			    title: '配-故障工单列表'
+			    title: '配-工单列表'
 			  }
 			},
     ]

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,105 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 		}
 	] //人员top5
   ngOnInit() {}
-
+	
+	/*========= 数据下钻 ========*/
+	
+	// 汇总
+	viewDetail1(){
+		let query = {
+			isGdId: true,
+		}
+		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 = {
+			isGdId: true,
+			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',
+				userDTO: {
+					name: data.userName,
+					id: data.userId?data.userId:-1
+				},
+				userId: data.userId?data.userId:-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 });
+	}
+	
   ngAfterViewInit(){
     setTimeout(() => {
       this.search();
@@ -476,7 +574,10 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 		this.dateRange = [];
 		this.activeIndex = 'day';
     this.customChangeDateComponent.resetByDate();
-		this.search();
+		sessionStorage.removeItem('distributionData');
+		setTimeout(_=>{
+			this.search();
+		})
 	}
 
   // 搜索

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

@@ -214,7 +214,9 @@ export class DistributionUserEvaluateStatisticsComponent implements OnInit, Afte
     this.userId = undefined;
     this.fieldConfig.fields = {groupId: undefined, deptId: undefined, buildingId: undefined, taskTypeId: undefined, statisticsTypeId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	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();
@@ -206,7 +387,9 @@ export class HourQualityControlStatisticsComponent implements OnInit, AfterViewI
     this.statisticsTypeId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, deptId: undefined, buildingId: undefined, taskTypeId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 防抖

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

@@ -3,7 +3,7 @@
     <app-custom-change-date #customChangeDate [isShowType]="false"></app-custom-change-date>
     <div class="searchDataItem">
       <span class="label">统计分类</span>：
-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择统计分类" [(ngModel)]="statisticsTypeId" (nzOpenChange)="openChangeStatisticsType($event)">
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择统计分类" [(ngModel)]="statisticsTypeId" (nzOpenChange)="openChangeStatisticsType()">
         <ng-container *ngFor="let option of statisticsTypeList">
           <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
         </ng-container>
@@ -20,23 +20,26 @@
     <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.overtimeDTO || fieldConfig.fields.overtimeIdDTO || 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>
 	<span>{{fieldConfig.fields.specialDTO?.name}}</span>
 	<span>{{fieldConfig.fields.overtimeDTO?.name}}</span>
-	<span>{{fieldConfig.fields.abnormalDTO?.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>
-<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px', x: '1400px'}">
+<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px', x: '1600px'}">
   <thead>
     <tr>
       <th nzWidth="150px">序号|单号</th>
+			<th nzWidth="100px">申请科室</th>
       <th nzWidth="200px">起点|终点科室</th>
       <th nzWidth="150px">统计|任务类型</th>
       <th nzWidth="200px">时间过程</th>
@@ -44,6 +47,7 @@
       <th nzWidth="200px">时间考核</th>
       <th nzWidth="150px">状态|评价</th>
       <th nzWidth="150px">费用|积分</th>
+			<th nzWidth="100px">执行人</th>
     </tr>
   </thead>
   <tbody>
@@ -52,6 +56,7 @@
 				<div>{{index+(pageIndex-1) * pageSize + 1}}</div>
 				<div class="text-style">{{data.gdcode}}</div>
 			</td>
+			<td>{{ data.createDept }}</td>
       <td>
 				<div>{{ data.startDept }}</div>
 				<div>{{ data.endDept }}</div>
@@ -82,9 +87,10 @@
 				<div>{{ data.evaluationName }}</div>
 			</td>
       <td>
-      	<div>{{ data.totalGrade }}{{data.totalGrade?'元':''}}</div>
-      	<div>{{ data.scorePrice }}{{data.scorePrice?'分':''}}</div>
+      	<div>{{ data.scorePrice }}{{data.scorePrice ? '元' : ''}}</div>
+      	<div>{{ data.totalGrade }}{{data.totalGrade ? '分' : ''}}</div>
       </td>
+			<td>{{data.workerName}}</td>
     </tr>
   </tbody>
 </nz-table>

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,24 @@ 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(){
+		console.log(12122121)
+		this.fieldConfig.fields = {}
+		sessionStorage.removeItem('distributionData')
+	}
+	
   ngAfterViewInit(){
     this.initSessionData();
-    this.getQueryParams();
-    setTimeout(() => {
-      this.search();
-    }, 0)
     this.onResize(0);
   }
 
@@ -56,14 +60,64 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
 
     }, 0)
   }
-
-  getQueryParams(){
+	
+	goingType:boolean = false;
+	gdStateId:any = null;
+	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 = {}
+				}
+				if(!query.isGdId){
+					this.gdStateId = '73,74'
+				}else{
+					this.gdStateId = undefined;
+				}
+				this.getQueryParams(query);
+			},50)
+		}else{
+			this.gdStateId = undefined;
+			setTimeout(_=>{
+				this.getQueryParams('');
+			},50)
+		}
+	}
+	
+  getQueryParams(query){
     let queryParams = this.tabService.getQueryParams();
-    this.tabService.clearQueryParams();
+		console.log(43434343,queryParams)
     if(queryParams.dateRange){
+			console.log(555555)
       this.dateRange = queryParams.dateRange;
-      this.customChangeDateComponent.initByDate(this.dateRange);
-    }
+      this.customChangeDateComponent.initByDate(this.dateRange, queryParams.defRange);
+		}else{
+			this.tabService.clearQueryParams();
+			console.log(666666)
+			if(query){
+				this.dateRange = [query.startDate, query.endDate];
+				this.customChangeDateComponent.initByDate(this.dateRange, queryParams.defRange);
+			}
+		}
+		setTimeout(_=>{
+			this.search();
+			this.onResize(37);
+		},100)
   }
 
   get getMoreFilter(){
@@ -129,16 +183,19 @@ 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,
+			specialCloseFlag: this.fieldConfig.fields.specialId,
+			// timeout: this.fieldConfig.fields.overtimeId,
+			// abnormityType: this.fieldConfig.fields.abnormalId,
 			workOrderEvaluationId: this.fieldConfig.fields.evaluateId || undefined,
-			userId: this.fieldConfig.fields.executeUserId || undefined,
-			hour: this.fieldConfig.fields.timeFrameId || undefined,
-			gdCode: this.fieldConfig.fields.codeNum || undefined
+			hour: this.fieldConfig.fields.timeFrameId != null ? this.fieldConfig.fields.timeFrameId : undefined,
+			gdCode: this.fieldConfig.fields.codeNum || undefined,
+			gdStateId: this.gdStateId
     };
 
     this.loading1 = true;
@@ -184,16 +241,19 @@ 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,
+    	specialCloseFlag: this.fieldConfig.fields.specialId,
+    	// timeout: this.fieldConfig.fields.overtimeId,
+    	// abnormityType: this.fieldConfig.fields.abnormalId,
     	workOrderEvaluationId: this.fieldConfig.fields.evaluateId || undefined,
-    	userId: this.fieldConfig.fields.executeUserId || undefined,
-    	hour: this.fieldConfig.fields.timeFrameId || undefined,
-    	gdCode: this.fieldConfig.fields.codeNum || undefined
+    	hour: this.fieldConfig.fields.timeFrameId != null ? this.fieldConfig.fields.timeFrameId : undefined,
+    	gdCode: this.fieldConfig.fields.codeNum || undefined,
+			gdStateId: this.gdStateId
     };
     this.mainService
       .postExportCustom("itsm/export", "workOrderList", postData)
@@ -225,10 +285,14 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
 		this.sortCurrent = {};
     this.dateRange = []
     this.statisticsTypeId = undefined;
+		this.gdStateId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
-		this.onResize(0);
+		sessionStorage.removeItem('distributionData');
+		setTimeout(_=>{
+			this.search();
+			this.onResize(0);
+		})
   }
 
   // 防抖
@@ -254,26 +318,33 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
 	  this.getList();
 	}
 
-  openChangeStatisticsType(flag){
-    flag && this.getStatisticsTypeList();
+  openChangeStatisticsType(){
+    this.getStatisticsTypeList();
   }
 
   // 获取统计分类列表
   statisticsTypeList:any[] = [];
-  getStatisticsTypeList(keyword?) {
+  getStatisticsTypeList() {
     this.isLoading = true;
     this.mainService
       .getDictionary("list", "statistics_date_type")
       .subscribe((data) => {
+				this.statisticsTypeList = []
         this.isLoading = false;
+				if(!data.find(i=> i.id == -1)){
+					data.push({
+						name:'未知',
+						id:-1
+					})
+				}
         this.statisticsTypeList = data;
       });
   }
 
   // 详细搜索
   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/source-statistics/source-statistics.component.ts

@@ -212,7 +212,9 @@ export class SourceStatisticsComponent implements OnInit, AfterViewInit {
     this.deptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, taskTypeId: undefined, buildingId: undefined, statisticsTypeId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 科室搜索

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();
@@ -212,7 +452,9 @@ export class TaskTypeQualityControlStatisticsComponent implements OnInit, AfterV
     this.taskTypeId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, deptId: undefined, buildingId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 任务类型搜索

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

@@ -219,7 +219,9 @@ export class UserBusinessStatisticsComponent implements OnInit, AfterViewInit {
     this.userId = undefined;
     this.fieldConfig.fields = {buildingId: undefined, deptId: undefined, groupId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 人员搜索

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

@@ -208,7 +208,9 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
     this.userId = undefined;
     this.fieldConfig.fields = {buildingId: undefined, deptId: undefined, groupId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 人员搜索

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

@@ -196,7 +196,9 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
     this.dateRange = []
     this.fieldConfig.fields = {category123: true};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 防抖

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

@@ -36,15 +36,15 @@
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.category }}</td>
-      <td>{{ data.sum }}</td>
+      <td class="text-sign" (click)="viewDetail1(data)">{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
       <td>{{ data.avgResolvedTime }}</td>
-      <td>{{ data.resolvedOverNum }}</td>
-      <td>{{ data.overTimeNum }}</td>
+      <td class="text-sign" (click)="viewDetail2(data)">{{ data.resolvedOverNum }}</td>
+      <td class="text-sign" (click)="viewDetail3(data)">{{ data.overTimeNum }}</td>
       <td>{{ data.consumablePrice }}</td>
       <td>{{ data.workHourPrice }}</td>
       <td>{{ data.totalPrice }}</td>
-      <td>{{ data.negativeNum }}</td>
+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.negativeNum }}</td>
       <td>{{ data.favorableRate }}</td>
     </tr>
   </tbody>
@@ -52,15 +52,15 @@
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
         <td style="width: 10%">{{ data.category }}</td>
-        <td style="width: 9%">{{ data.sum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
         <td style="width: 9%">{{ data.avgResponseTime }}</td>
         <td style="width: 9%">{{ data.avgResolvedTime }}</td>
-        <td style="width: 9%">{{ data.resolvedOverNum }}</td>
-        <td style="width: 9%">{{ data.overTimeNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.resolvedOverNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.overTimeNum }}</td>
         <td style="width: 9%">{{ data.consumablePrice }}</td>
         <td style="width: 9%">{{ data.workHourPrice }}</td>
         <td style="width: 9%">{{ data.totalPrice }}</td>
-        <td style="width: 9%">{{ data.negativeNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.negativeNum }}</td>
         <td style="width: 9%">{{ data.favorableRate }}</td>
       </tr>
     </table>

src/app/views/new-statistics/maintenance-statistics/category-one-statistics/category-one-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/maintenance-statistics/category-one-statistics/category-one-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-category-one-statistics",
@@ -15,6 +15,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
   ) {}
 
@@ -27,6 +28,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
   ngOnInit() {}
 
   ngAfterViewInit(){
+		this.getCategory1List();
     this.initSessionData();
     this.getQueryParams();
     setTimeout(() => {
@@ -43,7 +45,291 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 
     }, 0)
   }
+	
+	// 数据下钻
+	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,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					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,
+				}
+			}
+		}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 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,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					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,
+					overtimeDTO:{
+						id: 1,
+						name: "是"
+					},
+				}
+			}
+		}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,
+					overtimeDTO:{
+						id: 1,
+						name: "是"
+					},
+					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 });
+	}
+	
+	// 数据下钻
+	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,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					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,
+					isHangDTO: {
+						id: 1,
+						name: "是"
+					},
+				}
+			}
+		}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,
+					isHangDTO: {
+						id: 1,
+						name: "是"
+					},
+					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 });
+	}
+	
+	// 数据下钻
+	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,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					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": ""
+					},
+				}
+			}
+		}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 || 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 });
+	}
+	
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();
@@ -96,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) {
@@ -115,6 +421,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
       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,
       repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
       categoryLevel: 1,
@@ -168,6 +475,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
       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,
       repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
       categoryLevel: 1,
@@ -206,7 +514,10 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
     this.dateRange = []
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined, repairDeptId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+		sessionStorage.removeItem('maintenanceData');
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 防抖

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

@@ -204,7 +204,9 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
     this.dateRange = []
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 防抖

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

@@ -56,15 +56,15 @@
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.category }}</td>
-      <td>{{ data.sum }}</td>
+      <td class="text-sign" (click)="viewDetail1(data)">{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
       <td>{{ data.avgResolvedTime }}</td>
-      <td>{{ data.resolvedOverNum }}</td>
-      <td>{{ data.overTimeNum }}</td>
+      <td class="text-sign" (click)="viewDetail2(data)">{{ data.resolvedOverNum }}</td>
+      <td class="text-sign" (click)="viewDetail3(data)">{{ data.overTimeNum }}</td>
       <td>{{ data.consumablePrice }}</td>
       <td>{{ data.workHourPrice }}</td>
       <td>{{ data.totalPrice }}</td>
-      <td>{{ data.negativeNum }}</td>
+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.negativeNum }}</td>
       <td>{{ data.favorableRate }}</td>
     </tr>
   </tbody>
@@ -72,15 +72,15 @@
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
         <td style="width: 10%">{{ data.category }}</td>
-        <td style="width: 9%">{{ data.sum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
         <td style="width: 9%">{{ data.avgResponseTime }}</td>
         <td style="width: 9%">{{ data.avgResolvedTime }}</td>
-        <td style="width: 9%">{{ data.resolvedOverNum }}</td>
-        <td style="width: 9%">{{ data.overTimeNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.resolvedOverNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.overTimeNum }}</td>
         <td style="width: 9%">{{ data.consumablePrice }}</td>
         <td style="width: 9%">{{ data.workHourPrice }}</td>
         <td style="width: 9%">{{ data.totalPrice }}</td>
-        <td style="width: 9%">{{ data.negativeNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.negativeNum }}</td>
         <td style="width: 9%">{{ data.favorableRate }}</td>
       </tr>
     </table>

src/app/views/new-statistics/maintenance-statistics/category-three-statistics/category-three-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/maintenance-statistics/category-three-statistics/category-three-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-category-three-statistics",
@@ -17,6 +17,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
   ) {}
 
@@ -54,7 +55,763 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 
     }, 0)
   }
-
+	
+	// 数据下钻
+	viewDetail1(data, type){
+		let query = null
+		let item1 = null;
+		let item2 = null;
+		if(this.category1Id){
+		  item1 = this.category1List.find(item => item.id == this.category1Id);
+		}
+		if(this.category2Id){
+		  item2 = this.category2List.find(item => item.id == this.category2Id);
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					categoryId: this.category1Id && this.category2Id ? this.category2Id : this.category1Id,
+					hierarchy: this.category1Id && this.category2Id ? 2 : 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,
+					}
+				}
+			}
+			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{
+			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 });
+			}
+		}
+	}
+	
+	// 数据下钻
+	viewDetail2(data, type){
+		let query = null
+		let item1 = null;
+		let item2 = null;
+		if(this.category1Id){
+		  item1 = this.category1List.find(item => item.id == this.category1Id);
+		}
+		if(this.category2Id){
+		  item2 = this.category2List.find(item => item.id == this.category2Id);
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					overtimeId: 1,
+					categoryId: this.category1Id && this.category2Id ? this.category2Id : this.category1Id,
+					hierarchy: this.category1Id && this.category2Id ? 2 : 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,
+					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{
+			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 });
+			}
+		}
+	}
+	
+	// 数据下钻
+	viewDetail3(data, type){
+		let query = null
+		let item1 = null;
+		let item2 = null;
+		if(this.category1Id){
+		  item1 = this.category1List.find(item => item.id == this.category1Id);
+		}
+		if(this.category2Id){
+		  item2 = this.category2List.find(item => item.id == this.category2Id);
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					isHangId: 1,
+					categoryId: this.category1Id && this.category2Id ? this.category2Id : this.category1Id,
+					hierarchy: this.category1Id && this.category2Id ? 2 : 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,
+					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{
+			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 });
+			}
+		}
+	}
+	
+	// 数据下钻
+	viewDetail4(data, type){
+		let query = null
+		let item1 = null;
+		let item2 = null;
+		if(this.category1Id){
+		  item1 = this.category1List.find(item => item.id == this.category1Id);
+		}
+		if(this.category2Id){
+		  item2 = this.category2List.find(item => item.id == this.category2Id);
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20424,
+					categoryId: this.category1Id && this.category2Id ? this.category2Id : this.category1Id,
+					hierarchy: this.category1Id && this.category2Id ? 2 : 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,
+					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{
+			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 });
+			}
+		}
+	}
+	
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();
@@ -223,7 +980,10 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
     this.category2Id = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined, repairDeptId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+		sessionStorage.removeItem('maintenanceData');
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 防抖

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

@@ -46,15 +46,15 @@
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.category }}</td>
-      <td>{{ data.sum }}</td>
+      <td class="text-sign" (click)="viewDetail1(data)">{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
       <td>{{ data.avgResolvedTime }}</td>
-      <td>{{ data.resolvedOverNum }}</td>
-      <td>{{ data.overTimeNum }}</td>
+      <td class="text-sign" (click)="viewDetail2(data)">{{ data.resolvedOverNum }}</td>
+      <td class="text-sign" (click)="viewDetail3(data)">{{ data.overTimeNum }}</td>
       <td>{{ data.consumablePrice }}</td>
       <td>{{ data.workHourPrice }}</td>
       <td>{{ data.totalPrice }}</td>
-      <td>{{ data.negativeNum }}</td>
+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.negativeNum }}</td>
       <td>{{ data.favorableRate }}</td>
     </tr>
   </tbody>
@@ -62,15 +62,15 @@
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
         <td style="width: 10%">{{ data.category }}</td>
-        <td style="width: 9%">{{ data.sum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
         <td style="width: 9%">{{ data.avgResponseTime }}</td>
         <td style="width: 9%">{{ data.avgResolvedTime }}</td>
-        <td style="width: 9%">{{ data.resolvedOverNum }}</td>
-        <td style="width: 9%">{{ data.overTimeNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.resolvedOverNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.overTimeNum }}</td>
         <td style="width: 9%">{{ data.consumablePrice }}</td>
         <td style="width: 9%">{{ data.workHourPrice }}</td>
         <td style="width: 9%">{{ data.totalPrice }}</td>
-        <td style="width: 9%">{{ data.negativeNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.negativeNum }}</td>
         <td style="width: 9%">{{ data.favorableRate }}</td>
       </tr>
     </table>

src/app/views/new-statistics/maintenance-statistics/category-two-statistics/category-two-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/maintenance-statistics/category-two-statistics/category-two-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-category-two-statistics",
@@ -17,6 +17,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
   ) {}
 
@@ -54,7 +55,532 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
 
     }, 0)
   }
-
+	
+	// 数据下钻
+	viewDetail1(data, type){
+		let query = null;
+		let item = null;
+		if(this.category1Id){
+		  item = this.category1List.find(item => item.id == this.category1Id);
+		}
+		
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					categoryId: this.category1Id,
+					hierarchy: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 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{
+			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 });
+			}
+		}
+	}
+	
+	// 数据下钻
+	viewDetail2(data, type){
+		let query = null
+		let item = null;
+		if(this.category1Id){
+		  item = this.category1List.find(item => item.id == this.category1Id);
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					overtimeId: 1,
+					categoryId: this.category1Id,
+					hierarchy: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,
+					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{
+			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 });
+			}
+		}
+	}
+	
+	// 数据下钻
+	viewDetail3(data, type){
+		let query = null
+		let item = null;
+		if(this.category1Id){
+		  item = this.category1List.find(item => item.id == this.category1Id);
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					isHangId: 1,
+					categoryId: this.category1Id,
+					hierarchy: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,
+					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{
+			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 });
+			}
+		}
+	}
+	
+	// 数据下钻
+	viewDetail4(data, type){
+		let query = null
+		let item = null;
+		if(this.category1Id){
+		  item = this.category1List.find(item => item.id == this.category1Id);
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20424,
+					categoryId: this.category1Id,
+					hierarchy: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,
+					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{
+			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 });
+			}
+		}
+	}
+	
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();
@@ -222,7 +748,10 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
     this.category1Id = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined, repairDeptId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+		sessionStorage.removeItem('maintenanceData');
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 一级分类搜索

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

@@ -220,7 +220,10 @@ export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
     this.repairDeptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+		sessionStorage.removeItem('maintenanceData');
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 科室搜索

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

@@ -51,13 +51,13 @@
 			<tr *ngFor="let data of listOfData">
 				<td *ngIf="parent==1">{{ data.parentName || '无' }}<ng-container *ngIf="parent==1 && data.parentName">({{ data.parentCode }})</ng-container></td>
 				<td>{{ data.deptName }}<ng-container *ngIf="data.deptCode">({{ data.deptCode }})</ng-container></td>
-				<td>{{ data.sum }}</td>
+				<td class="text-sign" (click)="viewDetail1(data)">{{ data.sum }}</td>
 				<td>{{ data.degreeCount }}</td>
-				<td>{{ data.oneStar }}</td>
-				<td>{{ data.twoStar }}</td>
-				<td>{{ data.threeStar }}</td>
-				<td>{{ data.fourStar }}</td>
-				<td>{{ data.fiveStar }}</td>
+				<td class="text-sign" (click)="viewDetail2(data)">{{ data.oneStar }}</td>
+				<td class="text-sign" (click)="viewDetail3(data)">{{ data.twoStar }}</td>
+				<td class="text-sign" (click)="viewDetail4(data)">{{ data.threeStar }}</td>
+				<td class="text-sign" (click)="viewDetail5(data)">{{ data.fourStar }}</td>
+				<td class="text-sign" (click)="viewDetail6(data)">{{ data.fiveStar }}</td>
 				<td>{{ data.totalStar }}</td>
 				<td>{{ data.avgStar }}</td>
 			</tr>
@@ -68,13 +68,13 @@
 					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==1">{{ data.parentCode }}</td>
 					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==0">{{ data.deptCode }}</td>
 					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==1"></td>
-					<td [ngStyle]="{width:widthStyle}">{{ data.sum }}</td>
+					<td [ngStyle]="{width:widthStyle}" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
 					<td [ngStyle]="{width:widthStyle}">{{ data.degreeCount }}</td>
-					<td [ngStyle]="{width:widthStyle}">{{ data.oneStar }}</td>
-					<td [ngStyle]="{width:widthStyle}">{{ data.twoStar }}</td>
-					<td [ngStyle]="{width:widthStyle}">{{ data.threeStar }}</td>
-					<td [ngStyle]="{width:widthStyle}">{{ data.fourStar }}</td>
-					<td [ngStyle]="{width:widthStyle}">{{ data.fiveStar }}</td>
+					<td [ngStyle]="{width:widthStyle}" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.oneStar }}</td>
+					<td [ngStyle]="{width:widthStyle}" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.twoStar }}</td>
+					<td [ngStyle]="{width:widthStyle}" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.threeStar }}</td>
+					<td [ngStyle]="{width:widthStyle}" class="text-sign" (click)="viewDetail5(data, 'all')">{{ data.fourStar }}</td>
+					<td [ngStyle]="{width:widthStyle}" class="text-sign" (click)="viewDetail6(data, 'all')">{{ data.fiveStar }}</td>
 					<td [ngStyle]="{width:widthStyle}">{{ data.totalStar }}</td>
 					<td [ngStyle]="{width:widthStyle}">{{ data.avgStar }}</td>
 				</tr>

src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/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/maintenance-statistics/department-evaluate-statistics/department-evaluate-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 { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
@@ -19,6 +19,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
 		private tool: ToolService,
   ) {}
@@ -59,7 +60,464 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
     }, 0)
   }
+	
+	// 数据下钻
+	viewDetail1(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.deptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || 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,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: data.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || 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,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || 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 });
+	}
+	
+	// 数据下钻
+	viewDetail2(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.deptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20424,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || 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,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					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{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: data.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20424,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || 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,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					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": ""
+					}
+				}
+			}
+		}
+
+		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
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.deptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20423,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || 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,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					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{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: data.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20423,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || 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,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					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": ""
+					}
+				}
+			}
+		}
+
+		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
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.deptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20422,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || 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,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					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{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: data.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20422,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || 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,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					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": ""
+					}
+				}
+			}
+		}
+
+		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 });
+	}
+	
+	// 数据下钻
+	viewDetail5(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.deptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20421,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || 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,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					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{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: data.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20421,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || 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,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					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": ""
+					}
+				}
+			}
+		}
 
+		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 });
+	}
+	
+	// 数据下钻
+	viewDetail6(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.deptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20420,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: data.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20420,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					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": ""
+					}
+				}
+			}
+		}
+
+		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(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();
@@ -241,7 +699,10 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
     this.deptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, deptTypeId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+		sessionStorage.removeItem('maintenanceData');
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
 	// 防抖

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

@@ -52,15 +52,15 @@
 			<tr *ngFor="let data of listOfData">
 				<td *ngIf="parent==1">{{ data.parentName || '无' }}<ng-container *ngIf="parent==1 && data.parentName">({{ data.parentCode }})</ng-container></td>
 				<td>{{ data.deptName }}<ng-container *ngIf="data.deptCode">({{ data.deptCode }})</ng-container></td>
-				<td>{{ data.sum }}</td>
+				<td class="text-sign" (click)="viewDetail1(data)">{{ data.sum }}</td>
 				<td>{{ data.avgResponseTime }}</td>
 				<td>{{ data.avgResolvedTime }}</td>
-				<td>{{ data.resolvedOverNum }}</td>
-				<td>{{ data.overTimeNum }}</td>
+				<td class="text-sign" (click)="viewDetail2(data)">{{ data.resolvedOverNum }}</td>
+				<td class="text-sign" (click)="viewDetail3(data)">{{ data.overTimeNum }}</td>
 				<td>{{ data.consumablePrice }}</td>
 				<td>{{ data.workHourPrice }}</td>
 				<td>{{ data.totalPrice }}</td>
-				<td>{{ data.negativeNum }}</td>
+				<td class="text-sign" (click)="viewDetail4(data)">{{ data.negativeNum }}</td>
 				<td>{{ data.favorableRate }}</td>
 			</tr>
 		</tbody>
@@ -70,15 +70,15 @@
 					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==1">{{ data.parentCode }}</td>
 					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==0">{{ data.deptCode}}</td>
 					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==1"></td>
-					<td [ngStyle]="{width:widthStyle}">{{ data.sum }}</td>
+					<td [ngStyle]="{width:widthStyle}" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
 					<td [ngStyle]="{width:widthStyle}">{{ data.avgResponseTime }}</td>
 					<td [ngStyle]="{width:widthStyle}">{{ data.avgResolvedTime }}</td>
-					<td [ngStyle]="{width:widthStyle}">{{ data.resolvedOverNum }}</td>
-					<td [ngStyle]="{width:widthStyle}">{{ data.overTimeNum }}</td>
+					<td [ngStyle]="{width:widthStyle}" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.resolvedOverNum }}</td>
+					<td [ngStyle]="{width:widthStyle}" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.overTimeNum }}</td>
 					<td [ngStyle]="{width:widthStyle}">{{ data.consumablePrice }}</td>
 					<td [ngStyle]="{width:widthStyle}">{{ data.workHourPrice }}</td>
 					<td [ngStyle]="{width:widthStyle}">{{ data.totalPrice }}</td>
-					<td [ngStyle]="{width:widthStyle}">{{ data.negativeNum }}</td>
+					<td [ngStyle]="{width:widthStyle}" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.negativeNum }}</td>
 					<td [ngStyle]="{width:widthStyle}">{{ data.favorableRate }}</td>
 				</tr>
 			</table>

src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-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/maintenance-statistics/department-incident-statistics/department-incident-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 { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
@@ -19,6 +19,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
 		private tool: ToolService,
   ) {}
@@ -59,7 +60,303 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 
     }, 0)
   }
+	
+	// 数据下钻
+	viewDetail1(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.deptId,
+				searchQuery:{
+					statusValue: 'close',
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || 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,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: data.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || 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,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || 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 });
+	}
+	
+	// 数据下钻
+	viewDetail2(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.deptId,
+				searchQuery:{
+					statusValue: 'close',
+					overtimeId: 1,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || 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,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
+					overtimeDTO:{
+						id: 1,
+						name: "是"
+					},
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: data.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					overtimeId: 1,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || 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,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || 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 });
+	}
+	
+	// 数据下钻
+	viewDetail3(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.deptId,
+				searchQuery:{
+					statusValue: 'close',
+					isHangId: 1,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || 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,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
+					isHangDTO:{
+						id: 1,
+						name: "是"
+					},
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: data.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					isHangId: 1,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || 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,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || 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 });
+	}
+	
+	// 数据下钻
+	viewDetail4(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.deptId,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20424,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || 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,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					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{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: data.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20424,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || 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,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					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": ""
+					}
+				}
+			}
+		}
 
+		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(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();
@@ -241,7 +538,10 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
     this.deptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, deptTypeId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+		sessionStorage.removeItem('maintenanceData');
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 防抖

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

@@ -229,7 +229,9 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
     this.deptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, deptTypeId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 防抖

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

@@ -210,7 +210,9 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
     this.buildingId = undefined;
     this.fieldConfig.fields = {categoryId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 楼栋搜索

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

@@ -35,15 +35,15 @@
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.groupName }}</td>
-      <td>{{ data.sum }}</td>
+      <td class="text-sign" (click)="viewDetail1(data)">{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
       <td>{{ data.avgResolvedTime }}</td>
-      <td>{{ data.resolvedOverNum }}</td>
-      <td>{{ data.overTimeNum }}</td>
+      <td class="text-sign" (click)="viewDetail2(data)">{{ data.resolvedOverNum }}</td>
+      <td class="text-sign" (click)="viewDetail3(data)">{{ data.overTimeNum }}</td>
       <td>{{ data.consumablePrice }}</td>
       <td>{{ data.workHourPrice }}</td>
       <td>{{ data.totalPrice }}</td>
-      <td>{{ data.negativeNum }}</td>
+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.negativeNum }}</td>
       <td>{{ data.favorableRate }}</td>
     </tr>
   </tbody>
@@ -51,15 +51,15 @@
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
         <td style="width: 10%">{{ data.groupName }}</td>
-        <td style="width: 9%">{{ data.sum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
         <td style="width: 9%">{{ data.avgResponseTime }}</td>
         <td style="width: 9%">{{ data.avgResolvedTime }}</td>
-        <td style="width: 9%">{{ data.resolvedOverNum }}</td>
-        <td style="width: 9%">{{ data.overTimeNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.resolvedOverNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.overTimeNum }}</td>
         <td style="width: 9%">{{ data.consumablePrice }}</td>
         <td style="width: 9%">{{ data.workHourPrice }}</td>
         <td style="width: 9%">{{ data.totalPrice }}</td>
-        <td style="width: 9%">{{ data.negativeNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.negativeNum }}</td>
         <td style="width: 9%">{{ data.favorableRate }}</td>
       </tr>
     </table>

src/app/views/new-statistics/maintenance-statistics/group-statistics/group-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/maintenance-statistics/group-statistics/group-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-group-statistics",
@@ -15,6 +15,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
   ) {}
 
@@ -43,7 +44,267 @@ export class GroupStatisticsComponent 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',
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					groupId: data.groupId ? data.groupId : -1,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					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,
+					}
+				}
+			}
+		}
 
+		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
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					overtimeId: 1,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					overtimeDTO:{
+						id: 1,
+						name: "是"
+					},
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					groupId: data.groupId ? data.groupId : -1,
+					overtimeId: 1,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					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: "是"
+					},
+				}
+			}
+		}
+
+		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
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					isHangId: 1,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					isHangDTO:{
+						id: 1,
+						name: "是"
+					},
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					groupId: data.groupId ? data.groupId : -1,
+					isHangId: 1,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					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: "是"
+					},
+				}
+			}
+		}
+
+		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
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20424,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					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{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					groupId: data.groupId ? data.groupId : -1,
+					evaluateId: 20424,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					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": ""
+					}
+				}
+			}
+		}
+
+		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(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();
@@ -200,7 +461,9 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
     this.dateRange = []
     this.fieldConfig.fields = {categoryId: undefined, buildingId: undefined, floorId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 防抖

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

@@ -20,9 +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.userDTO || fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.sourceDTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || 
-		this.fieldConfig.fields.companyDTO || this.fieldConfig.fields.workHourParentDTO || this.fieldConfig.fields.workHourSmallDTO || this.fieldConfig.fields.evaluateDTO || this.fieldConfig.fields.repairUserDTO || this.fieldConfig.fields.consumableDTO || 
-		this.fieldConfig.fields.isHangDTO || this.fieldConfig.fields.overtimeDTO || this.fieldConfig.fields.codeNumDTO">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.sourceDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO || 
+		fieldConfig.fields.companyDTO || fieldConfig.fields.workHourParentDTO || fieldConfig.fields.workHourSmallDTO || fieldConfig.fields.evaluateDTO || fieldConfig.fields.repairUserDTO || fieldConfig.fields.consumableDTO || 
+		fieldConfig.fields.isHangDTO || fieldConfig.fields.overtimeDTO || fieldConfig.fields.codeNumDTO || fieldConfig.fields.deptTypeDTO">
   <span>{{fieldConfig.fields.workHourParentDTO?.workName}}</span>
 	<span>{{fieldConfig.fields.workHourSmallDTO?.workName}}</span>
 	<span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
@@ -40,13 +40,15 @@
 	<span>{{fieldConfig.fields.isHangDTO?.name}}</span>
 	<span>{{fieldConfig.fields.overtimeDTO?.name}}</span>
 	<span>{{fieldConfig.fields.codeNumDTO}}</span>
+	<span>{{fieldConfig.fields.deptTypeDTO?.name}}</span>
+	
 </div>
-<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px', x: '1550px'}">
+<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px', x: '1600px'}">
   <thead>
     <tr>
       <th nzWidth="150px">序号|单号</th>
       <th nzWidth="300px">故障描述</th>
-      <th nzWidth="150px">详细地址</th>
+      <th nzWidth="200px">详细地址</th>
       <th nzWidth="100px">受|处理人/组</th>
       <th nzWidth="200px">时间过程</th>
       <th nzWidth="100px">时长</th>
@@ -59,11 +61,17 @@
   <tbody>
     <tr *ngFor="let data of listOfData; let index = index;">
       <td (click)="viewDetail(data)">
-				<div>{{index+(pageIndex-1) * pageSize + 1}}</div>
+				<div>{{index+(pageIndex-1) * pageSize + 1}} {{data.priorityName}}</div>
 				<div class="text-style">{{data.incidentsign}}</div>
 			</td>
-      <td class="hide-describe">{{data.description}}</td>
-      <td>{{ data.housenumber }}</td>
+      <td class="hide-describe">
+				<div>{{data.mutiCategory}}</div>
+				<div>{{data.description}}</div>
+			</td>
+      <td>
+				<div>{{data.hosName}}-{{data.repairDept}}</div>
+				<div>{{ data.housenumber }}</div>
+			</td>
       <td>
 				<div>{{data.creator}}</div>
 				<div>{{data.groupOrHandlerUser}}</div>
@@ -79,8 +87,8 @@
 				<div>解决:{{data.resolvedTime}}</div>
 			</td>
       <td>
-      	<div>预接:{{data.overdueTime|date:'yyyy-MM-dd HH:mm:ss'}}</div>
-      	<div>预解:{{data.overdueResponseDate|date:'yyyy-MM-dd HH:mm:ss'}}</div>
+      	<div>预接:{{data.overdueResponseDate|date:'yyyy-MM-dd HH:mm:ss'}}</div>
+      	<div>预解:{{data.overdueTime|date:'yyyy-MM-dd HH:mm:ss'}}</div>
       </td>
       <td>{{ data.remark }}</td>
       <td>
@@ -101,7 +109,7 @@
 </div>
 
 <!-- 详细搜索 -->
-<app-search-more [fieldConfig]="fieldConfig" *ngIf="showSearchMore" [hosId]="hosId" [queryType]="queryType"  [dutyId]="dutyId"  [parentDutyId]="parentDutyId" (cancelEvent)="cancelEvent()" (submitEvent)="submitEvent($event)"></app-search-more>
+<app-search-more [fieldConfig]="fieldConfig" *ngIf="showSearchMore" [hosId]="hosId" [queryType]="queryType"  [dutyId]="dutyId"  [parentDutyId]="parentDutyId" (cancelEvent)="cancelEvent()" (submitEvent)="submitEvent($event)" [going]="goingType"></app-search-more>
 
 <!-- 详情 -->
 <app-incident-detail [id]="coopData.id" *ngIf="detailModalShow" (closeModelHs)="closeDetailModelOrder($event)" (confirmModelHs)="confirmDetailModelOrder($event)"></app-incident-detail>

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

@@ -2,7 +2,7 @@ import { TabService } from './../../services/tab.service';
 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, NavigationEnd  } from '@angular/router';
 import cloneDeep from 'lodash-es/cloneDeep'
@@ -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,29 +31,33 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
   repairDeptId;//报修科室id
 
   searchTimerSubject = new Subject();
-
+	dateData1:any;
+	dateData2:any;
+	
   ngOnInit() {
+		// 数据下钻搜索
 		this.getRouteQuery()
-		this.router.events
-		  .pipe(filter(event => event instanceof NavigationEnd))
-		  .subscribe((event: NavigationEnd) => {
-		    if(event.urlAfterRedirects=='/newStatistics/maintenanceStatistics/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];
       fun.call(this, v[1]);
     });
   }
-
+	
+	ngOnDestroy(){
+		sessionStorage.removeItem('maintenanceData')
+	}
+	
   ngAfterViewInit(){
     this.initSessionData();
-    this.getQueryParams();
-    setTimeout(() => {
-      this.search();
-    }, 0)
     this.onResize(0);
   }
 
@@ -65,34 +69,48 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
     }, 0)
   }
 	
+	goingType:boolean = false;
 	getRouteQuery(){
 		let data = sessionStorage.getItem('maintenanceData')
 		let query = null
 		if(data){
 			query = JSON.parse(data)
 			console.log('query==========',query)
-			if(query.startData){
-				this.customChangeDateComponent.startDate = query.startData
-			}
-			if(query.endDate){
-				this.customChangeDateComponent.startDate = query.endDate
-			}
-			if(query.searchQuery){
-				this.fieldConfig.fields = query.searchQuery
-			}
-			
-			this.search();
-			this.onResize(37);
+			setTimeout(_=>{
+				if(query.repairDeptId){
+					this.getRepairDeptList();
+					this.repairDeptId = query.repairDeptId
+				}else{
+					this.repairDeptId = 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();
+		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(){
@@ -152,7 +170,7 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
     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,
@@ -170,10 +188,12 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
 			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,
+			deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
     };
 		
 		if(this.fieldConfig.fields.workHourParentId && this.fieldConfig.fields.workHourSmallId){
@@ -239,10 +259,12 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
     	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,
+			deptTypeId: this.fieldConfig.fields.deptTypeId || undefined
     };
     
     if(this.fieldConfig.fields.workHourParentId && this.fieldConfig.fields.workHourSmallId){
@@ -280,11 +302,16 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
 		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();
-    this.search();
-		this.onResize(0);
+		sessionStorage.removeItem('maintenanceData');
+		setTimeout(_=>{
+			this.search();
+			this.onResize(0);
+		})
   }
 
   // 科室搜索
@@ -345,8 +372,8 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
   fieldConfig:any = {
     fields: {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: 
 		undefined,buildingId: undefined, floorId: undefined, companyId: undefined, 
-		workHourParentId: undefined, workHourSmallId: undefined, evaluateId: undefined, repairUserId: undefined, consumableId: undefined, isHangId: undefined, codeNum: undefined, overtimeId: undefined},
-    config: {groupAndUser: true, category123: true, source: true, buildingAndFloor: true, company: true, workHourParent: true, workHourSmall: true, evaluate: true, repairUser: true, consumable: true, isHang: true, code: true, overtime: true},
+		workHourParentId: undefined, workHourSmallId: undefined, evaluateId: undefined, repairUserId: undefined, consumableId: undefined, isHangId: undefined, codeNum: undefined, overtimeId: undefined, deptTypeId: undefined},
+    config: {groupAndUser: true, category123: true, source: true, buildingAndFloor: true, company: true, workHourParent: true, workHourSmall: true, evaluate: true, repairUser: true, consumable: true, isHang: true, code: true, overtime: true, deptType: true},
   }
   showSearchMore:boolean = false;
   showMore(){

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

@@ -47,15 +47,15 @@
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.startDate }}</td>
-      <td>{{ data.sum }}</td>
+      <td class="text-sign" (click)="viewDetail1(data)">{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
       <td>{{ data.avgResolvedTime }}</td>
-      <td>{{ data.resolvedOverNum }}</td>
-      <td>{{ data.overTimeNum }}</td>
+      <td class="text-sign" (click)="viewDetail2(data)">{{ data.resolvedOverNum }}</td>
+      <td class="text-sign" (click)="viewDetail3(data)">{{ data.overTimeNum }}</td>
       <td>{{ data.consumablePrice }}</td>
       <td>{{ data.workHourPrice }}</td>
       <td>{{ data.totalPrice }}</td>
-      <td>{{ data.negativeNum }}</td>
+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.negativeNum }}</td>
       <td>{{ data.favorableRate }}</td>
     </tr>
   </tbody>
@@ -63,15 +63,15 @@
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
         <td style="width: 10%">{{ data.startDate }}</td>
-        <td style="width: 9%">{{ data.sum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail1(data,'all')">{{ data.sum }}</td>
         <td style="width: 9%">{{ data.avgResponseTime }}</td>
         <td style="width: 9%">{{ data.avgResolvedTime }}</td>
-        <td style="width: 9%">{{ data.resolvedOverNum }}</td>
-        <td style="width: 9%">{{ data.overTimeNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail2(data,'all')">{{ data.resolvedOverNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail3(data,'all')">{{ data.overTimeNum }}</td>
         <td style="width: 9%">{{ data.consumablePrice }}</td>
         <td style="width: 9%">{{ data.workHourPrice }}</td>
         <td style="width: 9%">{{ data.totalPrice }}</td>
-        <td style="width: 9%">{{ data.negativeNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail4(data,'all')">{{ data.negativeNum }}</td>
         <td style="width: 9%">{{ data.favorableRate }}</td>
       </tr>
     </table>

src/app/views/new-statistics/maintenance-statistics/incident-statistics/incident-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/maintenance-statistics/incident-statistics/incident-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-incident-statistics",
@@ -17,6 +17,7 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
   ) {}
 
@@ -54,7 +55,287 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
 
     }, 0)
   }
-
+	
+	// 数据下钻
+	viewDetail1(data,type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate,
+				endDate: this.customChangeDateComponent.endDate,
+				repairDeptId: this.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					sourceId: this.fieldConfig.fields.sourceId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO,
+					sourceDTO: this.fieldConfig.fields.sourceDTO,
+					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',
+				endDate: data.startDate + ' ' + '23:59:59',
+				repairDeptId: this.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					sourceId: this.fieldConfig.fields.sourceId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO,
+					sourceDTO: this.fieldConfig.fields.sourceDTO,
+					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 });
+		}
+	}
+	
+	// 数据下钻
+	viewDetail2(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate,
+				endDate: this.customChangeDateComponent.endDate,
+				repairDeptId: this.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					overtimeId: 1,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					sourceId: this.fieldConfig.fields.sourceId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					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',
+				endDate: data.startDate + ' ' + '23:59:59',
+				repairDeptId: this.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					overtimeId: 1,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					sourceId: this.fieldConfig.fields.sourceId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					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 });
+		}
+	}
+	
+	// 数据下钻
+	viewDetail3(data, type){
+		let query = null;
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate,
+				endDate: this.customChangeDateComponent.endDate,
+				repairDeptId: this.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					isHangId: 1,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					sourceId: this.fieldConfig.fields.sourceId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					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',
+				endDate: data.startDate + ' ' + '23:59:59',
+				repairDeptId: this.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					isHangId: 1,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					sourceId: this.fieldConfig.fields.sourceId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					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 });
+		}
+	}
+	
+	// 数据下钻
+	viewDetail4(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate,
+				endDate: this.customChangeDateComponent.endDate,
+				repairDeptId: this.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20424,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					sourceId: this.fieldConfig.fields.sourceId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					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',
+				endDate: data.startDate + ' ' + '23:59:59',
+				repairDeptId: this.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20424,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					sourceId: this.fieldConfig.fields.sourceId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					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 });
+		}
+	}
+	
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();
@@ -218,7 +499,10 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
     this.repairDeptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+		sessionStorage.removeItem('maintenanceData');
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 科室搜索

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

@@ -11,7 +11,7 @@
   <ng-container *ngIf="!isLoading">
     <div class="top1-statistics">
       <div class="top-list">
-        <div class="special-box" (click)="viewDetail1()">
+        <div class="special-box cursor" (click)="viewDetail1()">
           <div class="num">{{workData.gd_total || 0}}</div>
           <div class="describe">工单总数</div>
         </div>
@@ -34,21 +34,21 @@
         <div class="border"></div>
       </div>
       <div class="top-list">
-        <div class="special-box" (click)="viewDetail2()">
+        <div class="special-box cursor" (click)="viewDetail2()">
           <div class="num">{{workData.gd_postpone || 0}}</div>
           <div class="describe">挂起单数</div>
         </div>
         <div class="border"></div>
       </div>
       <div class="top-list">
-        <div class="special-box" (click)="viewDetail3()">
+        <div class="special-box cursor" (click)="viewDetail3()">
           <div class="num">{{workData.gd_overtime || 0}}</div>
           <div class="describe">超时单数</div>
         </div>
         <div class="border"></div>
       </div>
       <div class="top-list">
-        <div class="special-box" (click)="viewDetail4()">
+        <div class="special-box cursor" (click)="viewDetail4()">
           <div class="num">{{workData.gd_degree}}</div>
           <div class="describe">差评单数</div>
         </div>
@@ -83,10 +83,10 @@
               <span *ngIf="index !=0 && index !=1 && index !=2">{{index+1}}</span>
             </div>
             <div class="table-list">{{item.name}}</div>
-            <div class="table-list" (click)="viewMaintain1(item)">{{item.count || 0}}</div>
+            <div class="table-list text-sign" (click)="viewMaintain1(item)">{{item.count || 0}}</div>
             <div class="table-list">{{item.avg_response}}分</div>
             <div class="table-list">{{item.avg_handle }}分</div>
-            <div class="table-list" (click)="viewMaintain2(item)">{{item.overtime || 0}}</div>
+            <div class="table-list text-sign" (click)="viewMaintain2(item)">{{item.overtime || 0}}</div>
           </div>
         </div>
       </div>
@@ -140,7 +140,7 @@
           <div class="th" *ngFor="let item of deptCostData; let index = index;">
             <div class="table-list-4">{{index+1}}</div>
             <div class="table-list-4 ellipsis-oneline" title="{{item.dept}}">{{item.dept}}</div>
-            <div class="table-list-4" (click)="viewDept(item)">{{item.sum || 0}}</div>
+            <div class="table-list-4 text-sign" (click)="viewDept(item)">{{item.sum || 0}}</div>
             <div class="table-list-4">{{item.sum_price || 0}}</div>
           </div>
         </div>

src/app/views/new-statistics/maintenance-statistics/synthesize-statistics/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));
@@ -48,7 +55,6 @@
 					right: 0;
 				}
 				.special-box{
-					cursor: pointer;
 					text-align: center;
 					position: relative;
 					top: -5px;

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:{
-				wxDegreeId: 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
+			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
+			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,23 +205,59 @@ 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
+			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
+			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
 	viewDept(data){
-		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+		let query = {
+			startDate: this.customChangeDateComponent.startDate,
+			endDate: this.customChangeDateComponent.endDate,
+			repairDeptId: data.repairDeptId ? data.repairDeptId : -1,
+			searchQuery:{
+				statusValue: 'close',
+			}
+		}
+		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 });
 	}
 	
 	// 维修处理类型切换
@@ -448,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 });
 	}
 
@@ -566,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.html

@@ -47,15 +47,15 @@
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.companyName }}</td>
-      <td>{{ data.sum }}</td>
+      <td class="text-sign" (click)="viewDetail1(data)">{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
       <td>{{ data.avgResolvedTime }}</td>
-      <td>{{ data.resolvedOverNum }}</td>
-      <td>{{ data.overTimeNum }}</td>
+      <td class="text-sign" (click)="viewDetail2(data)">{{ data.resolvedOverNum }}</td>
+      <td class="text-sign" (click)="viewDetail3(data)">{{ data.overTimeNum }}</td>
       <td>{{ data.consumablePrice }}</td>
       <td>{{ data.workHourPrice }}</td>
       <td>{{ data.totalPrice }}</td>
-      <td>{{ 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/tripartite-company-statistics/tripartite-company-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);