支助人员统计及其他BUG

package-lock.json

@@ -16,10 +16,12 @@
         "@angular/platform-browser": "~8.1.1",
         "@angular/platform-browser-dynamic": "~8.1.1",
         "@angular/router": "~8.1.1",
+        "@types/big.js": "^6.2.2",
         "@types/crypto-js": "^3.1.47",
         "@types/overlayscrollbars": "^1.12.1",
         "@types/swiper": "^6.0.0",
         "atmosphere.js": "2.3.6",
+        "big.js": "^6.2.1",
         "core-js": "^3.18.3",
         "crypto-js": "^3.3.0",
         "datatables.net": "^1.11.3",
@@ -997,6 +999,11 @@
         "npm": ">= 6.2.0"
       }
     },
+    "node_modules/@types/big.js": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmmirror.com/@types/big.js/-/big.js-6.2.2.tgz",
+      "integrity": "sha512-e2cOW9YlVzFY2iScnGBBkplKsrn2CsObHQ2Hiw4V1sSyiGbgWL8IyqE3zFi1Pt5o1pdAtYkDAIsF3KKUPjdzaA=="
+    },
     "node_modules/@types/crypto-js": {
       "version": "3.1.47",
       "resolved": "https://registry.npm.taobao.org/@types/crypto-js/download/@types/crypto-js-3.1.47.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fcrypto-js%2Fdownload%2F%40types%2Fcrypto-js-3.1.47.tgz",
@@ -2155,10 +2162,9 @@
       }
     },
     "node_modules/big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.nlark.com/big.js/download/big.js-5.2.2.tgz",
-      "integrity": "sha1-ZfCvOC9Xi83HQr2cKB6cstd2gyg=",
-      "dev": true,
+      "version": "6.2.1",
+      "resolved": "https://registry.npmmirror.com/big.js/-/big.js-6.2.1.tgz",
+      "integrity": "sha512-bCtHMwL9LeDIozFn+oNhhFoq+yQ3BNdnsLSASUxLciOb1vgvpHsIO1dsENiGMgbb4SkP5TrzWzRiLddn8ahVOQ==",
       "engines": {
         "node": "*"
       }
@@ -6914,6 +6920,15 @@
         "node": ">=4.0.0"
       }
     },
+    "node_modules/loader-utils/node_modules/big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/locate-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-3.0.0.tgz",
@@ -10098,7 +10113,6 @@
     },
     "node_modules/npm/node_modules/lodash._baseindexof": {
       "version": "3.1.0",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },
@@ -10113,19 +10127,16 @@
     },
     "node_modules/npm/node_modules/lodash._bindcallback": {
       "version": "3.0.1",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },
     "node_modules/npm/node_modules/lodash._cacheindexof": {
       "version": "3.0.2",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },
     "node_modules/npm/node_modules/lodash._createcache": {
       "version": "3.1.2",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
       "dependencies": {
@@ -10139,7 +10150,6 @@
     },
     "node_modules/npm/node_modules/lodash._getnative": {
       "version": "3.9.1",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },
@@ -10155,7 +10165,6 @@
     },
     "node_modules/npm/node_modules/lodash.restparam": {
       "version": "3.6.1",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },
@@ -17801,6 +17810,11 @@
         "semver-intersect": "1.4.0"
       }
     },
+    "@types/big.js": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmmirror.com/@types/big.js/-/big.js-6.2.2.tgz",
+      "integrity": "sha512-e2cOW9YlVzFY2iScnGBBkplKsrn2CsObHQ2Hiw4V1sSyiGbgWL8IyqE3zFi1Pt5o1pdAtYkDAIsF3KKUPjdzaA=="
+    },
     "@types/crypto-js": {
       "version": "3.1.47",
       "resolved": "https://registry.npm.taobao.org/@types/crypto-js/download/@types/crypto-js-3.1.47.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fcrypto-js%2Fdownload%2F%40types%2Fcrypto-js-3.1.47.tgz",
@@ -18822,10 +18836,9 @@
       }
     },
     "big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.nlark.com/big.js/download/big.js-5.2.2.tgz",
-      "integrity": "sha1-ZfCvOC9Xi83HQr2cKB6cstd2gyg=",
-      "dev": true
+      "version": "6.2.1",
+      "resolved": "https://registry.npmmirror.com/big.js/-/big.js-6.2.1.tgz",
+      "integrity": "sha512-bCtHMwL9LeDIozFn+oNhhFoq+yQ3BNdnsLSASUxLciOb1vgvpHsIO1dsENiGMgbb4SkP5TrzWzRiLddn8ahVOQ=="
     },
     "binary-extensions": {
       "version": "2.2.0",
@@ -22819,6 +22832,14 @@
         "big.js": "^5.2.2",
         "emojis-list": "^2.0.0",
         "json5": "^1.0.1"
+      },
+      "dependencies": {
+        "big.js": {
+          "version": "5.2.2",
+          "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
+          "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+          "dev": true
+        }
       }
     },
     "locate-path": {
@@ -25170,8 +25191,7 @@
         },
         "lodash._baseindexof": {
           "version": "3.1.0",
-          "bundled": true,
-          "extraneous": true
+          "bundled": true
         },
         "lodash._baseuniq": {
           "version": "4.6.0",
@@ -25183,18 +25203,15 @@
         },
         "lodash._bindcallback": {
           "version": "3.0.1",
-          "bundled": true,
-          "extraneous": true
+          "bundled": true
         },
         "lodash._cacheindexof": {
           "version": "3.0.2",
-          "bundled": true,
-          "extraneous": true
+          "bundled": true
         },
         "lodash._createcache": {
           "version": "3.1.2",
           "bundled": true,
-          "extraneous": true,
           "requires": {
             "lodash._getnative": "^3.0.0"
           }
@@ -25205,8 +25222,7 @@
         },
         "lodash._getnative": {
           "version": "3.9.1",
-          "bundled": true,
-          "extraneous": true
+          "bundled": true
         },
         "lodash._root": {
           "version": "3.0.1",
@@ -25218,8 +25234,7 @@
         },
         "lodash.restparam": {
           "version": "3.6.1",
-          "bundled": true,
-          "extraneous": true
+          "bundled": true
         },
         "lodash.union": {
           "version": "4.6.0",

package.json

@@ -23,10 +23,12 @@
     "@angular/platform-browser": "~8.1.1",
     "@angular/platform-browser-dynamic": "~8.1.1",
     "@angular/router": "~8.1.1",
+    "@types/big.js": "^6.2.2",
     "@types/crypto-js": "^3.1.47",
     "@types/overlayscrollbars": "^1.12.1",
     "@types/swiper": "^6.0.0",
     "atmosphere.js": "2.3.6",
+    "big.js": "^6.2.1",
     "core-js": "^3.18.3",
     "crypto-js": "^3.3.0",
     "datatables.net": "^1.11.3",

proxy.conf.json

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

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

@@ -10,13 +10,13 @@
       ></i>
     </div>
     <div class="content">
-      <div>
+      <!-- <div>
         <label nz-checkbox [(ngModel)]="isGroup">是否按组导出</label>
-      </div>
+      </div> -->
       <div class="isNumOrIntegral">
         <nz-radio-group [(ngModel)]="isNumOrIntegral">
-          <label nz-radio nzValue="byOrderNum">按工单数量排序</label>
-          <label nz-radio nzValue="byIntegral">按积分排序</label>
+          <label nz-radio nzValue="none">基础信息</label>
+          <label nz-radio nzValue="isGroup">按组导出</label>
           <label nz-radio nzValue="buildingAndInspectMode">人员工单积分信息</label>
         </nz-radio-group>
       </div>

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

@@ -58,7 +58,7 @@
       .content {
         width: 100%;
         height: auto;
-        padding: 19px 14px 0 14px;
+        padding: 0 14px;
         max-height: 500px;
         overflow-y: auto;
         .isNumOrIntegral {

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

@@ -12,8 +12,7 @@ export class ExcelExportComponent implements OnInit {
   @Input() isShow: boolean = false; //模态框
   @Input() loading: boolean = false; //确定按钮的loading
   deptList = []; //护理单元科室列表
-  isGroup = false; //是否按组导出
-  isNumOrIntegral = "byOrderNum";
+  isNumOrIntegral = "none";
   constructor() {}
 
   ngOnInit() {}
@@ -23,6 +22,6 @@ export class ExcelExportComponent implements OnInit {
   }
   // 表单提交
   submitForm(): void {
-    this.submitFormHand.emit({isGroup:this.isGroup,isNumOrIntegral:this.isNumOrIntegral});
+    this.submitFormHand.emit({isNumOrIntegral:this.isNumOrIntegral});
   }
 }

src/app/share/order-detail/order-detail.component.html

@@ -1134,7 +1134,7 @@
                 </td>
               </tr>
               <tr>
-                <td>科室追加分</td>
+                <td>特殊科室追加分</td>
                 <td>
                   {{ orderInfo.grade ? orderInfo.grade.estimateDeptGrade : "-" }}
                 </td>

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

@@ -3,7 +3,7 @@ import { ActivatedRoute, Router } from "@angular/router";
 
 import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
 import { ToolService } from "../../services/tool.service";
-import { format, startOfDay, endOfDay } from 'date-fns';
+import { format, startOfDay, endOfDay, previousMonday, previousSunday } from 'date-fns';
 import { DeptInspectionRateStatisticsService } from './dept-inspection-rate-statistics.service';
 
 @Component({
@@ -26,7 +26,7 @@ export class DeptInspectionRateStatisticsComponent implements OnInit {
 
   listOfData: any[] = []; //表格数据
   searchDto: any = {
-    dateRange: [],
+    dateRange: [previousMonday(new Date()), previousSunday(new Date())],
   }
 
   hosId: any; //院区（搜索）
@@ -50,7 +50,7 @@ export class DeptInspectionRateStatisticsComponent implements OnInit {
   // 重置
   reset() {
     this.searchDto = {
-      dateRange: [],
+      dateRange: [previousMonday(new Date()), previousSunday(new Date())],
     }
     this.search();
   }

src/app/views/task-type-management/task-type-management.component.ts

@@ -8,6 +8,7 @@ import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
 import { NzMessageService } from "ng-zorro-antd";
 import { format, startOfSecond } from 'date-fns';
+import Big from 'big.js';
 export interface Data {
   id: number;
   name: string;
@@ -674,17 +675,17 @@ export class TaskTypeManagementComponent implements OnInit {
               arr[1].sumTime =
                 arr[1].responseTime + arr[1].arriveTime + arr[1].executeTime;
               arr[0].sumScore =
-                arr[0].responseScore +
-                arr[0].arriveScore +
-                arr[0].executeScore +
-                arr[0].basicsScore +
-                arr[0].deptsScore;
+                Big(arr[0].responseScore)
+                .plus(arr[0].arriveScore)
+                .plus(arr[0].executeScore)
+                .plus(arr[0].basicsScore)
+                .plus(arr[0].deptsScore);
               arr[1].sumScore =
-                arr[1].responseScore +
-                arr[1].arriveScore +
-                arr[1].executeScore +
-                arr[1].basicsScore +
-                arr[1].deptsScore;
+                Big(arr[1].responseScore)
+                .plus(arr[1].arriveScore)
+                .plus(arr[1].executeScore)
+                .plus(arr[1].basicsScore)
+                .plus(arr[1].deptsScore);
               this.allTaskType[i].integralDetailedRules = arr;
             }
           }
@@ -1626,20 +1627,20 @@ export class TaskTypeManagementComponent implements OnInit {
   Change(data) {
     data.sumTime = data.responseTime + data.arriveTime + data.executeTime;
     data.sumScore =
-      data.responseScore +
-      data.arriveScore +
-      data.executeScore +
-      data.basicsScore +
-      data.deptsScore;
+      Big(data.responseScore)
+      .plus(data.arriveScore)
+      .plus(data.executeScore)
+      .plus(data.basicsScore)
+      .plus(data.deptsScore);
   }
   Change1(data) {
     data.sumTime = data.responseTime + data.arriveTime + data.executeTime;
     data.sumScore =
-      data.responseScore +
-      data.arriveScore +
-      data.executeScore +
-      data.basicsScore +
-      data.deptsScore;
+    Big(data.responseScore)
+    .plus(data.arriveScore)
+    .plus(data.executeScore)
+    .plus(data.basicsScore)
+    .plus(data.deptsScore);
   }
   getList1() {
     this.getCourseList(this.pageSize);

src/app/views/work-order-log/work-order-log.component.ts

@@ -26,7 +26,7 @@ export class WorkOrderLogComponent implements OnInit {
 
   listOfData: any[] = []; //表格数据
   searchDto: any = {
-    dateRange: [],
+    dateRange: [new Date(), new Date()],
   }
 
   hosId: any; //院区（搜索）
@@ -69,7 +69,7 @@ export class WorkOrderLogComponent implements OnInit {
   // 重置
   reset() {
     this.searchDto = {
-      dateRange: [],
+      dateRange: [new Date(), new Date()],
     }
     this.search();
   }

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

@@ -65,11 +65,11 @@
         [nzShowPagination]="false"
         [nzLoading]="loading1"
       >
-        <thead>
+        <thead (nzSortChange)="sort($event)" nzSingleSort>
           <tr class="thead">
             <th nzWidth="5%">序号</th>
             <th nzWidth="8%">姓名</th>
-            <th nzWidth="8%">工单总数</th>
+            <th nzWidth="8%" nzShowSort nzSortKey="byOrderNum" [(nzSort)]="sortCurrent.byOrderNum">工单总数</th>
             <th nzWidth="16%">五分钟内工单<br>特殊关闭数</th>
             <!-- <th nzWidth="8%"></th> -->
             <th nzWidth="16%">平均到达时长<br>平均完成时长</th>
@@ -77,7 +77,7 @@
             <th nzWidth="8%">按时完成达标率</th>
             <th nzWidth="8%">楼栋分<br>陪检方式分</th>
             <!-- <th nzWidth="8%"></th> -->
-            <th nzWidth="16%">总积分</th>
+            <th nzWidth="16%" nzShowSort nzSortKey="byIntegral" [(nzSort)]="sortCurrent.byIntegral">总积分</th>
             <th nzWidth="15%">操作</th>
           </tr>
         </thead>
@@ -109,8 +109,8 @@
           [(nzTotal)]="listLength"
           nzShowSizeChanger
           [(nzPageSize)]="pageSize"
-          (nzPageIndexChange)="getList()"
-          (nzPageSizeChange)="getList()"
+          (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"
+          (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"
         >
         </nz-pagination>
       </div>

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

@@ -69,13 +69,13 @@ export class WorkerStatisticsComponent implements OnInit {
       that.hospital = that.searchData["hosId"];
       that.changeDate(that.searchData["range"]);
       that.defRange = that.searchData["defRange"];
-      that.search();
+      // that.search();
     });
     // 不是从综合报表页面跳转过来的
     setTimeout(() => {
       if (!sub["isStopped"]) {
         that.changeDateRange(that.defRange);
-        that.search();
+        // that.search();
       }
     }, 100);
   }
@@ -91,9 +91,9 @@ export class WorkerStatisticsComponent implements OnInit {
       };
     }
     if (num !== undefined) {
-      this.getList(num);
+      this.getList(num, this.sortCurrentKey, this.sortCurrentValue);
     } else {
-      this.getList();
+      this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
     }
   }
   // 导出-model-确定
@@ -119,17 +119,16 @@ export class WorkerStatisticsComponent implements OnInit {
       endTime: this.endDate + " " + "23:59:59",
       groupId: this.group || "",
     };
-    if (obj.isGroup) {
-      postData.byGroup = "true";
+    if (this.sortCurrentKey && this.sortCurrentValue) {
+      postData[this.sortCurrentKey] = this.sortCurrentValue === "ascend" ? `asc` : `desc`;
     }
     switch (obj.isNumOrIntegral) {
-      case "byOrderNum":
-        //按工单数量排序
-        postData.byOrderNum = "true";
+      case "none":
+        //基础信息
         break;
-      case "byIntegral":
-        //按积分排序
-        postData.byIntegral = "true";
+      case "isGroup":
+        //按组导出
+        postData.byGroup = "true";
         break;
       case "buildingAndInspectMode":
         //人员工单积分信息
@@ -164,15 +163,15 @@ export class WorkerStatisticsComponent implements OnInit {
   reset() {
     this.changeDateRange("1");
     this.group = 0;
-    this.search();
+    // this.search();
   }
   // 表格数据
   loading1 = false;
-  getList(num?: number) {
+  getList(num?: number, field?: string, sort?: string) {
     if (num !== undefined) {
       this.pageIndex = num;
     }
-    let postData = {
+    let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
       startTime: this.searchData.dateRange.start,
@@ -180,6 +179,9 @@ export class WorkerStatisticsComponent implements OnInit {
       hosId: this.searchData.hosId,
       groupId: this.group || "",
     };
+    if (field && sort) {
+      postData[field] = sort === "ascend" ? `asc` : `desc`;
+    }
     this.loading1 = true;
     this.mainService
       .postCustom("report", "user", postData)
@@ -189,6 +191,20 @@ export class WorkerStatisticsComponent implements OnInit {
         this.listLength = result.totalNum;
       });
   }
+
+  // 列表排序
+  sortCurrent = {
+    byOrderNum: null,
+    byIntegral: null,
+  };
+  sortCurrentKey: string = "";
+  sortCurrentValue: string | null = "";
+  sort(e) {
+    const { key, value } = e;
+    this.sortCurrentKey = key;
+    this.sortCurrentValue = value;
+    this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
+  }
   // 获取院区/分组
   hospital: string; //选中院区
   group: number = 0; //选中组