Merge branch 'master' of http://git.dashitech.com/seimin/zy-pc

src/app/SimpleReuseStrategy.ts

@@ -1,66 +1,58 @@
-import { RouteReuseStrategy, ActivatedRouteSnapshot, DetachedRouteHandle, UrlSegment } from '@angular/router';
+import {RouteReuseStrategy, DefaultUrlSerializer, ActivatedRouteSnapshot, DetachedRouteHandle} from '@angular/router';
 
+/**
+ * 路由复用策略
+ */
 export class SimpleReuseStrategy implements RouteReuseStrategy {
-  static cacheRouters = new Map<string, DetachedRouteHandle>();
 
-  public static deleteRouteCache(url): void {
-    if (SimpleReuseStrategy.cacheRouters.has(url)) {
-      const handle: any = SimpleReuseStrategy.cacheRouters.get(url);
-      try {
-        handle.componentRef.destory();
-      } catch (e) { }
-      SimpleReuseStrategy.cacheRouters.delete(url);
-    }
+  public static handlers: { [key: string]: DetachedRouteHandle } = {};
+  private static waitDelete: string;
+
+  /** 表示对所有路由允许复用 如果你有路由不想利用可以在这加一些业务逻辑判断 */
+  public shouldDetach(route: ActivatedRouteSnapshot): boolean {
+    return route.routeConfig && route.routeConfig.data && route.routeConfig.data.reuse === true;
   }
 
-  public static deleteAllRouteCache(): void {
-    SimpleReuseStrategy.cacheRouters.forEach((handle: any, key) => {
-      SimpleReuseStrategy.deleteRouteCache(key);
-    });
+  /** 当路由离开时会触发。按path作为key存储路由快照&组件当前实例对象 */
+  public store(route: ActivatedRouteSnapshot, handle: DetachedRouteHandle): void {
+    if (SimpleReuseStrategy.waitDelete && SimpleReuseStrategy.waitDelete === this.getRouteUrl(route)) {
+      // 如果待删除是当前路由则不存储快照
+      SimpleReuseStrategy.waitDelete = null;
+      return;
+    }
+    SimpleReuseStrategy.handlers[this.getRouteUrl(route)] = handle;
   }
 
-  // one 进入路由触发，是否同一路由时复用路由
-  shouldReuseRoute(future: ActivatedRouteSnapshot, curr: ActivatedRouteSnapshot): boolean {
-    return future.routeConfig === curr.routeConfig &&
-      JSON.stringify(future.params) === JSON.stringify(curr.params);
+  /** 若 path 在缓存中有的都认为允许还原路由 */
+  public shouldAttach(route: ActivatedRouteSnapshot): boolean {
+    return !!SimpleReuseStrategy.handlers[this.getRouteUrl(route)];
   }
 
-  // 获取存储路由
-  retrieve(route: ActivatedRouteSnapshot): DetachedRouteHandle {
-    const url = this.getFullRouteURL(route);
-    if (route.data.reuse && SimpleReuseStrategy.cacheRouters.has(url)) {
-      return SimpleReuseStrategy.cacheRouters.get(url);
-    } else {
+  /** 从缓存中获取快照，若无则返回nul */
+  public retrieve(route: ActivatedRouteSnapshot): DetachedRouteHandle {
+    if (!route.routeConfig) {
       return null;
     }
-  }
 
-  // 是否允许复用路由
-  shouldDetach(route: ActivatedRouteSnapshot): boolean {
-    return Boolean(route.data.reuse);
-  }
-  // 当路由离开时会触发，存储路由
-  store(route: ActivatedRouteSnapshot, handle: DetachedRouteHandle): void {
-    const url = this.getFullRouteURL(route);
-    SimpleReuseStrategy.cacheRouters.set(url, handle);
-  }
-  //  是否允许还原路由
-  shouldAttach(route: ActivatedRouteSnapshot): boolean {
-    const url = this.getFullRouteURL(route);
-    return Boolean(route.data.reuse) && SimpleReuseStrategy.cacheRouters.has(url);
+    return SimpleReuseStrategy.handlers[this.getRouteUrl(route)];
   }
 
-  // 获取当前路由url
-  private getFullRouteURL(route: ActivatedRouteSnapshot): string {
-    const { pathFromRoot } = route;
-    let fullRouteUrlPath: string[] = [];
-    pathFromRoot.forEach((item: ActivatedRouteSnapshot) => {
-      fullRouteUrlPath = fullRouteUrlPath.concat(this.getRouteUrlPath(item));
-    });
-    return `/${fullRouteUrlPath.join('/')}`;
+  /** 进入路由触发，判断是否同一路由 */
+  public shouldReuseRoute(future: ActivatedRouteSnapshot, curr: ActivatedRouteSnapshot): boolean {
+    return future.routeConfig === curr.routeConfig &&
+      JSON.stringify(future.params) === JSON.stringify(curr.params);
+  }
 
+  private getRouteUrl(route: ActivatedRouteSnapshot) {
+    return route['_routerState'].url.replace(/\//g, '_');
   }
-  private getRouteUrlPath(route: ActivatedRouteSnapshot) {
-    return route.url.map(urlSegment => urlSegment.path);
+
+  public static deleteRouteSnapshot(url: string): void {
+    const key = url.replace(/\//g, '_');
+    if (SimpleReuseStrategy.handlers[key]) {
+      delete SimpleReuseStrategy.handlers[key];
+    } else {
+      SimpleReuseStrategy.waitDelete = key;
+    }
   }
 }

src/app/app-routing.module.ts

@@ -185,6 +185,12 @@ const routes: Routes = [
     path: "newStatistics",
     loadChildren: () => import("./views/new-statistics/new-statistics.module").then((m) => m.NewStatisticsModule),
   },
+  // 临时路由
+  {
+    path: "redirect",
+    redirectTo: '/',
+    pathMatch: 'full'
+  },
   // 管理端首页
   {
     path: '**',

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -130,7 +130,7 @@ export class HushijiandanComponent implements OnInit {
     private webs: WebsocketNurseService,
     public tool: ToolService,
 		public http: HttpClient
-		
+
   ) {
     this.othersListOptions = {
       onUpdate: (event: any) => {
@@ -313,17 +313,17 @@ export class HushijiandanComponent implements OnInit {
     this.coopBtns = coopBtns;
     console.log(this.coopBtns);
   }
-	
+
 	// 关闭客服弹框
 	smartClose(e){
 		this.smartShow = false;
 	}
-	
+
 	// 打开客服弹框
-	smartOpen(e){
+	smartOpen(e?){
 		this.smartShow = true;
 	}
-	
+
 	// 预览图片
 	imgs = [];
 	isPreview = false;
@@ -338,7 +338,7 @@ export class HushijiandanComponent implements OnInit {
 	    this.isPreview = true;
 	  }, 0)
 	}
-	
+
 	// 图片相关
 	showUploadList = {
 	  showPreviewIcon: true,
@@ -361,7 +361,7 @@ export class HushijiandanComponent implements OnInit {
 	  this.previewImage = file.url || file.thumbUrl;
 	  this.previewVisible = true;
 	};
-	
+
 	beforeUpload = (file: UploadFile): boolean => {
 		console.log('file2:', file)
 	  this.fileList = [...this.fileList, file];
@@ -371,7 +371,7 @@ export class HushijiandanComponent implements OnInit {
 	  console.log('this.fileList:', this.fileList)
 	  return true;
 	};
-	
+
 	getBase64(file: any): Promise<any> {
 	  return new Promise((resolve, reject) => {
 	    const reader = new FileReader();
@@ -380,10 +380,10 @@ export class HushijiandanComponent implements OnInit {
 	    reader.onerror = error => reject(error);
 	  });
 	}
-	
+
 	// 临时上传图片
 	temporarilyUrl = this.mainService.returnUploadUrl('wechatRequesterIncident', 0);
-	
+
 	// 图片上传
 	uploadImages(file, id){
 	  const formData = new FormData();
@@ -394,7 +394,7 @@ export class HushijiandanComponent implements OnInit {
 	  });
 	  return this.http.request(req).pipe(filter(e => e instanceof HttpResponse)).toPromise();
 	}
-	
+
 	// 获取任务类型（病理标本）
 	taskTypeData:any;
 	getTaskTypesId() {
@@ -3169,7 +3169,7 @@ export class HushijiandanComponent implements OnInit {
         this.patientModal = true;
         that.checkedShowMsg = data;
 				if(data.end){
-					if(data.end.end.departmentStrategy==202 || 
+					if(data.end.end.departmentStrategy==202 ||
 					data.end.end.departmentStrategy==204 ||
 					data.end.end.departmentStrategy==205){
 						this.isEndFixedType = true

src/app/views/main/main.component.ts

@@ -484,7 +484,9 @@ export class MainComponent implements OnInit {
   }
   // 统计
   toNewStatistics(): void {
-    this.router.navigateByUrl("newStatistics/maintenanceStatistics/incidentStatistics");
+    let menus = JSON.parse(localStorage.getItem("menu"));
+    let firstMenu = menus.find((item) => item.type == "newStatistics");
+    this.router.navigateByUrl(`newStatistics/${firstMenu.link}/${firstMenu.childrens[0].link}`);
   }
   // 大屏端或视图端
   screenType;

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

@@ -21,7 +21,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-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeUserInp($event)" formControlName="userId" nzPlaceHolder="请选择维修人员" (nzOpenChange)="openChangeUser($event)">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeUserInp($event)" formControlName="userId" nzPlaceHolder="请选择维修人员" (nzOpenChange)="openChangeUser($event)" (ngModelChange)="setIsSelecting()">
               <ng-container *ngFor="let option of userList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
               </ng-container>
@@ -63,7 +63,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-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeCategory3Inp($event)" formControlName="category3Id" nzPlaceHolder="请选择三级分类" (nzOpenChange)="openChangeCategory3($event)">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeCategory3Inp($event)" formControlName="category3Id" nzPlaceHolder="请选择三级分类" (nzOpenChange)="openChangeCategory3($event)" (ngModelChange)="setIsSelecting()">
               <ng-container *ngFor="let option of category3List">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.category" [nzValue]="option.id"></nz-option>
               </ng-container>
@@ -93,7 +93,7 @@
           <nz-form-control [nzSpan]="18" 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.buildingName" [nzValue]="option.id"></nz-option>
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName + '-' + option.buildingName" [nzValue]="option.id"></nz-option>
               </ng-container>
               <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
                 <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -105,7 +105,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-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeFloorInp($event)" formControlName="floorId" nzPlaceHolder="请选择楼层" (nzOpenChange)="openChangeFloor($event)">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeFloorInp($event)" formControlName="floorId" nzPlaceHolder="请选择楼层" (nzOpenChange)="openChangeFloor($event)" (ngModelChange)="setIsSelecting()">
               <ng-container *ngFor="let option of floorList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.floorName" [nzValue]="option.id"></nz-option>
               </ng-container>
@@ -119,7 +119,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-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeCompanyInp($event)" formControlName="companyId" nzPlaceHolder="请选择三方公司" (nzOpenChange)="openChangeCompany($event)">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeCompanyInp($event)" formControlName="companyId" nzPlaceHolder="请选择三方公司" (nzOpenChange)="openChangeCompany($event)" (ngModelChange)="setIsSelecting()">
               <ng-container *ngFor="let option of companyList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
               </ng-container>
@@ -133,9 +133,9 @@
         <nz-form-item [hidden]="!fieldConfig.config.repairDept">
           <nz-form-label [nzSpan]="6" nzFor="repairDeptId">报修科室</nz-form-label>
           <nz-form-control [nzSpan]="18" nzErrorTip="请选择报修科室!">
-            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" formControlName="repairDeptId" nzPlaceHolder="请选择报修科室" (nzOpenChange)="openChangeRepairDept($event)">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" formControlName="repairDeptId" nzPlaceHolder="请选择报修科室" (nzOpenChange)="openChangeRepairDept($event)" (ngModelChange)="setIsSelecting()">
               <ng-container *ngFor="let option of repairDeptList">
-                <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
               </ng-container>
               <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
                 <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...

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

@@ -109,9 +109,11 @@ export class SearchMoreComponent implements OnInit {
       fields.floorDTO = this.floorList.find(item => item.id == this.validateForm.value.floorId);
     }
     if(this.fieldConfig.config.company){
+      fields.companyId = this.validateForm.value.companyId;
       fields.companyDTO = this.companyList.find(item => item.id == this.validateForm.value.companyId);
     }
     if(this.fieldConfig.config.repairDept){
+      fields.repairDeptId = this.validateForm.value.repairDeptId;
       fields.repairDeptDTO = this.repairDeptList.find(item => item.id == this.validateForm.value.repairDeptId);
     }
     this.submitEvent.emit(fields);
@@ -124,11 +126,21 @@ export class SearchMoreComponent implements OnInit {
 
   // 防抖
   isLoading = false;
+  isSelecting:boolean = false; // 是否在选中状态
   searchTimer(fun, e) {
+    if (this.isSelecting) {
+      this.isSelecting = false; // 重置标志
+      return; // 跳过处理
+    }
     this.isLoading = true;
     this.searchTimerSubject.next([fun, e]);
   }
 
+  // 设置标志
+  setIsSelecting(){
+    this.isSelecting = true; // 设置标志
+  }
+
   // =================维修分组===================
 
   // 维修分组搜索
@@ -143,7 +155,7 @@ export class SearchMoreComponent implements OnInit {
       idx: 0,
       sum: 20,
       group2: {
-        hospitals: this.getHosId,
+        statisticalHosId: this.getHosId,
         groupName: keyword,
         type: 3,
       },
@@ -163,9 +175,10 @@ export class SearchMoreComponent implements OnInit {
   }
 
   changeGroup(id){
+    this.setIsSelecting();
     this.userList = [];
     this.validateForm.controls.userId.setValue(null);
-    this.getUserList('', id);
+    this.getUserList();
   }
 
   // =================维修人员===================
@@ -177,8 +190,8 @@ export class SearchMoreComponent implements OnInit {
 
   // 获取维修人员列表
   userList:any[] = [];
-  getUserList(keyword = '', groupId = ''){
-    if(!groupId){
+  getUserList(keyword = ''){
+    if(!this.validateForm.value.groupId){
       this.isLoading = false;
       this.userList = [];
       return;
@@ -189,7 +202,7 @@ export class SearchMoreComponent implements OnInit {
       user: {
         name: keyword,
         simpleQuery: true,
-        groupdata: { id: groupId },
+        groupdata: { id: this.validateForm.value.groupId },
         roleCodes: 'first-line support,second-line support,incident manager',
         engineer: 1,
       },
@@ -205,7 +218,7 @@ export class SearchMoreComponent implements OnInit {
     });
   }
   openChangeUser(flag){
-    flag && this.getUserList('', this.validateForm.value.groupId);
+    flag && this.getUserList();
   }
 
   // =================一级分类===================
@@ -222,8 +235,7 @@ export class SearchMoreComponent implements OnInit {
       category: {
         category: keyword,
         selectType: 'mutlQuery',
-        dutyIds: this.queryType == 3 ? this.dutyId : undefined,
-        parentDutyId: this.queryType == 3 ? this.parentDutyId : undefined,
+        statisticalHosId: this.getHosId,
         hierarchy: 1,
       },
     };
@@ -242,9 +254,10 @@ export class SearchMoreComponent implements OnInit {
   }
 
   changeCategory1(id){
+    this.setIsSelecting();
     this.category2List = [];
     this.validateForm.controls.category2Id.setValue(null);
-    this.getCategory2List('', id);
+    this.getCategory2List();
 
     this.category3List = [];
     this.validateForm.controls.category3Id.setValue(null);
@@ -259,8 +272,8 @@ export class SearchMoreComponent implements OnInit {
 
   // 获取二级分类列表
   category2List:any[] = [];
-  getCategory2List(keyword = '', parentId = ''){
-    if(!parentId){
+  getCategory2List(keyword = ''){
+    if(!this.validateForm.value.category1Id){
       this.isLoading = false;
       this.category2List = [];
       return;
@@ -269,7 +282,7 @@ export class SearchMoreComponent implements OnInit {
       category: {
         category: keyword,
         selectType: 'mutlQuery',
-        parent: { id: parentId },
+        parent: { id: this.validateForm.value.category1Id },
       },
     };
     this.isLoading = true;
@@ -283,13 +296,14 @@ export class SearchMoreComponent implements OnInit {
     });
   }
   openChangeCategory2(flag){
-    flag && this.getCategory2List('', this.validateForm.value.category1Id);
+    flag && this.getCategory2List();
   }
 
   changeCategory2(id){
+    this.setIsSelecting();
     this.category3List = [];
     this.validateForm.controls.category3Id.setValue(null);
-    this.getCategory3List('', id);
+    this.getCategory3List();
   }
 
   // =================三级分类===================
@@ -301,8 +315,8 @@ export class SearchMoreComponent implements OnInit {
 
   // 获取三级分类列表
   category3List:any[] = [];
-  getCategory3List(keyword = '', parentId = ''){
-    if(!parentId){
+  getCategory3List(keyword = ''){
+    if(!this.validateForm.value.category2Id){
       this.isLoading = false;
       this.category3List = [];
       return;
@@ -311,7 +325,7 @@ export class SearchMoreComponent implements OnInit {
       category: {
         category: keyword,
         selectType: 'mutlQuery',
-        parent: { id: parentId },
+        parent: { id: this.validateForm.value.category2Id },
       },
     };
     this.isLoading = true;
@@ -325,7 +339,7 @@ export class SearchMoreComponent implements OnInit {
     });
   }
   openChangeCategory3(flag){
-    flag && this.getCategory3List('', this.validateForm.value.category2Id);
+    flag && this.getCategory3List();
   }
 
   // =================故障来源===================
@@ -354,7 +368,7 @@ export class SearchMoreComponent implements OnInit {
       building: {
         simpleQuery: true,
         buildingName: keyword,
-        cascadeHosId:this.getHosId,
+        statisticalHosId:this.getHosId,
       },
     };
     this.isLoading = true;
@@ -372,9 +386,10 @@ export class SearchMoreComponent implements OnInit {
   }
 
   changeBuilding(id){
+    this.setIsSelecting();
     this.floorList = [];
     this.validateForm.controls.floorId.setValue(null);
-    this.getFloorList('', id);
+    this.getFloorList();
   }
 
   // =================楼层===================
@@ -386,8 +401,8 @@ export class SearchMoreComponent implements OnInit {
 
   // 获取楼层列表
   floorList:any[] = [];
-  getFloorList(keyword = '', buildingId = ''){
-    if(!buildingId){
+  getFloorList(keyword = ''){
+    if(!this.validateForm.value.buildingId){
       this.isLoading = false;
       this.floorList = [];
       return;
@@ -397,7 +412,7 @@ export class SearchMoreComponent implements OnInit {
       sum: 20,
       floor: {
         floorName: keyword,
-        buildId : buildingId,
+        buildId : this.validateForm.value.buildingId,
       },
     };
     this.isLoading = true;
@@ -411,7 +426,7 @@ export class SearchMoreComponent implements OnInit {
     });
   }
   openChangeFloor(flag){
-    flag && this.getFloorList('', this.validateForm.value.buildingId);
+    flag && this.getFloorList();
   }
 
   // =================三方公司===================
@@ -430,7 +445,7 @@ export class SearchMoreComponent implements OnInit {
       company: {
         busiType: { key: "company_busi_type", value: "2" },
         name: keyword,
-        hosId: this.getHosId,
+        statisticalHosId: this.getHosId,
       },
     };
     this.isLoading = true;
@@ -461,7 +476,7 @@ export class SearchMoreComponent implements OnInit {
       idx: 0,
       sum: 20,
       department: {
-        cascadeHosId: this.getHosId,
+        statisticalHosId: this.getHosId,
         dept: keyword,
         searchType: 1,
       },

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

@@ -5,17 +5,6 @@
       <nz-range-picker [(ngModel)]="dateRange" [nzAllowClear]="false" (ngModelChange)="changeDate($event)" (nzOnCalendarChange)="onCalendarChangeDate($event)">
       </nz-range-picker>
     </div>
-    <div class="searchDataItem">
-      <span class="label">报修科室</span>：
-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
-      <ng-container *ngFor="let option of repairDeptList">
-        <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
-      </ng-container>
-      <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
-        <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
-      </nz-option>
-    </nz-select>
-    </div>
   </div>
   <div class="operation">
     <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
@@ -24,21 +13,18 @@
     <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">
-  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
-  <span>{{fieldConfig.fields.userDTO?.name}}</span>
+<div class="moreFilter" *ngIf="fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO">
   <span>{{fieldConfig.fields.category1DTO?.category}}</span>
   <span>{{fieldConfig.fields.category2DTO?.category}}</span>
   <span>{{fieldConfig.fields.category3DTO?.category}}</span>
-  <span>{{fieldConfig.fields.sourceDTO?.name}}</span>
 </div>
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="10%" nzShowSort nzSortKey="startDate" [(nzSort)]="sortCurrent.startDate">时间</th>
+      <th nzWidth="10%">楼栋名称</th>
       <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
       <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
@@ -50,7 +36,7 @@
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
-      <td>{{ data.startDate }}</td>
+      <td>{{ data.name }}</td>
       <td>{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
       <td>{{ data.avgResolvedTime }}</td>
@@ -66,7 +52,7 @@
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 10%">{{ data.startDate }}</td>
+        <td style="width: 10%">{{ data.name }}</td>
         <td style="width: 9%">{{ data.sum }}</td>
         <td style="width: 9%">{{ data.avgResponseTime }}</td>
         <td style="width: 9%">{{ data.avgResolvedTime }}</td>
@@ -82,7 +68,8 @@
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -1,5 +1,4 @@
-import { debounceTime } from 'rxjs/operators';
-import { Subject } from 'rxjs';
+import { TabService } from './../../services/tab.service';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } from 'date-fns';
 import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
@@ -15,6 +14,7 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -23,16 +23,9 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
   pageSize: number = 30; //表格每页展示条数
   listLength: number = 0; //表格总数据量
 
-  repairDeptId;//报修科室id
-
-  searchTimerSubject = new Subject();
-
   ngOnInit() {
-    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
-      let fun = v[0];
-      fun.call(this, v[1]);
-    });
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -44,13 +37,21 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
-    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.sourceDTO;
+    let flag = this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO;
     return flag ? 21 : 0;
   }
 
@@ -102,24 +103,20 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
-      startDate: this.dateRange[0],
-      endDate: this.dateRange[1],
-      hosId: this.hosId,
-      dutyId: this.dutyId,
-      parentDutyId: this.parentDutyId,
-      repairDeptId: this.repairDeptId,
-      groupId: this.fieldConfig.fields.groupId,
-      userId: this.fieldConfig.fields.userId,
-      categoryId: this.fieldConfig.fields.categoryId,
-      sourceId: this.fieldConfig.fields.sourceId,
-      hierarchy: this.fieldConfig.fields.hierarchy,
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
     };
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
     }
     this.loading1 = true;
     this.mainService
-      .postCustom("itsm/report", "incidentWorkOrder", postData)
+      .postCustom("itsm/report", "buildingIncident", postData)
       .subscribe((result) => {
         this.loading1 = false;
         this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
@@ -166,23 +163,19 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
       nzDuration: 0,
     }).messageId;
     let postData:any = {
-      startDate: this.dateRange[0],
-      endDate: this.dateRange[1],
-      hosId: this.hosId,
-      dutyId: this.dutyId,
-      parentDutyId: this.parentDutyId,
-      repairDeptId: this.repairDeptId,
-      groupId: this.fieldConfig.fields.groupId,
-      userId: this.fieldConfig.fields.userId,
-      categoryId: this.fieldConfig.fields.categoryId,
-      sourceId: this.fieldConfig.fields.sourceId,
-      hierarchy: this.fieldConfig.fields.hierarchy,
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
     }
     this.mainService
-      .postExportCustom("itsm/export", "incidentWorkOrder", postData)
+      .postExportCustom("itsm/export", "buildingIncident", postData)
       .subscribe((data) => {
         this.message.remove(this.excelExportLoading);
         this.excelExportLoading = false;
@@ -210,52 +203,17 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
     this.dateRange = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]
-    this.repairDeptId = undefined;
-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined};
+    this.fieldConfig.fields = {category123: true};
     this.search();
   }
 
-  // 科室搜索
-  changeRepairDeptInp(e) {
-    this.searchTimer(this.getRepairDeptList, e);
-  }
-
   // 防抖
   isLoading = false;
-  searchTimer(fun, e) {
-    this.isLoading = true;
-    this.searchTimerSubject.next([fun, e]);
-  }
-
-  openChangeRepairDept(flag){
-    flag && this.getRepairDeptList();
-  }
-
-  // 获取报修科室列表
-  repairDeptList:any[] = [];
-  getRepairDeptList(keyword?) {
-    let data = {
-      department: {
-        cascadeHosId: this.getHosId,
-        dept: keyword,
-        searchType: 1,
-      },
-      idx: 0,
-      sum: 20,
-    };
-    this.isLoading = true;
-    this.mainService
-      .getFetchDataList("data", "department", data)
-      .subscribe((data) => {
-        this.isLoading = false;
-        this.repairDeptList = data.list;
-      });
-  }
 
   // 详细搜索
   fieldConfig:any = {
-    fields: {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined},
-    config: {groupAndUser: true, category123: true, source: true},
+    fields: {categoryId: undefined},
+    config: {category123: true},
   }
   showSearchMore:boolean = false;
   showMore(){
@@ -274,4 +232,3 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
     this.onResize();
   }
 }
-

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

@@ -26,8 +26,8 @@
     <tr>
       <th nzWidth="10%">故障现象</th>
       <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
       <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
@@ -71,7 +71,8 @@
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -1,3 +1,4 @@
+import { TabService } from './../../services/tab.service';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } from 'date-fns';
 import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
@@ -13,6 +14,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -23,6 +25,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 
   ngOnInit() {
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -34,11 +37,19 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.companyDTO || this.fieldConfig.fields.repairDeptDTO;
     return flag ? 21 : 0;
@@ -97,11 +108,11 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
-      groupId: this.fieldConfig.fields.groupId || undefined,
+      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,
-      compantId: this.fieldConfig.fields.compantId || undefined,
+      companyId: this.fieldConfig.fields.companyId || undefined,
       repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
       categoryLevel: 1,
     };
@@ -162,11 +173,11 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
-      groupId: this.fieldConfig.fields.groupId || undefined,
+      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,
-      compantId: this.fieldConfig.fields.compantId || undefined,
+      companyId: this.fieldConfig.fields.companyId || undefined,
       repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
       categoryLevel: 1,
     };

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

@@ -5,17 +5,6 @@
       <nz-range-picker [(ngModel)]="dateRange" [nzAllowClear]="false" (ngModelChange)="changeDate($event)" (nzOnCalendarChange)="onCalendarChangeDate($event)">
       </nz-range-picker>
     </div>
-    <div class="searchDataItem">
-      <span class="label">报修科室</span>：
-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
-      <ng-container *ngFor="let option of repairDeptList">
-        <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
-      </ng-container>
-      <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
-        <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
-      </nz-option>
-    </nz-select>
-    </div>
   </div>
   <div class="operation">
     <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
@@ -24,65 +13,43 @@
     <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">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO">
   <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
   <span>{{fieldConfig.fields.userDTO?.name}}</span>
   <span>{{fieldConfig.fields.category1DTO?.category}}</span>
   <span>{{fieldConfig.fields.category2DTO?.category}}</span>
   <span>{{fieldConfig.fields.category3DTO?.category}}</span>
-  <span>{{fieldConfig.fields.sourceDTO?.name}}</span>
+  <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
+  <span>{{fieldConfig.fields.floorDTO?.floorName}}</span>
 </div>
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="10%" nzShowSort nzSortKey="startDate" [(nzSort)]="sortCurrent.startDate">时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="workHourPrice" [(nzSort)]="sortCurrent.workHourPrice">工时费用(元)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用(元)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="negativeNum" [(nzSort)]="sortCurrent.negativeNum">差评单数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="favorableRate" [(nzSort)]="sortCurrent.favorableRate">好评率</th>
+      <th nzWidth="34%">来源名称</th>
+      <th nzWidth="33%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
+      <th nzWidth="33%" nzShowSort nzSortKey="rate" [(nzSort)]="sortCurrent.rate">占比</th>
     </tr>
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
-      <td>{{ data.startDate }}</td>
+      <td>{{ data.sourceName }}</td>
       <td>{{ data.sum }}</td>
-      <td>{{ data.avgResponseTime }}</td>
-      <td>{{ data.avgResolvedTime }}</td>
-      <td>{{ data.resolvedOverNum }}</td>
-      <td>{{ data.overTimeNum }}</td>
-      <td>{{ data.consumablePrice }}</td>
-      <td>{{ data.workHourPrice }}</td>
-      <td>{{ data.totalPrice }}</td>
-      <td>{{ data.negativeNum }}</td>
-      <td>{{ data.favorableRate }}</td>
+      <td>{{ data.rate }}</td>
     </tr>
   </tbody>
   <ng-template #footerTpl>
     <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%">{{ 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%">{{ 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%">{{ data.favorableRate }}</td>
+        <td style="width: 34%">{{ data.sourceName }}</td>
+        <td style="width: 33%">{{ data.sum }}</td>
+        <td style="width: 33%">{{ data.rate }}</td>
       </tr>
     </table>
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -1,5 +1,4 @@
-import { debounceTime } from 'rxjs/operators';
-import { Subject } from 'rxjs';
+import { TabService } from './../../services/tab.service';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } from 'date-fns';
 import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
@@ -15,6 +14,7 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -23,16 +23,9 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
   pageSize: number = 30; //表格每页展示条数
   listLength: number = 0; //表格总数据量
 
-  repairDeptId;//报修科室id
-
-  searchTimerSubject = new Subject();
-
   ngOnInit() {
-    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
-      let fun = v[0];
-      fun.call(this, v[1]);
-    });
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -44,13 +37,21 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
-    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.sourceDTO;
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO;
     return flag ? 21 : 0;
   }
 
@@ -102,24 +103,24 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
-      startDate: this.dateRange[0],
-      endDate: this.dateRange[1],
-      hosId: this.hosId,
-      dutyId: this.dutyId,
-      parentDutyId: this.parentDutyId,
-      repairDeptId: this.repairDeptId,
-      groupId: this.fieldConfig.fields.groupId,
-      userId: this.fieldConfig.fields.userId,
-      categoryId: this.fieldConfig.fields.categoryId,
-      sourceId: this.fieldConfig.fields.sourceId,
-      hierarchy: this.fieldConfig.fields.hierarchy,
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || undefined,
+      placeId: this.fieldConfig.fields.floorId || undefined,
     };
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
     }
     this.loading1 = true;
     this.mainService
-      .postCustom("itsm/report", "incidentWorkOrder", postData)
+      .postCustom("itsm/report", "incidentSource", postData)
       .subscribe((result) => {
         this.loading1 = false;
         this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
@@ -166,23 +167,23 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
       nzDuration: 0,
     }).messageId;
     let postData:any = {
-      startDate: this.dateRange[0],
-      endDate: this.dateRange[1],
-      hosId: this.hosId,
-      dutyId: this.dutyId,
-      parentDutyId: this.parentDutyId,
-      repairDeptId: this.repairDeptId,
-      groupId: this.fieldConfig.fields.groupId,
-      userId: this.fieldConfig.fields.userId,
-      categoryId: this.fieldConfig.fields.categoryId,
-      sourceId: this.fieldConfig.fields.sourceId,
-      hierarchy: this.fieldConfig.fields.hierarchy,
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || undefined,
+      placeId: this.fieldConfig.fields.floorId || undefined,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
     }
     this.mainService
-      .postExportCustom("itsm/export", "incidentWorkOrder", postData)
+      .postExportCustom("itsm/export", "incidentSource", postData)
       .subscribe((data) => {
         this.message.remove(this.excelExportLoading);
         this.excelExportLoading = false;
@@ -210,52 +211,17 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
     this.dateRange = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]
-    this.repairDeptId = undefined;
-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined};
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined};
     this.search();
   }
 
-  // 科室搜索
-  changeRepairDeptInp(e) {
-    this.searchTimer(this.getRepairDeptList, e);
-  }
-
   // 防抖
   isLoading = false;
-  searchTimer(fun, e) {
-    this.isLoading = true;
-    this.searchTimerSubject.next([fun, e]);
-  }
-
-  openChangeRepairDept(flag){
-    flag && this.getRepairDeptList();
-  }
-
-  // 获取报修科室列表
-  repairDeptList:any[] = [];
-  getRepairDeptList(keyword?) {
-    let data = {
-      department: {
-        cascadeHosId: this.getHosId,
-        dept: keyword,
-        searchType: 1,
-      },
-      idx: 0,
-      sum: 20,
-    };
-    this.isLoading = true;
-    this.mainService
-      .getFetchDataList("data", "department", data)
-      .subscribe((data) => {
-        this.isLoading = false;
-        this.repairDeptList = data.list;
-      });
-  }
 
   // 详细搜索
   fieldConfig:any = {
-    fields: {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined},
-    config: {groupAndUser: true, category123: true, source: true},
+    fields: {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined},
+    config: {groupAndUser: true, category123: true, buildingAndFloor: true},
   }
   showSearchMore:boolean = false;
   showMore(){
@@ -274,5 +240,3 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
     this.onResize();
   }
 }
-
-

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

@@ -46,8 +46,8 @@
     <tr>
       <th nzWidth="10%">故障现象</th>
       <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
       <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
@@ -91,7 +91,8 @@
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -1,3 +1,4 @@
+import { TabService } from './../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
@@ -15,6 +16,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -34,6 +36,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
       fun.call(this, v[1]);
     });
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -45,11 +48,19 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.companyDTO || this.fieldConfig.fields.repairDeptDTO;
     return flag ? 21 : 0;
@@ -109,11 +120,12 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
       categoryId: this.category2Id || this.category1Id || undefined,
-      groupId: this.fieldConfig.fields.groupId || undefined,
+      hierarchy: this.category2Id ? 2 : (this.category1Id ? 1 : undefined),
+      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,
-      compantId: this.fieldConfig.fields.compantId || undefined,
+      companyId: this.fieldConfig.fields.companyId || undefined,
       repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
       categoryLevel: 3,
     };
@@ -175,11 +187,12 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
       categoryId: this.category2Id || this.category1Id || undefined,
-      groupId: this.fieldConfig.fields.groupId || undefined,
+      hierarchy: this.category2Id ? 2 : (this.category1Id ? 1 : undefined),
+      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,
-      compantId: this.fieldConfig.fields.compantId || undefined,
+      companyId: this.fieldConfig.fields.companyId || undefined,
       repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
       categoryLevel: 3,
     };
@@ -242,7 +255,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
   changeCategory1(id){
     this.category2List = [];
     this.category2Id = null;
-    this.getCategory2List('', id);
+    this.getCategory2List();
   }
 
   // 获取一级分类列表
@@ -252,8 +265,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
       category: {
         category: keyword,
         selectType: 'mutlQuery',
-        dutyIds: this.queryType == 3 ? this.dutyId : undefined,
-        parentDutyId: this.queryType == 3 ? this.parentDutyId : undefined,
+        statisticalHosId: this.getHosId,
         hierarchy: 1,
       },
     };
@@ -274,13 +286,13 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
   }
 
   openChangeCategory2(flag){
-    flag && this.getCategory2List('', this.category1Id);
+    flag && this.getCategory2List();
   }
 
   // 获取二级分类列表
   category2List:any[] = [];
-  getCategory2List(keyword = '', parentId = '') {
-    if(!parentId){
+  getCategory2List(keyword = '') {
+    if(!this.category1Id){
       this.isLoading = false;
       this.category2List = [];
       return;
@@ -289,7 +301,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
       category: {
         category: keyword,
         selectType: 'mutlQuery',
-        parent: { id: parentId },
+        parent: { id: this.category1Id },
       },
     };
     this.isLoading = true;

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

@@ -36,8 +36,8 @@
     <tr>
       <th nzWidth="10%">故障现象</th>
       <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
       <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
@@ -81,7 +81,8 @@
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -1,3 +1,4 @@
+import { TabService } from './../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
@@ -15,6 +16,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -33,6 +35,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
       fun.call(this, v[1]);
     });
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -44,11 +47,19 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.companyDTO || this.fieldConfig.fields.repairDeptDTO;
     return flag ? 21 : 0;
@@ -108,11 +119,12 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
       categoryId: this.category1Id || undefined,
-      groupId: this.fieldConfig.fields.groupId || undefined,
+      hierarchy: this.category1Id ? 1 : undefined,
+      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,
-      compantId: this.fieldConfig.fields.compantId || undefined,
+      companyId: this.fieldConfig.fields.companyId || undefined,
       repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
       categoryLevel: 2,
     };
@@ -174,11 +186,12 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
       categoryId: this.category1Id || undefined,
-      groupId: this.fieldConfig.fields.groupId || undefined,
+      hierarchy: this.category1Id ? 1 : undefined,
+      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,
-      compantId: this.fieldConfig.fields.compantId || undefined,
+      companyId: this.fieldConfig.fields.companyId || undefined,
       repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
       categoryLevel: 2,
     };
@@ -242,8 +255,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
       category: {
         category: keyword,
         selectType: 'mutlQuery',
-        dutyIds: this.queryType == 3 ? this.dutyId : undefined,
-        parentDutyId: this.queryType == 3 ? this.parentDutyId : undefined,
+        statisticalHosId: this.getHosId,
         hierarchy: 1,
       },
     };

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

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

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

@@ -0,0 +1,71 @@
+<div class="searchDataWrap">
+  <div class="searchData">
+    <div class="searchDataItem">
+      <span class="label">建单时间</span>：
+      <nz-range-picker [(ngModel)]="dateRange" [nzAllowClear]="false" (ngModelChange)="changeDate($event)" (nzOnCalendarChange)="onCalendarChangeDate($event)">
+      </nz-range-picker>
+    </div>
+    <div class="searchDataItem">
+      <span class="label">报修科室</span>：
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
+        <ng-container *ngFor="let option of repairDeptList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
+        </ng-container>
+        <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+          <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+        </nz-option>
+      </nz-select>
+    </div>
+  </div>
+  <div class="operation">
+    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <button nz-button class="btn default" (click)="search()">查询</button>
+    <button nz-button class="btn default ml8" (click)="reset()">重置</button>
+    <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
+  </div>
+</div>
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO || fieldConfig.fields.companyDTO">
+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
+  <span>{{fieldConfig.fields.userDTO?.name}}</span>
+  <span>{{fieldConfig.fields.category1DTO?.category}}</span>
+  <span>{{fieldConfig.fields.category2DTO?.category}}</span>
+  <span>{{fieldConfig.fields.category3DTO?.category}}</span>
+  <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
+  <span>{{fieldConfig.fields.floorDTO?.floorName}}</span>
+  <span>{{fieldConfig.fields.companyDTO?.name}}</span>
+</div>
+<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
+  <thead (nzSortChange)="sort($event)" nzSingleSort>
+    <tr>
+      <th nzWidth="25%">耗材名称(耗材编号)</th>
+      <th nzWidth="25%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
+      <th nzWidth="25%" nzShowSort nzSortKey="consumableNum" [(nzSort)]="sortCurrent.consumableNum">使用数量</th>
+      <th nzWidth="25%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">总费用(元)</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr *ngFor="let data of listOfData">
+      <td>{{ data.consumableName }}({{ data.consumableCode }})</td>
+      <td>{{ data.sum }}</td>
+      <td>{{ data.consumableNum }}</td>
+      <td>{{ data.consumablePrice }}</td>
+    </tr>
+  </tbody>
+  <ng-template #footerTpl>
+    <table class="footTable">
+      <tr *ngFor="let data of listOfDataEnd">
+        <td style="width: 25%">{{ data.consumableName }}</td>
+        <td style="width: 25%">{{ data.sum }}</td>
+        <td style="width: 25%">{{ data.consumableNum }}</td>
+        <td style="width: 25%">{{ data.consumablePrice }}</td>
+      </tr>
+    </table>
+  </ng-template>
+</nz-table>
+<div class="pagination">
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
+</div>
+
+<!-- 详细搜索 -->
+<app-search-more [fieldConfig]="fieldConfig" *ngIf="showSearchMore" [hosId]="hosId" [queryType]="queryType"  [dutyId]="dutyId"  [parentDutyId]="parentDutyId" (cancelEvent)="cancelEvent()" (submitEvent)="submitEvent($event)"></app-search-more>

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

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

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

@@ -0,0 +1,291 @@
+import { TabService } from './../../services/tab.service';
+import { debounceTime } from 'rxjs/operators';
+import { Subject } from 'rxjs';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } from 'date-fns';
+import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
+import { MainService } from 'src/app/services/main.service';
+import { ActivatedRoute } from '@angular/router';
+@Component({
+  selector: "app-consumable-statistics",
+  templateUrl: "./consumable-statistics.component.html",
+  styleUrls: ["./consumable-statistics.component.less"],
+})
+export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
+  constructor(
+    private mainService: MainService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private tabService: TabService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  listOfDataEnd: any[] = []; //表格合计
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 30; //表格每页展示条数
+  listLength: number = 0; //表格总数据量
+
+  repairDeptId;//报修科室id
+
+  searchTimerSubject = new Subject();
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+    this.initSessionData();
+    this.getQueryParams();
+    this.search();
+  }
+
+  ngAfterViewInit(){
+    this.onResize();
+  }
+
+  tableHeight:number = 0;
+  @HostListener('window:resize')
+  onResize(): void {
+    setTimeout(() => {
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
+    }, 0)
+  }
+
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
+  get getMoreFilter(){
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.companyDTO;
+    return flag ? 21 : 0;
+  }
+
+  // 初始化缓存数据
+  queryType:any;
+  hosId:any;
+  dutyId:any;
+  parentDutyId:any;
+  initSessionData(){
+    let maintenanceStatistics = JSON.parse(sessionStorage.getItem('maintenanceStatistics'));
+    let queryType:any = maintenanceStatistics.queryType;
+    let hosId:any = maintenanceStatistics.hospitalId;
+    let dutyId:any = maintenanceStatistics.dutyId;
+
+    queryType = queryType ? +queryType : undefined;
+    hosId = hosId ? +hosId : undefined;
+    dutyId = dutyId ? +dutyId : undefined;
+
+    this.queryType = queryType;
+    if(queryType == 1){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 2){
+      this.hosId = hosId;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 3){
+      this.hosId = undefined;
+      this.dutyId = dutyId;
+      this.parentDutyId = undefined;
+    }else if(queryType == 4){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = dutyId;
+    }
+  }
+
+  get getHosId(){
+    return this.parentDutyId || this.dutyId || this.hosId;
+  }
+
+  // 表格数据
+  loading1 = false;
+  getList(num?: number, field?: string, sort?: string) {
+    if (num !== undefined) {
+      this.pageIndex = num;
+    }
+    let postData:any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || undefined,
+      repairDeptId: this.repairDeptId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || undefined,
+      placeId: this.fieldConfig.fields.floorId || undefined,
+      companyId: this.fieldConfig.fields.companyId || undefined,
+    };
+    if (field && sort) {
+      postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
+    }
+    this.loading1 = true;
+    this.mainService
+      .postCustom("itsm/report", "consumableIncident", postData)
+      .subscribe((result) => {
+        this.loading1 = false;
+        this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
+        this.listOfDataEnd = result.dataList.filter((v, i) => { return i == result.dataList.length - 1 });
+        this.listLength = result.totalCount;
+      });
+  }
+
+  // 列表排序
+  sortCurrent:any = {};
+  sortCurrentKey: string = "";
+  sortCurrentValue: string | null = "";
+  sort(e) {
+    const { key, value } = e;
+    this.sortCurrentKey = key;
+    this.sortCurrentValue = value;
+    this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 搜索
+  search() {
+    this.getList(1, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 日期选择
+  dateRange: any = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')];
+  changeDate(result?): void {
+    result[0] = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+    result[1] = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+    this.dateRange = result;
+  }
+
+  onCalendarChangeDate(dateArr){
+    console.log(dateArr)
+    if(dateArr.length == 2){
+      this.dateRange = [format(startOfDay(dateArr[0]), 'yyyy-MM-dd HH:mm:ss'), format(endOfDay(dateArr[1]), 'yyyy-MM-dd HH:mm:ss')];
+    }
+  }
+
+  // 导出
+  excelExportLoading:any = false;
+  excelExport(){
+    this.excelExportLoading = this.message.loading("导出中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData:any = {
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || undefined,
+      repairDeptId: this.repairDeptId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || undefined,
+      placeId: this.fieldConfig.fields.floorId || undefined,
+      companyId: this.fieldConfig.fields.companyId || undefined,
+    };
+    if (this.sortCurrentKey && this.sortCurrentValue) {
+      postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
+    }
+    this.mainService
+      .postExportCustom("itsm/export", "consumableIncident", postData)
+      .subscribe((data) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.success('导出成功');
+        var file = new Blob([data], {
+          type: "application/vnd.ms-excel",
+        });
+        //trick to download store a file having its URL
+        var fileURL = URL.createObjectURL(file);
+        var a = document.createElement("a");
+        a.href = fileURL;
+        a.target = "_blank";
+        a.download = `${this.route.parent.routeConfig.data.title}.xls`;
+        document.body.appendChild(a);
+        a.click();
+      },(err) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.error('导出失败');
+      });
+  }
+  // 重置
+  reset(){
+    this.sortCurrentKey = "";
+		this.sortCurrentValue = "";
+		this.sortCurrent = {};
+    this.dateRange = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]
+    this.repairDeptId = undefined;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined};
+    this.search();
+  }
+
+  // 科室搜索
+  changeRepairDeptInp(e) {
+    this.searchTimer(this.getRepairDeptList, e);
+  }
+
+  // 防抖
+  isLoading = false;
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  openChangeRepairDept(flag){
+    flag && this.getRepairDeptList();
+  }
+
+  // 获取报修科室列表
+  repairDeptList:any[] = [];
+  getRepairDeptList(keyword?) {
+    let data = {
+      department: {
+        statisticalHosId: this.getHosId,
+        dept: keyword,
+        searchType: 1,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "department", data)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.repairDeptList = data.list;
+      });
+  }
+
+  // 详细搜索
+  fieldConfig:any = {
+    fields: {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined},
+    config: {groupAndUser: true, category123: true, buildingAndFloor: true, company: true},
+  }
+  showSearchMore:boolean = false;
+  showMore(){
+    this.showSearchMore = true;
+  }
+
+  cancelEvent(){
+    this.showSearchMore = false;
+  }
+
+  submitEvent(fields){
+    this.showSearchMore = false;
+    this.fieldConfig.fields = fields;
+    console.log('this.fieldConfig.fields:', this.fieldConfig.fields)
+    this.search();
+    this.onResize();
+  }
+}

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

@@ -0,0 +1,21 @@
+import { ConsumableStatisticsComponent } from './consumable-statistics.component';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { ConsumableStatisticsRoutingModule } from './consumable-statistics-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { SearchMoreModule } from '../../components/search-more/search-more.module';
+
+
+@NgModule({
+  declarations: [
+    ConsumableStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    ConsumableStatisticsRoutingModule,
+    ShareModule,
+    SearchMoreModule,
+  ]
+})
+export class ConsumableStatisticsModule { }

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

@@ -6,15 +6,15 @@
       </nz-range-picker>
     </div>
     <div class="searchDataItem">
-      <span class="label">报修科室</span>：
-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
-      <ng-container *ngFor="let option of repairDeptList">
-        <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
-      </ng-container>
-      <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
-        <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
-      </nz-option>
-    </nz-select>
+      <span class="label">科室类型</span>：
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室类型" [(ngModel)]="deptTypeId" (nzOpenChange)="openChangeDeptType($event)">
+        <ng-container *ngFor="let option of deptTypeList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+        </ng-container>
+        <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+          <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+        </nz-option>
+      </nz-select>
     </div>
   </div>
   <div class="operation">
@@ -24,65 +24,64 @@
     <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">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO">
   <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
   <span>{{fieldConfig.fields.userDTO?.name}}</span>
   <span>{{fieldConfig.fields.category1DTO?.category}}</span>
   <span>{{fieldConfig.fields.category2DTO?.category}}</span>
   <span>{{fieldConfig.fields.category3DTO?.category}}</span>
-  <span>{{fieldConfig.fields.sourceDTO?.name}}</span>
+  <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
+  <span>{{fieldConfig.fields.floorDTO?.floorName}}</span>
 </div>
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="10%" nzShowSort nzSortKey="startDate" [(nzSort)]="sortCurrent.startDate">时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="workHourPrice" [(nzSort)]="sortCurrent.workHourPrice">工时费用(元)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用(元)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="negativeNum" [(nzSort)]="sortCurrent.negativeNum">差评单数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="favorableRate" [(nzSort)]="sortCurrent.favorableRate">好评率</th>
+      <th nzWidth="10%">科室名称(编码)</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="degreeCount" [(nzSort)]="sortCurrent.degreeCount">评价工单数</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="oneStar" [(nzSort)]="sortCurrent.oneStar">一星</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="twoStar" [(nzSort)]="sortCurrent.twoStar">二星</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="threeStar" [(nzSort)]="sortCurrent.threeStar">三星</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="fourStar" [(nzSort)]="sortCurrent.fourStar">四星</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="fiveStar" [(nzSort)]="sortCurrent.fiveStar">五星</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="totalStar" [(nzSort)]="sortCurrent.totalStar">评价总星数</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="avgStar" [(nzSort)]="sortCurrent.avgStar">平均总星数</th>
     </tr>
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
-      <td>{{ data.startDate }}</td>
+      <td>{{ data.deptName }}({{ data.deptCode }})</td>
       <td>{{ data.sum }}</td>
-      <td>{{ data.avgResponseTime }}</td>
-      <td>{{ data.avgResolvedTime }}</td>
-      <td>{{ data.resolvedOverNum }}</td>
-      <td>{{ data.overTimeNum }}</td>
-      <td>{{ data.consumablePrice }}</td>
-      <td>{{ data.workHourPrice }}</td>
-      <td>{{ data.totalPrice }}</td>
-      <td>{{ data.negativeNum }}</td>
-      <td>{{ data.favorableRate }}</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>{{ data.totalStar }}</td>
+      <td>{{ data.avgStar }}</td>
     </tr>
   </tbody>
   <ng-template #footerTpl>
     <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%">{{ 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%">{{ 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%">{{ data.favorableRate }}</td>
+        <td style="width: 10%">{{ data.deptCode }}</td>
+        <td style="width: 10%">{{ 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%">{{ data.totalStar }}</td>
+        <td style="width: 10%">{{ data.avgStar }}</td>
       </tr>
     </table>
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -1,5 +1,4 @@
-import { debounceTime } from 'rxjs/operators';
-import { Subject } from 'rxjs';
+import { TabService } from './../../services/tab.service';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } from 'date-fns';
 import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
@@ -15,6 +14,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -23,16 +23,11 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
   pageSize: number = 30; //表格每页展示条数
   listLength: number = 0; //表格总数据量
 
-  repairDeptId;//报修科室id
-
-  searchTimerSubject = new Subject();
+  deptTypeId;//科室类型id
 
   ngOnInit() {
-    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
-      let fun = v[0];
-      fun.call(this, v[1]);
-    });
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -44,13 +39,21 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
-    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.sourceDTO;
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO;
     return flag ? 21 : 0;
   }
 
@@ -102,24 +105,25 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
-      startDate: this.dateRange[0],
-      endDate: this.dateRange[1],
-      hosId: this.hosId,
-      dutyId: this.dutyId,
-      parentDutyId: this.parentDutyId,
-      repairDeptId: this.repairDeptId,
-      groupId: this.fieldConfig.fields.groupId,
-      userId: this.fieldConfig.fields.userId,
-      categoryId: this.fieldConfig.fields.categoryId,
-      sourceId: this.fieldConfig.fields.sourceId,
-      hierarchy: this.fieldConfig.fields.hierarchy,
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || undefined,
+      deptTypeId: this.deptTypeId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || undefined,
+      placeId: this.fieldConfig.fields.floorId || undefined,
     };
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
     }
     this.loading1 = true;
     this.mainService
-      .postCustom("itsm/report", "incidentWorkOrder", postData)
+      .postCustom("itsm/report", "deptEvaluate", postData)
       .subscribe((result) => {
         this.loading1 = false;
         this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
@@ -166,23 +170,24 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
       nzDuration: 0,
     }).messageId;
     let postData:any = {
-      startDate: this.dateRange[0],
-      endDate: this.dateRange[1],
-      hosId: this.hosId,
-      dutyId: this.dutyId,
-      parentDutyId: this.parentDutyId,
-      repairDeptId: this.repairDeptId,
-      groupId: this.fieldConfig.fields.groupId,
-      userId: this.fieldConfig.fields.userId,
-      categoryId: this.fieldConfig.fields.categoryId,
-      sourceId: this.fieldConfig.fields.sourceId,
-      hierarchy: this.fieldConfig.fields.hierarchy,
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || undefined,
+      deptTypeId: this.deptTypeId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || undefined,
+      placeId: this.fieldConfig.fields.floorId || undefined,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
     }
     this.mainService
-      .postExportCustom("itsm/export", "incidentWorkOrder", postData)
+      .postExportCustom("itsm/export", "deptEvaluate", postData)
       .subscribe((data) => {
         this.message.remove(this.excelExportLoading);
         this.excelExportLoading = false;
@@ -210,52 +215,34 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
     this.dateRange = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]
-    this.repairDeptId = undefined;
-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined};
+    this.deptTypeId = undefined;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined};
     this.search();
   }
 
-  // 科室搜索
-  changeRepairDeptInp(e) {
-    this.searchTimer(this.getRepairDeptList, e);
-  }
-
   // 防抖
   isLoading = false;
-  searchTimer(fun, e) {
-    this.isLoading = true;
-    this.searchTimerSubject.next([fun, e]);
-  }
 
-  openChangeRepairDept(flag){
-    flag && this.getRepairDeptList();
+  openChangeDeptType(flag){
+    flag && this.getDeptTypeList();
   }
 
-  // 获取报修科室列表
-  repairDeptList:any[] = [];
-  getRepairDeptList(keyword?) {
-    let data = {
-      department: {
-        cascadeHosId: this.getHosId,
-        dept: keyword,
-        searchType: 1,
-      },
-      idx: 0,
-      sum: 20,
-    };
+  // 获取科室类型列表
+  deptTypeList:any[] = [];
+  getDeptTypeList(keyword?) {
     this.isLoading = true;
     this.mainService
-      .getFetchDataList("data", "department", data)
+      .getDictionary("list", "dept_type")
       .subscribe((data) => {
         this.isLoading = false;
-        this.repairDeptList = data.list;
+        this.deptTypeList = data;
       });
   }
 
   // 详细搜索
   fieldConfig:any = {
-    fields: {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined},
-    config: {groupAndUser: true, category123: true, source: true},
+    fields: {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined},
+    config: {groupAndUser: true, category123: true, buildingAndFloor: true},
   }
   showSearchMore:boolean = false;
   showMore(){
@@ -274,5 +261,3 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
     this.onResize();
   }
 }
-
-

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

@@ -6,15 +6,15 @@
       </nz-range-picker>
     </div>
     <div class="searchDataItem">
-      <span class="label">报修科室</span>：
-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
-      <ng-container *ngFor="let option of repairDeptList">
-        <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
-      </ng-container>
-      <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
-        <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
-      </nz-option>
-    </nz-select>
+      <span class="label">科室类型</span>：
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室类型" [(ngModel)]="deptTypeId" (nzOpenChange)="openChangeDeptType($event)">
+        <ng-container *ngFor="let option of deptTypeList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+        </ng-container>
+        <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+          <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+        </nz-option>
+      </nz-select>
     </div>
   </div>
   <div class="operation">
@@ -24,21 +24,22 @@
     <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">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO">
   <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
   <span>{{fieldConfig.fields.userDTO?.name}}</span>
   <span>{{fieldConfig.fields.category1DTO?.category}}</span>
   <span>{{fieldConfig.fields.category2DTO?.category}}</span>
   <span>{{fieldConfig.fields.category3DTO?.category}}</span>
-  <span>{{fieldConfig.fields.sourceDTO?.name}}</span>
+  <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
+  <span>{{fieldConfig.fields.floorDTO?.floorName}}</span>
 </div>
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="10%" nzShowSort nzSortKey="startDate" [(nzSort)]="sortCurrent.startDate">时间</th>
+      <th nzWidth="10%">科室名称(编码)</th>
       <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
       <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
@@ -50,7 +51,7 @@
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
-      <td>{{ data.startDate }}</td>
+      <td>{{ data.deptName }}({{ data.deptCode }})</td>
       <td>{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
       <td>{{ data.avgResolvedTime }}</td>
@@ -66,7 +67,7 @@
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 10%">{{ data.startDate }}</td>
+        <td style="width: 10%">{{ data.deptCode }}</td>
         <td style="width: 9%">{{ data.sum }}</td>
         <td style="width: 9%">{{ data.avgResponseTime }}</td>
         <td style="width: 9%">{{ data.avgResolvedTime }}</td>
@@ -82,7 +83,8 @@
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -1,5 +1,4 @@
-import { debounceTime } from 'rxjs/operators';
-import { Subject } from 'rxjs';
+import { TabService } from './../../services/tab.service';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } from 'date-fns';
 import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
@@ -15,6 +14,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -23,16 +23,11 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
   pageSize: number = 30; //表格每页展示条数
   listLength: number = 0; //表格总数据量
 
-  repairDeptId;//报修科室id
-
-  searchTimerSubject = new Subject();
+  deptTypeId;//科室类型id
 
   ngOnInit() {
-    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
-      let fun = v[0];
-      fun.call(this, v[1]);
-    });
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -44,13 +39,21 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
-    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.sourceDTO;
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO;
     return flag ? 21 : 0;
   }
 
@@ -102,24 +105,25 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
-      startDate: this.dateRange[0],
-      endDate: this.dateRange[1],
-      hosId: this.hosId,
-      dutyId: this.dutyId,
-      parentDutyId: this.parentDutyId,
-      repairDeptId: this.repairDeptId,
-      groupId: this.fieldConfig.fields.groupId,
-      userId: this.fieldConfig.fields.userId,
-      categoryId: this.fieldConfig.fields.categoryId,
-      sourceId: this.fieldConfig.fields.sourceId,
-      hierarchy: this.fieldConfig.fields.hierarchy,
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || undefined,
+      deptTypeId: this.deptTypeId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || undefined,
+      placeId: this.fieldConfig.fields.floorId || undefined,
     };
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
     }
     this.loading1 = true;
     this.mainService
-      .postCustom("itsm/report", "incidentWorkOrder", postData)
+      .postCustom("itsm/report", "repairDept", postData)
       .subscribe((result) => {
         this.loading1 = false;
         this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
@@ -166,23 +170,24 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
       nzDuration: 0,
     }).messageId;
     let postData:any = {
-      startDate: this.dateRange[0],
-      endDate: this.dateRange[1],
-      hosId: this.hosId,
-      dutyId: this.dutyId,
-      parentDutyId: this.parentDutyId,
-      repairDeptId: this.repairDeptId,
-      groupId: this.fieldConfig.fields.groupId,
-      userId: this.fieldConfig.fields.userId,
-      categoryId: this.fieldConfig.fields.categoryId,
-      sourceId: this.fieldConfig.fields.sourceId,
-      hierarchy: this.fieldConfig.fields.hierarchy,
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || undefined,
+      deptTypeId: this.deptTypeId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || undefined,
+      placeId: this.fieldConfig.fields.floorId || undefined,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
     }
     this.mainService
-      .postExportCustom("itsm/export", "incidentWorkOrder", postData)
+      .postExportCustom("itsm/export", "repairDept", postData)
       .subscribe((data) => {
         this.message.remove(this.excelExportLoading);
         this.excelExportLoading = false;
@@ -210,52 +215,34 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
     this.dateRange = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]
-    this.repairDeptId = undefined;
-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined};
+    this.deptTypeId = undefined;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined};
     this.search();
   }
 
-  // 科室搜索
-  changeRepairDeptInp(e) {
-    this.searchTimer(this.getRepairDeptList, e);
-  }
-
   // 防抖
   isLoading = false;
-  searchTimer(fun, e) {
-    this.isLoading = true;
-    this.searchTimerSubject.next([fun, e]);
-  }
 
-  openChangeRepairDept(flag){
-    flag && this.getRepairDeptList();
+  openChangeDeptType(flag){
+    flag && this.getDeptTypeList();
   }
 
-  // 获取报修科室列表
-  repairDeptList:any[] = [];
-  getRepairDeptList(keyword?) {
-    let data = {
-      department: {
-        cascadeHosId: this.getHosId,
-        dept: keyword,
-        searchType: 1,
-      },
-      idx: 0,
-      sum: 20,
-    };
+  // 获取科室类型列表
+  deptTypeList:any[] = [];
+  getDeptTypeList(keyword?) {
     this.isLoading = true;
     this.mainService
-      .getFetchDataList("data", "department", data)
+      .getDictionary("list", "dept_type")
       .subscribe((data) => {
         this.isLoading = false;
-        this.repairDeptList = data.list;
+        this.deptTypeList = data;
       });
   }
 
   // 详细搜索
   fieldConfig:any = {
-    fields: {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined},
-    config: {groupAndUser: true, category123: true, source: true},
+    fields: {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined},
+    config: {groupAndUser: true, category123: true, buildingAndFloor: true},
   }
   showSearchMore:boolean = false;
   showMore(){
@@ -274,5 +261,3 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
     this.onResize();
   }
 }
-
-

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

@@ -6,15 +6,15 @@
       </nz-range-picker>
     </div>
     <div class="searchDataItem">
-      <span class="label">报修科室</span>：
-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
-      <ng-container *ngFor="let option of repairDeptList">
-        <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
-      </ng-container>
-      <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
-        <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
-      </nz-option>
-    </nz-select>
+      <span class="label">科室类型</span>：
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室类型" [(ngModel)]="deptTypeId" (nzOpenChange)="openChangeDeptType($event)">
+        <ng-container *ngFor="let option of deptTypeList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+        </ng-container>
+        <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+          <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+        </nz-option>
+      </nz-select>
     </div>
   </div>
   <div class="operation">
@@ -24,65 +24,52 @@
     <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">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO">
   <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
   <span>{{fieldConfig.fields.userDTO?.name}}</span>
   <span>{{fieldConfig.fields.category1DTO?.category}}</span>
   <span>{{fieldConfig.fields.category2DTO?.category}}</span>
   <span>{{fieldConfig.fields.category3DTO?.category}}</span>
-  <span>{{fieldConfig.fields.sourceDTO?.name}}</span>
+  <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
+  <span>{{fieldConfig.fields.floorDTO?.floorName}}</span>
 </div>
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="10%" nzShowSort nzSortKey="startDate" [(nzSort)]="sortCurrent.startDate">时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="workHourPrice" [(nzSort)]="sortCurrent.workHourPrice">工时费用(元)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用(元)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="negativeNum" [(nzSort)]="sortCurrent.negativeNum">差评单数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="favorableRate" [(nzSort)]="sortCurrent.favorableRate">好评率</th>
+      <th nzWidth="20%">科室名称(编码)</th>
+      <th nzWidth="16%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
+      <th nzWidth="16%" nzShowSort nzSortKey="phoneCount" [(nzSort)]="sortCurrent.phoneCount">电话报修数</th>
+      <th nzWidth="16%" nzShowSort nzSortKey="wechatCount" [(nzSort)]="sortCurrent.wechatCount">微信报修数</th>
+      <th nzWidth="16%" nzShowSort nzSortKey="webCount" [(nzSort)]="sortCurrent.webCount">web报修数</th>
+      <th nzWidth="16%" nzShowSort nzSortKey="otherCount" [(nzSort)]="sortCurrent.otherCount">其他</th>
     </tr>
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
-      <td>{{ data.startDate }}</td>
+      <td>{{ data.deptName }}({{ data.deptCode }})</td>
       <td>{{ data.sum }}</td>
-      <td>{{ data.avgResponseTime }}</td>
-      <td>{{ data.avgResolvedTime }}</td>
-      <td>{{ data.resolvedOverNum }}</td>
-      <td>{{ data.overTimeNum }}</td>
-      <td>{{ data.consumablePrice }}</td>
-      <td>{{ data.workHourPrice }}</td>
-      <td>{{ data.totalPrice }}</td>
-      <td>{{ data.negativeNum }}</td>
-      <td>{{ data.favorableRate }}</td>
+      <td>{{ data.phoneCount }}</td>
+      <td>{{ data.wechatCount }}</td>
+      <td>{{ data.webCount }}</td>
+      <td>{{ data.otherCount }}</td>
     </tr>
   </tbody>
   <ng-template #footerTpl>
     <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%">{{ 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%">{{ 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%">{{ data.favorableRate }}</td>
+        <td style="width: 20%">{{ data.deptCode }}</td>
+        <td style="width: 16%">{{ data.sum }}</td>
+        <td style="width: 16%">{{ data.phoneCount }}</td>
+        <td style="width: 16%">{{ data.wechatCount }}</td>
+        <td style="width: 16%">{{ data.webCount }}</td>
+        <td style="width: 16%">{{ data.otherCount }}</td>
       </tr>
     </table>
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -1,5 +1,4 @@
-import { debounceTime } from 'rxjs/operators';
-import { Subject } from 'rxjs';
+import { TabService } from './../../services/tab.service';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } from 'date-fns';
 import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
@@ -15,6 +14,7 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -23,16 +23,11 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
   pageSize: number = 30; //表格每页展示条数
   listLength: number = 0; //表格总数据量
 
-  repairDeptId;//报修科室id
-
-  searchTimerSubject = new Subject();
+  deptTypeId;//科室类型id
 
   ngOnInit() {
-    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
-      let fun = v[0];
-      fun.call(this, v[1]);
-    });
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -44,13 +39,21 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
-    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.sourceDTO;
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO;
     return flag ? 21 : 0;
   }
 
@@ -102,24 +105,25 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
-      startDate: this.dateRange[0],
-      endDate: this.dateRange[1],
-      hosId: this.hosId,
-      dutyId: this.dutyId,
-      parentDutyId: this.parentDutyId,
-      repairDeptId: this.repairDeptId,
-      groupId: this.fieldConfig.fields.groupId,
-      userId: this.fieldConfig.fields.userId,
-      categoryId: this.fieldConfig.fields.categoryId,
-      sourceId: this.fieldConfig.fields.sourceId,
-      hierarchy: this.fieldConfig.fields.hierarchy,
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || undefined,
+      deptTypeId: this.deptTypeId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || undefined,
+      placeId: this.fieldConfig.fields.floorId || undefined,
     };
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
     }
     this.loading1 = true;
     this.mainService
-      .postCustom("itsm/report", "incidentWorkOrder", postData)
+      .postCustom("itsm/report", "deptSource", postData)
       .subscribe((result) => {
         this.loading1 = false;
         this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
@@ -166,23 +170,24 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
       nzDuration: 0,
     }).messageId;
     let postData:any = {
-      startDate: this.dateRange[0],
-      endDate: this.dateRange[1],
-      hosId: this.hosId,
-      dutyId: this.dutyId,
-      parentDutyId: this.parentDutyId,
-      repairDeptId: this.repairDeptId,
-      groupId: this.fieldConfig.fields.groupId,
-      userId: this.fieldConfig.fields.userId,
-      categoryId: this.fieldConfig.fields.categoryId,
-      sourceId: this.fieldConfig.fields.sourceId,
-      hierarchy: this.fieldConfig.fields.hierarchy,
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || undefined,
+      deptTypeId: this.deptTypeId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || undefined,
+      placeId: this.fieldConfig.fields.floorId || undefined,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
     }
     this.mainService
-      .postExportCustom("itsm/export", "incidentWorkOrder", postData)
+      .postExportCustom("itsm/export", "deptSource", postData)
       .subscribe((data) => {
         this.message.remove(this.excelExportLoading);
         this.excelExportLoading = false;
@@ -210,52 +215,34 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
     this.dateRange = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]
-    this.repairDeptId = undefined;
-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined};
+    this.deptTypeId = undefined;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined};
     this.search();
   }
 
-  // 科室搜索
-  changeRepairDeptInp(e) {
-    this.searchTimer(this.getRepairDeptList, e);
-  }
-
   // 防抖
   isLoading = false;
-  searchTimer(fun, e) {
-    this.isLoading = true;
-    this.searchTimerSubject.next([fun, e]);
-  }
 
-  openChangeRepairDept(flag){
-    flag && this.getRepairDeptList();
+  openChangeDeptType(flag){
+    flag && this.getDeptTypeList();
   }
 
-  // 获取报修科室列表
-  repairDeptList:any[] = [];
-  getRepairDeptList(keyword?) {
-    let data = {
-      department: {
-        cascadeHosId: this.getHosId,
-        dept: keyword,
-        searchType: 1,
-      },
-      idx: 0,
-      sum: 20,
-    };
+  // 获取科室类型列表
+  deptTypeList:any[] = [];
+  getDeptTypeList(keyword?) {
     this.isLoading = true;
     this.mainService
-      .getFetchDataList("data", "department", data)
+      .getDictionary("list", "dept_type")
       .subscribe((data) => {
         this.isLoading = false;
-        this.repairDeptList = data.list;
+        this.deptTypeList = data;
       });
   }
 
   // 详细搜索
   fieldConfig:any = {
-    fields: {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined},
-    config: {groupAndUser: true, category123: true, source: true},
+    fields: {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined},
+    config: {groupAndUser: true, category123: true, buildingAndFloor: true},
   }
   showSearchMore:boolean = false;
   showMore(){
@@ -274,5 +261,3 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
     this.onResize();
   }
 }
-
-

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

@@ -6,15 +6,15 @@
       </nz-range-picker>
     </div>
     <div class="searchDataItem">
-      <span class="label">报修科室</span>：
-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
-      <ng-container *ngFor="let option of repairDeptList">
-        <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
-      </ng-container>
-      <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
-        <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
-      </nz-option>
-    </nz-select>
+      <span class="label">楼栋</span>：
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeBuildingInp($event)" nzAllowClear nzPlaceHolder="请选择楼栋" [(ngModel)]="buildingId" (nzOpenChange)="openChangeBuilding($event)">
+        <ng-container *ngFor="let option of buildingList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName + '-' + option.buildingName" [nzValue]="option.id"></nz-option>
+        </ng-container>
+        <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+          <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+        </nz-option>
+      </nz-select>
     </div>
   </div>
   <div class="operation">
@@ -24,21 +24,18 @@
     <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">
-  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
-  <span>{{fieldConfig.fields.userDTO?.name}}</span>
+<div class="moreFilter" *ngIf="fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO">
   <span>{{fieldConfig.fields.category1DTO?.category}}</span>
   <span>{{fieldConfig.fields.category2DTO?.category}}</span>
   <span>{{fieldConfig.fields.category3DTO?.category}}</span>
-  <span>{{fieldConfig.fields.sourceDTO?.name}}</span>
 </div>
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="10%" nzShowSort nzSortKey="startDate" [(nzSort)]="sortCurrent.startDate">时间</th>
+      <th nzWidth="10%">楼栋楼层名称</th>
       <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
       <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
@@ -50,7 +47,7 @@
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
-      <td>{{ data.startDate }}</td>
+      <td>{{ data.name }}</td>
       <td>{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
       <td>{{ data.avgResolvedTime }}</td>
@@ -66,7 +63,7 @@
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 10%">{{ data.startDate }}</td>
+        <td style="width: 10%">{{ data.name }}</td>
         <td style="width: 9%">{{ data.sum }}</td>
         <td style="width: 9%">{{ data.avgResponseTime }}</td>
         <td style="width: 9%">{{ data.avgResolvedTime }}</td>
@@ -82,7 +79,8 @@
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -1,3 +1,4 @@
+import { TabService } from './../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
@@ -15,6 +16,7 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -23,7 +25,7 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
   pageSize: number = 30; //表格每页展示条数
   listLength: number = 0; //表格总数据量
 
-  repairDeptId;//报修科室id
+  buildingId;//楼栋id
 
   searchTimerSubject = new Subject();
 
@@ -33,6 +35,7 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
       fun.call(this, v[1]);
     });
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -44,13 +47,21 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
-    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.sourceDTO;
+    let flag = this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO;
     return flag ? 21 : 0;
   }
 
@@ -102,24 +113,21 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
-      startDate: this.dateRange[0],
-      endDate: this.dateRange[1],
-      hosId: this.hosId,
-      dutyId: this.dutyId,
-      parentDutyId: this.parentDutyId,
-      repairDeptId: this.repairDeptId,
-      groupId: this.fieldConfig.fields.groupId,
-      userId: this.fieldConfig.fields.userId,
-      categoryId: this.fieldConfig.fields.categoryId,
-      sourceId: this.fieldConfig.fields.sourceId,
-      hierarchy: this.fieldConfig.fields.hierarchy,
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || undefined,
+      buildingId: this.buildingId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
     };
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
     }
     this.loading1 = true;
     this.mainService
-      .postCustom("itsm/report", "incidentWorkOrder", postData)
+      .postCustom("itsm/report", "floorIncident", postData)
       .subscribe((result) => {
         this.loading1 = false;
         this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
@@ -166,23 +174,20 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
       nzDuration: 0,
     }).messageId;
     let postData:any = {
-      startDate: this.dateRange[0],
-      endDate: this.dateRange[1],
-      hosId: this.hosId,
-      dutyId: this.dutyId,
-      parentDutyId: this.parentDutyId,
-      repairDeptId: this.repairDeptId,
-      groupId: this.fieldConfig.fields.groupId,
-      userId: this.fieldConfig.fields.userId,
-      categoryId: this.fieldConfig.fields.categoryId,
-      sourceId: this.fieldConfig.fields.sourceId,
-      hierarchy: this.fieldConfig.fields.hierarchy,
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || undefined,
+      buildingId: this.buildingId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
     }
     this.mainService
-      .postExportCustom("itsm/export", "incidentWorkOrder", postData)
+      .postExportCustom("itsm/export", "floorIncident", postData)
       .subscribe((data) => {
         this.message.remove(this.excelExportLoading);
         this.excelExportLoading = false;
@@ -210,14 +215,14 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
     this.dateRange = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]
-    this.repairDeptId = undefined;
-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined};
+    this.buildingId = undefined;
+    this.fieldConfig.fields = {categoryId: undefined};
     this.search();
   }
 
-  // 科室搜索
-  changeRepairDeptInp(e) {
-    this.searchTimer(this.getRepairDeptList, e);
+  // 楼栋搜索
+  changeBuildingInp(e) {
+    this.searchTimer(this.getBuildingList, e);
   }
 
   // 防抖
@@ -227,35 +232,35 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
     this.searchTimerSubject.next([fun, e]);
   }
 
-  openChangeRepairDept(flag){
-    flag && this.getRepairDeptList();
+  openChangeBuilding(flag){
+    flag && this.getBuildingList();
   }
 
   // 获取报修科室列表
-  repairDeptList:any[] = [];
-  getRepairDeptList(keyword?) {
+  buildingList:any[] = [];
+  getBuildingList(keyword?) {
     let data = {
-      department: {
-        cascadeHosId: this.getHosId,
-        dept: keyword,
-        searchType: 1,
+      building: {
+        simpleQuery: true,
+        buildingName: keyword,
+        statisticalHosId:this.getHosId,
       },
       idx: 0,
       sum: 20,
     };
     this.isLoading = true;
     this.mainService
-      .getFetchDataList("data", "department", data)
+      .getFetchDataList("data", "building", data)
       .subscribe((data) => {
         this.isLoading = false;
-        this.repairDeptList = data.list;
+        this.buildingList = data.list;
       });
   }
 
   // 详细搜索
   fieldConfig:any = {
-    fields: {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined},
-    config: {groupAndUser: true, category123: true, source: true},
+    fields: {categoryId: undefined},
+    config: {category123: true},
   }
   showSearchMore:boolean = false;
   showMore(){
@@ -274,5 +279,3 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
     this.onResize();
   }
 }
-
-

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

@@ -25,8 +25,8 @@
     <tr>
       <th nzWidth="10%">分组名称</th>
       <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
       <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
@@ -70,7 +70,8 @@
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -1,3 +1,4 @@
+import { TabService } from './../../services/tab.service';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } from 'date-fns';
 import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
@@ -13,6 +14,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -23,6 +25,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 
   ngOnInit() {
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -34,13 +37,21 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
-    let flag = this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO;
+    let flag = this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO;
     return flag ? 21 : 0;
   }
 
@@ -98,6 +109,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
     };
@@ -159,6 +171,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
     };

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

@@ -9,7 +9,7 @@
       <span class="label">报修科室</span>：
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
         <ng-container *ngFor="let option of repairDeptList">
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
         </ng-container>
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -37,8 +37,8 @@
     <tr>
       <th nzWidth="10%" nzShowSort nzSortKey="startDate" [(nzSort)]="sortCurrent.startDate">时间</th>
       <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
       <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
@@ -82,7 +82,8 @@
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -1,3 +1,4 @@
+import { TabService } from './../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
@@ -15,6 +16,7 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -33,6 +35,7 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
       fun.call(this, v[1]);
     });
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -44,11 +47,19 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.sourceDTO;
     return flag ? 21 : 0;
@@ -108,7 +119,7 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
       repairDeptId: this.repairDeptId || undefined,
-      groupId: this.fieldConfig.fields.groupId || undefined,
+      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,
@@ -172,7 +183,7 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
       repairDeptId: this.repairDeptId || undefined,
-      groupId: this.fieldConfig.fields.groupId || undefined,
+      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,
@@ -236,7 +247,7 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
   getRepairDeptList(keyword?) {
     let data = {
       department: {
-        cascadeHosId: this.getHosId,
+        statisticalHosId: this.getHosId,
         dept: keyword,
         searchType: 1,
       },

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

@@ -54,21 +54,21 @@ const routes: Routes = [
         }
       },
       {
-        // 处理组统计
+        // 维修组统计
         path: 'groupStatistics',
         loadChildren: () => import('./group-statistics/group-statistics.module').then(m => m.GroupStatisticsModule),
         data: {
           reuse: true,
-          title: '处理组统计'
+          title: '维修组统计'
         }
       },
       {
-        // 处理人统计
+        // 维修人统计
         path: 'userStatistics',
         loadChildren: () => import('./user-statistics/user-statistics.module').then(m => m.UserStatisticsModule),
         data: {
           reuse: true,
-          title: '处理人统计'
+          title: '维修人统计'
         }
       },
       {
@@ -134,6 +134,24 @@ const routes: Routes = [
           title: '故障来源统计'
         }
       },
+      {
+        // 耗材统计
+        path: 'consumableStatistics',
+        loadChildren: () => import('./consumable-statistics/consumable-statistics.module').then(m => m.ConsumableStatisticsModule),
+        data: {
+          reuse: true,
+          title: '耗材统计'
+        }
+      },
+      {
+        // 工时统计
+        path: 'workHourStatistics',
+        loadChildren: () => import('./work-hour-statistics/work-hour-statistics.module').then(m => m.WorkHourStatisticsModule),
+        data: {
+          reuse: true,
+          title: '工时统计'
+        }
+      },
     ]
   }
 ];

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

@@ -51,6 +51,8 @@
       .icon_transport{
         color: #666666;
         font-size: 24px;
+        position: relative;
+        top: 2px;
       }
     }
   }

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

@@ -1,7 +1,6 @@
 import { ActivatedRoute, Router } from '@angular/router';
 import { Component, OnInit, OnDestroy } from "@angular/core";
 import { ToolService } from 'src/app/services/tool.service';
-import { SimpleReuseStrategy } from '../../../SimpleReuseStrategy';
 import { TabService } from '../services/tab.service';
 @Component({
   selector: "app-maintenance-statistics",
@@ -26,9 +25,8 @@ export class MaintenanceStatisticsComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy(){
-    this.sessionRemove();
-    this.tabService.tabs = [];
-    SimpleReuseStrategy.deleteAllRouteCache();
+    // this.sessionRemove();
+    this.tabService.deleteAllRouteSnapshot();
   }
 
   getMenuList(){
@@ -41,20 +39,23 @@ export class MaintenanceStatisticsComponent implements OnInit, OnDestroy {
   clickMenu(data){
     this.activeMenuId = data.id;
     this.secondMenuList = this.menuList.find(v => v.id == this.activeMenuId).childrens || [];
-    this.tabService.tabs = [];
-    SimpleReuseStrategy.deleteAllRouteCache();
-    this.secondMenuList.length && this.clickSecondMenu(this.secondMenuList[0]);
+    // this.tabService.deleteAllRouteSnapshot();
+    console.log(this.tabService.tabs)
+    let activeTab = this.tabService.tabs.find(v => v.active);
+    // return;
+    if(this.secondMenuList.length){
+      if(activeTab.path === `/newStatistics/${this.route.parent.snapshot.routeConfig.path}/${this.secondMenuList[0].link}`){
+        this.clickSecondMenu(this.secondMenuList[0]);
+      }else{
+        this.activeSecondMenuLink = activeTab.path.split('/').reverse()[0];
+      }
+    }
   }
 
   // 点击二级菜单
   activeSecondMenuLink:string;
   clickSecondMenu(data){
     this.activeSecondMenuLink = data.link;
-    let hasCache = SimpleReuseStrategy.cacheRouters.has(`/newStatistics/${this.route.parent.snapshot.routeConfig.path}/${this.activeSecondMenuLink}`);
-    console.log('tabs', this.tabService.tabs);
-    console.log('cacheRouters', SimpleReuseStrategy.cacheRouters);
-    console.log('cacheRouters', hasCache);
-    !hasCache && SimpleReuseStrategy.deleteRouteCache(`/newStatistics/${this.route.parent.snapshot.routeConfig.path}/${this.activeSecondMenuLink}`);
     this.router.navigate([`/newStatistics/${this.route.parent.snapshot.routeConfig.path}/${this.activeSecondMenuLink}`], { replaceUrl: true });
   }
 
@@ -69,6 +70,14 @@ export class MaintenanceStatisticsComponent implements OnInit, OnDestroy {
   queryType;//查询范围
   // 初始化院区、部门显示
   initHospitalAndDuty(hospitalOrDuty){
+    let sessionData = JSON.parse(sessionStorage.getItem('maintenanceStatistics'));
+    console.log(sessionData);
+    if(sessionData){
+      this.hospital = sessionData.hospital;
+      this.duty = sessionData.duty;
+      this.queryType = sessionData.queryType;
+      return;
+    }
     let type = 'hospital';//默认是院区
     if(hospitalOrDuty.type){
       // 当前是责任部门
@@ -107,7 +116,7 @@ export class MaintenanceStatisticsComponent implements OnInit, OnDestroy {
 
   // 缓存数据
   sessionSave(){
-    sessionStorage.setItem('maintenanceStatistics', JSON.stringify({queryType: this.queryType, hospitalId: this.hospital ? this.hospital.id : undefined, dutyId: this.duty ? this.duty.id : undefined}))
+    sessionStorage.setItem('maintenanceStatistics', JSON.stringify({queryType: this.queryType, hospitalId: this.hospital ? this.hospital.id : undefined, dutyId: this.duty ? this.duty.id : undefined, hospital: this.hospital, duty: this.duty}));
   }
 
   // 清除缓存数据
@@ -130,7 +139,14 @@ export class MaintenanceStatisticsComponent implements OnInit, OnDestroy {
     this.queryRangeFlag = false;
 
     this.sessionSave();
-    this.router.navigate([`newStatistics/${this.route.parent.snapshot.routeConfig.path}/${this.activeSecondMenuLink}`], { replaceUrl: true });
+    // this.tabService.deleteRouteSnapshot(`/newStatistics/${this.route.parent.snapshot.routeConfig.path}/${this.activeSecondMenuLink}`);
+    // this.router.navigate([`/newStatistics/${this.route.parent.snapshot.routeConfig.path}/${this.activeSecondMenuLink}`], { replaceUrl: true });
+
+    this.router.navigateByUrl('/redirect', {
+      skipLocationChange: true
+    }).then(() => {
+      this.router.navigate([`/newStatistics/${this.route.parent.snapshot.routeConfig.path}/${this.activeSecondMenuLink}`], { replaceUrl: true });
+    });
   }
   cancelQueryRange() {
     this.queryRangeFlag = false;

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

@@ -58,7 +58,7 @@
 					<div class="statistics-select-list" [ngClass]="{'activeClass': activeIndex == 0}" (click)="selectCheck(0)">维修人员</div>
 					<div class="statistics-select-list" [ngClass]="{'activeClass': activeIndex == 1}" (click)="selectCheck(1)">维修组</div>
 				</div>
-				<div class="more" (click)="toPath(1)">更多></div>
+				<div class="more" *ngIf="showMore(activeIndex == 0 ? 'userStatistics' : 'groupStatistics')" (click)="toPath(activeIndex == 0 ? '/newStatistics/maintenanceStatistics/userStatistics' : '/newStatistics/maintenanceStatistics/groupStatistics')">更多></div>
 			</div>
 			<div class="table">
 				<div class="td">
@@ -67,7 +67,7 @@
 					<div class="table-td" *ngIf="activeIndex==1">维修组</div>
 					<div class="table-td">工单量</div>
 					<div class="table-td">平均接单时长</div>
-					<div class="table-td">平均处理时长</div>
+					<div class="table-td">平均解决时长</div>
 					<div class="table-td">超时单</div>
 				</div>
 				<div class="th" *ngFor="let item of maintainData; let index = index;">
@@ -88,8 +88,8 @@
 		<div class="statistics width-40">
 			<div class="statistics-box">
 				<div class="sign-green"></div>
-				<div class="statistics-title">报修来源</div>
-				<div class="more" (click)="toPath(2)">更多></div>
+				<div class="statistics-title">故障来源</div>
+				<div class="more" *ngIf="showMore('categorySourceStatistics')" (click)="toPath('/newStatistics/maintenanceStatistics/categorySourceStatistics')">更多></div>
 			</div>
 			<div class="echarts-repairs">
 			  <div echarts class="echarts" [options]='repairsOptions'></div>
@@ -101,7 +101,7 @@
 			<div class="statistics-box">
 				<div class="sign-green"></div>
 				<div class="statistics-title">一级故障现象Top5</div>
-				<div class="more" (click)="toPath(3)">更多></div>
+				<div class="more" *ngIf="showMore('categoryOneStatistics')" (click)="toPath('/newStatistics/maintenanceStatistics/categoryOneStatistics')">更多></div>
 			</div>
 			<div class="echarts-repairs">
 				<div echarts class="echarts" [options]='malfunctionOptions'></div>
@@ -111,7 +111,7 @@
 			<div class="statistics-box">
 				<div class="sign-green"></div>
 				<div class="statistics-title">楼栋报修Top5</div>
-				<div class="more" (click)="toPath(4)">更多></div>
+				<div class="more" *ngIf="showMore('buildingStatistics')" (click)="toPath('/newStatistics/maintenanceStatistics/buildingStatistics')">更多></div>
 			</div>
 			<div class="echarts-repairs">
 				<div echarts class="echarts" [options]='buildingOptions'></div>
@@ -123,7 +123,7 @@
 			<div class="statistics-box">
 				<div class="sign-green"></div>
 				<div class="statistics-title">科室费用Top5</div>
-				<div class="more" (click)="toPath(5)">更多></div>
+				<div class="more" *ngIf="showMore('departmentIncidentStatistics')" (click)="toPath('/newStatistics/maintenanceStatistics/departmentIncidentStatistics')">更多></div>
 			</div>
 			<div class="table">
 				<div class="td">
@@ -144,7 +144,7 @@
 			<div class="statistics-box">
 				<div class="sign-green"></div>
 				<div class="statistics-title">耗材Top5</div>
-				<div class="more" (click)="toPath(6)">更多></div>
+				<div class="more" *ngIf="showMore('consumableStatistics')" (click)="toPath('/newStatistics/maintenanceStatistics/consumableStatistics')">更多></div>
 			</div>
 			<div class="table">
 				<div class="td">

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

@@ -1,6 +1,8 @@
+import { Router } from '@angular/router';
 import { format, addMonths, startOfMonth, endOfMonth } from 'date-fns';
 import { Component, OnInit } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
+import { TabService } from '../../services/tab.service';
 @Component({
   selector: "app-synthesize-statistics",
   templateUrl: "./synthesize-statistics.component.html",
@@ -9,8 +11,10 @@ import { MainService } from 'src/app/services/main.service';
 export class SynthesizeStatisticsComponent implements OnInit {
   constructor(
     private mainService: MainService,
+    private tabService: TabService,
+    public router: Router,
   ) {}
-	
+
 	isLoading:Boolean = false;
 	workData:any = []; //工单统计
   listOfData: any[] = []; //表格数据
@@ -59,13 +63,13 @@ export class SynthesizeStatisticsComponent implements OnInit {
   ngOnInit() {
     this.search();
   }
-	
+
 	// 维修处理类型切换
 	selectCheck(type){
 		this.activeIndex = type
 		this.getMaintainData();
 	}
-	
+
 	// 报修来源
 	repairsChart() {
 		let postData:any = {
@@ -109,7 +113,7 @@ export class SynthesizeStatisticsComponent implements OnInit {
 							},
 							label: {
 									show: true,
-									formatter: '{b}: {c} {d}%'  
+									formatter: '{b}: {c} {d}%'
 							},
 				      // itemStyle: {
 				      //   normal: {
@@ -130,7 +134,7 @@ export class SynthesizeStatisticsComponent implements OnInit {
 				};
 		  });
 	}
-	
+
 	// 一级故障
 	malfunctionChart(){
 		let postData:any = {
@@ -195,7 +199,7 @@ export class SynthesizeStatisticsComponent implements OnInit {
 				}
 		  });
 	}
-	
+
 	// 楼栋报修
 	buildingChart(){
 		let postData:any = {
@@ -260,7 +264,7 @@ export class SynthesizeStatisticsComponent implements OnInit {
 		    }
 		  });
 	}
-	
+
 	// 科室费用
 	getDeptCostData() {
 	  let postData:any = {
@@ -277,7 +281,7 @@ export class SynthesizeStatisticsComponent implements OnInit {
 	      this.deptCostData = result.data || [];
 	    });
 	}
-	
+
 	// 耗材
 	getConsumableData() {
 	  let postData:any = {
@@ -295,12 +299,21 @@ export class SynthesizeStatisticsComponent implements OnInit {
 	      this.consumableData = result.data || [];
 	    });
 	}
-	
+
 	// 更多跳转
-	toPath(type){
-		console.log(type)
+	toPath(path){
+    let flag = this.tabService.tabs.some(v => v.path === path);
+    flag && this.tabService.deleteRouteSnapshot(path);
+    this.tabService.setQueryParams('dateRange', this.dateRange);
+    this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
+  // 判断更多是否显示
+  showMore(path){
+    let menus = JSON.parse(localStorage.getItem("menu"));
+    return menus.find(v => v.link === 'maintenanceStatistics').childrens.some(v => v.link === path);
+  }
+
   // 初始化缓存数据
   queryType:any;
   hosId:any;
@@ -334,7 +347,7 @@ export class SynthesizeStatisticsComponent implements OnInit {
       this.dutyId = undefined;
       this.parentDutyId = dutyId;
     }
-		
+
 		this.isLoading = true
 		this.getWorkData();
 		this.getMaintainData();
@@ -369,7 +382,7 @@ export class SynthesizeStatisticsComponent implements OnInit {
         this.listLength = result.totalCount;
       });
   }
-	
+
 	// 头部工单数据
 	getWorkData() {
 	  let postData:any = {
@@ -386,7 +399,7 @@ export class SynthesizeStatisticsComponent implements OnInit {
 	      this.workData = result.data[0] || [];
 	    });
 	}
-	
+
 	// 维修处理
 	getMaintainData() {
 	  let postData:any = {
@@ -404,14 +417,14 @@ export class SynthesizeStatisticsComponent implements OnInit {
 	      this.maintainData = result.data || [];
 	    });
 	}
-	
+
 	// 重置
 	reset(){
 		this.dateRange = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')];
 		this.activeIndex = 0;
 		this.search();
 	}
-	
+
   // 搜索
   search() {
 		this.initSessionData();

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

@@ -5,6 +5,17 @@
       <nz-range-picker [(ngModel)]="dateRange" [nzAllowClear]="false" (ngModelChange)="changeDate($event)" (nzOnCalendarChange)="onCalendarChangeDate($event)">
       </nz-range-picker>
     </div>
+    <div class="searchDataItem">
+      <span class="label">报修科室</span>：
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
+        <ng-container *ngFor="let option of repairDeptList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
+        </ng-container>
+        <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+          <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+        </nz-option>
+      </nz-select>
+    </div>
   </div>
   <div class="operation">
     <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
@@ -23,10 +34,10 @@
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="10%">分组名称</th>
+      <th nzWidth="10%">公司名称</th>
       <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
       <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
@@ -38,7 +49,7 @@
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
-      <td>{{ data.groupName }}</td>
+      <td>{{ data.companyName }}</td>
       <td>{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
       <td>{{ data.avgResolvedTime }}</td>
@@ -54,7 +65,7 @@
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 10%">{{ data.groupName }}</td>
+        <td style="width: 10%">{{ data.companyName }}</td>
         <td style="width: 9%">{{ data.sum }}</td>
         <td style="width: 9%">{{ data.avgResponseTime }}</td>
         <td style="width: 9%">{{ data.avgResolvedTime }}</td>
@@ -70,7 +81,8 @@
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -1,3 +1,6 @@
+import { TabService } from './../../services/tab.service';
+import { debounceTime } from 'rxjs/operators';
+import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } from 'date-fns';
 import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
@@ -13,6 +16,7 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -21,8 +25,17 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
   pageSize: number = 30; //表格每页展示条数
   listLength: number = 0; //表格总数据量
 
+  repairDeptId;//报修科室id
+
+  searchTimerSubject = new Subject();
+
   ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -34,13 +47,21 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
-    let flag = this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO;
+    let flag = this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO;
     return flag ? 21 : 0;
   }
 
@@ -97,7 +118,9 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
+      repairDeptId: this.repairDeptId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
     };
@@ -158,7 +181,9 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
+      repairDeptId: this.repairDeptId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
     };
@@ -194,12 +219,47 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
     this.dateRange = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]
+    this.repairDeptId = undefined;
     this.fieldConfig.fields = {categoryId: undefined, buildingId: undefined, floorId: undefined};
     this.search();
   }
 
+  // 科室搜索
+  changeRepairDeptInp(e) {
+    this.searchTimer(this.getRepairDeptList, e);
+  }
+
   // 防抖
   isLoading = false;
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  openChangeRepairDept(flag){
+    flag && this.getRepairDeptList();
+  }
+
+  // 获取报修科室列表
+  repairDeptList:any[] = [];
+  getRepairDeptList(keyword?) {
+    let data = {
+      department: {
+        statisticalHosId: this.getHosId,
+        dept: keyword,
+        searchType: 1,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "department", data)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.repairDeptList = data.list;
+      });
+  }
 
   // 详细搜索
   fieldConfig:any = {

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

@@ -36,8 +36,8 @@
     <tr>
       <th nzWidth="10%">人员姓名(工号)</th>
       <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
       <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
@@ -65,7 +65,7 @@
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 10%">{{ data.userName }}({{ data.userAccount }})</td>
+        <td style="width: 10%">{{ data.userName }}</td>
         <td style="width: 9%">{{ data.sum }}</td>
         <td style="width: 9%">{{ data.avgResponseTime }}</td>
         <td style="width: 9%">{{ data.avgResolvedTime }}</td>
@@ -81,7 +81,8 @@
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -5,6 +5,7 @@ import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } fro
 import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
 import { ActivatedRoute } from '@angular/router';
+import { TabService } from '../../services/tab.service';
 @Component({
   selector: "app-user-statistics",
   templateUrl: "./user-statistics.component.html",
@@ -15,6 +16,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+    private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -33,6 +35,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
       fun.call(this, v[1]);
     });
     this.initSessionData();
+    this.getQueryParams();
     this.search();
   }
 
@@ -44,11 +47,19 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
-      console.log('this.tableHeight:', this.tableHeight)
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
     }, 0)
   }
 
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO;
     return flag ? 21 : 0;
@@ -109,8 +120,9 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
       parentDutyId: this.parentDutyId || undefined,
       groupId: this.groupId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
-      placeId: this.fieldConfig.fields.buildingId || undefined,
+      placeId: this.fieldConfig.fields.floorId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
     };
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
@@ -171,8 +183,9 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
       parentDutyId: this.parentDutyId || undefined,
       groupId: this.groupId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
-      placeId: this.fieldConfig.fields.buildingId || undefined,
+      placeId: this.fieldConfig.fields.floorId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
@@ -232,7 +245,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
   getGroupList(keyword?) {
     let data = {
       group2: {
-        hospitals: this.getHosId,
+        statisticalHosId: this.getHosId,
         groupName: keyword,
         type: 3,
       },

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

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

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

@@ -0,0 +1,71 @@
+<div class="searchDataWrap">
+  <div class="searchData">
+    <div class="searchDataItem">
+      <span class="label">建单时间</span>：
+      <nz-range-picker [(ngModel)]="dateRange" [nzAllowClear]="false" (ngModelChange)="changeDate($event)" (nzOnCalendarChange)="onCalendarChangeDate($event)">
+      </nz-range-picker>
+    </div>
+    <div class="searchDataItem">
+      <span class="label">报修科室</span>：
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
+        <ng-container *ngFor="let option of repairDeptList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
+        </ng-container>
+        <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+          <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+        </nz-option>
+      </nz-select>
+    </div>
+  </div>
+  <div class="operation">
+    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <button nz-button class="btn default" (click)="search()">查询</button>
+    <button nz-button class="btn default ml8" (click)="reset()">重置</button>
+    <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
+  </div>
+</div>
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO || fieldConfig.fields.companyDTO">
+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
+  <span>{{fieldConfig.fields.userDTO?.name}}</span>
+  <span>{{fieldConfig.fields.category1DTO?.category}}</span>
+  <span>{{fieldConfig.fields.category2DTO?.category}}</span>
+  <span>{{fieldConfig.fields.category3DTO?.category}}</span>
+  <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
+  <span>{{fieldConfig.fields.floorDTO?.floorName}}</span>
+  <span>{{fieldConfig.fields.companyDTO?.name}}</span>
+</div>
+<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
+  <thead (nzSortChange)="sort($event)" nzSingleSort>
+    <tr>
+      <th nzWidth="25%">工时名称</th>
+      <th nzWidth="25%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
+      <th nzWidth="25%" nzShowSort nzSortKey="workHourNum" [(nzSort)]="sortCurrent.workHourNum">使用数量</th>
+      <th nzWidth="25%" nzShowSort nzSortKey="workHourPrice" [(nzSort)]="sortCurrent.workHourPrice">总费用(元)</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr *ngFor="let data of listOfData">
+      <td>{{ data.workHourName }}</td>
+      <td>{{ data.sum }}</td>
+      <td>{{ data.workHourNum }}</td>
+      <td>{{ data.workHourPrice }}</td>
+    </tr>
+  </tbody>
+  <ng-template #footerTpl>
+    <table class="footTable">
+      <tr *ngFor="let data of listOfDataEnd">
+        <td style="width: 25%">{{ data.workHourName }}</td>
+        <td style="width: 25%">{{ data.sum }}</td>
+        <td style="width: 25%">{{ data.workHourNum }}</td>
+        <td style="width: 25%">{{ data.workHourPrice }}</td>
+      </tr>
+    </table>
+  </ng-template>
+</nz-table>
+<div class="pagination">
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
+</div>
+
+<!-- 详细搜索 -->
+<app-search-more [fieldConfig]="fieldConfig" *ngIf="showSearchMore" [hosId]="hosId" [queryType]="queryType"  [dutyId]="dutyId"  [parentDutyId]="parentDutyId" (cancelEvent)="cancelEvent()" (submitEvent)="submitEvent($event)"></app-search-more>

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

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

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

@@ -0,0 +1,291 @@
+import { TabService } from './../../services/tab.service';
+import { debounceTime } from 'rxjs/operators';
+import { Subject } from 'rxjs';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } from 'date-fns';
+import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
+import { MainService } from 'src/app/services/main.service';
+import { ActivatedRoute } from '@angular/router';
+@Component({
+  selector: "app-work-hour-statistics",
+  templateUrl: "./work-hour-statistics.component.html",
+  styleUrls: ["./work-hour-statistics.component.less"],
+})
+export class WorkHourStatisticsComponent implements OnInit, AfterViewInit {
+  constructor(
+    private mainService: MainService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private tabService: TabService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  listOfDataEnd: any[] = []; //表格合计
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 30; //表格每页展示条数
+  listLength: number = 0; //表格总数据量
+
+  repairDeptId;//报修科室id
+
+  searchTimerSubject = new Subject();
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+    this.initSessionData();
+    this.getQueryParams();
+    this.search();
+  }
+
+  ngAfterViewInit(){
+    this.onResize();
+  }
+
+  tableHeight:number = 0;
+  @HostListener('window:resize')
+  onResize(): void {
+    setTimeout(() => {
+      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+
+    }, 0)
+  }
+
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
+  get getMoreFilter(){
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.companyDTO;
+    return flag ? 21 : 0;
+  }
+
+  // 初始化缓存数据
+  queryType:any;
+  hosId:any;
+  dutyId:any;
+  parentDutyId:any;
+  initSessionData(){
+    let maintenanceStatistics = JSON.parse(sessionStorage.getItem('maintenanceStatistics'));
+    let queryType:any = maintenanceStatistics.queryType;
+    let hosId:any = maintenanceStatistics.hospitalId;
+    let dutyId:any = maintenanceStatistics.dutyId;
+
+    queryType = queryType ? +queryType : undefined;
+    hosId = hosId ? +hosId : undefined;
+    dutyId = dutyId ? +dutyId : undefined;
+
+    this.queryType = queryType;
+    if(queryType == 1){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 2){
+      this.hosId = hosId;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 3){
+      this.hosId = undefined;
+      this.dutyId = dutyId;
+      this.parentDutyId = undefined;
+    }else if(queryType == 4){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = dutyId;
+    }
+  }
+
+  get getHosId(){
+    return this.parentDutyId || this.dutyId || this.hosId;
+  }
+
+  // 表格数据
+  loading1 = false;
+  getList(num?: number, field?: string, sort?: string) {
+    if (num !== undefined) {
+      this.pageIndex = num;
+    }
+    let postData:any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || undefined,
+      repairDeptId: this.repairDeptId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || undefined,
+      placeId: this.fieldConfig.fields.floorId || undefined,
+      companyId: this.fieldConfig.fields.companyId || undefined,
+    };
+    if (field && sort) {
+      postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
+    }
+    this.loading1 = true;
+    this.mainService
+      .postCustom("itsm/report", "workHourIncident", postData)
+      .subscribe((result) => {
+        this.loading1 = false;
+        this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
+        this.listOfDataEnd = result.dataList.filter((v, i) => { return i == result.dataList.length - 1 });
+        this.listLength = result.totalCount;
+      });
+  }
+
+  // 列表排序
+  sortCurrent:any = {};
+  sortCurrentKey: string = "";
+  sortCurrentValue: string | null = "";
+  sort(e) {
+    const { key, value } = e;
+    this.sortCurrentKey = key;
+    this.sortCurrentValue = value;
+    this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 搜索
+  search() {
+    this.getList(1, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 日期选择
+  dateRange: any = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')];
+  changeDate(result?): void {
+    result[0] = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+    result[1] = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+    this.dateRange = result;
+  }
+
+  onCalendarChangeDate(dateArr){
+    console.log(dateArr)
+    if(dateArr.length == 2){
+      this.dateRange = [format(startOfDay(dateArr[0]), 'yyyy-MM-dd HH:mm:ss'), format(endOfDay(dateArr[1]), 'yyyy-MM-dd HH:mm:ss')];
+    }
+  }
+
+  // 导出
+  excelExportLoading:any = false;
+  excelExport(){
+    this.excelExportLoading = this.message.loading("导出中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData:any = {
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || undefined,
+      repairDeptId: this.repairDeptId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || undefined,
+      placeId: this.fieldConfig.fields.floorId || undefined,
+      companyId: this.fieldConfig.fields.companyId || undefined,
+    };
+    if (this.sortCurrentKey && this.sortCurrentValue) {
+      postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
+    }
+    this.mainService
+      .postExportCustom("itsm/export", "workHourIncident", postData)
+      .subscribe((data) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.success('导出成功');
+        var file = new Blob([data], {
+          type: "application/vnd.ms-excel",
+        });
+        //trick to download store a file having its URL
+        var fileURL = URL.createObjectURL(file);
+        var a = document.createElement("a");
+        a.href = fileURL;
+        a.target = "_blank";
+        a.download = `${this.route.parent.routeConfig.data.title}.xls`;
+        document.body.appendChild(a);
+        a.click();
+      },(err) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.error('导出失败');
+      });
+  }
+  // 重置
+  reset(){
+    this.sortCurrentKey = "";
+		this.sortCurrentValue = "";
+		this.sortCurrent = {};
+    this.dateRange = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]
+    this.repairDeptId = undefined;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined};
+    this.search();
+  }
+
+  // 科室搜索
+  changeRepairDeptInp(e) {
+    this.searchTimer(this.getRepairDeptList, e);
+  }
+
+  // 防抖
+  isLoading = false;
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  openChangeRepairDept(flag){
+    flag && this.getRepairDeptList();
+  }
+
+  // 获取报修科室列表
+  repairDeptList:any[] = [];
+  getRepairDeptList(keyword?) {
+    let data = {
+      department: {
+        statisticalHosId: this.getHosId,
+        dept: keyword,
+        searchType: 1,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "department", data)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.repairDeptList = data.list;
+      });
+  }
+
+  // 详细搜索
+  fieldConfig:any = {
+    fields: {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined},
+    config: {groupAndUser: true, category123: true, buildingAndFloor: true, company: true},
+  }
+  showSearchMore:boolean = false;
+  showMore(){
+    this.showSearchMore = true;
+  }
+
+  cancelEvent(){
+    this.showSearchMore = false;
+  }
+
+  submitEvent(fields){
+    this.showSearchMore = false;
+    this.fieldConfig.fields = fields;
+    console.log('this.fieldConfig.fields:', this.fieldConfig.fields)
+    this.search();
+    this.onResize();
+  }
+}

src/app/views/new-statistics/maintenance-statistics/work-hour-statistics/work-hour-statistics.module.ts

@@ -0,0 +1,21 @@
+import { WorkHourStatisticsComponent } from './work-hour-statistics.component';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { WorkHourStatisticsRoutingModule } from './work-hour-statistics-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { SearchMoreModule } from '../../components/search-more/search-more.module';
+
+
+@NgModule({
+  declarations: [
+    WorkHourStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    WorkHourStatisticsRoutingModule,
+    ShareModule,
+    SearchMoreModule,
+  ]
+})
+export class WorkHourStatisticsModule { }

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

@@ -19,10 +19,39 @@ export class TabService {
     this.router.events
       .pipe(filter(event => event instanceof NavigationEnd))
       .subscribe((event: NavigationEnd) => {
-        event.urlAfterRedirects.startsWith('/newStatistics/') && this.updateTabs(event.urlAfterRedirects);
+      	console.log('event:', event)
+        if(event.urlAfterRedirects.startsWith('/newStatistics/')){
+          this.updateTabs(event.urlAfterRedirects);
+        }else if(event.urlAfterRedirects !== '/'){
+          sessionStorage.removeItem('maintenanceStatistics')
+        }
       });
   }
 
+  public queryParams: any = {};
+  setQueryParams(key, value){
+    this.queryParams[key] = value;
+  }
+
+  getQueryParams(){
+    return this.queryParams;
+  }
+
+  clearQueryParams(){
+    this.queryParams = {};
+  }
+
+  public deleteAllRouteSnapshot(){
+    this.tabs.forEach(v => {
+      SimpleReuseStrategy.deleteRouteSnapshot(v.path);
+    })
+    this.tabs = [];
+  }
+
+  public deleteRouteSnapshot(path){
+    SimpleReuseStrategy.deleteRouteSnapshot(path);
+  }
+
   private updateTabs(url: string) {
     const normalizedUrl = this.getNormalizedUrl(url);
     const existingTab = this.tabs.find(t => t.path === normalizedUrl);
@@ -60,7 +89,6 @@ export class TabService {
 
   closeTab(path: string): any {
     console.log('path:', path)
-    SimpleReuseStrategy.deleteRouteCache(path);
 
     const index = this.tabs.findIndex(t => t.path === path);
     if (index === -1) return;
@@ -84,6 +112,7 @@ export class TabService {
 
     // 执行删除
     this.tabs.splice(index, 1);
+    SimpleReuseStrategy.deleteRouteSnapshot(path);
 
     // 设置新激活页签
     if (newActiveTab) {
@@ -108,16 +137,16 @@ export class TabService {
 
   closeOtherTabs(keepTab: Tab): void {
     // 强制激活当前右键页签
-    this.tabs = this.tabs.filter(t => t.path === keepTab.path);
-    keepTab.active = true;
-    this.currentTab = keepTab;
-
     this.tabs.forEach(v => {
       if (v.path !== keepTab.path) {
-        SimpleReuseStrategy.deleteRouteCache(v.path);
+        SimpleReuseStrategy.deleteRouteSnapshot(v.path);
       }
     })
 
+    this.tabs = this.tabs.filter(t => t.path === keepTab.path);
+    keepTab.active = true;
+    this.currentTab = keepTab;
+
     // 触发路由跳转
     this.router.navigate([keepTab.path], {
       replaceUrl: true