统计暂存

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

@@ -101,7 +101,7 @@
             </nz-select>
           </nz-form-control>
         </nz-form-item>
-				
+
 				<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]="17" nzErrorTip="请选择来源!">
@@ -112,7 +112,7 @@
 				    </nz-select>
 				  </nz-form-control>
 				</nz-form-item>
-				
+
 				<nz-form-item [hidden]="!fieldConfig.config.minute">
 				  <nz-form-label [nzSpan]="6" nzFor="minuteClose">分钟内关单</nz-form-label>
 				  <nz-form-control [nzSpan]="17" nzErrorTip="请输入分钟内关单!">
@@ -127,7 +127,7 @@
 						 ></nz-input-number>
 					</nz-form-control>
 				</nz-form-item>
-				
+
 				<nz-form-item [hidden]="!fieldConfig.config.special">
 				  <nz-form-label [nzSpan]="6" nzFor="specialId">特殊关闭</nz-form-label>
 				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择特殊关闭!">
@@ -138,7 +138,7 @@
 				    </nz-select>
 				  </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]="17" nzErrorTip="请选择超时工单!">
@@ -149,7 +149,7 @@
 				    </nz-select>
 				  </nz-form-control>
 				</nz-form-item> -->
-				
+
 			<!-- 	<nz-form-item [hidden]="!fieldConfig.config.abnormal">
 				  <nz-form-label [nzSpan]="6" nzFor="abnormalId">异常工单</nz-form-label>
 				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择异常工单!">
@@ -160,7 +160,7 @@
 				    </nz-select>
 				  </nz-form-control>
 				</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]="17" nzErrorTip="请选择评价!">
@@ -174,7 +174,7 @@
 				    </nz-select>
 				  </nz-form-control>
 				</nz-form-item>
-				
+
 				<nz-form-item [hidden]="!fieldConfig.config.executeUser">
 				  <nz-form-label [nzSpan]="6" nzFor="executeUserId">执行人</nz-form-label>
 				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择人员!">
@@ -188,7 +188,7 @@
 				    </nz-select>
 				  </nz-form-control>
 				</nz-form-item>
-				
+
 				<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]="17" nzErrorTip="请选择人员!">
@@ -199,13 +199,24 @@
 				    </nz-select>
 				  </nz-form-control>
 				</nz-form-item>
-				
+
 				<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]="17" nzErrorTip="请输入单号!">
 				    <input class="width-200" type="text" placeHolder="请输入单号" nz-input formControlName="codeNum" />
 				  </nz-form-control>
 				</nz-form-item>
+
+        <nz-form-item [hidden]="!fieldConfig.config.emergencyType">
+				  <nz-form-label [nzSpan]="6" nzFor="emergencyTypeId">是否加急</nz-form-label>
+				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择是否加急!">
+				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="emergencyTypeId" nzPlaceHolder="请选择是否加急">
+				      <ng-container *ngFor="let option of emergencyTypeList">
+				        <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+				      </ng-container>
+				    </nz-select>
+				  </nz-form-control>
+				</nz-form-item>
       </form>
     </div>
     <div class="display_flex justify-content_flex-center">

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

@@ -27,12 +27,16 @@ export class DistributionSearchMoreComponent implements OnInit {
     private tool: ToolService,
     private mainService: MainService,
   ) { }
-	
+
 	minuteClose:any;
 	specialList:any = [
 		{name:'是',id:1},
 		{name:'否',id:0}
 	]
+  emergencyTypeList:any = [
+		{name:'是',id:1},
+		{name:'否',id:0}
+	]
 	overtimeList:any = [
 		{name:'是',id:1},
 		{name:'否',id:0}
@@ -67,12 +71,13 @@ export class DistributionSearchMoreComponent implements OnInit {
     this.deptList = this.fieldConfig.fields.deptDTO ? [this.fieldConfig.fields.deptDTO] : [];
 		this.sourceList = this.fieldConfig.fields.sourceDTO ? [this.fieldConfig.fields.sourceDTO] : [];
 		this.specialList = [{name:'是',id:1},{name:'否',id:0}];
+		this.emergencyTypeList = [{name:'是',id:300},{name:'否',id:299}];//后端要求写死，是否加急，是-300，否-299
 		this.overtimeList = [{name:'是',id:1},{name:'否',id:0}];
 		this.abnormalList = [{name:'是',id:1},{name:'否',id:0}];
 		this.evaluateList = this.fieldConfig.fields.evaluateDTO ? [this.fieldConfig.fields.evaluateDTO] : [];
 		this.executeUserList =  this.fieldConfig.fields.executeUserDTO ? [this.fieldConfig.fields.executeUserDTO] : [];
 		this.timeFrameList = this.fieldConfig.fields.timeFrameDTO ? [this.fieldConfig.fields.timeFrameDTO] : [];
-		
+
 		this.validateForm = this.fb.group({
       groupId: [this.fieldConfig.fields.groupId || null],
       userId: [this.fieldConfig.fields.userId === undefined ? null : this.fieldConfig.fields.userId],
@@ -83,6 +88,7 @@ export class DistributionSearchMoreComponent implements OnInit {
 			sourceId: [this.fieldConfig.fields.sourceId || null],
 			minuteClose: [this.fieldConfig.fields.minuteClose || null],
 			specialId: [this.fieldConfig.fields.specialDTO ? this.fieldConfig.fields.specialDTO.id  : null],
+			emergencyTypeId: [this.fieldConfig.fields.emergencyTypeDTO ? this.fieldConfig.fields.emergencyTypeDTO.id  : null],
 			overtimeId: [this.fieldConfig.fields.overtimeDTO ? this.fieldConfig.fields.overtimeDTO.id  : null],
 			abnormalId: [this.fieldConfig.fields.abnormalDTO ? this.fieldConfig.fields.abnormalDTO.id  : null],
 			evaluateId: [this.fieldConfig.fields.evaluateId || null],
@@ -90,32 +96,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 {
@@ -166,6 +172,10 @@ export class DistributionSearchMoreComponent implements OnInit {
 		  fields.specialId = this.validateForm.value.specialId;
 		  fields.specialDTO = this.specialList.find(item => item.id == this.validateForm.value.specialId);
 		}
+    if(this.fieldConfig.config.emergencyType){
+		  fields.emergencyTypeId = this.validateForm.value.emergencyTypeId;
+		  fields.emergencyTypeDTO = this.emergencyTypeList.find(item => item.id == this.validateForm.value.emergencyTypeId);
+		}
 		if(this.fieldConfig.config.overtime){
 		  fields.overtimeId = this.validateForm.value.overtimeId;
 		  fields.overtimeDTO = this.overtimeList.find(item => item.id == this.validateForm.value.overtimeId);
@@ -190,7 +200,7 @@ export class DistributionSearchMoreComponent implements OnInit {
 		  fields.timeFrameId = this.validateForm.value.timeFrameId;
 		  fields.timeFrameDTO = this.timeFrameList.find(item => item.id == this.validateForm.value.timeFrameId);
 		}
-		
+
     this.submitEvent.emit(fields);
     this.hideModal();
   }
@@ -414,9 +424,9 @@ export class DistributionSearchMoreComponent implements OnInit {
     flag && this.setIsSelecting(false);
     flag && this.getRepairDeptList();
   }
-	
+
 	// =================来源===================
-	
+
 	// 获取来源列表
 	sourceList:any[] = [];
 	getSourceDataList(keyword?){
@@ -439,10 +449,10 @@ export class DistributionSearchMoreComponent implements OnInit {
 			},
 		]
 	}
-	
+
 	// =================评价===================
-	
-	// 获取评价列表 
+
+	// 获取评价列表
 	evaluateList:any[] = [];
 	getWorkHourEvaluateList(){
 		this.isLoading = true;
@@ -453,14 +463,14 @@ export class DistributionSearchMoreComponent implements OnInit {
 		    this.evaluateList = data;
 		  });
 	}
-	
+
 	// =================执行人===================
-	
+
 	// 执行人搜索
 	changeExecuteUserInp(e) {
 	  this.searchTimer(this.getExecuteUserList, e);
 	}
-	
+
 	// 获取执行人列表
 	executeUserList:any[] = [];
 	getExecuteUserList(keyword?){
@@ -489,9 +499,9 @@ export class DistributionSearchMoreComponent implements OnInit {
 	  flag && this.setIsSelecting(false);
 	  flag && this.getExecuteUserList();
 	}
-	
+
 	// =================时段===================
-	
+
 	// 获取时段列表
 	timeFrameList:any[] = [];
 	getTimeFrameList(){

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

@@ -19,6 +19,7 @@ export class QueryRangeComponent implements OnInit {
   @Input() duty: any;
 	@Input() parent: any;
 	@Input() defaultDate: any = [];
+	@Input() currentDeptDTO;
   // sign = largeScreen 大屏
   // sign = main 管理端
   // sign = nurse 护士端
@@ -71,6 +72,7 @@ export class QueryRangeComponent implements OnInit {
     let queryType = this.validateForm.value.queryType;
 		let parent = this.validateForm.value.parent;
 		let defaultDate = this.validateForm.value.defaultDate;
+    let currentDeptDTO;
     let hospital;
     let duty;
     switch (queryType) {
@@ -87,8 +89,11 @@ export class QueryRangeComponent implements OnInit {
         hospital = this.dutyOneList.find(v => v.id == this.validateForm.value.dutyOne).parent;
         duty = this.dutyOneList.find(v => v.id == this.validateForm.value.dutyOne);
         break;
+      case 5:
+        currentDeptDTO = this.currentDept;
+        break;
     }
-    this.submitQueryRange.emit({queryType, hospital, duty, parent, defaultDate});
+    this.submitQueryRange.emit({queryType, hospital, duty, parent, defaultDate, currentDeptDTO});
     this.hideModal();
   }
 

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

@@ -17,7 +17,7 @@
             </nz-select>
           </nz-form-control>
         </nz-form-item>
-				
+
 				<nz-form-item [hidden]="!fieldConfig.config.workHourSmall">
 				  <nz-form-label [nzSpan]="6" nzFor="workHourSmallId">工时小类</nz-form-label>
 				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择工时小类!">
@@ -31,7 +31,7 @@
 				    </nz-select>
 				  </nz-form-control>
 				</nz-form-item>
-				
+
         <nz-form-item [hidden]="!fieldConfig.config.group">
           <nz-form-label [nzSpan]="6" nzFor="groupId">维修分组</nz-form-label>
           <nz-form-control [nzSpan]="16" nzErrorTip="请选择维修分组!">
@@ -185,7 +185,7 @@
             </nz-select>
           </nz-form-control>
         </nz-form-item>
-				
+
 				<nz-form-item [hidden]="!fieldConfig.config.repairUser">
 				  <nz-form-label [nzSpan]="6" nzFor="repairUserId">报修人</nz-form-label>
 				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择报修人!">
@@ -199,7 +199,7 @@
 				    </nz-select>
 				  </nz-form-control>
 				</nz-form-item>
-				
+
 				<nz-form-item [hidden]="!fieldConfig.config.deptType">
 				  <nz-form-label [nzSpan]="6" nzFor="deptTypeId">科室类型</nz-form-label>
 				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择科室类型!">
@@ -213,7 +213,7 @@
 				    </nz-select>
 				  </nz-form-control>
 				</nz-form-item>
-				
+
 				<nz-form-item [hidden]="!fieldConfig.config.evaluate">
 				  <nz-form-label [nzSpan]="6" nzFor="evaluateId">评价</nz-form-label>
 				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择评价!">
@@ -227,7 +227,7 @@
 				    </nz-select>
 				  </nz-form-control>
 				</nz-form-item>
-				
+
 				<nz-form-item [hidden]="!fieldConfig.config.consumable">
 				  <nz-form-label [nzSpan]="6" nzFor="consumableId">耗材</nz-form-label>
 				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择耗材!">
@@ -241,7 +241,7 @@
 				    </nz-select>
 				  </nz-form-control>
 				</nz-form-item>
-				
+
 				<nz-form-item [hidden]="!fieldConfig.config.isHang">
 				  <nz-form-label [nzSpan]="6" nzFor="isHangId">是否挂起</nz-form-label>
 				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择是否挂起!">
@@ -252,14 +252,14 @@
 				    </nz-select>
 				  </nz-form-control>
 				</nz-form-item>
-				
+
 				<nz-form-item [hidden]="!fieldConfig.config.code">
 				  <nz-form-label [nzSpan]="6" nzFor="codeNum">单号</nz-form-label>
 				  <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]="16" nzErrorTip="请选择超时工单!">
@@ -270,6 +270,20 @@
 				    </nz-select>
 				  </nz-form-control>
 				</nz-form-item>
+
+        <nz-form-item [hidden]="!fieldConfig.config.priority">
+				  <nz-form-label [nzSpan]="6" nzFor="priorityId">优先级</nz-form-label>
+				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择优先级!">
+				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzShowSearch formControlName="priorityId" nzPlaceHolder="请选择优先级" (nzOpenChange)="openChangePriority($event)">
+				      <ng-container *ngFor="let option of priorityList">
+				        <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [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>
+				  </nz-form-control>
+				</nz-form-item>
       </form>
     </div>
     <div class="display_flex justify-content_flex-center">

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

@@ -27,7 +27,7 @@ export class SearchMoreComponent implements OnInit {
     private tool: ToolService,
     private mainService: MainService,
   ) { }
-	
+
 	isHangList:any = [
 		{name:'是',id:1},
 		{name:'否',id:0}
@@ -36,7 +36,7 @@ export class SearchMoreComponent implements OnInit {
 		{name:'是',id:1},
 		{name:'否',id:0}
 	]
-	
+
   ngOnInit() {
     this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
       let fun = v[0];
@@ -70,7 +70,8 @@ export class SearchMoreComponent implements OnInit {
 		this.repairUserList = this.fieldConfig.fields.repairUserDTO ? [this.fieldConfig.fields.repairUserDTO] : [];
 		this.isHangList = [{name:'是',id:1},{name:'否',id:0}];
 		this.overtimeList = [{name:'是',id:1},{name:'否',id:0}];
-		
+		this.priorityList = this.fieldConfig.fields.priorityDTO ? [this.fieldConfig.fields.priorityDTO] : [];
+
 		this.validateForm = this.fb.group({
       groupId: [this.fieldConfig.fields.groupId || null],
       userId: [this.fieldConfig.fields.userId === undefined ? null : this.fieldConfig.fields.userId],
@@ -91,41 +92,42 @@ export class SearchMoreComponent implements OnInit {
 			isHangId: [this.fieldConfig.fields.isHangDTO ? this.fieldConfig.fields.isHangDTO.id  : null],
 			codeNum: [this.fieldConfig.fields.codeNum || null],
 			overtimeId: [this.fieldConfig.fields.overtimeDTO ? this.fieldConfig.fields.overtimeDTO.id  : null],
+			priorityId: [this.fieldConfig.fields.priorityId || 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 {
@@ -195,38 +197,42 @@ export class SearchMoreComponent implements OnInit {
 		  fields.deptTypeId = this.validateForm.value.deptTypeId;
 		  fields.deptTypeDTO = this.deptTypeList.find(item => item.id == this.validateForm.value.deptTypeId);
 		}
-		
+		if(this.fieldConfig.config.priority){
+		  fields.priorityId = this.validateForm.value.priorityId;
+		  fields.priorityDTO = this.priorityList.find(item => item.id == this.validateForm.value.priorityId);
+		}
+
 		if(this.fieldConfig.config.evaluate){
 			fields.evaluateId = this.validateForm.value.evaluateId;
 			fields.evaluateDTO = this.evaluateList.find(item => item.id == this.validateForm.value.evaluateId);
 		}
-		
+
 		if(this.fieldConfig.config.repairUser){
 			fields.repairUserId = this.validateForm.value.repairUserId;
 			fields.repairUserDTO = this.repairUserList.find(item => item.id == this.validateForm.value.repairUserId);
 		}
-		
+
 		if(this.fieldConfig.config.consumable){
 			fields.consumableId = this.validateForm.value.consumableId;
 			fields.consumableDTO = this.consumableList.find(item => item.id == this.validateForm.value.consumableId);
 		}
-		
+
 		if(this.fieldConfig.config.isHang){
 			fields.isHangId = this.validateForm.value.isHangId;
 			fields.isHangDTO = this.isHangList.find(item => item.id == this.validateForm.value.isHangId);
 		}
-		
-		
+
+
 		if(this.fieldConfig.config.code){
 			fields.codeNum = this.validateForm.value.codeNum;
 			fields.codeNumDTO = this.validateForm.value.codeNum;
 		}
-		
+
 		if(this.fieldConfig.config.overtime){
 			fields.overtimeId = this.validateForm.value.overtimeId;
 			fields.overtimeDTO = this.overtimeList.find(item => item.id == this.validateForm.value.overtimeId);
 		}
-				
+
     this.submitEvent.emit(fields);
     this.hideModal();
   }
@@ -312,6 +318,32 @@ export class SearchMoreComponent implements OnInit {
 	    });
 	}
 
+  // =================优先级===================
+
+	// 优先级
+	openChangePriority(flag){
+	  flag && this.getPriorityList();
+	}
+
+	// 获取优先级列表
+	priorityList:any[] = [];
+	getPriorityList(keyword?) {
+    let postData: any = {
+      idx: 0,
+      sum: 99999,
+      priority: {},
+    };
+    this.isLoading = true;
+    this.mainService.getFetchDataList("simple/data", "priority", postData).subscribe(result => {
+      this.isLoading = false;
+      if(result.status == 200){
+        this.priorityList = result.list || [];
+      }else{
+        this.priorityList = [];
+      }
+    });
+	}
+
   // =================维修人员===================
 
   // 维修人员搜索
@@ -668,14 +700,14 @@ export class SearchMoreComponent implements OnInit {
     flag && this.setIsSelecting(false);
     flag && this.getWorkHourParentList();
   }
-	
+
 	// =================工时小类===================
-	
+
 	// 工时小类搜索
 	changeWorkHourSmallInp(e) {
 	  this.searchTimer(this.getWorkHourSmallList, e);
 	}
-	
+
 	// 获取工时小类列表
 	workHourSmallList:any[] = [];
 	getWorkHourSmallList(keyword?){
@@ -711,10 +743,10 @@ export class SearchMoreComponent implements OnInit {
 	  flag && this.setIsSelecting(false);
 	  flag && this.getWorkHourSmallList();
 	}
-	
+
 	// =================评价===================
-	
-	// 获取评价列表 
+
+	// 获取评价列表
 	evaluateList:any[] = [];
 	getWorkHourEvaluateList(){
 		this.isLoading = true;
@@ -725,14 +757,14 @@ export class SearchMoreComponent implements OnInit {
 		    this.evaluateList = data;
 		  });
 	}
-	
+
 	// =================申请人员===================
-	
+
 	// 申请人员搜索
 	changerepairUserInp(e) {
 	  this.searchTimer(this.getrepairUserList, e);
 	}
-	
+
 	// 获取申请人员列表
 	repairUserList:any[] = [];
 	getrepairUserList(keyword = ''){
@@ -759,14 +791,14 @@ export class SearchMoreComponent implements OnInit {
 	  flag && this.setIsSelecting(false);
 	  flag && this.getrepairUserList();
 	}
-	
+
 	// =================耗材===================
-	
+
 	// 耗材搜索
 	changeConsumableInp(e) {
 	  this.searchTimer(this.getConsumableList, e);
 	}
-	
+
 	// 获取耗材列表
 	consumableList:any[] = [];
 	getConsumableList(keyword = ''){

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

@@ -19,21 +19,23 @@
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
       <th nzWidth="10%">业务分类名称</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
-			<th nzWidth="10%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭工单</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="emergency_count" [(nzSort)]="sortCurrent.emergency_count">加急工单</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
+			<th nzWidth="9%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭工单</th>
     </tr>
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.name }}</td>
       <td class="text-sign" (click)="viewDetail1(data)">{{ data.totalCount }}</td>
+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.emergency_count }}</td>
       <td>{{ data.totalGrade }}</td>
 			<td>{{ data.totalPrice }}</td>
       <td>{{ data.response_time_num }}</td>
@@ -48,15 +50,16 @@
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
         <td style="width: 10%">{{ data.name }}</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%" 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>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail1(data,'all')">{{ data.totalCount }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail4(data,'all')">{{ data.emergency_count }}</td>
+        <td style="width: 9%">{{ data.totalGrade }}</td>
+				<td style="width: 9%">{{ data.totalPrice }}</td>
+        <td style="width: 9%">{{ data.response_time_num }}</td>
+        <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%" 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/business-classify-statistics/business-classify-statistics.component.ts

@@ -46,7 +46,7 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
 
     }, 0)
   }
-	
+
 	// 数据下钻
 	viewDetail1(data, type){
 		let query = null
@@ -84,7 +84,7 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
 				}
 			}
 		}
-	
+
 		let path = '/newStatistics/distributionInspectionStatistics/incidentList'
 		let flag = this.tabService.tabs.some(v => v.path === path);
 		flag && this.tabService.deleteRouteSnapshot(path);
@@ -93,7 +93,7 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
 		sessionStorage.setItem('distributionData', JSON.stringify(query))
 		this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
 	viewDetail2(data, type){
 		let query = null
 		if(type=='all'){
@@ -134,7 +134,7 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
 				}
 			}
 		}
-	
+
 		let path = '/newStatistics/distributionInspectionStatistics/incidentList'
 		let flag = this.tabService.tabs.some(v => v.path === path);
 		flag && this.tabService.deleteRouteSnapshot(path);
@@ -143,7 +143,7 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
 		sessionStorage.setItem('distributionData', JSON.stringify(query))
 		this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
 	viewDetail3(data, type){
 		let query = null
 		if(type=='all'){
@@ -190,7 +190,63 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
 				}
 			}
 		}
-	
+
+		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
+		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,
+					emergencyTypeId: 300,
+					emergencyTypeDTO: {
+						"name": "是",
+						"id": 300
+					},
+				}
+			}
+		}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,
+					emergencyTypeId: 300,
+					emergencyTypeDTO: {
+						"name": "是",
+						"id": 300
+					},
+				}
+			}
+		}
+
 		let path = '/newStatistics/distributionInspectionStatistics/incidentList'
 		let flag = this.tabService.tabs.some(v => v.path === path);
 		flag && this.tabService.deleteRouteSnapshot(path);
@@ -199,7 +255,7 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
 		sessionStorage.setItem('distributionData', JSON.stringify(query))
 		this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();

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

@@ -30,23 +30,25 @@
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="10%" nzShowSort nzSortKey="date" [(nzSort)]="sortCurrent.date">日期</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
-			<th nzWidth="9%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均到达时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
+      <th nzWidth="12%" nzShowSort nzSortKey="date" [(nzSort)]="sortCurrent.date">日期</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="emergency_count" [(nzSort)]="sortCurrent.emergency_count">加急工单</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
+			<th nzWidth="8%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均到达时间</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
     </tr>
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.date }}</td>
       <td class="text-sign" (click)="viewDetail1(data)">{{ data.totalCount }}</td>
+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.emergency_count }}</td>
       <td>{{ data.totalGrade }}</td>
 			<td>{{ data.totalPrice }}</td>
       <td>{{ data.response_time_num }}</td>
@@ -61,17 +63,18 @@
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 10%">{{ data.date }}</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>
-        <td style="width: 9%">{{ data.arrive_time_num }}</td>
-        <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%" 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>
+        <td style="width: 12%">{{ data.date }}</td>
+        <td style="width: 8%" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.totalCount }}</td>
+        <td style="width: 8%" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.emergency_count }}</td>
+        <td style="width: 8%">{{ data.totalGrade }}</td>
+				<td style="width: 8%">{{ data.totalPrice }}</td>
+        <td style="width: 8%">{{ data.response_time_num }}</td>
+        <td style="width: 8%">{{ data.arrive_time_num }}</td>
+        <td style="width: 8%">{{ data.execution_time_num }}</td>
+        <td style="width: 8%">{{ data.aveper }}</td>
+        <td style="width: 8%">{{ data.total_time }}</td>
+        <td style="width: 8%" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.five_count }}</td>
+        <td style="width: 8%" 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.ts

@@ -46,7 +46,7 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
 
     }, 0)
   }
-	
+
 	// 数据下钻
 	viewDetail1(data, type){
 		let query = null
@@ -104,7 +104,7 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
 			this.router.navigate([path], { replaceUrl: true });
 		}
 	}
-	
+
 	viewDetail2(data, type){
 		let query = null
 		if(type=='all'){
@@ -165,7 +165,7 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
 			this.router.navigate([path], { replaceUrl: true });
 		}
 	}
-	
+
 	viewDetail3(data, type){
 		let query = null
 		if(type=='all'){
@@ -232,7 +232,74 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
 			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,
+				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,
+					emergencyTypeId: 300,
+					emergencyTypeDTO: {
+						"name": "是",
+						"id": 300
+					},
+				}
+			}
+			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,
+					emergencyTypeId: 300,
+					emergencyTypeDTO: {
+						"name": "是",
+						"id": 300
+					},
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange',  [data.date + ' ' + '00:00:00', data.date + ' ' + '23:59:59']);
+			this.tabService.setQueryParams('defRange', null);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}
+	}
+
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();

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

@@ -34,15 +34,16 @@
 				<th nzWidth="12%" *ngIf="parent==1" nzShowSort nzSortKey="parentOrders" [(nzSort)]="sortCurrent.parentOrders">父级科室(编码)</th>
 				<th [nzWidth]="parent==1 ? '8%' : '10%'" nzShowSort nzSortKey="orders" [(nzSort)]="sortCurrent.orders">科室(编码)</th>
 				<th [nzWidth]="parent==1 ? '8%' : '9%'" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
-				<th [nzWidth]="parent==1 ? '8%' : '9%'" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
-				<th [nzWidth]="parent==1 ? '8%' : '9%'" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
-				<th [nzWidth]="parent==1 ? '8%' : '9%'" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
-        <th [nzWidth]="parent==1 ? '8%' : '9%'" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均到达时间</th>
-				<th [nzWidth]="parent==1 ? '8%' : '9%'" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
-				<th [nzWidth]="parent==1 ? '8%' : '9%'" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
-				<th [nzWidth]="parent==1 ? '8%' : '9%'" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
-				<th [nzWidth]="parent==1 ? '8%' : '9%'" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
-				<th [nzWidth]="parent==1 ? '8%' : '9%'" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
+				<th [nzWidth]="parent==1 ? '8%' : '9%'" nzShowSort nzSortKey="emergency_count" [(nzSort)]="sortCurrent.emergency_count">加急工单</th>
+				<th [nzWidth]="parent==1 ? '8%' : '8%'" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
+				<th [nzWidth]="parent==1 ? '7%' : '8%'" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
+				<th [nzWidth]="parent==1 ? '7%' : '8%'" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
+        <th [nzWidth]="parent==1 ? '7%' : '8%'" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均到达时间</th>
+				<th [nzWidth]="parent==1 ? '7%' : '8%'" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
+				<th [nzWidth]="parent==1 ? '7%' : '8%'" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
+				<th [nzWidth]="parent==1 ? '7%' : '8%'" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
+				<th [nzWidth]="parent==1 ? '7%' : '8%'" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
+				<th [nzWidth]="parent==1 ? '7%' : '8%'" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
 			</tr>
 		</thead>
 		<tbody>
@@ -50,6 +51,7 @@
 				<td *ngIf="parent==1">{{ data.parentName || '无' }}</td>
 				<td>{{ data.name }}</td>
 				<td class="text-sign" (click)="viewDetail1(data)">{{ data.totalCount }}</td>
+				<td class="text-sign" (click)="viewDetail4(data)">{{ data.emergency_count }}</td>
 				<td>{{ data.totalGrade }}</td>
 				<td>{{ data.totalPrice }}</td>
 				<td>{{ data.response_time_num }}</td>
@@ -68,15 +70,16 @@
 					<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%'}" 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>
-					<td [ngStyle]="{width: parent==1 ? '8%' : '9%'}">{{ data.arrive_time_num }}</td>
-					<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%'}" 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>
+					<td [ngStyle]="{width: parent==1 ? '8%' : '9%'}" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.emergency_count }}</td>
+					<td [ngStyle]="{width: parent==1 ? '8%' : '8%'}">{{ data.totalGrade }}</td>
+					<td [ngStyle]="{width: parent==1 ? '7%' : '8%'}">{{ data.totalPrice }}</td>
+					<td [ngStyle]="{width: parent==1 ? '7%' : '8%'}">{{ data.response_time_num }}</td>
+					<td [ngStyle]="{width: parent==1 ? '7%' : '8%'}">{{ data.arrive_time_num }}</td>
+					<td [ngStyle]="{width: parent==1 ? '7%' : '8%'}">{{ data.execution_time_num }}</td>
+					<td [ngStyle]="{width: parent==1 ? '7%' : '8%'}">{{ data.aveper }}</td>
+					<td [ngStyle]="{width: parent==1 ? '7%' : '8%'}">{{ data.total_time }}</td>
+					<td [ngStyle]="{width: parent==1 ? '7%' : '8%'}" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.five_count }}</td>
+					<td [ngStyle]="{width: parent==1 ? '7%' : '8%'}" 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.ts

@@ -60,7 +60,7 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 
     }, 0)
   }
-	
+
 	// 数据下钻
 	viewDetail1(data, type){
 		let query = null
@@ -137,7 +137,7 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 			  });
 		}
 	}
-	
+
 	viewDetail2(data, type){
 		let query = null
 		let item = null
@@ -217,7 +217,7 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 				});
 		}
 	}
-	
+
 	viewDetail3(data, type){
 		let query = null
 		let item = null
@@ -303,7 +303,93 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 				});
 		}
 	}
-	
+
+	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,
+					emergencyTypeId: 300,
+					emergencyTypeDTO: {
+						"name": "是",
+						"id": 300
+					},
+				}
+			}
+			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,
+								emergencyTypeId: 300,
+								emergencyTypeDTO: {
+									"name": "是",
+									"id": 300
+								},
+							}
+						}
+						let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('distributionData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+					}
+				});
+		}
+	}
+
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();

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

@@ -125,6 +125,15 @@ const routes: Routes = [
 			    title: '配-人员评价统计'
 			  }
 			},
+			{
+			  // 人员效能统计
+			  path: 'distributionPersonnelEffectivenessStatistics',
+			  loadChildren: () => import('./distribution-personnel-effectiveness-statistics/distribution-personnel-effectiveness-statistics.module').then(m => m.DistributionPersonnelEffectivenessStatisticsModule),
+			  data: {
+			    reuse: true,
+			    title: '配-人员效能统计'
+			  }
+			},
       {
 			  // 24小时质控统计
 			  path: 'hourQualityControlStatistics',

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

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { DistributionPersonnelEffectivenessStatisticsComponent } from './distribution-personnel-effectiveness-statistics.component';
+
+
+const routes: Routes = [
+  { path: '', component: DistributionPersonnelEffectivenessStatisticsComponent }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class DistributionPersonnelEffectivenessStatisticsRoutingModule { }

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

@@ -0,0 +1,70 @@
+<div class="searchDataWrap">
+  <div class="searchData">
+    <app-custom-change-date #customChangeDate [isShowType]="false"></app-custom-change-date>
+    <div class="searchDataItem">
+      <span class="label">排除异常人员</span>：
+      <nz-input-number [(ngModel)]="matchUserCouont" [nzMin]="1" [nzStep]="1" [nzPrecision]="0"></nz-input-number>
+    </div>
+  </div>
+  <div class="operation">
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
+    <button nz-button class="btn default" (click)="search()">查询</button>
+    <button nz-button class="btn default ml8" (click)="reset()">重置</button>
+    <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.deptDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.taskTypeDTO || fieldConfig.fields.statisticsTypeDTO">
+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
+  <span>{{fieldConfig.fields.userDTO?.name}}</span>
+  <span>{{fieldConfig.fields.statisticsTypeDTO?.name}}</span>
+  <span>{{fieldConfig.fields.taskTypeDTO?.taskName}}</span>
+	<span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
+  <span>{{fieldConfig.fields.deptDTO?.dept}}</span>
+</div>
+<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
+  <thead (nzSortChange)="sort($event)" nzSingleSort>
+    <tr>
+      <th nzWidth="12.5%" nzShowSort nzSortKey="date" [(nzSort)]="sortCurrent.date">日期</th>
+      <th nzWidth="12.5%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单总量</th>
+      <th nzWidth="12.5%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">积分总量</th>
+      <th nzWidth="12.5%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总价格</th>
+      <th nzWidth="12.5%" nzShowSort nzSortKey="countWorker" [(nzSort)]="sortCurrent.countWorker">总人数</th>
+      <th nzWidth="12.5%" nzShowSort nzSortKey="avgCount" [(nzSort)]="sortCurrent.avgCount">人均单量</th>
+      <th nzWidth="12.5%" nzShowSort nzSortKey="avgGrade" [(nzSort)]="sortCurrent.avgGrade">人均积分</th>
+      <th nzWidth="12.5%" nzShowSort nzSortKey="avgPrice" [(nzSort)]="sortCurrent.avgPrice">人均费用</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr *ngFor="let data of listOfData">
+      <td>{{ data.date }}</td>
+      <td>{{ data.totalCount }}</td>
+      <td>{{ data.totalGrade }}</td>
+      <td>{{ data.totalPrice }}</td>
+      <td>{{ data.countWorker }}</td>
+      <td>{{ data.avgCount }}</td>
+      <td>{{ data.avgGrade }}</td>
+      <td>{{ data.avgPrice }}</td>
+    </tr>
+  </tbody>
+  <ng-template #footerTpl>
+    <table class="footTable">
+      <tr *ngFor="let data of listOfDataEnd">
+        <td style="width: 12.5%">{{ data.date }}</td>
+        <td style="width: 12.5%">{{ data.totalCount }}</td>
+        <td style="width: 12.5%">{{ data.totalGrade }}</td>
+        <td style="width: 12.5%">{{ data.totalPrice }}</td>
+        <td style="width: 12.5%">{{ data.countWorker }}</td>
+        <td style="width: 12.5%">{{ data.avgCount }}</td>
+        <td style="width: 12.5%">{{ data.avgGrade }}</td>
+        <td style="width: 12.5%">{{ data.avgPrice }}</td>
+      </tr>
+    </table>
+  </ng-template>
+</nz-table>
+<div class="pagination">
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
+</div>
+
+<!-- 详细搜索 -->
+<app-distribution-search-more [fieldConfig]="fieldConfig" *ngIf="showSearchMore" [hosId]="hosId" [queryType]="queryType"  [dutyId]="dutyId"  [parentDutyId]="parentDutyId" (cancelEvent)="cancelEvent()" (submitEvent)="submitEvent($event)"></app-distribution-search-more>

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

@@ -0,0 +1,71 @@
+@import "../../../../../../src/theme.less";
+:host{
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  ::ng-deep .ant-table-footer{
+    padding: 16px 0;
+    width: calc(100% - 15px);
+    font-weight: bold;
+  }
+  tr, th{
+    text-align: center;
+  }
+  .searchDataWrap{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .searchData{
+      padding: 16px;
+      display: flex;
+      align-items: center;
+      .searchDataItem{
+        margin-right: 24px;
+        .label{
+          font-size: 16px;
+        }
+        .selectItem{
+          width: 160px;
+        }
+      }
+    }
+    .operation{
+      margin-right: 16px;
+      display: flex;
+      align-items: center;
+      cursor: pointer;
+      .icon_transport{
+        margin-right: 16px;
+        font-size: 24px;
+      }
+      .btn{
+        &.default{
+          height: 32px;
+          line-height: 32px;
+          min-width: 70px;
+        }
+      }
+    }
+  }
+
+  .table{
+    margin: 0 8px;
+  }
+
+  .moreFilter{
+    margin-bottom: 16px;
+    span{
+      margin-left: 16px;
+      color: @primary-color;
+    }
+  }
+
+  .pagination{
+    padding: 16px;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+  }
+}

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

@@ -0,0 +1,245 @@
+import { TabService } from '../../services/tab.service';
+import { debounceTime } from 'rxjs/operators';
+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 { ToolService } from "../../../../services/tool.service";
+import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
+@Component({
+  selector: "app-distribution-personnel-effectiveness-statistics",
+  templateUrl: "./distribution-personnel-effectiveness-statistics.component.html",
+  styleUrls: ["./distribution-personnel-effectiveness-statistics.component.less"],
+})
+export class DistributionPersonnelEffectivenessStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
+  constructor(
+    private mainService: MainService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private tabService: TabService,
+		private tool: ToolService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  listOfDataEnd: any[] = []; //表格合计
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 30; //表格每页展示条数
+  listLength: number = 0; //表格总数据量
+
+  matchUserCouont:number = 1;//排除异常人员
+
+  searchTimerSubject = new Subject();
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+  }
+
+  ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
+    this.onResize();
+  }
+
+  tableHeight:number = 0;
+  @HostListener('window:resize')
+  onResize(): void {
+    setTimeout(() => {
+      this.tableHeight = window.innerHeight - (document.querySelector('.searchDataWrap') as HTMLElement).offsetHeight - 64 - 36 - 48 - 8 - (document.querySelector('.ant-table-header') as HTMLElement).offsetHeight - 55 - this.getMoreFilter + 14;
+
+    }, 0)
+  }
+
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
+    }
+  }
+
+  get getMoreFilter(){
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.deptDTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.taskTypeDTO || this.fieldConfig.fields.statisticsTypeDTO;
+    return flag ? 37 : 0;
+  }
+
+  // 初始化缓存数据
+  queryType:any;
+  hosId:any;
+  dutyId:any;
+  parentDutyId:any;
+  initSessionData(){
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
+
+    queryType = queryType ? +queryType : undefined;
+    hosId = hosId ? +hosId : undefined;
+    dutyId = dutyId ? +dutyId : undefined;
+
+    this.queryType = queryType;
+    if(queryType == 1){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 2){
+      this.hosId = hosId;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 3){
+      this.hosId = undefined;
+      this.dutyId = dutyId;
+      this.parentDutyId = undefined;
+    }else if(queryType == 4){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = dutyId;
+    }
+  }
+
+  get getHosId(){
+    return this.parentDutyId || this.dutyId || this.hosId;
+  }
+
+  // 表格数据
+  loading1 = false;
+  getList(num?: number, field?: string, sort?: string) {
+    if (num !== undefined) {
+      this.pageIndex = num;
+    }
+    let postData:any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+			matchUserCouont: this.matchUserCouont || undefined,
+			buildingId: this.fieldConfig.fields.buildingId || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
+      hosId: this.getHosId,
+      groupId: this.fieldConfig.fields.groupId || undefined,
+      userId: this.fieldConfig.fields.userId || undefined,
+      deptId: this.fieldConfig.fields.deptId || undefined,
+      taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+      statisticsTypeId: this.fieldConfig.fields.statisticsTypeId || undefined,
+    };
+    if (field && sort) {
+      postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
+    }
+    this.loading1 = true;
+    this.mainService
+      .postCustom("itsm/report", "dateUserTransOrder", postData)
+      .subscribe((result) => {
+        this.loading1 = false;
+        this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
+        this.listOfDataEnd = result.dataList.filter((v, i) => { return i == result.dataList.length - 1 });
+        this.listLength = result.totalCount;
+      });
+  }
+
+  // 列表排序
+  sortCurrent:any = {};
+  sortCurrentKey: string = "";
+  sortCurrentValue: string | null = "";
+  sort(e) {
+    const { key, value } = e;
+    this.sortCurrentKey = key;
+    this.sortCurrentValue = value;
+    this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 搜索
+  search() {
+    this.getList(1, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 日期选择
+  dateRange: any = [];
+
+  // 导出
+  excelExportLoading:any = false;
+  excelExport(){
+    this.excelExportLoading = this.message.loading("导出中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData:any = {
+			matchUserCouont: this.matchUserCouont || undefined,
+			buildingId: this.fieldConfig.fields.buildingId || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
+      hosId: this.getHosId,
+      groupId: this.fieldConfig.fields.groupId || undefined,
+      userId: this.fieldConfig.fields.userId || undefined,
+      deptId: this.fieldConfig.fields.deptId || undefined,
+      taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+      statisticsTypeId: this.fieldConfig.fields.statisticsTypeId || undefined,
+    };
+    if (this.sortCurrentKey && this.sortCurrentValue) {
+      postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
+    }
+    this.mainService
+      .postExportCustom("itsm/exportMergeTitle", "dateUserTransOrder", postData)
+      .subscribe((data) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.success('导出成功');
+        var file = new Blob([data], {
+          type: "application/vnd.ms-excel",
+        });
+        //trick to download store a file having its URL
+        var fileURL = URL.createObjectURL(file);
+        var a = document.createElement("a");
+        a.href = fileURL;
+        a.target = "_blank";
+        a.download = `${this.route.parent.routeConfig.data.title}.xls`;
+        document.body.appendChild(a);
+        a.click();
+      },(err) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.error('导出失败');
+      });
+  }
+  // 重置
+  reset(){
+    this.sortCurrentKey = "totalCount";
+		this.sortCurrentValue = "descend";
+		this.sortCurrent = {totalCount: 'descend'};
+    this.dateRange = []
+    this.matchUserCouont = 1;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, deptId: undefined, buildingId: undefined, taskTypeId: undefined, statisticsTypeId: undefined};
+    this.customChangeDateComponent.resetByDate();
+    setTimeout(_=>{
+    	this.search();
+    })
+  }
+
+  // 详细搜索
+  fieldConfig:any = {
+    fields: {groupId: undefined, userId: undefined, deptId: undefined, buildingId: undefined, taskTypeId: undefined, statisticsTypeId: undefined},
+    config: {groupAndUser: true, dept: true, building: true, taskType: true, statisticsType: true},
+  }
+  showSearchMore:boolean = false;
+  showMore(){
+    this.showSearchMore = true;
+  }
+
+  cancelEvent(){
+    this.showSearchMore = false;
+  }
+
+  submitEvent(fields){
+    this.showSearchMore = false;
+    this.fieldConfig.fields = fields;
+    console.log('this.fieldConfig.fields:', this.fieldConfig.fields)
+    this.search();
+    this.onResize();
+  }
+}

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

@@ -0,0 +1,23 @@
+import { DistributionPersonnelEffectivenessStatisticsComponent } from './distribution-personnel-effectiveness-statistics.component';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { DistributionPersonnelEffectivenessStatisticsRoutingModule } from './distribution-personnel-effectiveness-statistics-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { DistributionSearchMoreModule } from '../../components/distribution-search-more/distribution-search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
+
+
+@NgModule({
+  declarations: [
+    DistributionPersonnelEffectivenessStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    DistributionPersonnelEffectivenessStatisticsRoutingModule,
+    ShareModule,
+    DistributionSearchMoreModule,
+    CustomChangeDateModule,
+  ]
+})
+export class DistributionPersonnelEffectivenessStatisticsModule { }

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

@@ -30,23 +30,25 @@
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="10%" nzShowSort nzSortKey="date" [(nzSort)]="sortCurrent.date">时</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgCount" [(nzSort)]="sortCurrent.avgCount">平均单量</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="date" [(nzSort)]="sortCurrent.date">时</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="emergency_count" [(nzSort)]="sortCurrent.emergency_count">加急工单</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="avgCount" [(nzSort)]="sortCurrent.avgCount">平均单量</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
 			<th nzWidth="9%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
 			<th nzWidth="9%" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均到达时间</th>
       <th nzWidth="9%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
       <th nzWidth="9%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时达标率</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
     </tr>
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.date }}</td>
       <td class="text-sign" (click)="viewDetail1(data)">{{ data.totalCount }}</td>
+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.emergency_count }}</td>
       <td>{{ data.avgCount }}</td>
       <td>{{ data.totalGrade }}</td>
       <td>{{ data.response_time_num }}</td>
@@ -61,17 +63,18 @@
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 10%">{{ data.date }}</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: 8%">{{ data.date }}</td>
+        <td style="width: 8%" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.totalCount }}</td>
+        <td style="width: 8%" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.emergency_count }}</td>
+        <td style="width: 8%">{{ data.avgCount }}</td>
+        <td style="width: 8%">{{ data.totalGrade }}</td>
         <td style="width: 9%">{{ data.response_time_num }}</td>
         <td style="width: 9%">{{ data.arrive_time_num }}</td>
         <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%" 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>
+        <td style="width: 8%">{{ data.total_time }}</td>
+        <td style="width: 8%" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.five_count }}</td>
+        <td style="width: 8%" 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.ts

@@ -49,7 +49,7 @@ export class HourQualityControlStatisticsComponent implements OnInit, AfterViewI
 
     }, 0)
   }
-	
+
 	// 数据下钻
 	viewDetail1(data, type){
 		let query = null
@@ -105,7 +105,7 @@ export class HourQualityControlStatisticsComponent implements OnInit, AfterViewI
 		sessionStorage.setItem('distributionData', JSON.stringify(query))
 		this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
 	viewDetail2(data, type){
 		let query = null
 		if(type=='all'){
@@ -164,7 +164,7 @@ export class HourQualityControlStatisticsComponent implements OnInit, AfterViewI
 		sessionStorage.setItem('distributionData', JSON.stringify(query))
 		this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
 	viewDetail3(data, type){
 		let query = null
 		if(type=='all'){
@@ -229,7 +229,72 @@ export class HourQualityControlStatisticsComponent implements OnInit, AfterViewI
 		sessionStorage.setItem('distributionData', 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,
+				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,
+					emergencyTypeId: 300,
+					emergencyTypeDTO: {
+						"name": "是",
+						"id": 300
+					},
+				}
+			}
+		}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,
+					emergencyTypeId: 300,
+					emergencyTypeDTO: {
+						"name": "是",
+						"id": 300
+					},
+					timeFrameId: data.date || undefined,
+					timeFrameDTO:{
+						"name": data.date,
+						"id": data.date
+					}
+				}
+			}
+		}
+		let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+		let flag = this.tabService.tabs.some(v => v.path === path);
+		flag && this.tabService.deleteRouteSnapshot(path);
+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+		sessionStorage.setItem('distributionData', JSON.stringify(query))
+		this.router.navigate([path], { replaceUrl: true });
+	}
+
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();

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

@@ -20,7 +20,7 @@
     <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.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">
+<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.emergencyTypeDTO || 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>
@@ -34,6 +34,7 @@
 	<span>{{fieldConfig.fields.evaluateDTO?.name}}</span>
 	<span>{{fieldConfig.fields.codeNumDTO}}</span>
 	<span>{{fieldConfig.fields.timeFrameDTO?.name}}</span>
+	<span>{{fieldConfig.fields.emergencyTypeDTO?.name}}</span>
 </div>
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px', x: '1600px'}">
   <thead>

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

@@ -31,7 +31,7 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
   repairDeptId;//报修科室id
 
   searchTimerSubject = new Subject();
-	
+
   ngOnInit() {
 		// 数据下钻搜索
 		this.getRouteQuery()
@@ -40,13 +40,13 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
       fun.call(this, v[1]);
     });
   }
-	
+
 	ngOnDestroy(){
 		console.log(12122121)
 		this.fieldConfig.fields = {}
 		sessionStorage.removeItem('distributionData')
 	}
-	
+
   ngAfterViewInit(){
     this.initSessionData();
     this.onResize(0);
@@ -60,7 +60,7 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
     }, 0)
   }
-	
+
 	goingType:boolean = false;
 	gdStateId:any = null;
 	getRouteQuery(){
@@ -98,7 +98,7 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 			},50)
 		}
 	}
-	
+
   getQueryParams(query){
     let queryParams = this.tabService.getQueryParams();
 		console.log(43434343,queryParams)
@@ -121,10 +121,10 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   get getMoreFilter(){
-    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || 
-		this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || 
-		this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.sourceDTO  || 
-		this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || 
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO ||
+		this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO ||
+		this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.sourceDTO  ||
+		this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO ||
 		this.fieldConfig.fields.companyDTO || this.fieldConfig.fields.repairDeptDTO;
     return flag ? 37 : 0;
   }
@@ -190,6 +190,7 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 			sourceId: this.fieldConfig.fields.sourceId || undefined,
 			minutesClose: this.fieldConfig.fields.minuteClose || undefined,
 			specialCloseFlag: this.fieldConfig.fields.specialId,
+			emergencyType: this.fieldConfig.fields.emergencyTypeId,
 			// timeout: this.fieldConfig.fields.overtimeId,
 			// abnormityType: this.fieldConfig.fields.abnormalId,
 			workOrderEvaluationId: this.fieldConfig.fields.evaluateId || undefined,
@@ -248,6 +249,7 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
     	sourceId: this.fieldConfig.fields.sourceId || undefined,
     	minutesClose: this.fieldConfig.fields.minuteClose || undefined,
     	specialCloseFlag: this.fieldConfig.fields.specialId,
+    	emergencyType: this.fieldConfig.fields.emergencyTypeId,
     	// timeout: this.fieldConfig.fields.overtimeId,
     	// abnormityType: this.fieldConfig.fields.abnormalId,
     	workOrderEvaluationId: this.fieldConfig.fields.evaluateId || undefined,
@@ -301,7 +303,7 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
     this.isLoading = true;
     this.searchTimerSubject.next([fun, e]);
   }
-	
+
 	// 查看工单详情
 	coopData:any;
 	detailModalShow = false; //弹窗开关
@@ -343,8 +345,8 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
   // 详细搜索
   fieldConfig:any = {
-		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},
+		fields: { deptId: undefined, taskTypeId: undefined, sourceId: undefined, minuteId: undefined, specialId: undefined, emergencyTypeId: 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, emergencyType: true, overtime: true, abnormal: true, evaluate: true, code: true, timeFrame: true, groupAndUser: true, building: true},
   }
   showSearchMore:boolean = false;
   showMore(){

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

@@ -30,21 +30,23 @@
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
       <th nzWidth="10%">任务类型名称</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
-			<th nzWidth="10%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
-			<th nzWidth="10%" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均到达时间</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时达标率</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="emergency_count" [(nzSort)]="sortCurrent.emergency_count">加急工单</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
+			<th nzWidth="9%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
+			<th nzWidth="9%" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均到达时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时达标率</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
     </tr>
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.taskName }}</td>
       <td class="text-sign" (click)="viewDetail1(data)">{{ data.totalCount }}</td>
+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.emergency_count }}</td>
       <td>{{ data.totalGrade }}</td>
       <td>{{ data.response_time_num }}</td>
       <td>{{ data.arrive_time_num }}</td>
@@ -59,15 +61,16 @@
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
         <td style="width: 10%">{{ data.taskName }}</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%" 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>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.totalCount }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.emergency_count }}</td>
+        <td style="width: 9%">{{ data.totalGrade }}</td>
+        <td style="width: 9%">{{ data.response_time_num }}</td>
+        <td style="width: 9%">{{ data.arrive_time_num }}</td>
+        <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%" 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/taskType-quality-control-statistics/taskType-quality-control-statistics.component.ts

@@ -57,7 +57,7 @@ export class TaskTypeQualityControlStatisticsComponent implements OnInit, AfterV
 
     }, 0)
   }
-	
+
 	// 数据下钻
 	viewDetail1(data, type){
 		let query = null
@@ -132,7 +132,7 @@ export class TaskTypeQualityControlStatisticsComponent implements OnInit, AfterV
 			  });
 		}
 	}
-	
+
 	viewDetail2(data, type){
 		let query = null
 		let item = null
@@ -211,7 +211,7 @@ export class TaskTypeQualityControlStatisticsComponent implements OnInit, AfterV
 				});
 		}
 	}
-	
+
 	viewDetail3(data, type){
 		let query = null
 		let item = null
@@ -296,7 +296,92 @@ export class TaskTypeQualityControlStatisticsComponent implements OnInit, AfterV
 				});
 		}
 	}
-	
+
+	viewDetail4(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,
+					emergencyTypeId: 300,
+					emergencyTypeDTO: {
+						"name": "是",
+						"id": 300
+					},
+				}
+			}
+			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,
+								emergencyTypeId: 300,
+								emergencyTypeDTO: {
+									"name": "是",
+									"id": 300
+								},
+							}
+						}
+						let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('distributionData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+					}
+				});
+		}
+	}
+
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();

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

@@ -28,23 +28,25 @@
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="10%">人员(编码)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
-			<th nzWidth="9%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均到达时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
+      <th nzWidth="12%">人员(编码)</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="emergency_count" [(nzSort)]="sortCurrent.emergency_count">加急工单</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
+			<th nzWidth="8%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均到达时间</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
     </tr>
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.name }}</td>
       <td>{{ data.totalCount }}</td>
+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.emergency_count }}</td>
       <td>{{ data.totalGrade }}</td>
 			<td>{{ data.totalPrice }}</td>
       <td>{{ data.response_time_num }}</td>
@@ -59,17 +61,18 @@
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 10%">{{ data.name }}</td>
-        <td style="width: 9%">{{ 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>
-        <td style="width: 9%">{{ data.arrive_time_num }}</td>
-        <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: 12%">{{ data.name }}</td>
+        <td style="width: 8%">{{ data.totalCount }}</td>
+        <td style="width: 8%" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.emergency_count }}</td>
+        <td style="width: 8%">{{ data.totalGrade }}</td>
+				<td style="width: 8%">{{ data.totalPrice }}</td>
+        <td style="width: 8%">{{ data.response_time_num }}</td>
+        <td style="width: 8%">{{ data.arrive_time_num }}</td>
+        <td style="width: 8%">{{ data.execution_time_num }}</td>
+        <td style="width: 8%">{{ data.aveper }}</td>
+        <td style="width: 8%">{{ data.total_time }}</td>
+        <td style="width: 8%">{{ data.five_count }}</td>
+        <td style="width: 8%">{{ data.special_close }}</td>
       </tr>
     </table>
   </ng-template>

src/app/views/new-statistics/distribution-inspection-statistics/user-quality-control-statistics/user-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/user-quality-control-statistics/user-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 { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
   selector: "app-user-quality-control-statistics",
@@ -18,6 +18,7 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
     private message: NzMessageService,
     private route: ActivatedRoute,
     private tabService: TabService,
+    private router: Router,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -55,6 +56,92 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
     }, 0)
   }
 
+  viewDetail4(data, type){
+		let query = null
+		let item = null
+		if(this.userId){
+			item = this.userList.find(i => i.id == this.userId)
+		}
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+				searchQuery:{
+					statusValue: 'close',
+					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+					deptId: this.fieldConfig.fields.deptId || undefined,
+					taskTypeId: 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.userId || undefined,
+					userDTO: item || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					emergencyTypeId: 300,
+					emergencyTypeDTO: {
+						"name": "是",
+						"id": 300
+					},
+				}
+			}
+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+			let flag = this.tabService.tabs.some(v => v.path === path);
+			flag && this.tabService.deleteRouteSnapshot(path);
+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+			sessionStorage.setItem('distributionData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}else{
+			let arr = data.name.split('(')
+			let postData: any = {
+			  idx: 0,
+			  sum: 20,
+			  department: {
+			    dept: arr[0],
+			    searchType: 1,
+			  },
+			};
+			this.mainService.getFetchDataList("simple/data", "department", postData)
+				.subscribe((res) => {
+					if (res.status == 200) {
+						let item = res.list.find(i =>i.id == data.deptId)
+						query = {
+							startDate: this.customChangeDateComponent.startDate || undefined,
+							endDate: this.customChangeDateComponent.endDate || undefined,
+							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+							searchQuery:{
+								statusValue: 'close',
+								deptDTO: this.fieldConfig.fields.deptDTO || undefined,
+								deptId: this.fieldConfig.fields.deptId || undefined,
+								taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+								taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
+								groupId: this.fieldConfig.fields.groupId || undefined,
+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+								userId: data.userId || undefined,
+								userDTO: item || undefined,
+								buildingId: this.fieldConfig.fields.buildingId || undefined,
+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+								emergencyTypeId: 300,
+								emergencyTypeDTO: {
+									"name": "是",
+									"id": 300
+								},
+							}
+						}
+						let path = '/newStatistics/distributionInspectionStatistics/incidentList'
+						let flag = this.tabService.tabs.some(v => v.path === path);
+						flag && this.tabService.deleteRouteSnapshot(path);
+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
+						sessionStorage.setItem('distributionData', JSON.stringify(query))
+						this.router.navigate([path], { replaceUrl: true });
+					}
+				});
+		}
+	}
+
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();

src/app/views/new-statistics/maintenance-statistics/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 || 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">
+<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 || fieldConfig.fields.priorityDTO">
   <span>{{fieldConfig.fields.workHourParentDTO?.workName}}</span>
 	<span>{{fieldConfig.fields.workHourSmallDTO?.workName}}</span>
 	<span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
@@ -41,7 +41,8 @@
 	<span>{{fieldConfig.fields.overtimeDTO?.name}}</span>
 	<span>{{fieldConfig.fields.codeNumDTO}}</span>
 	<span>{{fieldConfig.fields.deptTypeDTO?.name}}</span>
-	
+	<span>{{fieldConfig.fields.priorityDTO?.name}}</span>
+
 </div>
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px', x: '1600px'}">
   <thead>

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

@@ -33,31 +33,22 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
   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'){
-		// 			console.log('维修=================')
-		// 			this.getRouteQuery()
-		//     }
-		//   });
 
+  ngOnInit() {
     this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
       let fun = v[0];
       fun.call(this, v[1]);
     });
   }
-	
+
 	ngOnDestroy(){
 		sessionStorage.removeItem('maintenanceData')
 	}
-	
+
   ngAfterViewInit(){
     this.initSessionData();
+    // 数据下钻搜索
+		this.getRouteQuery()
     this.onResize(0);
   }
 
@@ -68,37 +59,42 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 			this.tableHeight = window.innerHeight - (document.querySelector('.searchDataWrap') as HTMLElement).offsetHeight - 64 - 36 - 48 - 8 - (document.querySelector('.ant-table-header') as HTMLElement).offsetHeight - height - this.getMoreFilter + 14;
     }, 0)
   }
-	
+
 	goingType:boolean = false;
-	getRouteQuery(){
+	async getRouteQuery(){
 		let data = sessionStorage.getItem('maintenanceData')
 		let query = null
 		if(data){
 			query = JSON.parse(data)
 			console.log('query==========',query)
-			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)
+      if(query.repairDeptId){
+        this.repairDeptId = query.repairDeptId
+        let postData = {
+          department: {
+            id: query.repairDeptId,
+            searchType: 1,
+          },
+          idx: 0,
+          sum: 1,
+        };
+        let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
+        this.repairDeptList = result.list || [];
+      }else{
+        this.repairDeptId = undefined
+      }
+      if(query.searchQuery){
+        this.goingType = true
+        this.fieldConfig.fields = query.searchQuery
+      }else{
+        this.goingType = false
+        this.fieldConfig.fields = {}
+      }
+      this.getQueryParams();
 		}else{
-			setTimeout(_=>{
-				this.getQueryParams();
-			},50)
+      this.getQueryParams();
 		}
 	}
-	
+
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();
@@ -114,10 +110,10 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   get getMoreFilter(){
-    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || 
-		this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || 
-		this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.sourceDTO  || 
-		this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || 
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO ||
+		this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO ||
+		this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.sourceDTO  ||
+		this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO ||
 		this.fieldConfig.fields.companyDTO || this.fieldConfig.fields.repairDeptDTO;
     return flag ? 37 : 0;
   }
@@ -194,15 +190,16 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 			wxDegreeId: this.fieldConfig.fields.evaluateId,
 			statusValue: this.fieldConfig.fields.statusValue || undefined,
 			deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
+			priorityId: this.fieldConfig.fields.priorityId || undefined,
     };
-		
+
 		if(this.fieldConfig.fields.workHourParentId && this.fieldConfig.fields.workHourSmallId){
 			postData.workHourId = this.fieldConfig.fields.workHourSmallId
 		}
 		if(this.fieldConfig.fields.workHourParentId && !this.fieldConfig.fields.workHourSmallId){
 			postData.workHourId = this.fieldConfig.fields.workHourParentId
 		}
-		
+
     this.loading1 = true;
     this.mainService
       .postCustom("itsm/report", "incidentWorkOrderList", postData)
@@ -264,9 +261,10 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
     	incidentSign: this.fieldConfig.fields.codeNum,
 			wxDegreeId: this.fieldConfig.fields.evaluateId,
 			statusValue: this.fieldConfig.fields.statusValue || undefined,
-			deptTypeId: this.fieldConfig.fields.deptTypeId || undefined
+			deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
+			priorityId: this.fieldConfig.fields.priorityId || undefined,
     };
-    
+
     if(this.fieldConfig.fields.workHourParentId && this.fieldConfig.fields.workHourSmallId){
     	postData.workHourId = this.fieldConfig.fields.workHourSmallId
     }
@@ -325,7 +323,7 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
     this.isLoading = true;
     this.searchTimerSubject.next([fun, e]);
   }
-	
+
 	// 查看工单详情
 	coopData:any;
 	detailModalShow = false; //弹窗开关
@@ -342,7 +340,7 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 	  this.detailModalShow = false;
 	  this.getList();
 	}
-	
+
   openChangeRepairDept(flag){
     flag && this.getRepairDeptList();
   }
@@ -370,10 +368,9 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
   // 详细搜索
   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, 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},
+    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, deptTypeId: undefined, priorityId: 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, priority: true},
   }
   showSearchMore:boolean = false;
   showMore(){

src/app/views/new-statistics/maintenance-statistics/maintenance-statistics-routing.module.ts

@@ -161,6 +161,33 @@ const routes: Routes = [
           title: '修-工时大类统计'
         }
       },
+      {
+        // 人员效能统计
+        path: 'personnelEffectivenessStatistics',
+        loadChildren: () => import('./personnel-effectiveness-statistics/personnel-effectiveness-statistics.module').then(m => m.PersonnelEffectivenessStatisticsModule),
+        data: {
+          reuse: true,
+          title: '修-人员效能统计'
+        }
+      },
+      {
+        // 优先级日期统计
+        path: 'priorityDateStatistics',
+        loadChildren: () => import('./priority-date-statistics/priority-date-statistics.module').then(m => m.PriorityDateStatisticsModule),
+        data: {
+          reuse: true,
+          title: '修-优先级日期统计'
+        }
+      },
+      {
+        // 优先级质控统计
+        path: 'priorityQualityControlStatistics',
+        loadChildren: () => import('./priority-quality-control-statistics/priority-quality-control-statistics.module').then(m => m.PriorityQualityControlStatisticsModule),
+        data: {
+          reuse: true,
+          title: '修-优先级质控统计'
+        }
+      },
       {
         // 人员评价统计
         path: 'userEvaluateStatistics',

src/app/views/new-statistics/maintenance-statistics/personnel-effectiveness-statistics/personnel-effectiveness-statistics-routing.module.ts

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

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

@@ -0,0 +1,74 @@
+<div class="searchDataWrap">
+  <div class="searchData">
+    <app-custom-change-date #customChangeDate [isShowType]="false"></app-custom-change-date>
+    <div class="searchDataItem">
+      <span class="label">排除异常人员</span>：
+      <nz-input-number [(ngModel)]="matchUserCouont" [nzMin]="1" [nzStep]="1" [nzPrecision]="0"></nz-input-number>
+    </div>
+  </div>
+  <div class="operation">
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
+    <button nz-button class="btn default" (click)="search()">查询</button>
+    <button nz-button class="btn default ml8" (click)="reset()">重置</button>
+    <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.buildingDTO || fieldConfig.fields.floorDTO || fieldConfig.fields.companyDTO || fieldConfig.fields.sourceDTO || fieldConfig.fields.repairDeptDTO">
+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
+  <span>{{fieldConfig.fields.userDTO?.name}}</span>
+  <span>{{fieldConfig.fields.category1DTO?.category}}</span>
+  <span>{{fieldConfig.fields.category2DTO?.category}}</span>
+  <span>{{fieldConfig.fields.category3DTO?.category}}</span>
+  <span>{{fieldConfig.fields.sourceDTO?.name}}</span>
+  <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
+  <span>{{fieldConfig.fields.floorDTO?.floorName}}</span>
+  <span>{{fieldConfig.fields.companyDTO?.name}}</span>
+  <span>{{fieldConfig.fields.repairDeptDTO?.dept}}</span>
+</div>
+<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
+  <thead (nzSortChange)="sort($event)" nzSingleSort>
+    <tr>
+      <th nzWidth="12.5%" nzShowSort nzSortKey="startDate" [(nzSort)]="sortCurrent.startDate">日期</th>
+      <th nzWidth="12.5%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单总量</th>
+      <th nzWidth="12.5%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总价格</th>
+      <th nzWidth="12.5%" nzShowSort nzSortKey="countWorker" [(nzSort)]="sortCurrent.countWorker">总人数</th>
+      <th nzWidth="12.5%" nzShowSort nzSortKey="totalResolvedTime" [(nzSort)]="sortCurrent.totalResolvedTime">总维修时长</th>
+      <th nzWidth="12.5%" nzShowSort nzSortKey="avgCount" [(nzSort)]="sortCurrent.avgCount">人均单量</th>
+      <th nzWidth="12.5%" nzShowSort nzSortKey="avgPrice" [(nzSort)]="sortCurrent.avgPrice">人均费用</th>
+      <th nzWidth="12.5%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">人均维修时长</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr *ngFor="let data of listOfData">
+      <td>{{ data.startDate }}</td>
+      <td>{{ data.totalCount }}</td>
+      <td>{{ data.totalPrice }}</td>
+      <td>{{ data.countWorker }}</td>
+      <td>{{ data.totalResolvedTime }}</td>
+      <td>{{ data.avgCount }}</td>
+      <td>{{ data.avgPrice }}</td>
+      <td>{{ data.avgResolvedTime }}</td>
+    </tr>
+  </tbody>
+  <ng-template #footerTpl>
+    <table class="footTable">
+      <tr *ngFor="let data of listOfDataEnd">
+        <td style="width: 12.5%">{{ data.startDate }}</td>
+        <td style="width: 12.5%">{{ data.totalCount }}</td>
+        <td style="width: 12.5%">{{ data.totalPrice }}</td>
+        <td style="width: 12.5%">{{ data.countWorker }}</td>
+        <td style="width: 12.5%">{{ data.totalResolvedTime }}</td>
+        <td style="width: 12.5%">{{ data.avgCount }}</td>
+        <td style="width: 12.5%">{{ data.avgPrice }}</td>
+        <td style="width: 12.5%">{{ data.avgResolvedTime }}</td>
+      </tr>
+    </table>
+  </ng-template>
+</nz-table>
+<div class="pagination">
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
+</div>
+
+<!-- 详细搜索 -->
+<app-search-more [fieldConfig]="fieldConfig" *ngIf="showSearchMore" [hosId]="hosId" [queryType]="queryType"  [dutyId]="dutyId"  [parentDutyId]="parentDutyId" (cancelEvent)="cancelEvent()" (submitEvent)="submitEvent($event)"></app-search-more>

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

@@ -0,0 +1,71 @@
+@import "../../../../../../src/theme.less";
+:host{
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  ::ng-deep .ant-table-footer{
+    padding: 16px 0;
+    width: calc(100% - 15px);
+    font-weight: bold;
+  }
+  tr, th{
+    text-align: center;
+  }
+  .searchDataWrap{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .searchData{
+      padding: 16px;
+      display: flex;
+      align-items: center;
+      .searchDataItem{
+        margin-right: 24px;
+        .label{
+          font-size: 16px;
+        }
+        .selectItem{
+          width: 160px;
+        }
+      }
+    }
+    .operation{
+      margin-right: 16px;
+      display: flex;
+      align-items: center;
+      cursor: pointer;
+      .icon_transport{
+        margin-right: 16px;
+        font-size: 24px;
+      }
+      .btn{
+        &.default{
+          height: 32px;
+          line-height: 32px;
+          min-width: 70px;
+        }
+      }
+    }
+  }
+
+  .table{
+    margin: 0 8px;
+  }
+
+  .moreFilter{
+    margin-bottom: 16px;
+    span{
+      margin-left: 16px;
+      color: @primary-color;
+    }
+  }
+
+  .pagination{
+    padding: 16px;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+  }
+}

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

@@ -0,0 +1,255 @@
+import { TabService } from '../../services/tab.service';
+import { debounceTime } from 'rxjs/operators';
+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 { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
+@Component({
+  selector: "app-personnel-effectiveness-statistics",
+  templateUrl: "./personnel-effectiveness-statistics.component.html",
+  styleUrls: ["./personnel-effectiveness-statistics.component.less"],
+})
+export class PersonnelEffectivenessStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
+  constructor(
+    private mainService: MainService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private tabService: TabService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  listOfDataEnd: any[] = []; //表格合计
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 30; //表格每页展示条数
+  listLength: number = 0; //表格总数据量
+
+  matchUserCouont:number = 1;//排除异常人员
+
+  searchTimerSubject = new Subject();
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+  }
+
+  ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
+    this.onResize();
+  }
+
+  tableHeight:number = 0;
+  @HostListener('window:resize')
+  onResize(): void {
+    setTimeout(() => {
+      this.tableHeight = window.innerHeight - (document.querySelector('.searchDataWrap') as HTMLElement).offsetHeight - 64 - 36 - 48 - 8 - (document.querySelector('.ant-table-header') as HTMLElement).offsetHeight - 55 - this.getMoreFilter + 14;
+
+    }, 0)
+  }
+
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
+    }
+  }
+
+  get getMoreFilter(){
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.companyDTO || this.fieldConfig.fields.sourceDTO || this.fieldConfig.fields.repairDeptDTO;
+    return flag ? 37 : 0;
+  }
+
+  // 初始化缓存数据
+  queryType:any;
+  hosId:any;
+  dutyId:any;
+  parentDutyId:any;
+  initSessionData(){
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
+
+    queryType = queryType ? +queryType : undefined;
+    hosId = hosId ? +hosId : undefined;
+    dutyId = dutyId ? +dutyId : undefined;
+
+    this.queryType = queryType;
+    if(queryType == 1){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 2){
+      this.hosId = hosId;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 3){
+      this.hosId = undefined;
+      this.dutyId = dutyId;
+      this.parentDutyId = undefined;
+    }else if(queryType == 4){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = dutyId;
+    }
+  }
+
+  get getHosId(){
+    return this.parentDutyId || this.dutyId || this.hosId;
+  }
+
+  // 表格数据
+  loading1 = false;
+  getList(num?: number, field?: string, sort?: string) {
+    if (num !== undefined) {
+      this.pageIndex = num;
+    }
+    let postData:any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      treeLevel: 1,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || undefined,
+      matchUserCouont: this.matchUserCouont || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || undefined,
+      placeId: this.fieldConfig.fields.floorId || undefined,
+      companyId: this.fieldConfig.fields.companyId || undefined,
+      sourceId: this.fieldConfig.fields.sourceId || undefined,
+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+    };
+    if (field && sort) {
+      postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
+    }
+    this.loading1 = true;
+    this.mainService
+      .postCustom("itsm/report", "incidentWorkOrderUser", postData)
+      .subscribe((result) => {
+        this.loading1 = false;
+        this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
+        this.listOfDataEnd = result.dataList.filter((v, i) => { return i == result.dataList.length - 1 });
+        this.listLength = result.totalCount;
+      });
+  }
+
+  // 列表排序
+  sortCurrent:any = {};
+  sortCurrentKey: string = "";
+  sortCurrentValue: string | null = "";
+  sort(e) {
+    const { key, value } = e;
+    this.sortCurrentKey = key;
+    this.sortCurrentValue = value;
+    this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 搜索
+  search() {
+    this.getList(1, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 日期选择
+  dateRange: any = [];
+
+  // 导出
+  excelExportLoading:any = false;
+  excelExport(){
+    this.excelExportLoading = this.message.loading("导出中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData:any = {
+      treeLevel: 1,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || undefined,
+      matchUserCouont: this.matchUserCouont || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || undefined,
+      placeId: this.fieldConfig.fields.floorId || undefined,
+      companyId: this.fieldConfig.fields.companyId || undefined,
+      sourceId: this.fieldConfig.fields.sourceId || undefined,
+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+    };
+    if (this.sortCurrentKey && this.sortCurrentValue) {
+      postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
+    }
+    this.mainService
+      .postExportCustom("itsm/export", "incidentWorkOrderUser", postData)
+      .subscribe((data) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.success('导出成功');
+        var file = new Blob([data], {
+          type: "application/vnd.ms-excel",
+        });
+        //trick to download store a file having its URL
+        var fileURL = URL.createObjectURL(file);
+        var a = document.createElement("a");
+        a.href = fileURL;
+        a.target = "_blank";
+        a.download = `${this.route.parent.routeConfig.data.title}.xls`;
+        document.body.appendChild(a);
+        a.click();
+      },(err) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.error('导出失败');
+      });
+  }
+  // 重置
+  reset(){
+    this.sortCurrentKey = "";
+		this.sortCurrentValue = "";
+		this.sortCurrent = {};
+    this.dateRange = []
+    this.matchUserCouont = 1;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined, sourceId: undefined, repairDeptId: undefined};
+    this.customChangeDateComponent.resetByDate();
+    setTimeout(_=>{
+    	this.search();
+    })
+  }
+
+  // 详细搜索
+  fieldConfig:any = {
+    fields: {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined, sourceId: undefined, repairDeptId: undefined},
+    config: {groupAndUser: true, category123: true, buildingAndFloor: true, company: true, source: true, repairDept: true},
+  }
+  showSearchMore:boolean = false;
+  showMore(){
+    this.showSearchMore = true;
+  }
+
+  cancelEvent(){
+    this.showSearchMore = false;
+  }
+
+  submitEvent(fields){
+    this.showSearchMore = false;
+    this.fieldConfig.fields = fields;
+    console.log('this.fieldConfig.fields:', this.fieldConfig.fields)
+    this.search();
+    this.onResize();
+  }
+}

src/app/views/new-statistics/maintenance-statistics/personnel-effectiveness-statistics/personnel-effectiveness-statistics.module.ts

@@ -0,0 +1,23 @@
+import { PersonnelEffectivenessStatisticsComponent } from './personnel-effectiveness-statistics.component';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { PersonnelEffectivenessStatisticsRoutingModule } from './personnel-effectiveness-statistics-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { SearchMoreModule } from '../../components/search-more/search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
+
+
+@NgModule({
+  declarations: [
+    PersonnelEffectivenessStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    PersonnelEffectivenessStatisticsRoutingModule,
+    ShareModule,
+    SearchMoreModule,
+    CustomChangeDateModule,
+  ]
+})
+export class PersonnelEffectivenessStatisticsModule { }

src/app/views/new-statistics/maintenance-statistics/priority-date-statistics/priority-date-statistics-routing.module.ts

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

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

@@ -0,0 +1,64 @@
+<div class="searchDataWrap">
+  <div class="searchData">
+    <app-custom-change-date #customChangeDate [isShowType]="false"></app-custom-change-date>
+  </div>
+  <div class="operation">
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
+    <button nz-button class="btn default" (click)="search()">查询</button>
+    <button nz-button class="btn default ml8" (click)="reset()">重置</button>
+    <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 || fieldConfig.fields.repairDeptDTO">
+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
+  <span>{{fieldConfig.fields.userDTO?.name}}</span>
+  <span>{{fieldConfig.fields.category1DTO?.category}}</span>
+  <span>{{fieldConfig.fields.category2DTO?.category}}</span>
+  <span>{{fieldConfig.fields.category3DTO?.category}}</span>
+  <span>{{fieldConfig.fields.sourceDTO?.name}}</span>
+  <span>{{fieldConfig.fields.repairDeptDTO?.dept}}</span>
+</div>
+<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
+  <thead (nzSortChange)="sort($event)" nzSingleSort>
+    <tr>
+      <th nzWidth="16%" nzShowSort nzSortKey="date" [(nzSort)]="sortCurrent.date">日期</th>
+      <th nzWidth="14%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单总数</th>
+      <th nzWidth="14%" nzShowSort nzSortKey="极低" [(nzSort)]="sortCurrent['极低']">极低</th>
+      <th nzWidth="14%" nzShowSort nzSortKey="低" [(nzSort)]="sortCurrent['低']">低</th>
+      <th nzWidth="14%" nzShowSort nzSortKey="中" [(nzSort)]="sortCurrent['中']">中</th>
+      <th nzWidth="14%" nzShowSort nzSortKey="高" [(nzSort)]="sortCurrent['高']">高</th>
+      <th nzWidth="14%" nzShowSort nzSortKey="极高" [(nzSort)]="sortCurrent['极高']">极高</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr *ngFor="let data of listOfData">
+      <td>{{ data.date }}</td>
+      <td class="text-sign" (click)="viewDetail1(data)">{{ data.totalCount }}</td>
+      <td class="text-sign" (click)="viewDetail5(data, null, '极低')">{{ data['极低']}}</td>
+      <td class="text-sign" (click)="viewDetail5(data, null, '低')">{{ data['低'] }}</td>
+      <td class="text-sign" (click)="viewDetail5(data, null, '中')">{{ data['中'] }}</td>
+      <td class="text-sign" (click)="viewDetail5(data, null, '高')">{{ data['高'] }}</td>
+      <td class="text-sign" (click)="viewDetail5(data, null, '极高')">{{ data['极高'] }}</td>
+    </tr>
+  </tbody>
+  <ng-template #footerTpl>
+    <table class="footTable">
+      <tr *ngFor="let data of listOfDataEnd">
+        <td style="width: 16%">{{ data.date }}</td>
+        <td style="width: 14%" class="text-sign" (click)="viewDetail1(data,'all')">{{ data.totalCount }}</td>
+        <td style="width: 14%" class="text-sign" (click)="viewDetail5(data,'all', '极低')">{{ data['极低'] }}</td>
+        <td style="width: 14%" class="text-sign" (click)="viewDetail5(data,'all', '低')">{{ data['低'] }}</td>
+        <td style="width: 14%" class="text-sign" (click)="viewDetail5(data,'all', '中')">{{ data['中'] }}</td>
+        <td style="width: 14%" class="text-sign" (click)="viewDetail5(data,'all', '高')">{{ data['高'] }}</td>
+        <td style="width: 14%" class="text-sign" (click)="viewDetail5(data,'all', '极高')">{{ data['极高'] }}</td>
+      </tr>
+    </table>
+  </ng-template>
+</nz-table>
+<div class="pagination">
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
+</div>
+
+<!-- 详细搜索 -->
+<app-search-more [fieldConfig]="fieldConfig" *ngIf="showSearchMore" [hosId]="hosId" [queryType]="queryType"  [dutyId]="dutyId"  [parentDutyId]="parentDutyId" (cancelEvent)="cancelEvent()" (submitEvent)="submitEvent($event)"></app-search-more>

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

@@ -0,0 +1,75 @@
+@import "../../../../../../src/theme.less";
+:host{
+  position: absolute;
+  top: 0;
+  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);
+    font-weight: bold;
+  }
+  tr, th{
+    text-align: center;
+  }
+  .searchDataWrap{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .searchData{
+      padding: 16px;
+      display: flex;
+      align-items: center;
+      .searchDataItem{
+        margin-right: 24px;
+        .label{
+          font-size: 16px;
+        }
+        .selectItem{
+          width: 160px;
+        }
+      }
+    }
+    .operation{
+      margin-right: 16px;
+      display: flex;
+      align-items: center;
+      cursor: pointer;
+      .icon_transport{
+        margin-right: 16px;
+        font-size: 24px;
+      }
+      .btn{
+        &.default{
+          height: 32px;
+          line-height: 32px;
+          min-width: 70px;
+        }
+      }
+    }
+  }
+
+  .table{
+    margin: 0 8px;
+  }
+
+  .moreFilter{
+    margin-bottom: 16px;
+    span{
+      margin-left: 16px;
+      color: @primary-color;
+    }
+  }
+
+  .pagination{
+    padding: 16px;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+  }
+}

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

@@ -0,0 +1,389 @@
+import { TabService } from '../../services/tab.service';
+import { debounceTime } from 'rxjs/operators';
+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, Router } from '@angular/router';
+import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
+@Component({
+  selector: "app-priority-date-statistics",
+  templateUrl: "./priority-date-statistics.component.html",
+  styleUrls: ["./priority-date-statistics.component.less"],
+})
+export class PriorityDateStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
+  constructor(
+    private mainService: MainService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private tabService: TabService,
+    private router: Router,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  listOfDataEnd: any[] = []; //表格合计
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 30; //表格每页展示条数
+  listLength: number = 0; //表格总数据量
+
+  searchTimerSubject = new Subject();
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+  }
+
+  ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
+    this.onResize();
+  }
+
+  tableHeight:number = 0;
+  @HostListener('window:resize')
+  onResize(): void {
+    setTimeout(() => {
+      this.tableHeight = window.innerHeight - (document.querySelector('.searchDataWrap') as HTMLElement).offsetHeight - 64 - 36 - 48 - 8 - (document.querySelector('.ant-table-header') as HTMLElement).offsetHeight - 55 - this.getMoreFilter + 14;
+
+    }, 0)
+  }
+
+  // 数据下钻
+	viewDetail1(data,type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate,
+				endDate: this.customChangeDateComponent.endDate,
+				searchQuery:{
+					statusValue: 'close',
+					repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+					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.date + ' ' + '00:00:00',
+				endDate: data.date + ' ' + '23:59:59',
+				searchQuery:{
+					statusValue: 'close',
+					repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+					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.date + ' ' + '00:00:00', data.date + ' ' + '23:59:59']);
+			this.tabService.setQueryParams('defRange', null);
+			sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+			this.router.navigate([path], { replaceUrl: true });
+		}
+	}
+
+  // 数据下钻
+	viewDetail5(data,type,key){
+	console.log('data:', data)
+	console.log('type:', type)
+	console.log('key:', key)
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate,
+				endDate: this.customChangeDateComponent.endDate,
+				searchQuery:{
+					statusValue: 'close',
+					repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+					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,
+					priorityId: data[key + 'id'] || undefined,
+          priorityDTO: {
+            id: data[key + 'id'],
+            name: key,
+          }
+				}
+			}
+			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.date + ' ' + '00:00:00',
+				endDate: data.date + ' ' + '23:59:59',
+				searchQuery:{
+					statusValue: 'close',
+					repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+					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,
+          priorityId: data[key + 'id'] || undefined,
+          priorityDTO: {
+            id: data[key + 'id'],
+            name: key,
+          }
+				}
+			}
+			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.date + ' ' + '00:00:00', data.date + ' ' + '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();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
+    }
+  }
+
+  get getMoreFilter(){
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.sourceDTO || this.fieldConfig.fields.repairDeptDTO;
+    return flag ? 37 : 0;
+  }
+
+  // 初始化缓存数据
+  queryType:any;
+  hosId:any;
+  dutyId:any;
+  parentDutyId:any;
+  initSessionData(){
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
+
+    queryType = queryType ? +queryType : undefined;
+    hosId = hosId ? +hosId : undefined;
+    dutyId = dutyId ? +dutyId : undefined;
+
+    this.queryType = queryType;
+    if(queryType == 1){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 2){
+      this.hosId = hosId;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 3){
+      this.hosId = undefined;
+      this.dutyId = dutyId;
+      this.parentDutyId = undefined;
+    }else if(queryType == 4){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = dutyId;
+    }
+  }
+
+  get getHosId(){
+    return this.parentDutyId || this.dutyId || this.hosId;
+  }
+
+  // 表格数据
+  loading1 = false;
+  getList(num?: number, field?: string, sort?: string) {
+    if (num !== undefined) {
+      this.pageIndex = num;
+    }
+    let postData:any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+      sourceId: this.fieldConfig.fields.sourceId || undefined,
+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+    };
+    if (field && sort) {
+      postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
+    }
+    this.loading1 = true;
+    this.mainService
+      .postCustom("itsm/report", "incidentPriority", postData)
+      .subscribe((result) => {
+        this.loading1 = false;
+        result.dataList = result.dataList || [];
+        // 优先级需要处理
+        result.dataList.forEach(v => {
+          for (const key in v) {
+            if(key.includes('_')){
+              let [key1, value1] = key.split('_');
+              v[key1] = v[key];
+              v[key1 + 'id'] = +value1;
+            }
+          }
+        })
+
+        console.log('result.dataList:', result.dataList)
+        this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
+        this.listOfDataEnd = result.dataList.filter((v, i) => { return i == result.dataList.length - 1 });
+        this.listLength = result.totalCount;
+      });
+  }
+
+  // 列表排序
+  sortCurrent:any = {};
+  sortCurrentKey: string = "";
+  sortCurrentValue: string | null = "";
+  sort(e) {
+    const { key, value } = e;
+    this.sortCurrentKey = key;
+    this.sortCurrentValue = value;
+    this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 搜索
+  search() {
+    this.getList(1, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 日期选择
+  dateRange: any = [];
+
+  // 导出
+  excelExportLoading:any = false;
+  excelExport(){
+    this.excelExportLoading = this.message.loading("导出中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData:any = {
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+      sourceId: this.fieldConfig.fields.sourceId || undefined,
+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+    };
+    if (this.sortCurrentKey && this.sortCurrentValue) {
+      postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
+    }
+    this.mainService
+      .postExportCustom("itsm/export", "incidentPriority", postData)
+      .subscribe((data) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.success('导出成功');
+        var file = new Blob([data], {
+          type: "application/vnd.ms-excel",
+        });
+        //trick to download store a file having its URL
+        var fileURL = URL.createObjectURL(file);
+        var a = document.createElement("a");
+        a.href = fileURL;
+        a.target = "_blank";
+        a.download = `${this.route.parent.routeConfig.data.title}.xls`;
+        document.body.appendChild(a);
+        a.click();
+      },(err) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.error('导出失败');
+      });
+  }
+  // 重置
+  reset(){
+    this.sortCurrentKey = "";
+		this.sortCurrentValue = "";
+		this.sortCurrent = {};
+    this.dateRange = []
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, repairDeptId: undefined};
+    this.customChangeDateComponent.resetByDate();
+    setTimeout(_=>{
+    	this.search();
+    })
+  }
+
+  // 详细搜索
+  fieldConfig:any = {
+    fields: {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, repairDeptId: undefined},
+    config: {groupAndUser: true, category123: true, source: true, repairDept: true},
+  }
+  showSearchMore:boolean = false;
+  showMore(){
+    this.showSearchMore = true;
+  }
+
+  cancelEvent(){
+    this.showSearchMore = false;
+  }
+
+  submitEvent(fields){
+    this.showSearchMore = false;
+    this.fieldConfig.fields = fields;
+    console.log('this.fieldConfig.fields:', this.fieldConfig.fields)
+    this.search();
+    this.onResize();
+  }
+}

src/app/views/new-statistics/maintenance-statistics/priority-date-statistics/priority-date-statistics.module.ts

@@ -0,0 +1,23 @@
+import { PriorityDateStatisticsComponent } from './priority-date-statistics.component';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { PriorityDateStatisticsRoutingModule } from './priority-date-statistics-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { SearchMoreModule } from '../../components/search-more/search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
+
+
+@NgModule({
+  declarations: [
+    PriorityDateStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    PriorityDateStatisticsRoutingModule,
+    ShareModule,
+    SearchMoreModule,
+    CustomChangeDateModule,
+  ]
+})
+export class PriorityDateStatisticsModule { }

src/app/views/new-statistics/maintenance-statistics/priority-quality-control-statistics/priority-quality-control-statistics-routing.module.ts

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { PriorityQualityControlStatisticsComponent } from './priority-quality-control-statistics.component';
+
+
+const routes: Routes = [
+  { path: '', component: PriorityQualityControlStatisticsComponent }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class PriorityQualityControlStatisticsRoutingModule { }

src/app/views/new-statistics/maintenance-statistics/priority-quality-control-statistics/priority-quality-control-statistics.component.html

@@ -0,0 +1,75 @@
+<div class="searchDataWrap">
+  <div class="searchData">
+    <app-custom-change-date #customChangeDate [isShowType]="false"></app-custom-change-date>
+  </div>
+  <div class="operation">
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
+    <button nz-button class="btn default" (click)="search()">查询</button>
+    <button nz-button class="btn default ml8" (click)="reset()">重置</button>
+    <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
+  </div>
+</div>
+<div class="moreFilter" *ngIf="fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO || fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.repairDeptDTO || fieldConfig.fields.companyDTO">
+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
+  <span>{{fieldConfig.fields.userDTO?.name}}</span>
+  <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
+  <span>{{fieldConfig.fields.floorDTO?.floorName}}</span>
+  <span>{{fieldConfig.fields.companyDTO?.name}}</span>
+  <span>{{fieldConfig.fields.repairDeptDTO?.dept}}</span>
+</div>
+<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
+  <thead (nzSortChange)="sort($event)" nzSingleSort>
+    <tr>
+      <th nzWidth="10%">优先级</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="workHourPrice" [(nzSort)]="sortCurrent.workHourPrice">工时费用(元)</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用(元)</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="negativeNum" [(nzSort)]="sortCurrent.negativeNum">差评单数</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="favorableRate" [(nzSort)]="sortCurrent.favorableRate">好评率</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr *ngFor="let data of listOfData">
+      <td>{{ data.priorityName }}</td>
+      <td class="text-sign" (click)="viewDetail1(data)">{{ data.sum }}</td>
+      <td>{{ data.avgResponseTime }}</td>
+      <td>{{ data.avgResolvedTime }}</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 class="text-sign" (click)="viewDetail4(data)">{{ data.negativeNum }}</td>
+      <td>{{ data.favorableRate }}</td>
+    </tr>
+  </tbody>
+  <ng-template #footerTpl>
+    <table class="footTable">
+      <tr *ngFor="let data of listOfDataEnd">
+        <td style="width: 10%">{{ data.priorityName }}</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%" 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%" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.negativeNum }}</td>
+        <td style="width: 9%">{{ data.favorableRate }}</td>
+      </tr>
+    </table>
+  </ng-template>
+</nz-table>
+<div class="pagination">
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
+</div>
+
+<!-- 详细搜索 -->
+<app-search-more [fieldConfig]="fieldConfig" *ngIf="showSearchMore" [hosId]="hosId" [queryType]="queryType"  [dutyId]="dutyId"  [parentDutyId]="parentDutyId" (cancelEvent)="cancelEvent()" (submitEvent)="submitEvent($event)"></app-search-more>

src/app/views/new-statistics/maintenance-statistics/priority-quality-control-statistics/priority-quality-control-statistics.component.less

@@ -0,0 +1,75 @@
+@import "../../../../../../src/theme.less";
+:host{
+  position: absolute;
+  top: 0;
+  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);
+    font-weight: bold;
+  }
+  tr, th{
+    text-align: center;
+  }
+  .searchDataWrap{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .searchData{
+      padding: 16px;
+      display: flex;
+      align-items: center;
+      .searchDataItem{
+        margin-right: 24px;
+        .label{
+          font-size: 16px;
+        }
+        .selectItem{
+          width: 160px;
+        }
+      }
+    }
+    .operation{
+      margin-right: 16px;
+      display: flex;
+      align-items: center;
+      cursor: pointer;
+      .icon_transport{
+        margin-right: 16px;
+        font-size: 24px;
+      }
+      .btn{
+        &.default{
+          height: 32px;
+          line-height: 32px;
+          min-width: 70px;
+        }
+      }
+    }
+  }
+
+  .table{
+    margin: 0 8px;
+  }
+
+  .moreFilter{
+    margin-bottom: 16px;
+    span{
+      margin-left: 16px;
+      color: @primary-color;
+    }
+  }
+
+  .pagination{
+    padding: 16px;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+  }
+}

src/app/views/new-statistics/maintenance-statistics/priority-quality-control-statistics/priority-quality-control-statistics.component.ts

@@ -0,0 +1,541 @@
+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, Router } from '@angular/router';
+import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
+@Component({
+  selector: "app-priority-quality-control-statistics",
+  templateUrl: "./priority-quality-control-statistics.component.html",
+  styleUrls: ["./priority-quality-control-statistics.component.less"],
+})
+export class PriorityQualityControlStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
+  constructor(
+    private mainService: MainService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+		private router: Router,
+    private tabService: TabService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  listOfDataEnd: any[] = []; //表格合计
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 30; //表格每页展示条数
+  listLength: number = 0; //表格总数据量
+
+  ngOnInit() {}
+
+  ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
+    this.onResize();
+  }
+
+  tableHeight:number = 0;
+  @HostListener('window:resize')
+  onResize(): void {
+    setTimeout(() => {
+      this.tableHeight = window.innerHeight - (document.querySelector('.searchDataWrap') as HTMLElement).offsetHeight - 64 - 36 - 48 - 8 - (document.querySelector('.ant-table-header') as HTMLElement).offsetHeight - 55 - this.getMoreFilter + 14;
+
+    }, 0)
+  }
+
+	// 数据下钻
+	viewDetail1(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+          groupId: this.fieldConfig.fields.groupId || undefined,
+          userId: this.fieldConfig.fields.userId || undefined,
+          repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+          companyId: this.fieldConfig.fields.companyId || 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,
+          repairDeptDTO: this.fieldConfig.fields.repairDeptDTO || undefined,
+          companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+          priorityId: data.priorityId || undefined,
+          priorityDTO: {
+            id: data.priorityId,
+            name: data.priorityName,
+          }
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+          groupId: this.fieldConfig.fields.groupId || undefined,
+          userId: this.fieldConfig.fields.userId || undefined,
+          repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+          companyId: this.fieldConfig.fields.companyId || 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,
+          repairDeptDTO: this.fieldConfig.fields.repairDeptDTO || undefined,
+          companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+          priorityId: data.priorityId || undefined,
+          priorityDTO: {
+            id: data.priorityId,
+            name: data.priorityName,
+          }
+				}
+			}
+		}
+
+		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,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+          groupId: this.fieldConfig.fields.groupId || undefined,
+          userId: this.fieldConfig.fields.userId || undefined,
+          repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+          companyId: this.fieldConfig.fields.companyId || 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,
+          repairDeptDTO: this.fieldConfig.fields.repairDeptDTO || undefined,
+          companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+          priorityId: data.priorityId || undefined,
+          priorityDTO: {
+            id: data.priorityId,
+            name: data.priorityName,
+          },
+					overtimeDTO:{
+						id: 1,
+						name: "是"
+					},
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					overtimeId: 1,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+          groupId: this.fieldConfig.fields.groupId || undefined,
+          userId: this.fieldConfig.fields.userId || undefined,
+          repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+          companyId: this.fieldConfig.fields.companyId || 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,
+          repairDeptDTO: this.fieldConfig.fields.repairDeptDTO || undefined,
+          companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+          priorityId: data.priorityId || undefined,
+          priorityDTO: {
+            id: data.priorityId,
+            name: data.priorityName,
+          },
+					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,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+          groupId: this.fieldConfig.fields.groupId || undefined,
+          userId: this.fieldConfig.fields.userId || undefined,
+          repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+          companyId: this.fieldConfig.fields.companyId || 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,
+          repairDeptDTO: this.fieldConfig.fields.repairDeptDTO || undefined,
+          companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+          priorityId: data.priorityId || undefined,
+          priorityDTO: {
+            id: data.priorityId,
+            name: data.priorityName,
+          },
+					isHangDTO:{
+						id: 1,
+						name: "是"
+					},
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					isHangId: 1,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+          groupId: this.fieldConfig.fields.groupId || undefined,
+          userId: this.fieldConfig.fields.userId || undefined,
+          repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+          companyId: this.fieldConfig.fields.companyId || 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,
+          repairDeptDTO: this.fieldConfig.fields.repairDeptDTO || undefined,
+          companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+          priorityId: data.priorityId || undefined,
+          priorityDTO: {
+            id: data.priorityId,
+            name: data.priorityName,
+          },
+					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,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+          groupId: this.fieldConfig.fields.groupId || undefined,
+          userId: this.fieldConfig.fields.userId || undefined,
+          repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+          companyId: this.fieldConfig.fields.companyId || 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,
+          repairDeptDTO: this.fieldConfig.fields.repairDeptDTO || undefined,
+          companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+          priorityId: data.priorityId || undefined,
+          priorityDTO: {
+            id: data.priorityId,
+            name: data.priorityName,
+          },
+					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',
+					evaluateId: 20424,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+          groupId: this.fieldConfig.fields.groupId || undefined,
+          userId: this.fieldConfig.fields.userId || undefined,
+          repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+          companyId: this.fieldConfig.fields.companyId || 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,
+          repairDeptDTO: this.fieldConfig.fields.repairDeptDTO || undefined,
+          companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+          priorityId: data.priorityId || undefined,
+          priorityDTO: {
+            id: data.priorityId,
+            name: data.priorityName,
+          },
+					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();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
+    }
+  }
+
+  get getMoreFilter(){
+    let flag = this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.groupDTO;
+    return flag ? 37 : 0;
+  }
+
+  // 初始化缓存数据
+  queryType:any;
+  hosId:any;
+  dutyId:any;
+  parentDutyId:any;
+  initSessionData(){
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
+
+    queryType = queryType ? +queryType : undefined;
+    hosId = hosId ? +hosId : undefined;
+    dutyId = dutyId ? +dutyId : undefined;
+
+    this.queryType = queryType;
+    if(queryType == 1){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 2){
+      this.hosId = hosId;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 3){
+      this.hosId = undefined;
+      this.dutyId = dutyId;
+      this.parentDutyId = undefined;
+    }else if(queryType == 4){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = dutyId;
+    }
+  }
+
+  get getHosId(){
+    return this.parentDutyId || this.dutyId || this.hosId;
+  }
+
+  // 表格数据
+  loading1 = false;
+  getList(num?: number, field?: string, sort?: string) {
+    if (num !== undefined) {
+      this.pageIndex = num;
+    }
+    let postData:any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || undefined,
+      placeId: this.fieldConfig.fields.floorId || undefined,
+      groupId: this.fieldConfig.fields.groupId || undefined,
+      userId: this.fieldConfig.fields.userId || undefined,
+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+      companyId: this.fieldConfig.fields.companyId || undefined,
+    };
+    if (field && sort) {
+      postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
+    }
+    this.loading1 = true;
+    this.mainService
+      .postCustom("itsm/report", "incidentPriorityQc", postData)
+      .subscribe((result) => {
+        this.loading1 = false;
+        this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
+        this.listOfDataEnd = result.dataList.filter((v, i) => { return i == result.dataList.length - 1 });
+        this.listLength = result.totalCount;
+      });
+  }
+
+  // 列表排序
+  sortCurrent:any = {};
+  sortCurrentKey: string = "";
+  sortCurrentValue: string | null = "";
+  sort(e) {
+    const { key, value } = e;
+    this.sortCurrentKey = key;
+    this.sortCurrentValue = value;
+    this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 搜索
+  search() {
+    this.getList(1, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 日期选择
+  dateRange: any = [];
+
+  // 导出
+  excelExportLoading:any = false;
+  excelExport(){
+    this.excelExportLoading = this.message.loading("导出中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData:any = {
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || undefined,
+      placeId: this.fieldConfig.fields.floorId || undefined,
+      groupId: this.fieldConfig.fields.groupId || undefined,
+      userId: this.fieldConfig.fields.userId || undefined,
+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+      companyId: this.fieldConfig.fields.companyId || undefined,
+    };
+    if (this.sortCurrentKey && this.sortCurrentValue) {
+      postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
+    }
+    this.mainService
+      .postExportCustom("itsm/export", "incidentPriorityQc", postData)
+      .subscribe((data) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.success('导出成功');
+        var file = new Blob([data], {
+          type: "application/vnd.ms-excel",
+        });
+        //trick to download store a file having its URL
+        var fileURL = URL.createObjectURL(file);
+        var a = document.createElement("a");
+        a.href = fileURL;
+        a.target = "_blank";
+        a.download = `${this.route.parent.routeConfig.data.title}.xls`;
+        document.body.appendChild(a);
+        a.click();
+      },(err) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.error('导出失败');
+      });
+  }
+  // 重置
+  reset(){
+    this.sortCurrentKey = "";
+		this.sortCurrentValue = "";
+		this.sortCurrent = {};
+    this.dateRange = []
+    this.fieldConfig.fields = {buildingId: undefined, floorId: undefined, groupId: undefined, userId: undefined, repairDeptId: undefined, companyId: undefined};
+    this.customChangeDateComponent.resetByDate();
+    setTimeout(_=>{
+    	this.search();
+    })
+  }
+
+  // 防抖
+  isLoading = false;
+
+  // 详细搜索
+  fieldConfig:any = {
+    fields: {buildingId: undefined, floorId: undefined, groupId: undefined, userId: undefined, repairDeptId: undefined, companyId: undefined},
+    config: {buildingAndFloor: true, groupAndUser: true, repairDept: true, company: true},
+  }
+  showSearchMore:boolean = false;
+  showMore(){
+    this.showSearchMore = true;
+  }
+
+  cancelEvent(){
+    this.showSearchMore = false;
+  }
+
+  submitEvent(fields){
+    this.showSearchMore = false;
+    this.fieldConfig.fields = fields;
+    console.log('this.fieldConfig.fields:', this.fieldConfig.fields)
+    this.search();
+    this.onResize();
+  }
+}

src/app/views/new-statistics/maintenance-statistics/priority-quality-control-statistics/priority-quality-control-statistics.module.ts

@@ -0,0 +1,23 @@
+import { PriorityQualityControlStatisticsComponent } from './priority-quality-control-statistics.component';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { PriorityQualityControlStatisticsRoutingModule } from './priority-quality-control-statistics-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { SearchMoreModule } from '../../components/search-more/search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
+
+
+@NgModule({
+  declarations: [
+    PriorityQualityControlStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    PriorityQualityControlStatisticsRoutingModule,
+    ShareModule,
+    SearchMoreModule,
+    CustomChangeDateModule,
+  ]
+})
+export class PriorityQualityControlStatisticsModule { }

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

@@ -2,13 +2,24 @@
 	<div class="searchDataWrap">
 		<div class="searchData">
       <app-custom-change-date #customChangeDate [isShowType]="true" name="选择日期"></app-custom-change-date>
+      <div class="searchDataItem">
+        <span class="label">报修科室</span>：
+        <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
+          <ng-container *ngFor="let option of repairDeptList">
+            <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + 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>
 		<div class="operation">
 			<button nz-button class="btn default" (click)="search()">搜索</button>
 			<button nz-button class="btn default ml8" (click)="reset()">重置</button>
 		</div>
 	</div>
-  <ng-container *ngIf="!isLoading">
+  <ng-container *ngIf="!isLoading1">
     <div class="top1-statistics">
       <div class="top-list">
         <div class="special-box cursor" (click)="viewDetail1()">
@@ -169,6 +180,6 @@
     </div>
   </ng-container>
 </div>
-<div class="mask-style" *ngIf="isLoading">
+<div class="mask-style" *ngIf="isLoading1">
 	<nz-spin nzSimple class="spin-style"></nz-spin>
 </div>

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

@@ -26,7 +26,10 @@
 			margin-bottom: 8px;
 		  .searchData{
 		    padding: 16px;
+        display: flex;
+        align-items: center;
 		    .searchDataItem{
+          margin-right: 24px;
 		      .label{
 		        font-size: 16px;
 		      }

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

@@ -3,6 +3,8 @@ import { Component, OnInit, ViewChild, AfterViewInit } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
 import { TabService } from '../../services/tab.service';
 import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
+import { debounceTime } from 'rxjs/operators';
+import { Subject } from 'rxjs';
 @Component({
   selector: "app-synthesize-statistics",
   templateUrl: "./synthesize-statistics.component.html",
@@ -16,7 +18,7 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
     public router: Router,
   ) {}
 
-	isLoading:Boolean = false;
+	isLoading1:Boolean = false;
 	workData:any = []; //工单统计
   listOfData: any[] = []; //表格数据
   pageIndex: number = 1; //表格当前页码
@@ -62,7 +64,14 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 		}
 	] //报修耗材
 
-  ngOnInit() {}
+  searchTimerSubject = new Subject();
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+  }
 
   ngAfterViewInit(){
     setTimeout(() => {
@@ -70,12 +79,54 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
     }, 0)
   }
 
+  get getHosId(){
+    return this.parentDutyId || this.dutyId || this.hosId;
+  }
+
+  // 科室搜索
+  changeRepairDeptInp(e) {
+    this.searchTimer(this.getRepairDeptList, e);
+  }
+
+  // 防抖
+  isLoading = false;
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  openChangeRepairDept(flag){
+    flag && this.getRepairDeptList();
+  }
+
+  // 获取报修科室列表
+  repairDeptId;//报修科室id
+  repairDeptList:any[] = [];
+  getRepairDeptList(keyword?) {
+    let data = {
+      department: {
+        statisticalHosId: this.getHosId,
+        dept: keyword,
+        searchType: 1,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "department", data)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.repairDeptList = data.list;
+      });
+  }
+
 	/*========= 数据下钻 ========*/
 
 	// 汇总
 	viewDetail1(){
 		let query = {
-
+      repairDeptId: this.repairDeptId,
 		}
 		let path = '/newStatistics/maintenanceStatistics/incidentList'
 		let flag = this.tabService.tabs.some(v => v.path === path);
@@ -92,6 +143,7 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 		let query = {
 			startDate: this.customChangeDateComponent.startDate,
 			endDate: this.customChangeDateComponent.endDate,
+      repairDeptId: this.repairDeptId,
 			searchQuery:{
 				isHangId: 1,
 				isHangDTO:{
@@ -114,6 +166,7 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 		let query = {
 			startDate: this.customChangeDateComponent.startDate,
 			endDate: this.customChangeDateComponent.endDate,
+      repairDeptId: this.repairDeptId,
 			searchQuery:{
 				overtimeId: 1,
 				overtimeDTO:{
@@ -136,6 +189,7 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 		let query = {
 			startDate: this.customChangeDateComponent.startDate,
 			endDate: this.customChangeDateComponent.endDate,
+      repairDeptId: this.repairDeptId,
 			searchQuery:{
 				evaluateId: 20424,
 				evaluateDTO: {
@@ -163,12 +217,13 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 		let query = {
 			startDate: this.customChangeDateComponent.startDate,
 			endDate: this.customChangeDateComponent.endDate,
+      repairDeptId: this.repairDeptId,
 			searchQuery:{
 				statusValue: 'close',
 				groupId:null,
 				groupDTO:null,
 				userId:null,
-				userDTO:null
+				userDTO:null,
 			}
 		}
 		if(this.activeIndex==0){
@@ -201,6 +256,7 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 		let query = {
 			startDate: this.customChangeDateComponent.startDate,
 			endDate: this.customChangeDateComponent.endDate,
+      repairDeptId: this.repairDeptId,
 			searchQuery:{
 				statusValue: 'close',
 				groupId:null,
@@ -275,6 +331,7 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 		  hosId: this.hosId,
 		  dutyId: this.dutyId,
 		  parentDutyId: this.parentDutyId,
+		  repairDeptId: this.repairDeptId || undefined,
 		};
 		this.mainService
 		  .getReportData(postData)
@@ -351,6 +408,7 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 		  hosId: this.hosId,
 		  dutyId: this.dutyId,
 		  parentDutyId: this.parentDutyId,
+      repairDeptId: this.repairDeptId || undefined,
 		};
 		this.mainService
 		  .getReportData(postData)
@@ -429,6 +487,7 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 		  hosId: this.hosId,
 		  dutyId: this.dutyId,
 		  parentDutyId: this.parentDutyId,
+      repairDeptId: this.repairDeptId || undefined,
 		};
 		this.mainService
 		  .getReportData(postData)
@@ -507,6 +566,7 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 	    hosId: this.hosId,
 	    dutyId: this.dutyId,
 	    parentDutyId: this.parentDutyId,
+      repairDeptId: this.repairDeptId || undefined,
 	  };
 	  this.mainService
 	    .getReportData(postData)
@@ -524,11 +584,12 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 	    hosId: this.hosId,
 	    dutyId: this.dutyId,
 	    parentDutyId: this.parentDutyId,
+      repairDeptId: this.repairDeptId || undefined,
 	  };
 	  this.mainService
 	    .getReportData(postData)
 	    .subscribe((result:any) => {
-				this.isLoading = false;
+				this.isLoading1 = false;
 	      this.consumableData = result.data || [];
 	    });
 	}
@@ -553,11 +614,13 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
   hosId:any;
   dutyId:any;
   parentDutyId:any;
+  currentDeptDTO:any;
   initSessionData(){
     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
     let queryType:any = newStatistics.queryType;
     let hosId:any = newStatistics.hospitalId;
     let dutyId:any = newStatistics.dutyId;
+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
 
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;
@@ -580,9 +643,13 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
       this.hosId = undefined;
       this.dutyId = undefined;
       this.parentDutyId = dutyId;
+    }else if(queryType == 5){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = dutyId;
     }
 
-		this.isLoading = true
+		this.isLoading1 = true
 		this.getWorkData();
 		this.getMaintainData();
 		this.repairsChart();
@@ -626,6 +693,7 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 	    hosId: this.hosId,
 	    dutyId: this.dutyId,
 	    parentDutyId: this.parentDutyId,
+      repairDeptId: this.repairDeptId || undefined,
 	  };
 	  this.mainService
 	    .getReportData(postData)
@@ -644,6 +712,7 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 	    hosId: this.hosId,
 	    dutyId: this.dutyId,
 	    parentDutyId: this.parentDutyId,
+      repairDeptId: this.repairDeptId || undefined,
 	  };
 	  this.mainService
 	    .getReportData(postData)
@@ -654,6 +723,7 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 
 	// 重置
 	reset(){
+    this.repairDeptId = undefined;
 		this.dateRange = [];
 		this.activeIndex = 0;
     this.customChangeDateComponent.resetByDate();

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

@@ -13,4 +13,4 @@
 <router-outlet></router-outlet>
 
 <!-- 查询范围 -->
-<app-query-range [sign]="sign" [hospital]="hospital" [duty]="duty" [queryType]="queryType" [parent]="parent" [defaultDate]="defaultDate" (cancelQueryRange)="cancelQueryRange()" (submitQueryRange)="submitQueryRange($event)" *ngIf="queryRangeFlag"></app-query-range>
+<app-query-range [sign]="sign" [hospital]="hospital" [duty]="duty" [queryType]="queryType" [realQueryType]="realQueryType" [parent]="parent" [defaultDate]="defaultDate" [currentDeptDTO]="currentDeptDTO" (cancelQueryRange)="cancelQueryRange()" (submitQueryRange)="submitQueryRange($event)" *ngIf="queryRangeFlag"></app-query-range>

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

@@ -44,8 +44,10 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
   hospital;
   duty;
   queryType;//查询范围
+  realQueryType;//queryType=5的时候，查询范围
 	parent:any = 0;
 	defaultDate:any = [];
+	currentDeptDTO;
   // 初始化院区、部门显示
   initHospitalAndDuty(hospitalOrDuty){
     let sessionData = JSON.parse(sessionStorage.getItem('newStatistics'));
@@ -54,8 +56,10 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
       this.hospital = sessionData.hospital;
       this.duty = sessionData.duty;
       this.queryType = sessionData.queryType;
+      this.realQueryType = sessionData.realQueryType;
 			this.parent = sessionData.parent;
 			this.defaultDate = sessionData.defaultDate;
+			this.currentDeptDTO = sessionData.currentDeptDTO;
       return;
     }
 
@@ -85,6 +89,20 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
     if(this.sign === 'nurse'){
       // 护士端跳转到统计
       this.queryType = 5;
+      this.currentDeptDTO = this.tool.getCurrentUserDept();
+      if(this.hospital){
+        if(this.duty){
+          if(this.duty.parentDeptId){
+            this.realQueryType = 3;
+          }else{
+            this.realQueryType = 4;
+          }
+        }else{
+          this.realQueryType = 2;
+        }
+      }else{
+        this.realQueryType = 1;
+      }
     }else{
       if(this.hospital){
         if(this.duty){
@@ -107,7 +125,7 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
 
   // 缓存数据
   sessionSave(){
-    sessionStorage.setItem('newStatistics', JSON.stringify({queryType: this.queryType, hospitalId: this.hospital ? this.hospital.id : undefined, dutyId: this.duty ? this.duty.id : undefined, hospital: this.hospital, duty: this.duty, parent: this.parent, defaultDate: this.defaultDate}));
+    sessionStorage.setItem('newStatistics', JSON.stringify({queryType: this.queryType, realQueryType: this.realQueryType, hospitalId: this.hospital ? this.hospital.id : undefined, dutyId: this.duty ? this.duty.id : undefined, hospital: this.hospital, duty: this.duty, parent: this.parent, defaultDate: this.defaultDate, currentDeptDTO: this.currentDeptDTO}));
   }
 
   // 查询范围
@@ -115,16 +133,20 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
   queryRangeClick(){
     this.queryRangeFlag = true;
   }
-  submitQueryRange({queryType, hospital, duty, parent, defaultDate}) {
+  submitQueryRange({queryType, hospital, duty, parent, defaultDate, currentDeptDTO, realQueryType}) {
     console.log('queryType:', queryType)
+    console.log('realQueryType:', realQueryType)
     console.log('hospital:', hospital)
     console.log('duty:', duty)
     console.log('defaultDate:', defaultDate)
+    console.log('currentDeptDTO:', currentDeptDTO)
     this.queryType = queryType;
+    this.realQueryType = realQueryType;
     this.hospital = hospital;
     this.duty = duty;
 		this.parent = parent;
 		this.defaultDate = defaultDate;
+		this.currentDeptDTO = currentDeptDTO;
     this.queryRangeFlag = false;
 
     this.sessionSave();