支助人员统计导出修改

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

@@ -0,0 +1,42 @@
+<div
+  class="save add display_flex align-items_center justify-content_flex-center"
+  *ngIf="isShow"
+>
+  <div class="modalBody">
+    <div class="title">
+      选择导出方式<i
+        class="icon_transport transport-guanbi"
+        (click)="hideModal()"
+      ></i>
+    </div>
+    <div class="content">
+      <div>
+        <label nz-checkbox [(ngModel)]="isGroup">是否按组导出</label>
+      </div>
+      <div class="isNumOrIntegral">
+        <nz-radio-group [(ngModel)]="isNumOrIntegral">
+          <label nz-radio nzValue="A">按工单数量排序</label>
+          <label nz-radio nzValue="B">按积分排序</label>
+        </nz-radio-group>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button
+        nzType="primary"
+        nz-button
+        (click)="submitForm()"
+        [nzLoading]="loading"
+      >
+        确认导出
+      </button>
+      <button
+        class="btn cancel"
+        nz-button
+        nzType="default"
+        (click)="hideModal()"
+      >
+        取消
+      </button>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,74 @@
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+  .modalBody {
+    width: 350px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 100%;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 330px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px 0 14px;
+        max-height: 500px;
+        overflow-y: auto;
+        .isNumOrIntegral {
+          margin: 24px 0;
+        }
+      }
+
+      button:nth-child(1) {
+        margin-right: 20px;
+      }
+    }
+  }
+}

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

@@ -0,0 +1,29 @@
+import { Component, OnInit, Output, Input } from "@angular/core";
+import { EventEmitter } from "@angular/core";
+
+@Component({
+  selector: "app-excel-export",
+  templateUrl: "./excel-export.component.html",
+  styleUrls: ["./excel-export.component.less"],
+})
+export class ExcelExportComponent implements OnInit {
+  @Output() submitFormHand = new EventEmitter();
+  @Output() hideFormHand = new EventEmitter();
+  @Input() isShow: boolean = false; //模态框
+  @Input() loading: boolean = false; //确定按钮的loading
+  deptList = []; //护理单元科室列表
+  isGroup = false; //是否按组导出
+  isNumOrIntegral = "A";
+  constructor() {}
+
+  ngOnInit() {}
+  // 隐藏模态框
+  hideModal() {
+    this.hideFormHand.emit();
+  }
+  // 表单提交
+  submitForm(): void {
+    this.submitFormHand.emit({isGroup:this.isGroup,isNumOrIntegral:this.isNumOrIntegral});
+    this.hideModal();
+  }
+}

src/app/share/share.module.ts

@@ -28,6 +28,7 @@ import { CollapseComponent } from './collapse/collapse.component';
 import { CollapsePanelComponent } from './collapse-panel/collapse-panel.component';
 import { HtmlTransformPipe } from '../pipes/html-transform.pipe';
 import { BxPromptModalComponent } from './bx-prompt-modal/bx-prompt-modal.component';
+import { ExcelExportComponent } from './excel-export/excel-export.component';
 
 @NgModule({
   declarations: [
@@ -54,6 +55,7 @@ import { BxPromptModalComponent } from './bx-prompt-modal/bx-prompt-modal.compon
     CollapseComponent,
     CollapsePanelComponent,
     HtmlTransformPipe,
+    ExcelExportComponent,
   ],
   imports: [
     CommonModule,
@@ -95,6 +97,7 @@ import { BxPromptModalComponent } from './bx-prompt-modal/bx-prompt-modal.compon
     CollapseComponent,
     CollapsePanelComponent,
     HtmlTransformPipe,
+    ExcelExportComponent,
   ]
 })
 export class ShareModule { }

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

@@ -1,6 +1,9 @@
 <div class="detail">
   <div class="title">
-    工单详情
+    <div>
+      工单详情
+      <label class="isFiveOrder" nz-checkbox [ngModel]="isFiveOrder" (ngModelChange)="changeIsFiveOrder($event)">执行时长五分钟以内工单</label>
+    </div>
     <i class="icon_transport transport-guanbi" (click)="close()"></i>
   </div>
   <div class="box">

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

@@ -24,6 +24,10 @@
   position: relative;
   padding-bottom: 70px;
 
+  .isFiveOrder{
+    margin-left: 24px;
+  }
+
   .title {
     font-size: 18px;
     text-align: center;

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

@@ -1,26 +1,33 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { NzMessageService } from 'ng-zorro-antd';
-import { MainService } from 'src/app/services/main.service';
-import { ToolService } from 'src/app/services/tool.service';
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { NzMessageService } from "ng-zorro-antd";
+import { MainService } from "src/app/services/main.service";
+import { ToolService } from "src/app/services/tool.service";
 
 @Component({
-  selector: 'app-worker-statistics-detail',
-  templateUrl: './worker-statistics-detail.component.html',
-  styleUrls: ['./worker-statistics-detail.component.less'],
+  selector: "app-worker-statistics-detail",
+  templateUrl: "./worker-statistics-detail.component.html",
+  styleUrls: ["./worker-statistics-detail.component.less"],
 })
 export class WorkerStatisticsDetailComponent implements OnInit {
-  loading1 = false;//获取选中支助人员的工单列表loading
-  hosId;//当前院区id
-  currentPersonId;//当前支助人员id
-  startTime;//当前开始时间
-  endTime;//当前结束时间
-  groupId;//当前组ID
-  listOfData = [];//获取选中支助人员的工单列表
-  pageIndex: number = 1;//页码
-  listLength: number = 0;//总数据条目数
-  pageSize: number = 10;//每页条数
-  constructor(private mainService: MainService, private tool: ToolService, private message: NzMessageService, private route: ActivatedRoute, private router: Router) { }
+  loading1 = false; //获取选中支助人员的工单列表loading
+  hosId; //当前院区id
+  currentPersonId; //当前支助人员id
+  startTime; //当前开始时间
+  endTime; //当前结束时间
+  groupId; //当前组ID
+  listOfData = []; //获取选中支助人员的工单列表
+  pageIndex: number = 1; //页码
+  listLength: number = 0; //总数据条目数
+  pageSize: number = 10; //每页条数
+  isFiveOrder: boolean = false; //是否执行时长五分钟以内工单
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private router: Router
+  ) {}
 
   ngOnInit() {
     this.hosId = this.tool.getCurrentHospital().id;
@@ -30,37 +37,57 @@ export class WorkerStatisticsDetailComponent implements OnInit {
     this.groupId = this.route.snapshot.params.groupId;
     this.getOrdersByPerson(this.hosId, this.currentPersonId);
   }
+  // 是否剖执行时长五分钟以内工单
+  changeIsFiveOrder(e: boolean) {
+    if (e) {
+      this.getOrdersByPerson(this.hosId, this.currentPersonId, e);
+    } else {
+      this.getOrdersByPerson(this.hosId, this.currentPersonId);
+    }
+  }
   //获取选中支助人员的工单列表
-  getOrdersByPerson(hosId: number, currentPersonId: number) {
+  getOrdersByPerson(
+    hosId: number,
+    currentPersonId: number,
+    isFiveOrder: boolean = false
+  ) {
     this.loading1 = true;
-    let postData = {
+    let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
       startTime: this.startTime,
       endTime: this.endTime,
       hosId,
-      groupId: this.groupId == 'null' ? '' : this.groupId,
+      groupId: this.groupId == "null" ? "" : this.groupId,
       worker: currentPersonId,
+    };
+    if(isFiveOrder){
+      postData.difLong = true;
     }
-    this.mainService.postCustom('report', 'userDetails', postData).subscribe(result => {
-      this.loading1 = false;
-      if (result.status == 200) {
-        this.listOfData = result.list;
-        this.listLength = result.totalNum;
-      } else {
-        this.message.error('获取数据失败');
+    this.mainService.postCustom("report", "userDetails", postData).subscribe(
+      (result) => {
+        this.loading1 = false;
+        if (result.status == 200) {
+          this.listOfData = result.list;
+          this.listLength = result.totalNum;
+        } else {
+          this.message.error("获取数据失败");
+        }
+      },
+      (err) => {
+        this.loading1 = false;
+        this.message.error("获取数据失败");
       }
-    }, err => {
-      this.loading1 = false;
-      this.message.error('获取数据失败');
-    })
+    );
   }
   //查看积分详情
   integralDetail(obj) {
-    this.router.navigateByUrl(`/main/workerStatistics/workerStatisticsDetail/${this.currentPersonId}/${this.startTime}/${this.endTime}/${this.groupId}/orderDetail/${obj.id}/3`);
+    this.router.navigateByUrl(
+      `/main/workerStatistics/workerStatisticsDetail/${this.currentPersonId}/${this.startTime}/${this.endTime}/${this.groupId}/orderDetail/${obj.id}/3`
+    );
   }
   //关闭
   close() {
-    this.router.navigateByUrl('/main/workerStatistics');
+    this.router.navigateByUrl("/main/workerStatistics");
   }
 }

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

@@ -1,81 +1,136 @@
 <div class="list-template">
   <div class="list-template__content">
     <div class="list-template__top" nz-row>
-      <div nz-col nzXl='18' class="list-template__searchBox">
+      <div nz-col nzXl="18" class="list-template__searchBox">
         <div class="list-template__searchItem">
           <span class="label">发起时间</span>：
-          <nz-range-picker [(ngModel)]="dateRange" [nzAllowClear]='false' (ngModelChange)="changeDate($event)">
+          <nz-range-picker
+            [(ngModel)]="dateRange"
+            [nzAllowClear]="false"
+            (ngModelChange)="changeDate($event)"
+          >
           </nz-range-picker>
           <br />
         </div>
         <div class="list-template__searchItem ml8">
-          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false" nzPlaceHolder="请选择时间"
-            [(ngModel)]="defRange" (ngModelChange)="changeDateRange($event)">
-            <nz-option nzLabel="{{data.label}}" nzValue="{{data.id}}" *ngFor="let data of defRanges"></nz-option>
+          <nz-select
+            class="formItem"
+            [nzDropdownMatchSelectWidth]="false"
+            [nzShowSearch]="false"
+            nzPlaceHolder="请选择时间"
+            [(ngModel)]="defRange"
+            (ngModelChange)="changeDateRange($event)"
+          >
+            <nz-option
+              nzLabel="{{ data.label }}"
+              nzValue="{{ data.id }}"
+              *ngFor="let data of defRanges"
+            ></nz-option>
           </nz-select>
         </div>
         <div class="list-template__searchItem">
           <span class="label">分组</span>：
-          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false" nzPlaceHolder="请选择分组"
-            [ngModel]="group" (ngModelChange)="searchGroup($event)">
+          <nz-select
+            class="formItem"
+            [nzDropdownMatchSelectWidth]="false"
+            [nzShowSearch]="false"
+            nzPlaceHolder="请选择分组"
+            [ngModel]="group"
+            (ngModelChange)="searchGroup($event)"
+          >
             <nz-option nzLabel="全部" [nzValue]="0"></nz-option>
-            <nz-option nzLabel="{{data.groupName}}" nzValue="{{data.id}}" *ngFor="let data of groupList"></nz-option>
+            <nz-option
+              nzLabel="{{ data.groupName }}"
+              nzValue="{{ data.id }}"
+              *ngFor="let data of groupList"
+            ></nz-option>
           </nz-select>
         </div>
       </div>
-      <div nz-col nzXl='6' class="list-template__btns">
-        <button nz-button class="btn default" (click)='search(1)'>搜索</button>
-        <button nz-button class="btn default ml8" (click)='export()' [nzLoading]="loading2">导出</button>
-        <button nz-button class="btn default ml8" (click)='reset()'>重置</button>
+      <div nz-col nzXl="6" class="list-template__btns">
+        <button nz-button class="btn default" (click)="search(1)">搜索</button>
+        <button nz-button class="btn default ml8" (click)="excelExport()">
+          导出
+        </button>
+        <button nz-button class="btn default ml8" (click)="reset()">
+          重置
+        </button>
       </div>
     </div>
     <div class="list-template__bottom">
-      <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
-        [nzLoading]="loading1">
+      <nz-table
+        class="list-template__nzTable"
+        [nzData]="listOfData"
+        nzSize="middle"
+        [nzShowPagination]="false"
+        [nzLoading]="loading1"
+      >
         <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="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="10%">总积分</th>
             <th nzWidth="10%">操作</th>
           </tr>
         </thead>
         <tbody>
-          <tr *ngFor="let data of listOfData;let index=index;">
-            <td>{{index+(pageIndex-1)*10+1}}</td>
+          <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.order||0}}</td>
-            <td>{{data.num||0}}</td>
-            <td>{{data.specialCloseNum}}</td>
-            <td>{{data.avePer+'%'}}</td>
-            <td>{{data.arriveTime}}</td>
-            <td>{{data.completeTime}}</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.avePer + "%" }}</td>
+            <td>{{ data.order || 0 }}</td>
             <td>
               <div class="coop">
-                <span *ngIf="coopBtns.look" (click)="personDetail(data.workerId)">查看</span>
+                <span
+                  *ngIf="coopBtns.look"
+                  (click)="personDetail(data.workerId)"
+                  >查看</span
+                >
               </div>
             </td>
           </tr>
         </tbody>
       </nz-table>
       <div class="list-template__pagination">
-        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
-          (nzPageIndexChange)="getList()" (nzPageSizeChange)="getList()">
+        <nz-pagination
+          [(nzPageIndex)]="pageIndex"
+          [(nzTotal)]="listLength"
+          nzShowSizeChanger
+          [(nzPageSize)]="pageSize"
+          (nzPageIndexChange)="getList()"
+          (nzPageSizeChange)="getList()"
+        >
         </nz-pagination>
       </div>
     </div>
   </div>
 </div>
 <!-- 操作成功/失败提示框 -->
-<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
-  [info]="promptInfo"></app-prompt-modal>
+<app-prompt-modal
+  *ngIf="promptModalShow"
+  [content]="promptContent"
+  [success]="ifSuccess"
+  [show]="promptModalShow"
+  [info]="promptInfo"
+></app-prompt-modal>
+<app-excel-export
+  [loading]="loading2"
+  [isShow]="isShow"
+  (submitFormHand)="submitExcelExport($event)"
+  (hideFormHand)="hideExcelExport($event)"
+  *ngIf="isShow"
+></app-excel-export>
 
 <!-- 查看详情 -->
 <router-outlet></router-outlet>

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

@@ -96,18 +96,34 @@ export class WorkerStatisticsComponent implements OnInit {
       this.getList();
     }
   }
+  // 导出-model-确定
+  submitExcelExport(e) {
+    console.log(e);
+    this.export(e);
+  }
+  // 导出-model-取消
+  hideExcelExport() {
+    this.isShow = false;
+  }
+  // 导出-触发
+  excelExport() {
+    this.isShow = true;
+  }
   // 导出
   loading2 = false;
-  export() {
-    let that = this;
-    let postData = {
-      hosId: that.hospital,
+  isShow = false;
+  export(obj) {
+    let postData: any = {
+      hosId: this.hospital,
       startTime: this.startDate + " " + "00:00:00",
       endTime: this.endDate + " " + "23:59:59",
-      groupId: that.group || "",
+      groupId: this.group || "",
     };
+    if (obj.isGroup) {
+      postData.byGroup = true;
+    }
     this.loading2 = true;
-    that.mainService.exportReport("user", postData).subscribe(
+    this.mainService.exportReport("user", postData).subscribe(
       (data) => {
         this.loading2 = false;
         this.showPromptModal("导出", true, "");