中南优化

src/app/share/excel-export/excel-export.component.html

@@ -17,6 +17,7 @@
         <nz-radio-group [(ngModel)]="isNumOrIntegral">
           <label nz-radio nzValue="byOrderNum">按工单数量排序</label>
           <label nz-radio nzValue="byIntegral">按积分排序</label>
+          <label nz-radio nzValue="buildingAndInspectMode">人员工单积分信息</label>
         </nz-radio-group>
       </div>
     </div>

src/app/share/excel-export/excel-export.component.less

@@ -52,7 +52,7 @@
   // 新增
   &.add {
     .modalBody {
-      width: 330px;
+      width: 480px;
       height: auto;
 
       .content {

src/app/views/worker-statistics-detail/worker-statistics-detail.component.html

@@ -12,26 +12,24 @@
       <thead>
         <tr class="thead">
           <th nzWidth="5%">序号</th>
-          <th nzWidth="10%">工单单号</th>
-          <th nzWidth="15%">申请科室</th>
-          <th nzWidth="10%">工单类型</th>
-          <th nzWidth="15%">任务类型</th>
+          <th nzWidth="15%">工单单号<br>申请科室</th>
+          <th nzWidth="15%">工单类型<br>任务类型</th>
           <th nzWidth="10%">发起时间</th>
           <th nzWidth="10%">执行时长</th>
+          <th nzWidth="15%">楼栋分<br>陪检方式分</th>
           <th nzWidth="5%">积分</th>
           <th nzWidth="10%">是否特殊关闭</th>
-          <th nzWidth="10%">操作</th>
+          <th nzWidth="15%">操作</th>
         </tr>
       </thead>
       <tbody>
         <tr *ngFor="let data of listOfData;let index=index;">
           <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
-          <td>{{ data.gdcode }}</td>
-          <td>{{ data.createDeptDTO?data.createDeptDTO.dept:'' }}</td>
-          <td>{{ data.taskType.associationType.name }}</td>
-          <td>{{ data.taskType.taskName }}</td>
+          <td>{{ data.gdcode }}<br>{{ data.createDeptDTO?data.createDeptDTO.dept:'' }}</td>
+          <td>{{ data.taskType.associationType.name }}<br>{{ data.taskType.taskName }}</td>
           <td>{{data.startTime|date:'yyyy-MM-dd HH:mm'}}</td>
           <td>{{ data.showTimeNum }}</td>
+          <td>{{ data.grade?data.grade.buildingGrade:'' }}<br>{{ data.grade?data.grade.inspectModeGrade:'' }}</td>
           <td>{{data.grade?data.grade.gradeTotal:'-'}}</td>
           <td>{{data.specialCloseReason?'是':'否'}}</td>
           <td>

src/app/views/worker-statistics-detail/worker-statistics-detail.component.less

@@ -15,7 +15,7 @@
 
 .detail {
   width: 1200px;
-  height: 580px;
+  height: 620px;
   border-radius: 5px;
   background: #fff;
   color: #333;

src/app/views/worker-statistics/worker-statistics.component.html

@@ -68,15 +68,17 @@
         <thead>
           <tr class="thead">
             <th nzWidth="5%">序号</th>
-            <th nzWidth="10%">姓名</th>
-            <th nzWidth="10%">工单总数</th>
-            <th nzWidth="10%">五分钟内工单</th>
-            <th nzWidth="10%">特殊关闭数</th>
-            <th nzWidth="10%">平均到达时长</th>
-            <th nzWidth="10%">平均完成时长</th>
-            <th nzWidth="15%">按时完成达标率</th>
-            <th nzWidth="10%">总积分</th>
-            <th nzWidth="10%">操作</th>
+            <th nzWidth="8%">姓名</th>
+            <th nzWidth="8%">工单总数</th>
+            <th nzWidth="16%">五分钟内工单<br>特殊关闭数</th>
+            <!-- <th nzWidth="8%"></th> -->
+            <th nzWidth="16%">平均到达时长<br>平均完成时长</th>
+            <!-- <th nzWidth="8%"></th> -->
+            <th nzWidth="8%">按时完成达标率</th>
+            <th nzWidth="8%">楼栋分<br>陪检方式分</th>
+            <!-- <th nzWidth="8%"></th> -->
+            <th nzWidth="16%">总积分</th>
+            <th nzWidth="15%">操作</th>
           </tr>
         </thead>
         <tbody>
@@ -84,11 +86,10 @@
             <td>{{ index + (pageIndex - 1) * 10 + 1 }}</td>
             <td>{{ data.name }}</td>
             <td>{{ data.total || 0 }}</td>
-            <td>{{ data.fiveTimeNum || 0 }}</td>
-            <td>{{ data.specialCloseNum }}</td>
-            <td>{{ data.arriveTime }}</td>
-            <td>{{ data.completeTime }}</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>
               <div class="coop">

src/app/views/worker-statistics/worker-statistics.component.ts

@@ -131,6 +131,10 @@ export class WorkerStatisticsComponent implements OnInit {
         //按积分排序
         postData.byIntegral = "true";
         break;
+      case "buildingAndInspectMode":
+        //人员工单积分信息
+        postData.buildingAndInspectMode = "true";
+        break;
     }
     this.loading2 = true;
     this.mainService.exportReport("user", postData).subscribe(

src/main.ts

@@ -8,7 +8,7 @@ if (environment.production) {
   enableProdMode();
   if (window) {
     window.console.log = function () { };
-    console.info('v2.4.23');
+    console.info('v2.4.24');
   }
 }
 platformBrowserDynamic().bootstrapModule(AppModule)