一堆统计

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,18 +13,15 @@
     <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>
@@ -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>

src/app/views/new-statistics/maintenance-statistics/building-statistics/building-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 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.search();
   }
@@ -50,7 +40,7 @@ export class BuildingStatisticsComponent 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,19 @@ 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,
     };
     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 +151,18 @@ 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,
     };
     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 +190,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 +219,3 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
     this.onResize();
   }
 }
-

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

@@ -101,7 +101,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
       userId: this.fieldConfig.fields.userId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
-      compantId: this.fieldConfig.fields.compantId || undefined,
+      companyId: this.fieldConfig.fields.companyId || undefined,
       repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
       categoryLevel: 1,
     };
@@ -166,7 +166,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
       userId: this.fieldConfig.fields.userId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
-      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,59 +13,36 @@
     <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>

src/app/views/new-statistics/maintenance-statistics/category-source-statistics/category-source-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 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.search();
   }
@@ -50,7 +40,7 @@ export class CategorySourceStatisticsComponent 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.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO;
     return flag ? 21 : 0;
   }
 
@@ -102,24 +92,23 @@ 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.groupId || undefined,
+      userId: this.fieldConfig.fields.userId || 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", "incidentSource", postData)
       .subscribe((result) => {
         this.loading1 = false;
         this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
@@ -166,23 +155,22 @@ 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.groupId || undefined,
+      userId: this.fieldConfig.fields.userId || 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", "incidentSource", postData)
       .subscribe((data) => {
         this.message.remove(this.excelExportLoading);
         this.excelExportLoading = false;
@@ -210,52 +198,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 +227,3 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
     this.onResize();
   }
 }
-
-

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

@@ -113,7 +113,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
       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,
     };
@@ -179,7 +179,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
       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,
     };

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

@@ -112,7 +112,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
       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,
     };
@@ -178,7 +178,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
       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,
     };

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,70 @@
+<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.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">
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></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,273 @@
+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,
+  ) {}
+
+  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.search();
+  }
+
+  ngAfterViewInit(){
+    this.onResize();
+  }
+
+  tableHeight:number = 0;
+  @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)
+    }, 0)
+  }
+
+  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.groupId || undefined,
+      userId: this.fieldConfig.fields.userId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || 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.groupId || undefined,
+      userId: this.fieldConfig.fields.userId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || 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();
+  }
+
+  // 防抖
+  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, 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,59 +24,57 @@
     <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>

src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/department-evaluate-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,9 @@ 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.search();
   }
@@ -50,7 +42,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
   }
 
   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 +94,24 @@ 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.groupId || undefined,
+      userId: this.fieldConfig.fields.userId || 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", "deptEvaluate", postData)
       .subscribe((result) => {
         this.loading1 = false;
         this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
@@ -166,23 +158,23 @@ 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.groupId || undefined,
+      userId: this.fieldConfig.fields.userId || 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", "deptEvaluate", postData)
       .subscribe((data) => {
         this.message.remove(this.excelExportLoading);
         this.excelExportLoading = false;
@@ -210,52 +202,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 +248,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,18 +24,19 @@
     <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>
@@ -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>

src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-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,9 @@ 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.search();
   }
@@ -50,7 +42,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
   }
 
   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 +94,24 @@ 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.groupId || undefined,
+      userId: this.fieldConfig.fields.userId || 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", "repairDept", postData)
       .subscribe((result) => {
         this.loading1 = false;
         this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
@@ -166,23 +158,23 @@ 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.groupId || undefined,
+      userId: this.fieldConfig.fields.userId || 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", "repairDept", postData)
       .subscribe((data) => {
         this.message.remove(this.excelExportLoading);
         this.excelExportLoading = false;
@@ -210,52 +202,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 +248,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,59 +24,45 @@
     <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>

src/app/views/new-statistics/maintenance-statistics/department-source-statistics/department-source-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,9 @@ 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.search();
   }
@@ -50,7 +42,7 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
   }
 
   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 +94,24 @@ 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.groupId || undefined,
+      userId: this.fieldConfig.fields.userId || 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", "deptSource", postData)
       .subscribe((result) => {
         this.loading1 = false;
         this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
@@ -166,23 +158,23 @@ 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.groupId || undefined,
+      userId: this.fieldConfig.fields.userId || 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", "deptSource", postData)
       .subscribe((data) => {
         this.message.remove(this.excelExportLoading);
         this.excelExportLoading = false;
@@ -210,52 +202,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 +248,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.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,18 +24,15 @@
     <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>
@@ -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>

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

@@ -23,7 +23,7 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
   pageSize: number = 30; //表格每页展示条数
   listLength: number = 0; //表格总数据量
 
-  repairDeptId;//报修科室id
+  buildingId;//楼栋id
 
   searchTimerSubject = new Subject();
 
@@ -50,7 +50,7 @@ export class FloorStatisticsComponent 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 +102,20 @@ 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,
     };
     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 +162,19 @@ 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,
     };
     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,16 +202,11 @@ 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 = {category123: true};
     this.search();
   }
 
-  // 科室搜索
-  changeRepairDeptInp(e) {
-    this.searchTimer(this.getRepairDeptList, e);
-  }
-
   // 防抖
   isLoading = false;
   searchTimer(fun, e) {
@@ -227,35 +214,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,
+        cascadeHosId: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 +261,3 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
     this.onResize();
   }
 }
-
-

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

@@ -40,7 +40,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
   }
 
   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;
   }
 

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

@@ -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/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.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,7 +34,7 @@
 <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>
@@ -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>

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

@@ -1,3 +1,5 @@
+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";
@@ -21,7 +23,15 @@ 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();
   }
@@ -40,7 +50,7 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
   }
 
   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,6 +107,7 @@ 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,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
@@ -158,6 +169,7 @@ 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,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
@@ -194,12 +206,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: {
+        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 = {

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

@@ -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>

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,70 @@
+<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.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">
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></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,273 @@
+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,
+  ) {}
+
+  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.search();
+  }
+
+  ngAfterViewInit(){
+    this.onResize();
+  }
+
+  tableHeight:number = 0;
+  @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)
+    }, 0)
+  }
+
+  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.groupId || undefined,
+      userId: this.fieldConfig.fields.userId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || 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.groupId || undefined,
+      userId: this.fieldConfig.fields.userId || undefined,
+      categoryId: this.fieldConfig.fields.categoryId || 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();
+  }
+
+  // 防抖
+  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, 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 { }