优化

package-lock.json

@@ -2608,9 +2608,9 @@
       }
     },
     "core-js": {
-      "version": "3.16.1",
-      "resolved": "https://registry.nlark.com/core-js/download/core-js-3.16.1.tgz",
-      "integrity": "sha1-9Ehc5cnzxqfLGPqASI4I02IJckk="
+      "version": "3.16.4",
+      "resolved": "https://registry.nlark.com/core-js/download/core-js-3.16.4.tgz",
+      "integrity": "sha1-D7ECmlVPwmiMCWPXyQDhiBiKeOA="
     },
     "core-util-is": {
       "version": "1.0.2",
@@ -6445,9 +6445,9 @@
       }
     },
     "npm": {
-      "version": "6.14.14",
-      "resolved": "https://registry.nlark.com/npm/download/npm-6.14.14.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnpm%2Fdownload%2Fnpm-6.14.14.tgz",
-      "integrity": "sha1-MX+xMoMbdoKKahgN2cvLsjxdKiA=",
+      "version": "6.14.15",
+      "resolved": "https://registry.nlark.com/npm/download/npm-6.14.15.tgz",
+      "integrity": "sha1-l91Rr1tdYiW2EbQMXLTTHaHUZ/4=",
       "requires": {
         "JSONStream": "^1.3.5",
         "abbrev": "~1.1.1",
@@ -6558,7 +6558,7 @@
         "sorted-union-stream": "~2.1.3",
         "ssri": "^6.0.2",
         "stringify-package": "^1.0.1",
-        "tar": "^4.4.15",
+        "tar": "^4.4.19",
         "text-table": "~0.2.0",
         "tiny-relative-date": "^1.3.0",
         "uid-number": "0.0.6",
@@ -8566,7 +8566,7 @@
           "bundled": true
         },
         "path-parse": {
-          "version": "1.0.6",
+          "version": "1.0.7",
           "bundled": true
         },
         "performance-now": {
@@ -9117,16 +9117,16 @@
           }
         },
         "tar": {
-          "version": "4.4.15",
+          "version": "4.4.19",
           "bundled": true,
           "requires": {
-            "chownr": "^1.1.1",
-            "fs-minipass": "^1.2.5",
-            "minipass": "^2.8.6",
-            "minizlib": "^1.2.1",
-            "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.3"
+            "chownr": "^1.1.4",
+            "fs-minipass": "^1.2.7",
+            "minipass": "^2.9.0",
+            "minizlib": "^1.3.3",
+            "mkdirp": "^0.5.5",
+            "safe-buffer": "^5.2.1",
+            "yallist": "^3.1.1"
           },
           "dependencies": {
             "minipass": {
@@ -9136,6 +9136,14 @@
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
               }
+            },
+            "safe-buffer": {
+              "version": "5.2.1",
+              "bundled": true
+            },
+            "yallist": {
+              "version": "3.1.1",
+              "bundled": true
             }
           }
         },

package.json

@@ -24,7 +24,7 @@
     "@angular/router": "~8.1.1",
     "@types/crypto-js": "^3.1.47",
     "@types/overlayscrollbars": "^1.12.1",
-    "core-js": "^3.16.1",
+    "core-js": "^3.16.4",
     "crypto-js": "^3.3.0",
     "datatables.net": "^1.10.25",
     "date-fns": "^2.23.0",
@@ -32,7 +32,7 @@
     "ng-zorro-antd": "^8.5.2",
     "ngx-echarts": "^4.2.2",
     "ngx-sortablejs": "^3.1.3",
-    "npm": "^6.14.14",
+    "npm": "^6.14.15",
     "overlayscrollbars": "^1.11.0",
     "overlayscrollbars-ngx": "^0.1.1",
     "rxjs": "~6.4.0",

src/app/pipes/html-transform.pipe.ts

@@ -0,0 +1,13 @@
+import { Pipe, PipeTransform } from "@angular/core";
+import { DomSanitizer } from "@angular/platform-browser";
+
+@Pipe({
+  name: "htmlTransform",
+})
+export class HtmlTransformPipe implements PipeTransform {
+  constructor(private sanitizer: DomSanitizer) {}
+
+  transform(value: any, ...args: any[]): any {
+    return this.sanitizer.bypassSecurityTrustHtml(value);
+  }
+}

src/app/share/prompt-modal/prompt-modal.component.ts

@@ -1,42 +1,39 @@
-import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
-import host from "../../../assets/js/http.js";
-// import { ActivatedRoute, Router } from '@angular/router';
-
+import { Component, OnInit, Input, Output, EventEmitter } from "@angular/core";
+import host from "../../../assets/js/http";
 @Component({
-  selector: 'app-prompt-modal',
-  templateUrl: './prompt-modal.component.html',
-  styleUrls: ['./prompt-modal.component.less']
+  selector: "app-prompt-modal",
+  templateUrl: "./prompt-modal.component.html",
+  styleUrls: ["./prompt-modal.component.less"],
 })
 export class PromptModalComponent implements OnInit {
-  host=host.host;
+  host = host.host;
   @Input() content: string;
   @Input() success: boolean;
   @Input() show: boolean;
   @Input() info: string;
-  @Input() back: string = '';
+  @Input() back: string = "";
   @Input() isReLoad: Boolean = false;
   @Input() loading: Boolean = false;
-  @Input() previewImage: string = '';
+  @Input() previewImage: string = "";
   // @Input() nUrl: string;
 
-  @Output() closeModel = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+  @Output() closeModel = new EventEmitter<any>(); //1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
 
   constructor() {}
   // constructor(private router: Router) {}
 
   ngOnInit() {
     console.log(this.show);
-    console.log(this.previewImage)
+    console.log(this.previewImage);
   }
   hideModal() {
     this.show = false;
-    this.closeModel.emit(this.back);//emits(向上弹射)事件
+    this.closeModel.emit(this.back); //emits(向上弹射)事件
     // if(this.nUrl){
     //   this.router.navigateByUrl(this.nUrl);
     // }
-    if(this.isReLoad){
-      location.reload(true)
+    if (this.isReLoad) {
+      location.reload(true);
     }
   }
-
 }

src/app/share/share.module.ts

@@ -26,6 +26,7 @@ import { GenerateFloorComponent } from './generate-floor/generate-floor.componen
 import { BatchOrdersComponent } from './batch-orders/batch-orders.component';
 import { CollapseComponent } from './collapse/collapse.component';
 import { CollapsePanelComponent } from './collapse-panel/collapse-panel.component';
+import { HtmlTransformPipe } from '../pipes/html-transform.pipe';
 
 @NgModule({
   declarations: [
@@ -50,6 +51,7 @@ import { CollapsePanelComponent } from './collapse-panel/collapse-panel.componen
     BatchOrdersComponent,
     CollapseComponent,
     CollapsePanelComponent,
+    HtmlTransformPipe,
   ],
   imports: [
     CommonModule,
@@ -89,6 +91,7 @@ import { CollapsePanelComponent } from './collapse-panel/collapse-panel.componen
     BatchOrdersComponent,
     CollapseComponent,
     CollapsePanelComponent,
+    HtmlTransformPipe,
   ]
 })
 export class ShareModule { }

src/app/type/sourceId.ts

@@ -1,9 +0,0 @@
-/**
- * 建单来源sourceId
- */
-export enum SourceId {
-  fuwutai = 1, //服务台
-  hushi = 2, //护士端
-  xitong = 3, //系统自动建单
-  wechat = 4, //微信端
-}

src/app/type/types.ts

@@ -0,0 +1,24 @@
+/**
+ * 建单来源
+ */
+export enum SourceId {
+  fuwutai = 1, //服务台
+  hushi = 2, //护士端
+  xitong = 3, //系统自动建单
+  wechat = 4, //微信端
+}
+/**
+ * 接口地址
+ */
+export interface baseUrlType {
+  domain: string; //chrome下载地址
+  host: string; //接口地址
+  specimenViewHost: string; //业务视图地址
+  bigScreenHost: string; //大屏地址地址
+  bigScreenHost2: string; //大屏地址2地址
+  homeWs: string; //websocket首页地址
+  mainWs: string; //websocket管理端地址
+  nurseWs: string; //websocket护士端地址
+  fwtWs: string; //websocket服务台地址
+  phoneWs: string; //websocket服务台来电地址
+}

src/app/views/fuwutai/fuwutai.component.ts

@@ -18,7 +18,7 @@ import { NzNotificationService } from "ng-zorro-antd/notification";
 import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
 import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
-import { SourceId } from "src/app/type/sourceId";
+import { SourceId } from "src/app/type/types";
 @Component({
   selector: "app-fuwutai",
   templateUrl: "./fuwutai.component.html",

src/app/views/hushijiandan/hushijiandan.component.html

@@ -472,8 +472,8 @@
                               <overlay-scrollbars class="modalBody_right_box" #osComponentRef9 style="height: 100%;"
                                 *ngIf="!rLoading&&listDeptOrderRecords.length">
                                 <div class="modalBody_right_box">
-                                  <div class="modalBody_right_list" *ngFor="let item of listDeptOrderRecords">
-                                    {{item.msg}}</div>
+                                  <div class="modalBody_right_list" *ngFor="let item of listDeptOrderRecords"
+                                    [innerHTML]="item.msg|htmlTransform"></div>
                                 </div>
                               </overlay-scrollbars>
                               <div class="modalBody_left nLoading w100" *ngIf="rLoading">

src/app/views/hushijiandan/hushijiandan.component.less

@@ -399,6 +399,9 @@
               text-align: justify;
               border-bottom: 1px solid #dde1e5;
               padding: 8px 0;
+              b {
+                color: @primary-color;
+              }
             }
           }
           .modalBody_box {

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -31,7 +31,7 @@ import {
   differenceInCalendarDays,
   getHours,
 } from "date-fns";
-import { SourceId } from "src/app/type/sourceId";
+import { SourceId } from "src/app/type/types";
 // 日期禁用
 function range(start: number, end: number): number[] {
   const result: number[] = [];

src/app/views/login/login.component.html

@@ -1,9 +1,11 @@
 <div class="login" *ngIf="!isSingleSignOn">
   <div class="loginBox">
+    <!-- 标题 -->
     <div class="title">
       <img src="../../assets/images/login_logo@2.png" alt="大势医院输送保障管理平台">
       <strong>大势医院输送保障管理平台</strong>
     </div>
+    <!-- 登录表单 -->
     <div class="content">
       <div class="form_wrap">
         <p>用户登录</p>
@@ -38,6 +40,7 @@
         </div>
       </div>
     </div>
+    <!-- 底部 -->
     <div class="bottom">
       <span>@大势科技.[京ICO:143]</span>
       <strong>点击下载谷歌浏览器👉</strong>

src/app/views/login/login.component.ts

@@ -2,22 +2,20 @@ import { Component, OnInit } from "@angular/core";
 import { Router } from "@angular/router";
 import { FormBuilder, Validators, FormGroup } from "@angular/forms";
 import { NzMessageService } from "ng-zorro-antd/message";
-
 import { MainService } from "../../services/main.service";
 import http from "../../../assets/js/http";
 import { AES, mode, pad, enc } from "crypto-js";
-
+import { baseUrlType } from "src/app/type/types";
 @Component({
   selector: "app-login",
   templateUrl: "./login.component.html",
   styleUrls: ["./login.component.less"],
 })
 export class LoginComponent implements OnInit {
-  http;
+  http: baseUrlType;
   validateForm: FormGroup;
-  loading: boolean = false;
-  // 是否单点登录
-  isSingleSignOn: boolean;
+  loading: boolean = false; // 加载状态
+  isSingleSignOn: boolean = false; // 是否单点登录
   constructor(
     private router: Router,
     private fb: FormBuilder,
@@ -26,8 +24,7 @@ export class LoginComponent implements OnInit {
   ) {}
   ngOnInit() {
     this.http = http;
-    let url = location.href;
-    this.isSingleSignOn = url.includes("?");
+    this.isSingleSignOn = location.href.includes("?");
     if (this.isSingleSignOn) {
       this.singleSignOn();
     } else {
@@ -83,7 +80,6 @@ export class LoginComponent implements OnInit {
     });
     return tmpDeAES.toString(enc.Utf8);
   }
-
   // 初始化菜单
   initMenu(menu) {
     let menuLis = this.transform(menu);
@@ -99,7 +95,6 @@ export class LoginComponent implements OnInit {
     localStorage.setItem("menu", JSON.stringify(menuLis));
     localStorage.setItem("index", "true"); //首页默认高亮
   }
-
   // 初始化登录表单
   initForm() {
     let username, passsword;
@@ -175,7 +170,6 @@ export class LoginComponent implements OnInit {
       }
     });
   }
-
   // 页面跳转
   toRoute2(data) {
     let roleMenus = data.user.menu;
@@ -248,27 +242,8 @@ export class LoginComponent implements OnInit {
       this.router.navigateByUrl("/main/home");
     }
   }
-
   // 处理树数据（parent格式转为children格式）
   transform(nodes): any {
-    // // 一级菜单
-    // let parents = nodes.filter(value => value.parentid == 'undefined' || value.parentid == null)
-    // // 二级菜单
-    // let childrens = nodes.filter(value => value.parentid !== 'undefined' && value.parentid != null)
-    // let translator = (parents, childrens) => {
-    //   parents.forEach((parent) => {
-    //     childrens.forEach(current => {
-    //       if (current.parentid === parent.id) {
-    //         translator([current], childrens)
-    //         typeof parent.childrens !== 'undefined' ? parent.childrens.push(current) : parent.childrens = [current]
-    //       }
-    //     }
-    //     )
-    //   }
-    //   )
-    // }
-    // translator(parents, childrens)
-    //重写，提升数据处理效率-seimin
     let parents = [];
     const idMapping = nodes.reduce((acc, el, i) => {
       acc[el.id] = i;

src/app/views/order-source-statistics/order-source-statistics.component.html

@@ -57,10 +57,10 @@
           <tr *ngFor="let data of listOfData;let index=index;">
             <td>{{index+(pageIndex-1)*10+1}}</td>
             <td>{{ data.date }}</td>
-            <td>{{ data.total||0}}</td>
-            <td>{{data.speCount||0}}</td>
-            <td>{{data.spePlanCount||0}}</td>
-            <td>{{data.insCount||0}}</td>
+            <td>{{ data.source1||0}}</td>
+            <td>{{data.source2||0}}</td>
+            <td>{{data.source3||0}}</td>
+            <td>{{data.source4||0}}</td>
           </tr>
         </tbody>
       </nz-table>

src/app/views/order-source-statistics/order-source-statistics.component.ts

@@ -170,10 +170,11 @@ export class OrderSourceStatisticsComponent implements OnInit {
       endTime: this.searchData.dateRange.end,
       hosId: this.searchData.hosId,
       type: this.dateType,
+      sourceType: "date",
     };
     this.loading1 = true;
     this.mainService
-      .postCustom("report", "workOrder", postData)
+      .postCustom("report", "workOrderSourceReport", postData)
       .subscribe((result) => {
         this.loading1 = false;
         this.listOfData = result.list || [];

src/assets/js/http.js

@@ -1,16 +0,0 @@
-var domainName = document.domain;//域名
-var port = location.port;//端口
-var protocolName = document.location.protocol;//http协议
-var wsName = protocolName === 'http:' ? 'ws' : 'wss';//ws协议
-module.exports = {
-  domain: protocolName + '//' + domainName + ':' + port,//chrome下载
-  host: protocolName + '//' + domainName + ':' + port + '/service',//测试接口
-  specimenViewHost: protocolName + '//' + domainName + ':' + port + '/specimenView',//业务视图
-  bigScreenHost: protocolName + '//' + domainName + ':' + port + '/largeScreen',//大屏地址
-  bigScreenHost2: protocolName + '//' + domainName + ':' + port + '/largeScreen2',//大屏地址2
-  homeWs: wsName + '://' + domainName + ':8080/webSocket/index',//websocket首页
-  mainWs: wsName + '://' + domainName + ':8080/webSocket/message/manage',//websocket管理端
-  nurseWs: wsName + '://' + domainName + ':8080/webSocket/message/nurse',//websocket护士端
-  fwtWs: wsName + '://' + domainName + ':8080/webSocket/message/ser',//websocket服务台
-  phoneWs: wsName + '://' + domainName + ':8080/webSocket/message/phone',//websocket服务台来电
-}

src/assets/js/http.ts

@@ -0,0 +1,19 @@
+import { baseUrlType } from "src/app/type/types";
+
+const domainName: string = document.domain; //域名
+const port: string = location.port; //端口
+const protocolName: string = document.location.protocol; //http协议
+const wsName: string = protocolName === "http:" ? "ws" : "wss"; //ws协议
+const baseUrl: baseUrlType = {
+  domain: `${protocolName}//${domainName}:${port}`, //chrome下载地址
+  host: `${protocolName}//${domainName}:${port}/service`, //接口地址
+  specimenViewHost: `${protocolName}//${domainName}:${port}/specimenView`, //业务视图地址
+  bigScreenHost: `${protocolName}//${domainName}:${port}/largeScreen`, //大屏地址地址
+  bigScreenHost2: `${protocolName}//${domainName}:${port}/largeScreen2`, //大屏地址2地址
+  homeWs: `${wsName}://${domainName}:8080/webSocket/index`, //websocket首页地址
+  mainWs: `${wsName}://${domainName}:8080/webSocket/message/manage`, //websocket管理端地址
+  nurseWs: `${wsName}://${domainName}:8080/webSocket/message/nurse`, //websocket护士端地址
+  fwtWs: `${wsName}://${domainName}:8080/webSocket/message/ser`, //websocket服务台地址
+  phoneWs: `${wsName}://${domainName}:8080/webSocket/message/phone`, //websocket服务台来电地址
+};
+export default baseUrl;