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

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

@@ -38,7 +38,7 @@
   <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="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>

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

@@ -38,7 +38,7 @@
   <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="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>