修改

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.4.223",
+    "target": "http://192.168.3.108",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/share/businessData-detail-modal/businessData-detail-modal.component.ts

@@ -135,72 +135,41 @@ export class BusinessDataDetailModalComponent implements OnInit {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
     }
-    let type = '';
     switch(this.dataInfo.type){
       case 'total':
-        postData.deptId = this.dataInfo.data.deptId,
-        postData.hosId = this.hosId,
-        postData.startTime = this.dataInfo.searchDto.startTime,
-        postData.endTime = this.dataInfo.searchDto.endTime,
-        type = 'inspect';
+        postData.deptId = this.dataInfo.data.deptId;
+        postData.hosId = this.hosId;
+        postData.startTime = this.dataInfo.searchDto.startTime;
+        postData.endTime = this.dataInfo.searchDto.endTime;
         break;
       case 'noCheckCount':
-        postData.deptId = this.dataInfo.data.deptId,
-        postData.hosId = this.hosId,
-        postData.startTime = this.dataInfo.searchDto.startTime,
-        postData.endTime = this.dataInfo.searchDto.endTime,
-        postData.reportInsState = 'noCheck',
-        type = 'inspect';
+        postData.deptId = this.dataInfo.data.deptId;
+        postData.hosId = this.hosId;
+        postData.startTime = this.dataInfo.searchDto.startTime;
+        postData.endTime = this.dataInfo.searchDto.endTime;
+        postData.reportInsState = 'noCheck';
         break;
       case 'checkCount':
-        postData.deptId = this.dataInfo.data.deptId,
-        postData.hosId = this.hosId,
-        postData.startTime = this.dataInfo.searchDto.startTime,
-        postData.endTime = this.dataInfo.searchDto.endTime,
-        postData.reportInsState = 'check',
-        type = 'inspect';
+        postData.deptId = this.dataInfo.data.deptId;
+        postData.hosId = this.hosId;
+        postData.startTime = this.dataInfo.searchDto.startTime;
+        postData.endTime = this.dataInfo.searchDto.endTime;
+        postData.reportInsState = 'check';
         break;
       case 'insCount':
-        postData.deptId = this.dataInfo.data.deptId,
-        postData.hosId = this.hosId,
-        postData.startTime = this.dataInfo.searchDto.startTime,
-        postData.endTime = this.dataInfo.searchDto.endTime,
-        postData.reportInsState = 'inspect',
-        type = 'inspect';
-        break;
-      case 'workOrderCount':
-        postData.workOrder =  {
-          "model": "report",
-          "createDept": this.dataInfo.data.deptId,
-          "hosId": this.hosId,
-          "timeOut": 0,
-          "taskType": {
-              "associationType": {
-                  "key": 'association_types',
-                  "value": 'inspect',
-              }
-          },
-          startTime1: this.dataInfo.searchDto.startTime,
-          endTime1: this.dataInfo.searchDto.endTime,
-        }
-        type = 'workOrder';
+        postData.deptId = this.dataInfo.data.deptId;
+        postData.hosId = this.hosId;
+        postData.startTime = this.dataInfo.searchDto.startTime;
+        postData.endTime = this.dataInfo.searchDto.endTime;
+        postData.reportInsState = 'inspect';
         break;
     }
-
     this.hsLoading = true;
-    if(type == 'inspect'){
-      this.mainService.listMsgByMain("listInspect", postData).subscribe((data: any) => {
-        this.hsLoading = false;
-        this.inspectionRateStatisticsList = data.list || [];
-        this.total = data.totalNum || 0;
-      })
-    }else{
-      this.mainService.getFetchDataList('data', type, postData).subscribe((data: any) => {
-        this.hsLoading = false;
-        this.inspectionRateStatisticsList = data.list || [];
-        this.total = data.totalNum || 0;
-      })
-    }
+    this.mainService.listMsgByMain("listInspect", postData).subscribe((data: any) => {
+      this.hsLoading = false;
+      this.inspectionRateStatisticsList = data.list || [];
+      this.total = data.totalNum || 0;
+    })
 
   }
 }

src/app/views/dept-inspection-rate-statistics/dept-inspection-rate-statistics-routing.module.ts

@@ -6,6 +6,12 @@ import { DeptInspectionRateStatisticsComponent } from './dept-inspection-rate-st
 const routes: Routes = [{
   path: '',
   component: DeptInspectionRateStatisticsComponent,
+  children: [
+    {
+      path: 'workerStatisticsDetail/:workerId/:startTime/:endTime/:groupId/:type/:deptId',//id是workid，startTime是开始时间,endTime是结束时间，groupId是组ID，type区别类型
+      loadChildren: () => import('../worker-statistics-detail/worker-statistics-detail.module').then(m => m.WorkerStatisticsDetailModule)
+    }
+  ]
 }];
 
 @NgModule({

src/app/views/dept-inspection-rate-statistics/dept-inspection-rate-statistics.component.html

@@ -3,7 +3,7 @@
     <div class="list-template__top" nz-row>
       <div nz-col nzXl='17' class="list-template__searchBox">
         <div class="list-template__searchItem">
-          <span class="label">操作时间</span>：
+          <span class="label">申请时间</span>：
           <nz-range-picker [(ngModel)]="searchDto.dateRange"></nz-range-picker>
         </div>
       </div>
@@ -36,7 +36,7 @@
             <td class="tab_hover" (click)="viewDetail({ data: data, searchDto: searchDto, type: 'checkCount' }, 'deptInspectionRateStatistics')">{{ data.checkCount }}</td>
             <td class="tab_hover" (click)="viewDetail({ data: data, searchDto: searchDto, type: 'insCount' }, 'deptInspectionRateStatistics')">{{ data.insCount }}</td>
             <td>{{ data.inspectRate }}%</td>
-            <td class="tab_hover" (click)="viewDetail({ data: data, searchDto: searchDto, type: 'workOrderCount' }, 'deptInspectionRateStatistics')">{{ data.workOrderCount }}</td>
+            <td class="tab_hover" (click)="personDetail({ data: data, searchDto: searchDto})">{{ data.workOrderCount }}</td>
           </tr>
         </tbody>
       </nz-table>
@@ -48,6 +48,8 @@
     </div>
   </div>
 </div>
+<!-- 查看详情 -->
+<router-outlet></router-outlet>
 
 <!-- 业务数据查看 -->
 <app-businessData-detail-modal

src/app/views/dept-inspection-rate-statistics/dept-inspection-rate-statistics.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, ViewChild } from "@angular/core";
-import { ActivatedRoute } from "@angular/router";
+import { ActivatedRoute, Router } from "@angular/router";
 
 import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
 import { ToolService } from "../../services/tool.service";
@@ -18,6 +18,7 @@ export class DeptInspectionRateStatisticsComponent implements OnInit {
   })
   osComponentRef1: OverlayScrollbarsComponent;
   constructor(
+    private router: Router,
     private route: ActivatedRoute,
     private tool: ToolService,
     private deptInspectionRateStatisticsService: DeptInspectionRateStatisticsService,
@@ -88,5 +89,14 @@ export class DeptInspectionRateStatisticsComponent implements OnInit {
   closeModelBlood(e) {
     this.businessDataModalShow = JSON.parse(e).show;
   }
+
+  personDetail(dataInfo){
+    let startDate = dataInfo.searchDto.startTime || 'null';
+    let endDate = dataInfo.searchDto.endDate || 'null';
+    let deptId = dataInfo.data.deptId || 'null';
+    this.router.navigateByUrl(
+      `/main/deptInspectionRateStatistics/workerStatisticsDetail/null/${startDate}/${endDate}/null/deptInspectionRateStatistics/${deptId}`
+    );
+  }
 }
 

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

@@ -15,7 +15,7 @@
           <th nzWidth="15%">工单单号<br>申请科室</th>
           <th nzWidth="15%">工单类型<br>任务类型</th>
           <th nzWidth="10%">发起时间</th>
-          <th nzWidth="10%">执行时长</th>
+          <th nzWidth="10%">执行时长<br>执行人</th>
           <th nzWidth="15%">楼栋分<br>陪检方式分</th>
           <th nzWidth="5%">积分</th>
           <th nzWidth="10%">是否特殊关闭</th>
@@ -28,7 +28,7 @@
           <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.showTimeNum }}<br>{{ data.worker?data.worker.name:'' }}</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>

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

@@ -16,6 +16,8 @@ export class WorkerStatisticsDetailComponent implements OnInit {
   startTime; //当前开始时间
   endTime; //当前结束时间
   groupId; //当前组ID
+  type; //区别跳转页面类型
+  deptId; //当前科室
   listOfData = []; //获取选中配送人员的工单列表
   pageIndex: number = 1; //页码
   listLength: number = 0; //总数据条目数
@@ -35,12 +37,11 @@ export class WorkerStatisticsDetailComponent implements OnInit {
     this.startTime = this.route.snapshot.params.startTime;
     this.endTime = this.route.snapshot.params.endTime;
     this.groupId = this.route.snapshot.params.groupId;
+    this.type = this.route.snapshot.params.type;
+    this.deptId = this.route.snapshot.params.deptId;
     this.getOrdersByPerson(this.hosId, this.currentPersonId);
   }
-  // resetPageSize(hosId, currentPersonId){
-  //   this.pageIndex = 1;
-  //   this.getOrdersByPerson(hosId, currentPersonId);
-  // }
+
   // 是否剖执行时长五分钟以内工单
   changeIsFiveOrder(e: boolean) {
     this.isFiveOrder = e;
@@ -60,15 +61,21 @@ export class WorkerStatisticsDetailComponent implements OnInit {
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
-      startTime: this.startTime,
-      endTime: this.endTime,
+      startTime: this.startTime === 'null' ? undefined : this.startTime,
+      endTime: this.endTime === 'null' ? undefined : this.endTime,
       hosId,
-      groupId: this.groupId == "null" ? "" : this.groupId,
-      worker: currentPersonId,
     };
     if(this.isFiveOrder){
       postData.difLong = true;
     }
+    if(this.type === 'workerStatistics'){
+      postData.groupId = this.groupId === 'null' ? undefined : this.groupId;
+      postData.worker = currentPersonId;
+    }else if(this.type === 'deptInspectionRateStatistics'){
+      postData.deptId = this.deptId === 'null' ? undefined : this.deptId;
+      postData.key = "association_types";
+      postData.value = "inspect";
+    }
     this.mainService.postCustom("report", "userDetails", postData).subscribe(
       (result) => {
         this.loading1 = false;
@@ -88,11 +95,11 @@ export class WorkerStatisticsDetailComponent implements OnInit {
   //查看积分详情
   integralDetail(obj) {
     this.router.navigateByUrl(
-      `/main/workerStatistics/workerStatisticsDetail/${this.currentPersonId}/${this.startTime}/${this.endTime}/${this.groupId}/orderDetail/${obj.id}/3`
+      `/main/${this.type}/workerStatisticsDetail/${this.currentPersonId}/${this.startTime}/${this.endTime}/${this.groupId}/${this.type}/${this.deptId}/orderDetail/${obj.id}/3`
     );
   }
   //关闭
   close() {
-    this.router.navigateByUrl("/main/workerStatistics");
+    this.router.navigateByUrl(`/main/${this.type}`);
   }
 }

src/app/views/worker-statistics/worker-statistics-routing.module.ts

@@ -9,7 +9,7 @@ const routes: Routes = [
     component: WorkerStatisticsComponent,
     children: [
       {
-        path: 'workerStatisticsDetail/:workerId/:startTime/:endTime/:groupId',//id是workid，startTime是开始时间,endTime是结束时间，groupId是组ID
+        path: 'workerStatisticsDetail/:workerId/:startTime/:endTime/:groupId/:type/:deptId',//id是workid，startTime是开始时间,endTime是结束时间，groupId是组ID，type是类型
         loadChildren: () => import('../worker-statistics-detail/worker-statistics-detail.module').then(m => m.WorkerStatisticsDetailModule)
       }
     ]

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

@@ -319,7 +319,7 @@ export class WorkerStatisticsComponent implements OnInit {
     let endDate = this.endDate + " " + "23:59:59";
     let group = this.group || "null";
     this.router.navigateByUrl(
-      `/main/workerStatistics/workerStatisticsDetail/${workerId}/${startDate}/${endDate}/${group}`
+      `/main/workerStatistics/workerStatisticsDetail/${workerId}/${startDate}/${endDate}/${group}/workerStatistics/null`
     );
   }
 }