拉取代码

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

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

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

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

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

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

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

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

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

@@ -453,9 +453,13 @@ export class FuwutaiComponent implements OnInit {
             }
             this.showPromptModal("建单", true, "", "close");
           }
-        } else {
-          this.showPromptModal("建单", false, data["msg"]);
-        }
+        } else if(data["status"] == 1000033){
+					//重复建单那策略
+					this.repeatMsg = data["msg"];
+					this.showRepeatModal(postData, "transport");
+				}else{
+					this.showPromptModal("建单", false, data["msg"]);
+				}
       });
     }
   }
@@ -539,9 +543,13 @@ export class FuwutaiComponent implements OnInit {
         } else if(data["status"] == 100042){
           this.newOrderShow = false; //关闭弹窗
           this.showPromptModal("建单", false, data["msg"]);
-        } else {
-          this.showPromptModal("建单", false, data["msg"]);
-        }
+        } else if(data["status"] == 1000033){
+					//重复建单那策略
+					this.repeatMsg = data["msg"];
+					this.showRepeatModal(postData, "inspection");
+				}else{
+					this.showPromptModal("建单", false, data["msg"]);
+				}
       });
     }
   }
@@ -578,9 +586,13 @@ export class FuwutaiComponent implements OnInit {
           }
           this.showPromptModal("建单", true, "", "close");
         }
-      } else {
-        this.showPromptModal("建单", false, data["msg"]);
-      }
+      } else if(data["status"] == 1000033){
+				//重复建单那策略
+				this.repeatMsg = data["msg"];
+				this.showRepeatModal(postData, "specimen");
+			}else{
+				this.showPromptModal("建单", false, data["msg"]);
+			}
     });
   }
   // 其他表单提交
@@ -640,9 +652,13 @@ export class FuwutaiComponent implements OnInit {
           }
           this.showPromptModal("建单", true, "", "close");
         }
-      } else {
-        this.showPromptModal("建单", false, data["msg"]);
-      }
+      } else if(data["status"] == 1000033){
+				//重复建单那策略
+				this.repeatMsg = data["msg"];
+				this.showRepeatModal(postData, "other");
+			}else{
+				this.showPromptModal("建单", false, data["msg"]);
+			}
     });
   }
   // 万能交接表单提交
@@ -694,9 +710,13 @@ export class FuwutaiComponent implements OnInit {
           }
           this.showPromptModal("建单", true, "", "close");
         }
-      } else {
-        this.showPromptModal("建单", false, data["msg"]);
-      }
+      } else if(data["status"] == 1000033){
+				//重复建单那策略
+				this.repeatMsg = data["msg"];
+				this.showRepeatModal(postData, "ordinary");
+			}else{
+				this.showPromptModal("建单", false, data["msg"]);
+			}
     });
   }
   // 核酸打印
@@ -750,6 +770,7 @@ export class FuwutaiComponent implements OnInit {
     })
   }
   //获取检查页面任务类型
+	allTaskType:any;
   getInspectAndPatientTransportConfigTasktype() {
     if(!this.hsmsData.hsmsSwitch){
       return;
@@ -776,6 +797,24 @@ export class FuwutaiComponent implements OnInit {
           this.getInspectAndPatientTransportConfig(tasktype);
         }
       });
+			
+			let query = {
+			  idx: 0,
+			  sum: 9999,
+			  taskType: {
+			    hosId: {
+			      id: this.checkedHos
+			    }
+			  }
+			};
+			this.mainService
+			  .getFetchDataList("simple/data", "taskType", query)
+			  .subscribe((result) => {
+			    if (result.status == 200) {
+			      this.allTaskType = result.list || {};
+						this.initControlView();
+			    }
+			  });
   }
   // 获取检查页面信息配置
   getInspectAndPatientTransportConfig(tasktype) {
@@ -803,8 +842,10 @@ export class FuwutaiComponent implements OnInit {
         }
       });
   }
+	currentDept:any;
   ngOnInit() {
     this.websocketLoading = true;
+		this.currentDept = this.tool.getCurrentUserDept();
     this.coopBtns = this.tool.initCoopBtns(this.route);
 		// console.log(8989899,this.coopBtns)
     //防抖
@@ -866,7 +907,6 @@ export class FuwutaiComponent implements OnInit {
     this.initOrderScope();
     this.getVisitList();
     this.getMessageList();
-    this.initControlView();
     this.moveMenu("fixedMenu");
     this.moveMenu("fixedMenuLeft");
     this.moveMenuAll("fixedMenuAll");
@@ -2199,6 +2239,7 @@ export class FuwutaiComponent implements OnInit {
               item.computedReceiveFlag = this.computedReceive(item.data)
               item.computedEditFlag = this.computedEdit(item.data)
             }
+						item.taskTypeConfig = this.allTaskType.find(i=>i.associationType.id == item.data.taskType.associationType.id)
           });
           this.unassignedList = unassignedList;
           this.batchType = false;
@@ -2225,6 +2266,7 @@ export class FuwutaiComponent implements OnInit {
               item.computedReceiveFlag = this.computedReceive(item.data)
               item.computedEditFlag = this.computedEdit(item.data)
             }
+						item.taskTypeConfig = this.allTaskType.find(i=>i.associationType.id == item.data.taskType.associationType.id)
           });
           this.arriveList = arriveList;
           this.batchType1 = false;
@@ -2240,6 +2282,7 @@ export class FuwutaiComponent implements OnInit {
               item.computedHandleFlag = this.computedHandle(item.data)
               item.computedEditFlag = this.computedEdit(item.data)
             }
+						item.taskTypeConfig = this.allTaskType.find(i=>i.associationType.id == item.data.taskType.associationType.id)
           });
           this.executionList = executionList;
           this.loading3 = false;
@@ -2521,6 +2564,7 @@ export class FuwutaiComponent implements OnInit {
       },0)
     }
     this.buildType = buildType;
+		console.log(123,buildType)
     if(this.itsmData.mdv2Switch){
       if(this.buildType !== '继续建单' && this.buildType !== '编辑事件' && this.buildType !== '报修转事件'){
         this.resetOrderData();
@@ -4608,6 +4652,7 @@ export class FuwutaiComponent implements OnInit {
     console.log(this.workTypesArrange[index].value);
     let taskType = this.workTypesArrange[index].value.find(v => v.id == value);
     let patientCode;
+		this.taskType = taskType.associationTypeValue
     if(taskType.associationTypeValue === 'inspect'){
       patientCode = this.patientZy;
       this.requiredConfigChange('validateFormZy', 'startDept', false);
@@ -4727,11 +4772,15 @@ export class FuwutaiComponent implements OnInit {
     }, 0)
   }
 	psValue:any;
+	taskType:any;
   radioChangeQt(value) {
     //任务类型id
     if (value === "" || value === null) {
       return;
     }
+		let index = this.tabIndex;
+		let item = this.workTypesArrange[1].value.find(v => v.id == value);
+		this.taskType = item.associationTypeValue
 		this.psValue = value
     this.startDeptQt = null;
     this.endDeptQt = null;
@@ -5009,16 +5058,184 @@ export class FuwutaiComponent implements OnInit {
         },
       },
     };
-    this.mainService.buildOrder(postData).subscribe((result) => {
+    this.mainService.buildOrder(postData).subscribe((result:any) => {
       this.createLoading = false;
       this.deptFlag = false;
       if (result["status"] == 200) {
         this.showPromptModal("建单", true, "");
-      } else {
-        this.showPromptModal("建单", false, result["msg"]);
-      }
+      } else if(result["status"] == 1000033){
+				//重复建单那策略
+				this.repeatMsg = result.msg;
+				this.showRepeatModal(postData, "");
+      }else{
+				this.showPromptModal("建单", false, result["msg"]);
+			}
     });
   }
+	
+	limitTimeModal: boolean = false; //模态框
+	limitTimeInfo:string = '';
+	limitTimeItem: any = {};
+	hideLimitTimeModal() {
+	  this.limitTimeModal = false;
+	}
+	
+	// 建单判断时间-护士端建单通用方法
+	isShowConfirm:boolean = true;
+	isShowConfirmInfo:string = '';
+	newOrderTimeFun(order, fun1, fun2){
+	  if(this.currentDept.typeValue != 'recovery' && this.currentDept.typeValue != 'surgery'){
+	    let taskTypeId = order.taskType.id;
+	    let deptId = order.createDept;
+	    let maskFlag = this.msg.loading("正在加载中..", {
+	      nzDuration: 0,
+	    }).messageId;
+	    this.mainService
+	    .postCustom("api", "compareWorkTime", {taskTypeId, deptId, yyTime: order.yyTime})
+	    .subscribe((data) => {
+	      this.msg.remove(maskFlag);
+	      if(data.state == 200){
+	        fun2.call(this);
+	      }else{
+	        fun1.call(this);
+	        this.limitTimeModal = true;
+	        this.limitTimeItem = {taskTypeId, fun1, fun2};
+	        this.limitTimeInfo = data.data.remark;
+	        this.isShowConfirm = data.data.limitType == 1;
+	        if(this.isShowConfirm || data.data.limitNum == 1){
+	          this.isShowConfirmInfo = '';
+	        }else{
+	          this.isShowConfirmInfo = '请在规定时间内下单';
+	        }
+	      }
+	    })
+	  }else{
+	    fun2.call(this);
+	  }
+	}
+	
+	repeatModal: boolean = false; //删除模态框
+	repeatMsg = "";
+	loadingRepeat = false;
+	repeatPostData;
+	sourceType;
+	isYuyue;
+	showRepeatModal(postData, sourceType, yuyue?) {
+	  this.repeatModal = true;
+	  this.repeatPostData = postData;
+	  this.sourceType = sourceType;
+	  this.isYuyue = yuyue ? yuyue : false;
+	}
+	hideRepeatModal() {
+	  this.repeatModal = false;
+	  this.btnLoading = false;
+	}
+	confirmRepeat() {
+	  this.loadingRepeat = true;
+	  this.repeatPostData.tipsCreateOder = 1;
+	  this.newOrderTimeFun(this.repeatPostData.workOrder, () => {
+	    this.loadingRepeat = false;
+	    this.repeatModal = false;
+	  }, () => {
+	    this.mainService
+	    .postCustom(
+	      "api",
+	      this.isYuyue ? "appointmentOrder" : "startOrder",
+	      this.repeatPostData
+	    )
+	    .subscribe((data) => {
+	      this.loadingRepeat = false;
+	      this.repeatModal = false;
+	      if(this.currentDept.typeValue == 'recovery'){
+	        this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.repeatPostData.workOrder.patient.patientCode}).subscribe((resultData) => {
+	          this.confirmRepeatFun(data);
+	        });
+	      }else{
+	        this.confirmRepeatFun(data);
+	      }
+	    });
+	  })
+	}
+	confirmRepeatFun(data){
+	  if (this.sourceType === "specimen") {
+	    // 标本建单
+	    if (data.status == 200 && (this.taskType == "other" || this.taskType == "ordinary")) {
+	      this.showPromptModal("创建", true, "", this.taskType);
+	    } else if (data.status == 200 && this.taskType == "bb") {
+	      this.showPromptModal("创建", true, "", "bb");
+	    } else if (this.taskType == "bb" && data.status == 100043) {
+	      this.showPromptModal("创建", true, data.msg);
+	    } else {
+	      this.showPromptModal("创建", false, data.msg);
+	    }
+	  } else if (this.sourceType === "other" || this.sourceType === "ordinary") {
+			// 其他建单
+	    if (data.status == 200 && (this.taskType == "other" || this.taskType == "ordinary")) {
+	      this.showPromptModal("创建", true, "", this.taskType);
+	    } else if (data.status == 200 && this.taskType == "bb") {
+	      this.showPromptModal("创建", true, "", "bb");
+	    } else if (this.taskType == "bb" && data.status == 100043) {
+	      this.showPromptModal("创建", true, data.msg);
+	    } else {
+	      this.showPromptModal("创建", false, data.msg);
+	    }
+	  } else if (this.sourceType === "transport") {
+	    // 转运
+	    if (data.status == 200) {
+	      this.showPromptModal("创建", true, "");
+	    } else if (data.status == 100042) {
+	      this.showPromptModal("创建", false, data.msg);
+	    } else {
+	      this.showPromptModal("创建", false, data.msg);
+	    }
+	  } else if (this.sourceType === "accompany1") {
+	    // 陪检
+	    if (data.status == 200) {
+	      this.showPromptModal("创建", true, "");
+	    } else if (data.status == 100042) {
+	      this.showPromptModal("创建", false, data.msg);
+	    } else {
+	      this.showPromptModal("创建", false, data.msg);
+	    }
+	  } else if (this.sourceType === "accompany2") {
+	    // 陪检
+	    if (data.status == 200) {
+	      this.showPromptModal("创建", true, "");
+	    } else if (data.status == 100042) {
+	      this.showPromptModal("创建", false, data.msg);
+	    } else {
+	      this.showPromptModal("创建", false, data.msg);
+	    }
+	  } else if (this.sourceType === "accompany3") {
+	    // 陪检
+	    if (data.status == 200) {
+	      this.showPromptModal("创建", true, "");
+	    } else if (data.status == 100042) {
+	      this.showPromptModal("创建", false, data.msg);
+	    } else {
+	      this.showPromptModal("创建", false, data.msg);
+	    }
+	  } else if (this.sourceType === "accompany4") {
+	    // 陪检
+	    if (data.status == 200) {
+	      this.showPromptModal("创建", true, "");
+	    } else if (data.status == 100042) {
+	      this.showPromptModal("创建", false, data.msg);
+	    } else {
+	      this.showPromptModal("创建", false, data.msg);
+	    }
+	  } else if (this.sourceType === "accompany5") {
+	    // 陪检
+	    if (data.status == 200) {
+	      this.showPromptModal("创建", true, "");
+	    } else if (data.status == 100042) {
+	      this.showPromptModal("创建", false, data.msg);
+	    } else {
+	      this.showPromptModal("创建", false, data.msg);
+	    }
+	  }
+	}
+	
   // 隐藏选择转入科室的模态框
   deptFlagHand(e) {
     this.deptFlag = false;
@@ -5149,6 +5366,8 @@ export class FuwutaiComponent implements OnInit {
     } else if (this.currentRTab === 3) {
       this.getDictionaryList();
     }
+		this.newOrderShow = false;
+		this.newOrderShowOpen = false;
     this.fixedTab = "";
     this.fixedMenuShangla();
   }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -33,7 +33,7 @@
 	<span>{{fieldConfig.fields.codeNumDTO}}</span>
 	<span>{{fieldConfig.fields.timeFrameDTO?.name}}</span>
 </div>
-<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px', x: '1400px'}">
+<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px', x: '1500px'}">
   <thead>
     <tr>
       <th nzWidth="150px">序号|单号</th>
@@ -44,6 +44,7 @@
       <th nzWidth="200px">时间考核</th>
       <th nzWidth="150px">状态|评价</th>
       <th nzWidth="150px">费用|积分</th>
+			<th nzWidth="100px">执行人</th>
     </tr>
   </thead>
   <tbody>
@@ -85,6 +86,7 @@
       	<div>{{ data.totalGrade }}{{data.totalGrade?'元':''}}</div>
       	<div>{{ data.scorePrice }}{{data.scorePrice?'分':''}}</div>
       </td>
+			<td>{{data.workerName}}</td>
     </tr>
   </tbody>
 </nz-table>

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

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

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

@@ -2,7 +2,7 @@ import { TabService } from './../../services/tab.service';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
   selector: "app-category-one-statistics",
@@ -15,6 +15,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
   ) {}
 
@@ -43,7 +44,145 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 
     }, 0)
   }
+	
+	// 数据下钻
+	viewDetail1(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					hierarchy: data.hierarchy,
+					categoryId: data.categoryId,
+					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					userId: this.fieldConfig.fields.userId || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					companyId: this.fieldConfig.fields.companyId || undefined,
+				}
+			}
+		}
 
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	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,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					hierarchy: data.hierarchy,
+					categoryId: data.categoryId,
+					overtimeId: 1,
+					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					userId: this.fieldConfig.fields.userId || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					companyId: this.fieldConfig.fields.companyId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	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,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					hierarchy: data.hierarchy,
+					categoryId: data.categoryId,
+					isHangId: 1,
+					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					userId: this.fieldConfig.fields.userId || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					companyId: this.fieldConfig.fields.companyId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	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,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					hierarchy: data.hierarchy,
+					categoryId: data.categoryId,
+					evaluateId: 20424,
+					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					userId: this.fieldConfig.fields.userId || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					companyId: this.fieldConfig.fields.companyId || undefined,
+				}
+			}
+		}
+		
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();

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

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

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

@@ -4,7 +4,7 @@ import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
   selector: "app-category-three-statistics",
@@ -17,6 +17,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
   ) {}
 
@@ -54,7 +55,145 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 
     }, 0)
   }
-
+	
+	// 数据下钻
+	viewDetail1(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					hierarchy: data.hierarchy,
+					categoryId: data.categoryId,
+					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					userId: this.fieldConfig.fields.userId || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					companyId: this.fieldConfig.fields.companyId || undefined,
+				}
+			}
+		}
+		
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	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,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					hierarchy: data.hierarchy,
+					categoryId: data.categoryId,
+					overtimeId: 1,
+					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					userId: this.fieldConfig.fields.userId || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					companyId: this.fieldConfig.fields.companyId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	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,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					hierarchy: data.hierarchy,
+					categoryId: data.categoryId,
+					isHangId: 1,
+					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					userId: this.fieldConfig.fields.userId || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					companyId: this.fieldConfig.fields.companyId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	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,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					hierarchy: data.hierarchy,
+					categoryId: data.categoryId,
+					evaluateId: 20424,
+					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					userId: this.fieldConfig.fields.userId || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					companyId: this.fieldConfig.fields.companyId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();

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

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

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

@@ -4,7 +4,7 @@ import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
   selector: "app-category-two-statistics",
@@ -17,6 +17,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
   ) {}
 
@@ -54,7 +55,145 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
 
     }, 0)
   }
+	
+	// 数据下钻
+	viewDetail1(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					hierarchy: data.hierarchy,
+					categoryId: data.categoryId,
+					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					userId: this.fieldConfig.fields.userId || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					companyId: this.fieldConfig.fields.companyId || undefined,
+				}
+			}
+		}
 
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	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,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					hierarchy: data.hierarchy,
+					categoryId: data.categoryId,
+					overtimeId: 1,
+					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					userId: this.fieldConfig.fields.userId || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					companyId: this.fieldConfig.fields.companyId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	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,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					hierarchy: data.hierarchy,
+					categoryId: data.categoryId,
+					isHangId: 1,
+					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					userId: this.fieldConfig.fields.userId || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					companyId: this.fieldConfig.fields.companyId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	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,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					hierarchy: data.hierarchy,
+					categoryId: data.categoryId,
+					evaluateId: 20424,
+					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					userId: this.fieldConfig.fields.userId || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					companyId: this.fieldConfig.fields.companyId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();

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

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

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

@@ -2,7 +2,7 @@ import { TabService } from './../../services/tab.service';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { ToolService } from "../../../../services/tool.service";
 import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
@@ -19,6 +19,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
 		private tool: ToolService,
   ) {}
@@ -59,7 +60,215 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
     }, 0)
   }
+	
+	// 数据下钻
+	viewDetail1(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: data.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	viewDetail2(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20424,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: data.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20424,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+				}
+			}
+		}
 
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	viewDetail3(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20423,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: data.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20423,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	viewDetail4(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20422,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: data.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20422,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	viewDetail5(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20421,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: data.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20421,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	viewDetail6(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20420,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: data.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20420,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();

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

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

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

@@ -2,7 +2,7 @@ import { TabService } from './../../services/tab.service';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { ToolService } from "../../../../services/tool.service";
 import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
@@ -19,6 +19,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
 		private tool: ToolService,
   ) {}
@@ -59,7 +60,145 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 
     }, 0)
   }
+	
+	// 数据下钻
+	viewDetail1(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: data.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	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,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: data.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					overtimeId: 1,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+				}
+			}
+		}
 
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	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,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: data.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					isHangId: 1,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	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,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: data.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20424,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();

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

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

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

@@ -2,7 +2,7 @@ import { TabService } from './../../services/tab.service';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
   selector: "app-group-statistics",
@@ -15,6 +15,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
   ) {}
 
@@ -43,7 +44,133 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 
     }, 0)
   }
+	
+	// 数据下钻
+	viewDetail1(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					groupId: data.groupId ? data.groupId : -1,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+				}
+			}
+		}
 
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	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,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					groupId: data.groupId ? data.groupId : -1,
+					overtimeId: 1,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	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,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					groupId: data.groupId ? data.groupId : -1,
+					isHangId: 1,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	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,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					groupId: data.groupId ? data.groupId : -1,
+					evaluateId: 20424,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();

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

@@ -1,6 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <app-custom-change-date #customChangeDate [isShowType]="false"></app-custom-change-date>
+    <app-custom-change-date #customChangeDate [isShowType]="false" [dateData1]="dateData1" [dateData2]="dateData2"></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)">
@@ -20,9 +20,9 @@
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
   </div>
 </div>
-<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.sourceDTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || 
-		this.fieldConfig.fields.companyDTO || this.fieldConfig.fields.workHourParentDTO || this.fieldConfig.fields.workHourSmallDTO || this.fieldConfig.fields.evaluateDTO || this.fieldConfig.fields.repairUserDTO || this.fieldConfig.fields.consumableDTO || 
-		this.fieldConfig.fields.isHangDTO || this.fieldConfig.fields.overtimeDTO || this.fieldConfig.fields.codeNumDTO">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.sourceDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO || 
+		fieldConfig.fields.companyDTO || fieldConfig.fields.workHourParentDTO || fieldConfig.fields.workHourSmallDTO || fieldConfig.fields.evaluateDTO || fieldConfig.fields.repairUserDTO || fieldConfig.fields.consumableDTO || 
+		fieldConfig.fields.isHangDTO || fieldConfig.fields.overtimeDTO || fieldConfig.fields.codeNumDTO || fieldConfig.fields.deptTypeDTO">
   <span>{{fieldConfig.fields.workHourParentDTO?.workName}}</span>
 	<span>{{fieldConfig.fields.workHourSmallDTO?.workName}}</span>
 	<span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
@@ -40,13 +40,15 @@
 	<span>{{fieldConfig.fields.isHangDTO?.name}}</span>
 	<span>{{fieldConfig.fields.overtimeDTO?.name}}</span>
 	<span>{{fieldConfig.fields.codeNumDTO}}</span>
+	<span>{{fieldConfig.fields.deptTypeDTO.name}}</span>
+	
 </div>
-<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px', x: '1550px'}">
+<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px', x: '1600px'}">
   <thead>
     <tr>
       <th nzWidth="150px">序号|单号</th>
       <th nzWidth="300px">故障描述</th>
-      <th nzWidth="150px">详细地址</th>
+      <th nzWidth="200px">详细地址</th>
       <th nzWidth="100px">受|处理人/组</th>
       <th nzWidth="200px">时间过程</th>
       <th nzWidth="100px">时长</th>
@@ -59,11 +61,17 @@
   <tbody>
     <tr *ngFor="let data of listOfData; let index = index;">
       <td (click)="viewDetail(data)">
-				<div>{{index+(pageIndex-1) * pageSize + 1}}</div>
+				<div>{{index+(pageIndex-1) * pageSize + 1}} {{data.priorityName}}</div>
 				<div class="text-style">{{data.incidentsign}}</div>
 			</td>
-      <td class="hide-describe">{{data.description}}</td>
-      <td>{{ data.housenumber }}</td>
+      <td class="hide-describe">
+				<div>{{data.mutiCategory}}</div>
+				<div>{{data.description}}</div>
+			</td>
+      <td>
+				<div>{{data.hosName}}-{{data.repairDept}}</div>
+				<div>{{ data.housenumber }}</div>
+			</td>
       <td>
 				<div>{{data.creator}}</div>
 				<div>{{data.groupOrHandlerUser}}</div>

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

@@ -2,7 +2,7 @@ import { TabService } from './../../services/tab.service';
 import { debounceTime, filter } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
-import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
+import { Component, OnInit, HostListener, AfterViewInit, ViewChild, OnDestroy } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
 import { ActivatedRoute, Router, NavigationEnd  } from '@angular/router';
 import cloneDeep from 'lodash-es/cloneDeep'
@@ -12,7 +12,7 @@ import { CustomChangeDateComponent } from '../../components/custom-change-date/c
   templateUrl: "./incident-list.component.html",
   styleUrls: ["./incident-list.component.less"],
 })
-export class IncidentListComponent implements OnInit, AfterViewInit {
+export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
   @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
@@ -31,13 +31,16 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
   repairDeptId;//报修科室id
 
   searchTimerSubject = new Subject();
-
+	dateData1:any;
+	dateData2:any;
+	
   ngOnInit() {
+		// 数据下钻搜索
 		this.getRouteQuery()
 		this.router.events
 		  .pipe(filter(event => event instanceof NavigationEnd))
 		  .subscribe((event: NavigationEnd) => {
-		    if(event.urlAfterRedirects=='/newStatistics/maintenanceStatistics/incidentList'){
+		    if(event.urlAfterRedirects.endsWith('/incidentList')){
 					this.getRouteQuery()
 		    }
 		  });
@@ -47,7 +50,11 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
       fun.call(this, v[1]);
     });
   }
-
+	
+	ngOnDestroy(){
+		sessionStorage.removeItem('maintenanceData')
+	}
+	
   ngAfterViewInit(){
     this.initSessionData();
     this.getQueryParams();
@@ -71,18 +78,31 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
 		if(data){
 			query = JSON.parse(data)
 			console.log('query==========',query)
-			if(query.startData){
-				this.customChangeDateComponent.startDate = query.startData
-			}
-			if(query.endDate){
-				this.customChangeDateComponent.startDate = query.endDate
-			}
-			if(query.searchQuery){
-				this.fieldConfig.fields = query.searchQuery
-			}
-			
-			this.search();
-			this.onResize(37);
+			setTimeout(_=>{
+				// console.log(777,this.customChangeDateComponent)
+				if(query.startDate){
+					this.dateData1 = query.startDate
+					this.customChangeDateComponent.startDate = query.startDate
+				}
+				if(query.endDate){
+					this.dateData2 = query.endDate
+					this.customChangeDateComponent.endDate = query.endDate
+				}
+				if(query.repairDeptId){
+					this.getRepairDeptList();
+					this.repairDeptId = query.repairDeptId
+				}else{
+					this.repairDeptId = undefined
+				}
+				if(query.searchQuery){
+					this.fieldConfig.fields = query.searchQuery
+				}else{
+					this.fieldConfig.fields = {}
+				}
+				
+				this.search();
+				this.onResize(37);
+			})
 		}
 	}
 	
@@ -174,6 +194,8 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
 			hangUp: this.fieldConfig.fields.isHangId==0 ? undefined : this.fieldConfig.fields.isHangId,
 			incidentSign: this.fieldConfig.fields.codeNum,
 			wxDegreeId: this.fieldConfig.fields.evaluateId,
+			statusValue: this.fieldConfig.fields.statusValue || undefined,
+			deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
     };
 		
 		if(this.fieldConfig.fields.workHourParentId && this.fieldConfig.fields.workHourSmallId){
@@ -243,6 +265,8 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
     	hangUp: this.fieldConfig.fields.isHangId==0 ? undefined : this.fieldConfig.fields.isHangId,
     	incidentSign: this.fieldConfig.fields.codeNum,
 			wxDegreeId: this.fieldConfig.fields.evaluateId,
+			statusValue: this.fieldConfig.fields.statusValue || undefined,
+			deptTypeId: this.fieldConfig.fields.deptTypeId || undefined
     };
     
     if(this.fieldConfig.fields.workHourParentId && this.fieldConfig.fields.workHourSmallId){
@@ -345,8 +369,8 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
   fieldConfig:any = {
     fields: {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: 
 		undefined,buildingId: undefined, floorId: undefined, companyId: undefined, 
-		workHourParentId: undefined, workHourSmallId: undefined, evaluateId: undefined, repairUserId: undefined, consumableId: undefined, isHangId: undefined, codeNum: undefined, overtimeId: undefined},
-    config: {groupAndUser: true, category123: true, source: true, buildingAndFloor: true, company: true, workHourParent: true, workHourSmall: true, evaluate: true, repairUser: true, consumable: true, isHang: true, code: true, overtime: true},
+		workHourParentId: undefined, workHourSmallId: undefined, evaluateId: undefined, repairUserId: undefined, consumableId: undefined, isHangId: undefined, codeNum: undefined, overtimeId: undefined, deptTypeId: undefined},
+    config: {groupAndUser: true, category123: true, source: true, buildingAndFloor: true, company: true, workHourParent: true, workHourSmall: true, evaluate: true, repairUser: true, consumable: true, isHang: true, code: true, overtime: true, deptType: true},
   }
   showSearchMore:boolean = false;
   showMore(){

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

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

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

@@ -4,7 +4,7 @@ import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
   selector: "app-incident-statistics",
@@ -17,6 +17,7 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
   ) {}
 
@@ -54,7 +55,133 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
 
     }, 0)
   }
+	
+	// 数据下钻
+	viewDetail1(data,type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate,
+				endDate: this.customChangeDateComponent.endDate,
+				searchQuery:{
+					statusValue: 'close',
+				}
+			}
+		}else{
+			 query = {
+				startDate: data.startDate + ' ' + '00:00:00',
+				endDate: data.startDate + ' ' + '23:59:59',
+				searchQuery:{
+					statusValue: 'close',
+					groupId: this.fieldConfig.fields.userId ? undefined : (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,
+				}
+			}
+		}
 
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	viewDetail2(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate,
+				endDate: this.customChangeDateComponent.endDate,
+				searchQuery:{
+					statusValue: 'close',
+					overtimeId: 1,
+				}
+			}
+		}else{
+			query = {
+				startDate: data.startDate + ' ' + '00:00:00',
+				endDate: data.startDate + ' ' + '23:59:59',
+				searchQuery:{
+					statusValue: 'close',
+					overtimeId: 1,
+					groupId: this.fieldConfig.fields.userId ? undefined : (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,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	viewDetail3(data, type){
+		let query = null;
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate,
+				endDate: this.customChangeDateComponent.endDate,
+				searchQuery:{
+					statusValue: 'close',
+					isHangId: 1
+				}
+			}
+		}else{
+			query = {
+				startDate: data.startDate + ' ' + '00:00:00',
+				endDate: data.startDate + ' ' + '23:59:59',
+				searchQuery:{
+					statusValue: 'close',
+					isHangId: 1,
+					groupId: this.fieldConfig.fields.userId ? undefined : (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,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	viewDetail4(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate,
+				endDate: this.customChangeDateComponent.endDate,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20424
+				}
+			}
+		}else{
+			query = {
+				startDate: data.startDate + ' ' + '00:00:00',
+				endDate: data.startDate + ' ' + '23:59:59',
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20424,
+					groupId: this.fieldConfig.fields.userId ? undefined : (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,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();

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

@@ -114,7 +114,7 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 			startDate: this.customChangeDateComponent.startDate,
 			endDate: this.customChangeDateComponent.endDate,
 			searchQuery:{
-				wxDegreeId: 20424
+				evaluateId: 20424
 			}
 		}
 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
@@ -133,10 +133,10 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 			}
 		}
 		if(this.activeIndex==0){
-			query.searchQuery.userId = data.userId
+			query.searchQuery.userId = data.userId ? data.userId : -1
 			delete query.searchQuery.groupId
 		}else{
-			query.searchQuery.groupId = data.groupId
+			query.searchQuery.groupId = data.groupId ? data.groupId: -1
 			delete query.searchQuery.userId
 		}
 		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
@@ -155,10 +155,10 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 			}
 		}
 		if(this.activeIndex==0){
-			query.searchQuery.userId = data.userId
+			query.searchQuery.userId = data.userId ? data.userId : -1
 			delete query.searchQuery.groupId
 		}else{
-			query.searchQuery.groupId = data.groupId
+			query.searchQuery.groupId = data.groupId ? data.groupId: -1
 			delete query.searchQuery.userId
 		}
 		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
@@ -167,6 +167,15 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 	
 	// 课科室费用top5
 	viewDept(data){
+		let query = {
+			startDate: this.customChangeDateComponent.startDate,
+			endDate: this.customChangeDateComponent.endDate,
+			repairDeptId: data.repairDeptId ? data.repairDeptId : -1,
+			searchQuery:{
+				statusValue: 'close',
+			}
+		}
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
 		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
 	}
 	

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

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

src/app/views/new-statistics/maintenance-statistics/tripartite-company-statistics/tripartite-company-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-tripartite-company-statistics",
@@ -17,6 +17,7 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
   ) {}
 
@@ -53,7 +54,141 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 
     }, 0)
   }
+	
+	// 数据下钻
+	viewDetail1(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					companyId: data.companyId,
+				}
+			}
+		}
 
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	viewDetail2(data, type){
+		let query = null
+		if(type=='all'){
+			let query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					overtimeId: 1,
+				}
+			}
+		}else{
+			let query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					overtimeId: 1,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					companyId: data.companyId,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	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,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					isHangId: 1,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					companyId: data.companyId,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	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,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20424,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					companyId: data.companyId,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();

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

@@ -47,13 +47,13 @@
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.userName }}<ng-container *ngIf="data.userAccount">({{ data.userAccount }})</ng-container></td>
-      <td>{{ data.sum }}</td>
+      <td (click)="viewDetail1(data)">{{ data.sum }}</td>
       <td>{{ data.degreeCount }}</td>
-      <td>{{ data.oneStar }}</td>
-      <td>{{ data.twoStar }}</td>
-      <td>{{ data.threeStar }}</td>
-      <td>{{ data.fourStar }}</td>
-      <td>{{ data.fiveStar }}</td>
+      <td (click)="viewDetail2(data)">{{ data.oneStar }}</td>
+      <td (click)="viewDetail3(data)">{{ data.twoStar }}</td>
+      <td (click)="viewDetail4(data)">{{ data.threeStar }}</td>
+      <td (click)="viewDetail5(data)">{{ data.fourStar }}</td>
+      <td (click)="viewDetail6(data)">{{ data.fiveStar }}</td>
       <td>{{ data.totalStar }}</td>
       <td>{{ data.avgStar }}</td>
     </tr>
@@ -62,13 +62,13 @@
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
         <td style="width: 10%">{{ data.userName }}</td>
-        <td style="width: 10%">{{ data.sum }}</td>
+        <td style="width: 10%" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
         <td style="width: 10%">{{ data.degreeCount }}</td>
-        <td style="width: 10%">{{ data.oneStar }}</td>
-        <td style="width: 10%">{{ data.twoStar }}</td>
-        <td style="width: 10%">{{ data.threeStar }}</td>
-        <td style="width: 10%">{{ data.fourStar }}</td>
-        <td style="width: 10%">{{ data.fiveStar }}</td>
+        <td style="width: 10%" (click)="viewDetail2(data, 'all')">{{ data.oneStar }}</td>
+        <td style="width: 10%" (click)="viewDetail3(data, 'all')">{{ data.twoStar }}</td>
+        <td style="width: 10%" (click)="viewDetail4(data, 'all')">{{ data.threeStar }}</td>
+        <td style="width: 10%" (click)="viewDetail5(data, 'all')">{{ data.fourStar }}</td>
+        <td style="width: 10%" (click)="viewDetail6(data, 'all')">{{ data.fiveStar }}</td>
         <td style="width: 10%">{{ data.totalStar }}</td>
         <td style="width: 10%">{{ data.avgStar }}</td>
       </tr>

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

@@ -3,7 +3,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 { TabService } from '../../services/tab.service';
 import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
@@ -17,6 +17,7 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
   ) {}
 
@@ -54,7 +55,209 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 
     }, 0)
   }
+	
+	// 数据下钻
+	viewDetail1(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: data.userId || undefined,
+				}
+			}
+		}
 
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	viewDetail2(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20424,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20424,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: data.userId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	viewDetail3(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20423,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20423,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: data.userId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	viewDetail4(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20422,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20422,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: data.userId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	viewDetail5(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20421,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20421,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: data.userId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	viewDetail6(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20420
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					evaluateId: 20420,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: data.userId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();

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

@@ -48,16 +48,16 @@
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.userName }}<ng-container *ngIf="data.userAccount">({{ data.userAccount }})</ng-container></td>
-      <td>{{ data.sum }}</td>
+      <td (click)="viewDetail1(data)">{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
       <td>{{ data.avgResolvedTime }}</td>
-      <td>{{ data.resolvedOverNum }}</td>
-      <td>{{ data.overTimeNum }}</td>
+      <td (click)="viewDetail2(data)">{{ data.resolvedOverNum }}</td>
+      <td (click)="viewDetail3(data)">{{ data.overTimeNum }}</td>
       <td>{{ data.consumablePrice }}</td>
       <td>{{ data.workHourPrice }}</td>
       <td>{{ data.totalPrice }}</td>
 			<td>{{ data.totalScore }}</td>
-      <td>{{ data.negativeNum }}</td>
+      <td (click)="viewDetail4(data)">{{ data.negativeNum }}</td>
       <td>{{ data.favorableRate }}</td>
     </tr>
   </tbody>
@@ -65,16 +65,16 @@
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
         <td style="width: 8%">{{ data.userName }}</td>
-        <td style="width: 8%">{{ data.sum }}</td>
+        <td style="width: 8%" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
         <td style="width: 8%">{{ data.avgResponseTime }}</td>
         <td style="width: 8%">{{ data.avgResolvedTime }}</td>
-        <td style="width: 8%">{{ data.resolvedOverNum }}</td>
-        <td style="width: 8%">{{ data.overTimeNum }}</td>
+        <td style="width: 8%" (click)="viewDetail2(data, 'all')">{{ data.resolvedOverNum }}</td>
+        <td style="width: 8%" (click)="viewDetail3(data, 'all')">{{ data.overTimeNum }}</td>
         <td style="width: 8%">{{ data.consumablePrice }}</td>
         <td style="width: 8%">{{ data.workHourPrice }}</td>
         <td style="width: 8%">{{ data.totalPrice }}</td>
 				<td style="width: 8%">{{ data.totalScore }}</td>
-        <td style="width: 8%">{{ data.negativeNum }}</td>
+        <td style="width: 8%" (click)="viewDetail4(data, 'all')">{{ data.negativeNum }}</td>
         <td style="width: 8%">{{ data.favorableRate }}</td>
       </tr>
     </table>

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

@@ -3,7 +3,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 { TabService } from '../../services/tab.service';
 import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
@@ -17,6 +17,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
   ) {}
 
@@ -54,7 +55,137 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 
     }, 0)
   }
+	
+	// 数据下钻
+	viewDetail1(data, type){
+		let query = null
+		if(type=='all'){
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					userId: data.userId ? data.userId : -1,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+				}
+			}
+		}
 
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	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,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					userId: data.userId ? data.userId : -1,
+					overtimeId: 1,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	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,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					userId: data.userId ? data.userId : -1,
+					isHangId: 1,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 数据下钻
+	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,
+				}
+			}
+		}else{
+			query = {
+				startDate: this.customChangeDateComponent.startDate || undefined,
+				endDate: this.customChangeDateComponent.endDate || undefined,
+				searchQuery:{
+					statusValue: 'close',
+					userId: data.userId ? data.userId : -1,
+					evaluateId: 20424,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+				}
+			}
+		}
+
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();