优化展示

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

@@ -68,7 +68,8 @@
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -71,7 +71,8 @@
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -48,7 +48,8 @@
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -91,7 +91,8 @@
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -120,6 +120,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
       categoryId: this.category2Id || this.category1Id || undefined,
+      hierarchy: this.category2Id ? 2 : (this.category1Id ? 1 : undefined),
       groupId: this.fieldConfig.fields.groupId || undefined,
       userId: this.fieldConfig.fields.userId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
@@ -186,6 +187,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
       categoryId: this.category2Id || this.category1Id || undefined,
+      hierarchy: this.category2Id ? 2 : (this.category1Id ? 1 : undefined),
       groupId: this.fieldConfig.fields.groupId || undefined,
       userId: this.fieldConfig.fields.userId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,

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

@@ -81,7 +81,8 @@
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -119,6 +119,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
       categoryId: this.category1Id || undefined,
+      hierarchy: this.category1Id ? 1 : undefined,
       groupId: this.fieldConfig.fields.groupId || undefined,
       userId: this.fieldConfig.fields.userId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
@@ -185,6 +186,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
       categoryId: this.category1Id || undefined,
+      hierarchy: this.category1Id ? 1 : undefined,
       groupId: this.fieldConfig.fields.groupId || undefined,
       userId: this.fieldConfig.fields.userId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,

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

@@ -63,7 +63,8 @@
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -80,7 +80,8 @@
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -83,7 +83,8 @@
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -68,7 +68,8 @@
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -79,7 +79,8 @@
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -70,7 +70,8 @@
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -82,7 +82,8 @@
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -81,7 +81,8 @@
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -81,7 +81,8 @@
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->

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

@@ -63,7 +63,8 @@
   </ng-template>
 </nz-table>
 <div class="pagination">
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
 </div>
 
 <!-- 详细搜索 -->