优化

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

@@ -15,35 +15,35 @@
 <nz-table [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="10%">时间</th>
-      <th nzWidth="9%">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="byOrderNum" [(nzSort)]="sortCurrent.byOrderNum">平均响应时间</th>
-      <th nzWidth="9%">平均解决时间</th>
-      <th nzWidth="9%">超时单数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="completionRate" [(nzSort)]="sortCurrent.completionRate">挂起单数</th>
-      <th nzWidth="9%">耗材费用(元)</th>
-      <th nzWidth="9%">工时费用(元)</th>
-      <th nzWidth="9%">总费用(元)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="byIntegral" [(nzSort)]="sortCurrent.byIntegral">差评单数</th>
-      <th nzWidth="9%">好评率</th>
+      <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>
     </tr>
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData; let index = index">
-      <td>{{ index + (pageIndex - 1) * 10 + 1 }}</td>
-      <td>{{ data.name }}</td>
-      <td>{{ data.total || 0 }}</td>
-      <td>{{ data.total || 0 }}</td>
-      <td>{{ data.total || 0 }}</td>
-      <td>{{ data.fiveTimeNum || 0 }}<br>{{ data.specialCloseNum }}</td>
-      <td>{{ data.arriveTime }}<br>{{ data.completeTime }}</td>
-      <td>{{ data.avePer + "%" }}</td>
-      <td>{{ data.buildingGrade }}<br>{{ data.inspectModeGrade }}</td>
-      <td>{{ data.order || 0 }}</td>
-      <td>{{ data.order || 0 }}</td>
+      <td>{{ data.startDate }}</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>
     </tr>
   </tbody>
 </nz-table>
 <div>
   <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
-</div>
+</div>

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

@@ -27,9 +27,10 @@ export class IncidentStatisticsComponent implements OnInit {
   dutyId:any;
   parentDutyId:any;
   initSessionData(){
-    let queryType:any = sessionStorage.getItem('maintenance_statistics_queryType');
-    let hosId:any = sessionStorage.getItem('maintenance_statistics_hospitalId');
-    let dutyId:any = sessionStorage.getItem('maintenance_statistics_dutyId');
+    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;
@@ -71,7 +72,7 @@ export class IncidentStatisticsComponent implements OnInit {
       parentDutyId: this.parentDutyId,
     };
     if (field && sort) {
-      postData[field] = sort === "ascend" ? `asc` : `desc`;
+      postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
     }
     this.loading1 = true;
     this.mainService
@@ -84,11 +85,7 @@ export class IncidentStatisticsComponent implements OnInit {
   }
 
   // 列表排序
-  sortCurrent = {
-    byOrderNum: null,
-    byIntegral: null,
-		completionRate: null,
-  };
+  sortCurrent = {};
   sortCurrentKey: string = "";
   sortCurrentValue: string | null = "";
   sort(e) {

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

@@ -107,16 +107,12 @@ export class MaintenanceStatisticsComponent implements OnInit, OnDestroy {
 
   // 缓存数据
   sessionSave(){
-    sessionStorage.setItem('maintenance_statistics_queryType', this.queryType);
-    sessionStorage.setItem('maintenance_statistics_hospitalId', this.hospital ? this.hospital.id : '');
-    sessionStorage.setItem('maintenance_statistics_dutyId', this.duty ? this.duty.id : '');
+    sessionStorage.setItem('maintenanceStatistics', JSON.stringify({queryType: this.queryType, hospitalId: this.hospital ? this.hospital.id : undefined, dutyId: this.duty ? this.duty.id : undefined}))
   }
 
   // 清除缓存数据
   sessionRemove(){
-    sessionStorage.removeItem('maintenance_statistics_queryType');
-    sessionStorage.removeItem('maintenance_statistics_hospitalId');
-    sessionStorage.removeItem('maintenance_statistics_dutyId');
+    sessionStorage.removeItem('maintenanceStatistics');
   }
 
   // 查询范围