暂提

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

@@ -5,9 +5,9 @@
     <div class="content">
       <form nz-form [formGroup]="validateForm" class="addForm">
         <nz-form-item [hidden]="!fieldConfig.config.groupAndUser">
-          <nz-form-label [nzSpan]="6" nzFor="groupId">维&nbsp;&nbsp;修&nbsp;&nbsp;组</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择维修组!">
-            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeGroupInp($event)" formControlName="groupId" nzPlaceHolder="请选择维修组" (nzOpenChange)="openChangeGroup($event)" (ngModelChange)="changeGroup($event)">
+          <nz-form-label [nzSpan]="6" nzFor="groupId">维修分组</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择维修分组!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeGroupInp($event)" formControlName="groupId" nzPlaceHolder="请选择维修分组" (nzOpenChange)="openChangeGroup($event)" (ngModelChange)="changeGroup($event)">
               <ng-container *ngFor="let option of groupList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.groupName" [nzValue]="option.id"></nz-option>
               </ng-container>
@@ -19,7 +19,7 @@
         </nz-form-item>
 
         <nz-form-item [hidden]="!fieldConfig.config.groupAndUser">
-          <nz-form-label [nzSpan]="6" nzFor="groupId">维修人员</nz-form-label>
+          <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)">
               <ng-container *ngFor="let option of userList">
@@ -87,6 +87,62 @@
             </nz-select>
           </nz-form-control>
         </nz-form-item>
+
+        <nz-form-item [hidden]="!fieldConfig.config.buildingAndFloor">
+          <nz-form-label [nzSpan]="6" nzFor="buildingId">楼<span style="visibility: hidden;">囧囧</span>栋</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择楼栋!">
+            <nz-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>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+
+        <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)">
+              <ng-container *ngFor="let option of floorList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.floorName" [nzValue]="option.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+
+        <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)">
+              <ng-container *ngFor="let option of companyList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+
+        <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)">
+              <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>
+          </nz-form-control>
+        </nz-form-item>
       </form>
     </div>
     <div class="display_flex justify-content_flex-center">

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

@@ -87,7 +87,6 @@
 
       .content {
         width: 100%;
-        min-height: 166px;
         padding: 10px 24px 0;
         height: auto;
         overflow-y: auto;

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

@@ -47,6 +47,10 @@ export class SearchMoreComponent implements OnInit {
     this.category2List = this.fieldConfig.fields.category2DTO ? [this.fieldConfig.fields.category2DTO] : [];
     this.category3List = this.fieldConfig.fields.category3DTO ? [this.fieldConfig.fields.category3DTO] : [];
     this.sourceList = this.fieldConfig.fields.sourceDTO ? [this.fieldConfig.fields.sourceDTO] : [];
+    this.buildingList = this.fieldConfig.fields.buildingDTO ? [this.fieldConfig.fields.buildingDTO] : [];
+    this.floorList = this.fieldConfig.fields.floorDTO ? [this.fieldConfig.fields.floorDTO] : [];
+    this.companyList = this.fieldConfig.fields.companyDTO ? [this.fieldConfig.fields.companyDTO] : [];
+    this.repairDeptList = this.fieldConfig.fields.repairDeptDTO ? [this.fieldConfig.fields.repairDeptDTO] : [];
 
     this.validateForm = this.fb.group({
       groupId: [this.fieldConfig.fields.groupId || null],
@@ -55,6 +59,10 @@ export class SearchMoreComponent implements OnInit {
       category2Id: [this.fieldConfig.fields.category2DTO ? this.fieldConfig.fields.category2DTO.id  : null],
       category3Id: [this.fieldConfig.fields.category3DTO ? this.fieldConfig.fields.category3DTO.id  : null],
       sourceId: [this.fieldConfig.fields.sourceId || null],
+      buildingId: [this.fieldConfig.fields.buildingId || null],
+      floorId: [this.fieldConfig.fields.floorId === undefined ? null : this.fieldConfig.fields.floorId],
+      companyId: [this.fieldConfig.fields.companyDTO ? this.fieldConfig.fields.companyDTO.id  : null],
+      repairDeptId: [this.fieldConfig.fields.repairDeptDTO ? this.fieldConfig.fields.repairDeptDTO.id  : null],
     });
   }
   // 表单提交
@@ -94,6 +102,18 @@ export class SearchMoreComponent implements OnInit {
       fields.sourceId = this.validateForm.value.sourceId;
       fields.sourceDTO = this.sourceList.find(item => item.id == this.validateForm.value.sourceId);
     }
+    if(this.fieldConfig.config.buildingAndFloor){
+      fields.buildingId = this.validateForm.value.buildingId;
+      fields.buildingDTO = this.buildingList.find(item => item.id == this.validateForm.value.buildingId);
+      fields.floorId = this.validateForm.value.floorId;
+      fields.floorDTO = this.floorList.find(item => item.id == this.validateForm.value.floorId);
+    }
+    if(this.fieldConfig.config.company){
+      fields.companyDTO = this.companyList.find(item => item.id == this.validateForm.value.companyId);
+    }
+    if(this.fieldConfig.config.repairDept){
+      fields.repairDeptDTO = this.repairDeptList.find(item => item.id == this.validateForm.value.repairDeptId);
+    }
     this.submitEvent.emit(fields);
     this.hideModal();
   }
@@ -109,14 +129,14 @@ export class SearchMoreComponent implements OnInit {
     this.searchTimerSubject.next([fun, e]);
   }
 
-  // =================维修组===================
+  // =================维修分组===================
 
-  // 维修组搜索
+  // 维修分组搜索
   changeGroupInp(e) {
     this.searchTimer(this.getGroupList, e);
   }
 
-  // 获取维修组列表
+  // 获取维修分组列表
   groupList:any[] = [];
   getGroupList(keyword?){
     let postData: any = {
@@ -167,9 +187,11 @@ export class SearchMoreComponent implements OnInit {
       idx: 0,
       sum: 20,
       user: {
-        hospitals: this.getHosId,
-        groupName: keyword,
-        type: 3,
+        name: keyword,
+        simpleQuery: true,
+        groupdata: { id: groupId },
+        roleCodes: 'first-line support,second-line support,incident manager',
+        engineer: 1,
       },
     };
     this.isLoading = true;
@@ -315,4 +337,146 @@ export class SearchMoreComponent implements OnInit {
       this.sourceList = result;
     });
   }
+
+  // =================楼栋===================
+
+  // 楼栋搜索
+  changeBuildingInp(e) {
+    this.searchTimer(this.getBuildingList, e);
+  }
+
+  // 获取楼栋列表
+  buildingList:any[] = [];
+  getBuildingList(keyword?){
+    let postData: any = {
+      idx: 0,
+      sum: 20,
+      building: {
+        simpleQuery: true,
+        buildingName: keyword,
+        cascadeHosId:this.getHosId,
+      },
+    };
+    this.isLoading = true;
+    this.mainService.getFetchDataList("simple/data", "building", postData).subscribe(result => {
+      this.isLoading = false;
+      if(result.status == 200){
+        this.buildingList = result.list || [];
+      }else{
+        this.buildingList = [];
+      }
+    });
+  }
+  openChangeBuilding(flag){
+    flag && this.getBuildingList();
+  }
+
+  changeBuilding(id){
+    this.floorList = [];
+    this.validateForm.controls.floorId.setValue(null);
+    this.getFloorList('', id);
+  }
+
+  // =================楼层===================
+
+  // 楼层搜索
+  changeFloorInp(e) {
+    this.searchTimer(this.getFloorList, e);
+  }
+
+  // 获取楼层列表
+  floorList:any[] = [];
+  getFloorList(keyword = '', buildingId = ''){
+    if(!buildingId){
+      this.isLoading = false;
+      this.floorList = [];
+      return;
+    }
+    let postData: any = {
+      idx: 0,
+      sum: 20,
+      floor: {
+        floorName: keyword,
+        buildId : buildingId,
+      },
+    };
+    this.isLoading = true;
+    this.mainService.getFetchDataList("simple/data", "floor", postData).subscribe(result => {
+      this.isLoading = false;
+      if(result.status == 200){
+        this.floorList = result.list || [];
+      }else{
+        this.floorList = [];
+      }
+    });
+  }
+  openChangeFloor(flag){
+    flag && this.getFloorList('', this.validateForm.value.buildingId);
+  }
+
+  // =================三方公司===================
+
+  // 三方公司搜索
+  changeCompanyInp(e) {
+    this.searchTimer(this.getCompanyList, e);
+  }
+
+  // 获取三方公司列表
+  companyList:any[] = [];
+  getCompanyList(keyword?){
+    let postData: any = {
+      idx: 0,
+      sum: 20,
+      company: {
+        busiType: { key: "company_busi_type", value: "2" },
+        name: keyword,
+        hosId: this.getHosId,
+      },
+    };
+    this.isLoading = true;
+    this.mainService.getFetchDataList("simple/data", "company", postData).subscribe(result => {
+      this.isLoading = false;
+      if(result.status == 200){
+        this.companyList = result.list || [];
+      }else{
+        this.companyList = [];
+      }
+    });
+  }
+  openChangeCompany(flag){
+    flag && this.getCompanyList();
+  }
+
+  // =================报修科室===================
+
+  // 报修科室搜索
+  changeRepairDeptInp(e) {
+    this.searchTimer(this.getRepairDeptList, e);
+  }
+
+  // 获取报修科室列表
+  repairDeptList:any[] = [];
+  getRepairDeptList(keyword?){
+    let postData: any = {
+      idx: 0,
+      sum: 20,
+      department: {
+        cascadeHosId: this.getHosId,
+        dept: keyword,
+        searchType: 1,
+      },
+    };
+    this.isLoading = true;
+    this.mainService.getFetchDataList("simple/data", "department", postData).subscribe(result => {
+      this.isLoading = false;
+      if(result.status == 200){
+        this.repairDeptList = result.list || [];
+      }else{
+        this.repairDeptList = [];
+      }
+    });
+  }
+  openChangeRepairDept(flag){
+    flag && this.getRepairDeptList();
+  }
 }

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

@@ -129,7 +129,7 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
   }
 
   // 列表排序
-  sortCurrent = {};
+  sortCurrent:any = {};
   sortCurrentKey: string = "";
   sortCurrentValue: string | null = "";
   sort(e) {

src/app/views/new-statistics/maintenance-statistics/category-one-statistics/category-one-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,18 +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">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO || fieldConfig.fields.companyDTO || fieldConfig.fields.repairDeptDTO">
   <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
   <span>{{fieldConfig.fields.userDTO?.name}}</span>
-  <span>{{fieldConfig.fields.category1DTO?.category}}</span>
-  <span>{{fieldConfig.fields.category2DTO?.category}}</span>
-  <span>{{fieldConfig.fields.category3DTO?.category}}</span>
-  <span>{{fieldConfig.fields.sourceDTO?.name}}</span>
+  <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
+  <span>{{fieldConfig.fields.floorDTO?.floorName}}</span>
+  <span>{{fieldConfig.fields.companyDTO?.name}}</span>
+  <span>{{fieldConfig.fields.repairDeptDTO?.dept}}</span>
 </div>
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="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>
@@ -50,7 +39,7 @@
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
-      <td>{{ data.startDate }}</td>
+      <td>{{ data.category }}</td>
       <td>{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
       <td>{{ data.avgResolvedTime }}</td>
@@ -66,7 +55,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.category }}</td>
         <td style="width: 9%">{{ data.sum }}</td>
         <td style="width: 9%">{{ data.avgResponseTime }}</td>
         <td style="width: 9%">{{ data.avgResolvedTime }}</td>

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

@@ -1,5 +1,3 @@
-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";
@@ -23,15 +21,7 @@ export class CategoryOneStatisticsComponent 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.search();
   }
@@ -50,7 +40,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
   }
 
   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.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.companyDTO || this.fieldConfig.fields.repairDeptDTO;
     return flag ? 21 : 0;
   }
 
@@ -102,24 +92,25 @@ export class CategoryOneStatisticsComponent 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.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,
+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+      categoryLevel: 1,
     };
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
     }
     this.loading1 = true;
     this.mainService
-      .postCustom("itsm/report", "incidentWorkOrder", postData)
+      .postCustom("itsm/report", "breakdownCategory", postData)
       .subscribe((result) => {
         this.loading1 = false;
         this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
@@ -129,7 +120,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
   }
 
   // 列表排序
-  sortCurrent = {};
+  sortCurrent:any = {};
   sortCurrentKey: string = "";
   sortCurrentValue: string | null = "";
   sort(e) {
@@ -166,23 +157,24 @@ export class CategoryOneStatisticsComponent 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.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,
+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+      categoryLevel: 1,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
     }
     this.mainService
-      .postExportCustom("itsm/export", "incidentWorkOrder", postData)
+      .postExportCustom("itsm/export", "breakdownCategory", postData)
       .subscribe((data) => {
         this.message.remove(this.excelExportLoading);
         this.excelExportLoading = false;
@@ -210,52 +202,17 @@ export class CategoryOneStatisticsComponent 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, buildingId: undefined, floorId: undefined, companyId: undefined, repairDeptId: 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, buildingId: undefined, floorId: undefined, companyId: undefined, repairDeptId: undefined},
+    config: {groupAndUser: true, buildingAndFloor: true, company: true, repairDept: true},
   }
   showSearchMore:boolean = false;
   showMore(){

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

@@ -129,7 +129,7 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
   }
 
   // 列表排序
-  sortCurrent = {};
+  sortCurrent:any = {};
   sortCurrentKey: string = "";
   sortCurrentValue: string | null = "";
   sort(e) {

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

@@ -6,15 +6,24 @@
       </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>
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCategory1Inp($event)" nzAllowClear nzPlaceHolder="请选择一级分类" [(ngModel)]="category1Id" (nzOpenChange)="openChangeCategory1($event)" (ngModelChange)="changeCategory1($event)">
+        <ng-container *ngFor="let option of category1List">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.category" [nzValue]="option.id"></nz-option>
+        </ng-container>
+        <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+          <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+        </nz-option>
+      </nz-select>
+    </div>
+    <div class="searchDataItem">
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCategory2Inp($event)" nzAllowClear nzPlaceHolder="请选择二级分类" [(ngModel)]="category2Id" (nzOpenChange)="openChangeCategory2($event)">
+        <ng-container *ngFor="let option of category2List">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.category" [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,18 +33,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">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO || fieldConfig.fields.companyDTO || fieldConfig.fields.repairDeptDTO">
   <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
   <span>{{fieldConfig.fields.userDTO?.name}}</span>
-  <span>{{fieldConfig.fields.category1DTO?.category}}</span>
-  <span>{{fieldConfig.fields.category2DTO?.category}}</span>
-  <span>{{fieldConfig.fields.category3DTO?.category}}</span>
-  <span>{{fieldConfig.fields.sourceDTO?.name}}</span>
+  <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
+  <span>{{fieldConfig.fields.floorDTO?.floorName}}</span>
+  <span>{{fieldConfig.fields.companyDTO?.name}}</span>
+  <span>{{fieldConfig.fields.repairDeptDTO?.dept}}</span>
 </div>
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="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>
@@ -50,7 +59,7 @@
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
-      <td>{{ data.startDate }}</td>
+      <td>{{ data.category }}</td>
       <td>{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
       <td>{{ data.avgResolvedTime }}</td>
@@ -66,7 +75,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.category }}</td>
         <td style="width: 9%">{{ data.sum }}</td>
         <td style="width: 9%">{{ data.avgResponseTime }}</td>
         <td style="width: 9%">{{ data.avgResolvedTime }}</td>

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

@@ -23,7 +23,8 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
   pageSize: number = 30; //表格每页展示条数
   listLength: number = 0; //表格总数据量
 
-  repairDeptId;//报修科室id
+  category1Id;//一级分类id
+  category2Id;//二级分类id
 
   searchTimerSubject = new Subject();
 
@@ -50,7 +51,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
   }
 
   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.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.companyDTO || this.fieldConfig.fields.repairDeptDTO;
     return flag ? 21 : 0;
   }
 
@@ -102,24 +103,26 @@ export class CategoryThreeStatisticsComponent 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.category2Id || this.category1Id || undefined,
+      groupId: 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,
+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+      categoryLevel: 3,
     };
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
     }
     this.loading1 = true;
     this.mainService
-      .postCustom("itsm/report", "incidentWorkOrder", postData)
+      .postCustom("itsm/report", "breakdownCategory", postData)
       .subscribe((result) => {
         this.loading1 = false;
         this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
@@ -129,7 +132,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
   }
 
   // 列表排序
-  sortCurrent = {};
+  sortCurrent:any = {};
   sortCurrentKey: string = "";
   sortCurrentValue: string | null = "";
   sort(e) {
@@ -166,23 +169,25 @@ export class CategoryThreeStatisticsComponent 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.category2Id || this.category1Id || undefined,
+      groupId: 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,
+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+      categoryLevel: 3,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
     }
     this.mainService
-      .postExportCustom("itsm/export", "incidentWorkOrder", postData)
+      .postExportCustom("itsm/export", "breakdownCategory", postData)
       .subscribe((data) => {
         this.message.remove(this.excelExportLoading);
         this.excelExportLoading = false;
@@ -210,16 +215,12 @@ export class CategoryThreeStatisticsComponent 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.category1Id = undefined;
+    this.category2Id = undefined;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined, repairDeptId: undefined};
     this.search();
   }
 
-  // 科室搜索
-  changeRepairDeptInp(e) {
-    this.searchTimer(this.getRepairDeptList, e);
-  }
-
   // 防抖
   isLoading = false;
   searchTimer(fun, e) {
@@ -227,35 +228,83 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
     this.searchTimerSubject.next([fun, e]);
   }
 
-  openChangeRepairDept(flag){
-    flag && this.getRepairDeptList();
+  // =====================一级分类=====================
+
+  // 一级分类搜索
+  changeCategory1Inp(e) {
+    this.searchTimer(this.getCategory1List, e);
+  }
+
+  openChangeCategory1(flag){
+    flag && this.getCategory1List();
+  }
+
+  changeCategory1(id){
+    this.category2List = [];
+    this.category2Id = null;
+    this.getCategory2List('', id);
   }
 
-  // 获取报修科室列表
-  repairDeptList:any[] = [];
-  getRepairDeptList(keyword?) {
+  // 获取一级分类列表
+  category1List:any[] = [];
+  getCategory1List(keyword?) {
+    let data = {
+      category: {
+        category: keyword,
+        selectType: 'mutlQuery',
+        dutyIds: this.queryType == 3 ? this.dutyId : undefined,
+        parentDutyId: this.queryType == 3 ? this.parentDutyId : undefined,
+        hierarchy: 1,
+      },
+    };
+    this.isLoading = true;
+    this.mainService
+      .incidentPost("listIncidentCategory", data)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.category1List = data.data;
+      });
+  }
+
+  // =====================二级分类=====================
+
+  // 二级分类搜索
+  changeCategory2Inp(e) {
+    this.searchTimer(this.getCategory2List, e);
+  }
+
+  openChangeCategory2(flag){
+    flag && this.getCategory2List('', this.category1Id);
+  }
+
+  // 获取二级分类列表
+  category2List:any[] = [];
+  getCategory2List(keyword = '', parentId = '') {
+    if(!parentId){
+      this.isLoading = false;
+      this.category2List = [];
+      return;
+    }
     let data = {
-      department: {
-        cascadeHosId: this.getHosId,
-        dept: keyword,
-        searchType: 1,
+      category: {
+        category: keyword,
+        selectType: 'mutlQuery',
+        parent: { id: parentId },
       },
-      idx: 0,
-      sum: 20,
     };
     this.isLoading = true;
     this.mainService
-      .getFetchDataList("data", "department", data)
+      .incidentPost("listIncidentCategory", data)
       .subscribe((data) => {
         this.isLoading = false;
-        this.repairDeptList = data.list;
+        this.category2List = data.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, buildingId: undefined, floorId: undefined, companyId: undefined, repairDeptId: undefined},
+    config: {groupAndUser: true, buildingAndFloor: true, company: true, repairDept: true},
   }
   showSearchMore:boolean = false;
   showMore(){

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

@@ -6,15 +6,14 @@
       </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>
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCategory1Inp($event)" nzAllowClear nzPlaceHolder="请选择一级分类" [(ngModel)]="category1Id" (nzOpenChange)="openChangeCategory1($event)">
+        <ng-container *ngFor="let option of category1List">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.category" [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,18 +23,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">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO || fieldConfig.fields.companyDTO || fieldConfig.fields.repairDeptDTO">
   <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
   <span>{{fieldConfig.fields.userDTO?.name}}</span>
-  <span>{{fieldConfig.fields.category1DTO?.category}}</span>
-  <span>{{fieldConfig.fields.category2DTO?.category}}</span>
-  <span>{{fieldConfig.fields.category3DTO?.category}}</span>
-  <span>{{fieldConfig.fields.sourceDTO?.name}}</span>
+  <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
+  <span>{{fieldConfig.fields.floorDTO?.floorName}}</span>
+  <span>{{fieldConfig.fields.companyDTO?.name}}</span>
+  <span>{{fieldConfig.fields.repairDeptDTO?.dept}}</span>
 </div>
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="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>
@@ -50,7 +49,7 @@
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
-      <td>{{ data.startDate }}</td>
+      <td>{{ data.category }}</td>
       <td>{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
       <td>{{ data.avgResolvedTime }}</td>
@@ -66,7 +65,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.category }}</td>
         <td style="width: 9%">{{ data.sum }}</td>
         <td style="width: 9%">{{ data.avgResponseTime }}</td>
         <td style="width: 9%">{{ data.avgResolvedTime }}</td>

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

@@ -23,7 +23,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
   pageSize: number = 30; //表格每页展示条数
   listLength: number = 0; //表格总数据量
 
-  repairDeptId;//报修科室id
+  category1Id;//一级分类id
 
   searchTimerSubject = new Subject();
 
@@ -50,7 +50,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
   }
 
   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.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.companyDTO || this.fieldConfig.fields.repairDeptDTO;
     return flag ? 21 : 0;
   }
 
@@ -102,24 +102,26 @@ export class CategoryTwoStatisticsComponent 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.category1Id || undefined,
+      groupId: 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,
+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+      categoryLevel: 2,
     };
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
     }
     this.loading1 = true;
     this.mainService
-      .postCustom("itsm/report", "incidentWorkOrder", postData)
+      .postCustom("itsm/report", "breakdownCategory", postData)
       .subscribe((result) => {
         this.loading1 = false;
         this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
@@ -129,7 +131,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
   }
 
   // 列表排序
-  sortCurrent = {};
+  sortCurrent:any = {};
   sortCurrentKey: string = "";
   sortCurrentValue: string | null = "";
   sort(e) {
@@ -166,23 +168,25 @@ export class CategoryTwoStatisticsComponent 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.category1Id || undefined,
+      groupId: 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,
+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+      categoryLevel: 2,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
     }
     this.mainService
-      .postExportCustom("itsm/export", "incidentWorkOrder", postData)
+      .postExportCustom("itsm/export", "breakdownCategory", postData)
       .subscribe((data) => {
         this.message.remove(this.excelExportLoading);
         this.excelExportLoading = false;
@@ -210,14 +214,14 @@ export class CategoryTwoStatisticsComponent 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.category1Id = undefined;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined, repairDeptId: undefined};
     this.search();
   }
 
-  // 科室搜索
-  changeRepairDeptInp(e) {
-    this.searchTimer(this.getRepairDeptList, e);
+  // 一级分类搜索
+  changeCategory1Inp(e) {
+    this.searchTimer(this.getCategory1List, e);
   }
 
   // 防抖
@@ -227,35 +231,35 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
     this.searchTimerSubject.next([fun, e]);
   }
 
-  openChangeRepairDept(flag){
-    flag && this.getRepairDeptList();
+  openChangeCategory1(flag){
+    flag && this.getCategory1List();
   }
 
-  // 获取报修科室列表
-  repairDeptList:any[] = [];
-  getRepairDeptList(keyword?) {
+  // 获取一级分类列表
+  category1List:any[] = [];
+  getCategory1List(keyword?) {
     let data = {
-      department: {
-        cascadeHosId: this.getHosId,
-        dept: keyword,
-        searchType: 1,
+      category: {
+        category: keyword,
+        selectType: 'mutlQuery',
+        dutyIds: this.queryType == 3 ? this.dutyId : undefined,
+        parentDutyId: this.queryType == 3 ? this.parentDutyId : undefined,
+        hierarchy: 1,
       },
-      idx: 0,
-      sum: 20,
     };
     this.isLoading = true;
     this.mainService
-      .getFetchDataList("data", "department", data)
+      .incidentPost("listIncidentCategory", data)
       .subscribe((data) => {
         this.isLoading = false;
-        this.repairDeptList = data.list;
+        this.category1List = data.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, buildingId: undefined, floorId: undefined, companyId: undefined, repairDeptId: undefined},
+    config: {groupAndUser: true, buildingAndFloor: true, company: true, repairDept: true},
   }
   showSearchMore:boolean = false;
   showMore(){

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

@@ -129,7 +129,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
   }
 
   // 列表排序
-  sortCurrent = {};
+  sortCurrent:any = {};
   sortCurrentKey: string = "";
   sortCurrentValue: string | null = "";
   sort(e) {

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

@@ -129,7 +129,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
   }
 
   // 列表排序
-  sortCurrent = {};
+  sortCurrent:any = {};
   sortCurrentKey: string = "";
   sortCurrentValue: string | null = "";
   sort(e) {

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

@@ -129,7 +129,7 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
   }
 
   // 列表排序
-  sortCurrent = {};
+  sortCurrent:any = {};
   sortCurrentKey: string = "";
   sortCurrentValue: string | null = "";
   sort(e) {

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

@@ -129,7 +129,7 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
   }
 
   // 列表排序
-  sortCurrent = {};
+  sortCurrent:any = {};
   sortCurrentKey: string = "";
   sortCurrentValue: string | null = "";
   sort(e) {

src/app/views/new-statistics/maintenance-statistics/group-statistics/group-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,18 +13,17 @@
     <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 || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO">
   <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>
@@ -50,7 +38,7 @@
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
-      <td>{{ data.startDate }}</td>
+      <td>{{ data.groupName }}</td>
       <td>{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
       <td>{{ data.avgResolvedTime }}</td>
@@ -66,7 +54,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.groupName }}</td>
         <td style="width: 9%">{{ data.sum }}</td>
         <td style="width: 9%">{{ data.avgResponseTime }}</td>
         <td style="width: 9%">{{ data.avgResolvedTime }}</td>

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

@@ -1,5 +1,3 @@
-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";
@@ -23,15 +21,7 @@ export class GroupStatisticsComponent 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.search();
   }
@@ -50,7 +40,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
   }
 
   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 +92,21 @@ export class GroupStatisticsComponent 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,
+      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", "repairGroup", postData)
       .subscribe((result) => {
         this.loading1 = false;
         this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
@@ -129,7 +116,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
   }
 
   // 列表排序
-  sortCurrent = {};
+  sortCurrent:any = {};
   sortCurrentKey: string = "";
   sortCurrentValue: string | null = "";
   sort(e) {
@@ -166,23 +153,20 @@ export class GroupStatisticsComponent 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,
+      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", "repairGroup", postData)
       .subscribe((data) => {
         this.message.remove(this.excelExportLoading);
         this.excelExportLoading = false;
@@ -210,52 +194,17 @@ export class GroupStatisticsComponent 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 = {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: {categoryId: undefined, buildingId: undefined, floorId: undefined},
+    config: {category123: true, buildingAndFloor: true},
   }
   showSearchMore:boolean = false;
   showMore(){
@@ -274,5 +223,3 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
     this.onResize();
   }
 }
-
-

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

@@ -8,13 +8,13 @@
     <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>
+        <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">

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

@@ -102,17 +102,17 @@ export class IncidentStatisticsComponent 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,
+      repairDeptId: this.repairDeptId || undefined,
+      groupId: this.fieldConfig.fields.groupId || undefined,
+      userId: this.fieldConfig.fields.userId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || undefined,
+      sourceId: this.fieldConfig.fields.sourceId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
     };
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
@@ -129,7 +129,7 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
   }
 
   // 列表排序
-  sortCurrent = {};
+  sortCurrent:any = {};
   sortCurrentKey: string = "";
   sortCurrentValue: string | null = "";
   sort(e) {
@@ -166,17 +166,17 @@ export class IncidentStatisticsComponent 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,
+      repairDeptId: this.repairDeptId || undefined,
+      groupId: this.fieldConfig.fields.groupId || undefined,
+      userId: this.fieldConfig.fields.userId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || undefined,
+      sourceId: this.fieldConfig.fields.sourceId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`

src/app/views/new-statistics/maintenance-statistics/tripartite-company-statistics/tripartite-company-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,18 +13,17 @@
     <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 || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO">
   <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>
@@ -50,7 +38,7 @@
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
-      <td>{{ data.startDate }}</td>
+      <td>{{ data.groupName }}</td>
       <td>{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
       <td>{{ data.avgResolvedTime }}</td>
@@ -66,7 +54,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.groupName }}</td>
         <td style="width: 9%">{{ data.sum }}</td>
         <td style="width: 9%">{{ data.avgResponseTime }}</td>
         <td style="width: 9%">{{ data.avgResolvedTime }}</td>

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

@@ -1,5 +1,3 @@
-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";
@@ -23,15 +21,7 @@ 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.search();
   }
@@ -50,7 +40,7 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
   }
 
   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 +92,21 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
     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,
+      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", "tripartiteCompany", postData)
       .subscribe((result) => {
         this.loading1 = false;
         this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
@@ -129,7 +116,7 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
   }
 
   // 列表排序
-  sortCurrent = {};
+  sortCurrent:any = {};
   sortCurrentKey: string = "";
   sortCurrentValue: string | null = "";
   sort(e) {
@@ -166,23 +153,20 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
       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,
+      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", "tripartiteCompany", postData)
       .subscribe((data) => {
         this.message.remove(this.excelExportLoading);
         this.excelExportLoading = false;
@@ -210,52 +194,17 @@ 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 = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: 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: {
-        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, buildingId: undefined, floorId: undefined},
+    config: {category123: true, buildingAndFloor: true},
   }
   showSearchMore:boolean = false;
   showMore(){
@@ -274,5 +223,3 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
     this.onResize();
   }
 }
-
-

src/app/views/new-statistics/maintenance-statistics/user-statistics/user-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)="changeGroupInp($event)" nzAllowClear nzPlaceHolder="请选择维修分组" [(ngModel)]="groupId" (nzOpenChange)="openChangeGroup($event)">
+        <ng-container *ngFor="let option of groupList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.groupName" [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,18 +24,17 @@
     <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.buildingDTO || fieldConfig.fields.floorDTO || 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>
+  <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>
@@ -50,7 +49,7 @@
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
-      <td>{{ data.startDate }}</td>
+      <td>{{ data.userName }}({{ data.userAccount }})</td>
       <td>{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
       <td>{{ data.avgResolvedTime }}</td>
@@ -66,7 +65,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.userName }}({{ data.userAccount }})</td>
         <td style="width: 9%">{{ data.sum }}</td>
         <td style="width: 9%">{{ data.avgResponseTime }}</td>
         <td style="width: 9%">{{ data.avgResolvedTime }}</td>

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

@@ -23,7 +23,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
   pageSize: number = 30; //表格每页展示条数
   listLength: number = 0; //表格总数据量
 
-  repairDeptId;//报修科室id
+  groupId;//维修分组id
 
   searchTimerSubject = new Subject();
 
@@ -50,7 +50,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
   }
 
   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.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO;
     return flag ? 21 : 0;
   }
 
@@ -102,24 +102,22 @@ export class UserStatisticsComponent 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.groupId || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || undefined,
+      placeId: this.fieldConfig.fields.buildingId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || undefined,
     };
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
     }
     this.loading1 = true;
     this.mainService
-      .postCustom("itsm/report", "incidentWorkOrder", postData)
+      .postCustom("itsm/report", "repairUser", postData)
       .subscribe((result) => {
         this.loading1 = false;
         this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
@@ -129,7 +127,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
   }
 
   // 列表排序
-  sortCurrent = {};
+  sortCurrent:any = {};
   sortCurrentKey: string = "";
   sortCurrentValue: string | null = "";
   sort(e) {
@@ -166,23 +164,21 @@ export class UserStatisticsComponent 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.groupId || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || undefined,
+      placeId: this.fieldConfig.fields.buildingId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || 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", "repairUser", postData)
       .subscribe((data) => {
         this.message.remove(this.excelExportLoading);
         this.excelExportLoading = false;
@@ -210,14 +206,14 @@ export class UserStatisticsComponent 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.groupId = undefined;
+    this.fieldConfig.fields = {buildingId: undefined, floorId: undefined, categoryId: undefined};
     this.search();
   }
 
-  // 科室搜索
-  changeRepairDeptInp(e) {
-    this.searchTimer(this.getRepairDeptList, e);
+  // 维修分组搜索
+  changeGroupInp(e) {
+    this.searchTimer(this.getGroupList, e);
   }
 
   // 防抖
@@ -227,35 +223,35 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
     this.searchTimerSubject.next([fun, e]);
   }
 
-  openChangeRepairDept(flag){
-    flag && this.getRepairDeptList();
+  openChangeGroup(flag){
+    flag && this.getGroupList();
   }
 
-  // 获取报修科室列表
-  repairDeptList:any[] = [];
-  getRepairDeptList(keyword?) {
+  // 获取维修分组列表
+  groupList:any[] = [];
+  getGroupList(keyword?) {
     let data = {
-      department: {
-        cascadeHosId: this.getHosId,
-        dept: keyword,
-        searchType: 1,
+      group2: {
+        hospitals: this.getHosId,
+        groupName: keyword,
+        type: 3,
       },
       idx: 0,
       sum: 20,
     };
     this.isLoading = true;
     this.mainService
-      .getFetchDataList("data", "department", data)
+      .getFetchDataList("data", "group2", data)
       .subscribe((data) => {
         this.isLoading = false;
-        this.repairDeptList = data.list;
+        this.groupList = data.list;
       });
   }
 
   // 详细搜索
   fieldConfig:any = {
-    fields: {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined},
-    config: {groupAndUser: true, category123: true, source: true},
+    fields: {buildingId: undefined, floorId: undefined, categoryId: undefined},
+    config: {buildingAndFloor: true, category123: true},
   }
   showSearchMore:boolean = false;
   showMore(){
@@ -274,5 +270,3 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
     this.onResize();
   }
 }
-
-