解决冲突

angular.json

@@ -39,7 +39,9 @@
             ],
             "scripts": [
               "node_modules/echarts/dist/echarts.min.js",
-              "./node_modules/swiper/swiper-bundle.min.js"
+              "./node_modules/swiper/swiper-bundle.min.js",
+              "src/assets/libs/TLWebSocketAgent.js",
+              "src/assets/libs/ola_api.js"
             ]
           },
           "configurations": {
@@ -110,7 +112,9 @@
             ],
             "scripts": [
               "node_modules/echarts/dist/echarts.min.js",
-              "./node_modules/swiper/swiper-bundle.min.js"
+              "./node_modules/swiper/swiper-bundle.min.js",
+              "src/assets/libs/TLWebSocketAgent.js",
+              "src/assets/libs/ola_api.js"
             ]
           }
         },

package-lock.json

@@ -32,6 +32,7 @@
         "ngx-echarts": "^4.2.2",
         "ngx-print": "~1.2.1",
         "ngx-sortablejs": "^3.1.3",
+        "ngx-virtual-scroller": "^4.0.3",
         "npm": "^6.14.15",
         "overlayscrollbars": "^1.11.0",
         "overlayscrollbars-ngx": "^0.1.1",
@@ -829,6 +830,12 @@
         "npm": ">= 6.2.0"
       }
     },
+    "node_modules/@tweenjs/tween.js": {
+      "version": "17.4.0",
+      "resolved": "https://registry.npmmirror.com/@tweenjs/tween.js/-/tween.js-17.4.0.tgz",
+      "integrity": "sha512-J3fzl1F6wvh8KXVVcIuHN12xi1ZDcPA/0Vix+ZcJYwZWVHUwfIqfvzYXXEw7ybeev6477KCTt9fKydU+ajUqcg==",
+      "license": "MIT"
+    },
     "node_modules/@types/big.js": {
       "version": "6.2.2",
       "resolved": "https://registry.npmmirror.com/@types/big.js/-/big.js-6.2.2.tgz",
@@ -947,6 +954,12 @@
       "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==",
       "dev": true
     },
+    "node_modules/@types/tween.js": {
+      "version": "17.2.0",
+      "resolved": "https://registry.npmmirror.com/@types/tween.js/-/tween.js-17.2.0.tgz",
+      "integrity": "sha512-mOsqurEtFEzwgkVc/jDVE2XrjZBYTbrmDUyCr9GXmnfc6q5otokxFtKvSY/B21zgz9LVRIvRTawKczjKi57wrA==",
+      "license": "MIT"
+    },
     "node_modules/@types/webpack-sources": {
       "version": "0.1.12",
       "resolved": "https://registry.npmmirror.com/@types/webpack-sources/-/webpack-sources-0.1.12.tgz",
@@ -7652,6 +7665,20 @@
         "sortablejs": ">=1.7.0"
       }
     },
+    "node_modules/ngx-virtual-scroller": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmmirror.com/ngx-virtual-scroller/-/ngx-virtual-scroller-4.0.3.tgz",
+      "integrity": "sha512-JBqUJ/f7GRCZDnI/JeiFoTmYR8rC/Hyv8L5I7ImePM6f/hwiFNRsrK8Abdd0E3TwklwgmZAK875te9XQJrgsyQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@tweenjs/tween.js": "17.4.0",
+        "@types/tween.js": "17.2.0"
+      },
+      "peerDependencies": {
+        "@angular/core": ">=6.0.0",
+        "tslib": "^1.10.0"
+      }
+    },
     "node_modules/nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmmirror.com/nice-try/-/nice-try-1.0.5.tgz",

package.json

@@ -40,6 +40,7 @@
     "ngx-echarts": "^4.2.2",
     "ngx-print": "~1.2.1",
     "ngx-sortablejs": "^3.1.3",
+    "ngx-virtual-scroller": "^4.0.3",
     "npm": "^6.14.15",
     "overlayscrollbars": "^1.11.0",
     "overlayscrollbars-ngx": "^0.1.1",

src/app/components/bind-extension-number/bind-extension-number.component.html

@@ -0,0 +1,68 @@
+<!-- 绑定分机 -->
+<div class="init recallOrder display_flex justify-content_flex-center align-items_center">
+  <div class="con modalBody">
+    <div class="title">
+      绑定分机<i class="icon_transport transport-guanbi" (click)="cancelInit()"></i>
+    </div>
+    <div class="content">
+      <div class="scopeTab">
+        <div class="scopeTabItem" [ngClass]="{ active: item.value == activeScopeTab.value }" *ngFor="let item of scopeTabs" (click)="activeScopeTab = item">
+          <label nz-checkbox [(ngModel)]="item.checked" (ngModelChange)="changeFlag($event, item)">{{item.name}}</label>
+        </div>
+      </div>
+      <!-- 分机绑定 -->
+      <div class="conditions" *ngIf="activeScopeTab.value == 1">
+        <div nz-row class="row">
+          <div nz-col nzSpan="3" class="name">院区：</div>
+          <div nz-col nzSpan="21">
+            <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择院区" [(ngModel)]="formData1.hospital" (ngModelChange)="changeHospital($event)">
+              <ng-container *ngFor="let option of hospitalList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </div>
+        </div>
+        <div nz-row class="row">
+          <div nz-col nzSpan="3" class="name">分机号：</div>
+          <div nz-col nzSpan="21">
+            <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择分机号" [(ngModel)]="formData1.number">
+              <ng-container *ngFor="let option of phoneNumList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.value" [nzValue]="option.value"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </div>
+        </div>
+      </div>
+      <!-- 呼叫中心 -->
+      <div class="conditions" *ngIf="activeScopeTab.value == 2">
+        <div nz-row class="row">
+          <div nz-col nzSpan="3" class="name">分机号：</div>
+          <div nz-col nzSpan="21">
+            <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择分机号" [(ngModel)]="formData2.number">
+              <ng-container *ngFor="let option of hjzxCornetList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.value" [nzValue]="option.value"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="btns display_flex justify-content_flex-center">
+      <button class="btn" nz-button nzType="primary" [nzLoading]="websocketLoading" (click)="saveOrderScope()">
+        {{activeScopeTab.value == 1 ? '绑定' : '签入'}}
+      </button>
+      <button class="btn cancel" nz-button nzType="default" (click)="cancelInit()">
+        取消
+      </button>
+    </div>
+  </div>
+</div>

src/app/components/bind-extension-number/bind-extension-number.component.less

@@ -0,0 +1,192 @@
+@import "../../../../src/theme.less";
+:host {
+  ::ng-deep .ant-checkbox-wrapper + .ant-checkbox-wrapper{
+    margin-left: 0!important;
+  }
+  .formItem {
+    width: 290px;
+  }
+  .name{
+    line-height: 32px;
+  }
+  .row{
+    margin-bottom: 24px!important;
+  }
+  .required{
+    position: relative;
+    &::before{
+      font-family: icon_transport;
+      font-size: 10px;
+      content:'\e606';
+      color: red;
+      position: absolute;
+      right: 100%;
+      top: 50%;
+      transform: translateY(-50%);
+      margin-right: 2px;
+    }
+  }
+  // 撤回工单
+  .recallOrder {
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.4);
+    z-index: 9999999;
+
+    .modalBody {
+      width: 350px;
+      height: 220px;
+      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: 310px;
+        height: 117px;
+        background: #f9fafb;
+        border: 1px solid #e5e9ed;
+        border-radius: 5px;
+        overflow: hidden;
+        margin-top: 12px;
+
+        div {
+          text-align: center;
+          margin: 0;
+
+          &.icon {
+            margin-top: 17px;
+
+            i {
+              color: #ff3b53;
+              font-size: 30px !important;
+
+              &.transport-wenhao {
+                color: #f5a523;
+              }
+            }
+          }
+
+          &.defeat {
+            color: #333;
+            font-size: 18px;
+          }
+
+          &:nth-child(3) {
+            font-size: 14px;
+            color: #666;
+          }
+        }
+
+        .conditions {
+          height: 235px;
+          overflow: auto;
+          padding: 48px 80px;
+
+          div {
+            text-align: left;
+          }
+        }
+      }
+
+      .btns {
+        button {
+          margin-top: 10px;
+          margin-left: 5px;
+        }
+
+        .recDelBtn {
+          width: 115px;
+        }
+      }
+    }
+  }
+
+  // 初始化设置
+  .init {
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.4);
+    z-index: 99;
+
+    .con {
+      width: 832px;
+      height: auto;
+      background: #fff;
+      border-radius: 5px;
+      padding: 10px 20px;
+      color: #333;
+
+      .content {
+        width: 100%;
+        height: auto;
+
+        .scopeTab{
+          display: flex;
+          height: 60px;
+          border-bottom: 1px solid #D9D9D9;
+          .scopeTabItem{
+            flex: 1;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            border-right: 1px solid #D9D9D9;
+            background-color: #fff;
+            cursor: pointer;
+            &:last-of-type{
+              border-right: none;
+            }
+            &.active{
+              background-color: #F0F6ED;
+            }
+          }
+        }
+
+        .remin {
+          font-size: 14px;
+          color: #666;
+          line-height: 48px;
+          border-bottom: 1px solid #e5e9ed;
+        }
+
+        .boxes {
+          color: #333;
+          padding: 8px 12px;
+
+          & > div:nth-child(1) {
+            color: #333;
+            text-align: left;
+          }
+
+          & > div:nth-child(2) {
+            color: #666;
+            text-align: left;
+          }
+        }
+      }
+    }
+  }
+}

src/app/components/bind-extension-number/bind-extension-number.component.ts

@@ -0,0 +1,191 @@
+import { Component, OnInit, Output, Input } from '@angular/core';
+import { EventEmitter } from '@angular/core';
+import { MainService } from 'src/app/services/main.service';
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+import { WebsocketIncomingService } from 'src/app/services/websocket-incoming.service';
+
+@Component({
+  selector: 'app-bind-extension-number',
+  templateUrl: './bind-extension-number.component.html',
+  styleUrls: ['./bind-extension-number.component.less']
+})
+export class BindExtensionNumberComponent implements OnInit {
+  @Input() websocketLoading:boolean = false;
+  @Input() hsmsData:any = {
+    checkedHos: undefined,
+    scopeGroups: [],
+    orderScopeRadio: undefined,
+  }
+  @Input() itsmData:any = {
+    checkedHos: undefined,
+    scopeGroups: [],
+    orderScopeRadio: undefined,
+  }
+  @Output() confirmModal = new EventEmitter();
+  @Output() cancelModal = new EventEmitter();
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+    private icomingService: WebsocketIncomingService,
+  ) { }
+
+  user = JSON.parse(localStorage.getItem("user")); //用户信息
+  isLoading:boolean = false;
+  formData1:any = {};
+  formData2:any = {};
+  hospitalList:any[] = [];
+
+  // 工单范选项卡
+  scopeTabs:any[] = [
+    { name: '分机绑定', value: 1, checked: false },
+    { name: '呼叫中心', value: 2, checked: false },
+  ];
+  activeScopeTab = this.scopeTabs[0];
+
+  ngOnInit() {
+    console.log('itsmData', this.itsmData);
+    console.log('hsmsData', this.hsmsData);
+    this.getHospitalList();
+    this.getHjzxCornetList();
+    this.getCallCenterConfig();
+  }
+
+  // 获取院区列表
+  getHospitalList() {
+    // 工单范围
+    // 运维不限制部门，则取权限下的所有院区和部门
+    // 运维限制部门，则取运维选中的部门和配送选中的院区
+    if(this.itsmData.mdv2Switch){
+      // 开通运维
+      if(this.itsmData.allDuty === 1){
+        // 不限制部门
+        let hospitals = this.user.infoPermission.hospitals || [];
+        let dutyList = this.user.infoPermission.dutyList || [];
+        this.hospitalList = hospitals.concat(dutyList);
+      }else{
+        // 限制部门
+        if(this.hsmsData.hsmsSwitch){
+          // 开通配送
+          this.hospitalList = this.itsmData.checkedHos.concat(this.hsmsData.checkedHosDTO);
+        }else{
+          // 未开通配送
+          this.hospitalList = this.itsmData.checkedHos;
+        }
+      }
+    }else{
+      // 未开通运维
+      if(this.hsmsData.hsmsSwitch){
+        // 开通配送
+        this.hospitalList = [this.hsmsData.checkedHosDTO];
+      }else{
+        // 未开通配送
+        this.hospitalList = [];
+      }
+    }
+  }
+
+  //获取呼叫中心分机号码
+  hjzxCornetList:any[] = [];
+  getHjzxCornetList() {
+    this.isLoading = true;
+    this.mainService.getDictionary('list', 'hjzx_cornet').subscribe((data) => {
+      this.isLoading = false;
+      this.hjzxCornetList = data || [];
+    });
+  }
+
+  // 获取呼叫中心服务连接地址
+  callCenterConfigObj:any = {};
+  getCallCenterConfig() {
+    let data = {
+      idx: 0,
+      sum: 9999,
+      callCenterConfig: {},
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "callCenterConfig", data)
+      .subscribe((data) => {
+        if (data.status == 200) {
+          let list = data.list || [];
+          this.callCenterConfigObj = list.length ? list[0] : {};
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+
+  // 修改院区
+  changeHospital(hosId){
+    this.phoneNumList = [];
+    this.getPhoneNumList(hosId);
+  }
+
+
+
+  // 修改选项卡-是否启动
+  changeFlag(flag, item){
+    if(flag){
+      this.scopeTabs.forEach(v => {
+        if(v.value != item.value){
+          v.checked = false;
+        }
+      })
+    }
+  }
+
+  //获取所有分机号码列表
+  phoneNumList:any[] = [];
+  getPhoneNumList(hosId) {
+    this.isLoading = true;
+    let postData = {
+      idx: 0,
+      sum: 100,
+      hospitalConfig: { hosId },
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "hospitalConfig", postData)
+      .subscribe((result) => {
+        this.isLoading = false;
+        this.phoneNumList = result.list.filter((item) => item.key.includes("phone_num_port") && item.value);
+        console.log('this.phoneNumList:', this.phoneNumList)
+      });
+  }
+
+  // 保存工单范围设置
+  saveOrderScope() {
+    let startObj = this.scopeTabs.find((item) => item.checked);
+    if(startObj){
+      if(startObj.value == 1){
+        // 录音盒
+        if(!this.formData1.number){
+          this.message.warning('请选择【分机绑定】分机号码')
+          return;
+        }
+        this.icomingService.setSign('box');
+        this.confirmModal.emit(this.formData1.number);
+      }else if(startObj.value == 2){
+        // 呼叫中心
+        if(!this.formData2.number){
+          this.message.warning('请选择【呼叫中心】分机号码')
+          return;
+        }
+        if(!this.callCenterConfigObj.socketUrl.trim()){
+          this.message.warning('呼叫中心服务连接地址未配置，请前往配置中心->三方配置中配置')
+          return;
+        }
+        this.icomingService.setSign('callCenter');
+        this.icomingService.setSocketUrl(this.callCenterConfigObj.socketUrl);
+        this.confirmModal.emit(this.formData2.number);
+      }
+    }else{
+      this.message.warning('请启动分机号码或呼叫中心')
+    }
+  }
+
+  // 关闭弹窗
+  cancelInit() {
+    this.cancelModal.emit();
+  }
+}

src/app/components/bind-extension-number/bind-extension-number.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { BindExtensionNumberComponent } from './bind-extension-number.component';
+import { ShareModule } from '../../share/share.module';
+
+
+@NgModule({
+  declarations: [
+    BindExtensionNumberComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+  ],
+  exports: [
+    BindExtensionNumberComponent,
+  ]
+})
+export class BindExtensionNumberModule { }

src/app/components/configurationCenter/configuration-callcenter/configuration-callcenter.component.html

@@ -3,7 +3,6 @@
     <div class="addressAssign">
       <overlay-scrollbars #osComponentRef2 class="contentBody2">
         <div class="contentBody">
-          <div class="hospital">{{currentHospital.hosName}}</div>
           <div class="classList">
             节假日班次：
             <nz-select class="select" [nzDropdownMatchSelectWidth]="false" nzAllowClear [(ngModel)]="dataInfo.holidayClassId"
@@ -28,6 +27,10 @@
               </nz-option>
             </nz-select>
           </div>
+          <div class="classList">
+            呼叫中心服务连接：
+            <input style="width: 270px;" nz-input placeholder="请填写呼叫中心服务连接" [(ngModel)]="dataInfo.socketUrl" />
+          </div>
         </div>
       </overlay-scrollbars>
       <div class="contentBtns">

src/app/components/configurationCenter/configuration-callcenter/configuration-callcenter.component.ts

@@ -33,9 +33,9 @@ export class ConfigurationCallcenterComponent implements OnInit {
   submitMessageForm(): void {
     this.btnLoading = true;
     let postData:any = {
-      hosId: this.currentHospital.id,
       workdayClassId: this.dataInfo.workdayClassId,
       holidayClassId: this.dataInfo.holidayClassId,
+      socketUrl: this.dataInfo.socketUrl,
     };
     postData = { ...this.dataInfo, ...postData };
     this.mainService
@@ -80,9 +80,7 @@ export class ConfigurationCallcenterComponent implements OnInit {
     let data = {
       idx: 0,
       sum: 9999,
-      callCenterConfig: {
-        hosId: this.currentHospital.id,
-      },
+      callCenterConfig: {},
     };
     this.loading1 = true;
     this.mainService

src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, ViewChild } from "@angular/core";
+import { Component, OnInit, ViewChild, Input } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { MainService } from "../../../services/main.service";
 import { Validators, FormGroup, FormBuilder, FormControl } from '@angular/forms';
@@ -33,23 +33,16 @@ export class ConfigurationDictionaryComponent implements OnInit {
   osComponentRef2: OverlayScrollbarsComponent;
 
   ngOnInit() {
-    this.initDictionaryForm();
+    this.activeDictionaryKey = this.dictionaryKeyList[0];
     this.getDictionaryList();
+    this.initDictionaryForm();
   }
 
   // 数据字典key列表
-  dictionaryKeyList: any[] = [
-    { id: 1, name: '积分配置', key: "incident_category_score"},
-    { id: 2, name: '事件来源', key: "incident_source"},
-    { id: 3, name: '处理结果', key: "incident_closecode"},
-    { id: 4, name: '处理方式', key: "incident_handle_type"},
-    { id: 5, name: '状态', key: "incident_status"},
-    { id: 6, name: '维修记录', key: "repair_type"},
-    { id: 7, name: '满意度评价', key: "incident_degree"},
-  ];
+  @Input() dictionaryKeyList: any[] = [];
 
   // 点击数据字典key
-  activeDictionaryKey:any = this.dictionaryKeyList[0];
+  activeDictionaryKey:any;
   clickDictionaryKey(item){
     this.activeDictionaryKey = item;
     this.getDictionaryList();
@@ -107,6 +100,7 @@ export class ConfigurationDictionaryComponent implements OnInit {
           this.btnLoading = false;
           this.delModal = false;
           if (data.status == 200) {
+            this.mainService.clearDictionary();
             this.showPromptModal(this.tipsMsg2, true, "");
           } else {
             this.showPromptModal(this.tipsMsg2, false, data.msg);
@@ -247,6 +241,7 @@ export class ConfigurationDictionaryComponent implements OnInit {
       .subscribe((result) => {
         this.btnLoading = false;
         if (result.status == 200) {
+          this.mainService.clearDictionary();
           this.showPromptModal('保存', true, '');
         } else {
           this.showPromptModal('保存', false, result.msg || '');

src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { ConfigurationDictionaryComponent } from './configuration-dictionary.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    ConfigurationDictionaryComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+  ],
+  exports: [
+    ConfigurationDictionaryComponent,
+  ]
+})
+export class ConfigurationDictionaryModule { }

src/app/components/incidentManagement/incident-detail/incident-detail.component.ts

@@ -228,11 +228,6 @@ export class IncidentDetailComponent implements OnInit {
     return this.incidentData.synergetic && this.incidentData.synergetic.length ? this.incidentData.synergetic.map(v => v.name).join('，') : '';
   }
 
-  // 是否进入汇总单
-  isInSummaryOrder(){
-    return this.incidentData.duty && this.itsmSummarySheet.value == 1 && (this.incidentData.handlingPersonnelUser.id == this.tool.getCurrentUserId());
-  }
-
   // 获取院区配置信息
   itsmSummarySheet:any = {};//是否需要填写汇总单
   getHospitalConfig() {
@@ -250,12 +245,10 @@ export class IncidentDetailComponent implements OnInit {
         let list = result.list || [];
         this.itsmSummarySheet = list.find(v => v.key == 'itsmSummarySheet') || {};
         console.log(this.itsmSummarySheet)
-        if(this.isInSummaryOrder()){
-          // 维修汇总单
-          if(this.incidentData.state.value == 'close' && this.incidentData.summaryId){
-            let flag = this.tabs.some(v => v.value === 4);
-            !flag && this.tabs.splice(2, 0, {name: '汇总单', value: 4});
-          }
+        // 维修汇总单
+        if(this.incidentData.state.value == 'close' && this.itsmSummarySheet.value == 1 && this.incidentData.summaryId){
+          let flag = this.tabs.some(v => v.value === 4);
+          !flag && this.tabs.splice(2, 0, {name: '汇总单', value: 4});
         }
       });
   }

src/app/components/incidentManagement/incident-handle/incident-handle.component.ts

@@ -159,7 +159,7 @@ export class IncidentHandleComponent implements OnInit {
       idx: 0,
       sum: 9999,
       solution: {
-        category: categoryId,
+        categoryId,
 				status: this.solutionStatus,
 				type: this.solutionType,
       },

src/app/components/incidentManagement/incident-recording/incident-recording.component.html

@@ -0,0 +1,14 @@
+<div class="save display_flex justify-content_flex-center align-items_center add">
+  <div class="modalBody">
+    <div class="title">回放录音<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <div class="content audio">
+      <audio controls style="outline: none;">
+        <source [src]="audioPath" type="audio/wav">
+      </audio>
+    </div>
+    <div class=" display_flex justify-content_flex-center">
+      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">知道了</button>
+    </div>
+  </div>
+</div>

src/app/components/incidentManagement/incident-recording/incident-recording.component.less

@@ -0,0 +1,173 @@
+@import "../../../../../src/theme.less";
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+
+  .modalBody {
+    width: 350px;
+    height: 220px;
+    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: 310px;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      & > div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 18px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+      .roundRobinTips {
+        font-size: 12px;
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+        max-height: 497px;
+        overflow-y: auto;
+        &.audio {
+          padding: 0;
+          height: 126px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+
+            .desc {
+              margin-top: 5px;
+            }
+          }
+
+          .datesControl {
+            margin-top: -16px;
+
+            .ant-form-item-label {
+              line-height: 40px;
+            }
+          }
+
+          .timer {
+            .ant-form-item-label {
+              width: 100%;
+              text-align: left;
+            }
+
+            .numInp {
+              margin-right: 5px;
+            }
+
+            .line {
+              margin-right: 5px;
+            }
+          }
+
+          .timer2 {
+            .ant-form-item-label {
+              line-height: 20px;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}

src/app/components/incidentManagement/incident-recording/incident-recording.component.ts

@@ -0,0 +1,29 @@
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+
+@Component({
+  selector: 'app-incident-recording',
+  templateUrl: './incident-recording.component.html',
+  styleUrls: ['./incident-recording.component.less']
+})
+export class IncidentRecordingComponent implements OnInit {
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  @Input() path: any;
+
+  constructor() { }
+
+  audioPath = ""; //录音文件地址
+
+  ngOnInit() {
+    this.audioPath = location.origin + this.path;
+  }
+
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+}
+
+
+
+

src/app/components/incidentManagement/incident-recording/incident-recording.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { IncidentRecordingComponent } from './incident-recording.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    IncidentRecordingComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+  ],
+  exports: [
+    IncidentRecordingComponent,
+  ]
+})
+export class IncidentRecordingModule { }

src/app/components/incidentManagement/incident-ser-call/incident-ser-call.component.html

@@ -0,0 +1,77 @@
+<div class="modal display_flex align-items_center">
+  <div class="modalBody">
+    <div class="title">通话记录<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="content">
+      <div class="list-template w100" style="padding: 16px;">
+        <div class="list-template__content">
+          <div class="list-template__top" nz-row style="padding: 0;">
+            <div nz-col nzXl='18' class="list-template__searchBox">
+              <div class="list-template__searchItem">
+                <span class="label">主叫号码：</span>
+                <input nz-input class="formItem" placeholder="请输入主叫号码" [(ngModel)]="searchDTO.dTMFA" />
+              </div>
+              <div class="list-template__searchItem">
+                <span class="label">被叫号码：</span>
+                <input nz-input class="formItem" placeholder="请输入被叫号码" [(ngModel)]="searchDTO.dTMFB" />
+              </div>
+              <div class="list-template__searchItem">
+                <span class="label">开始时间：</span>
+                <nz-date-picker class="formItem" [ngModel]="searchDTO.responseTime" (ngModelChange)="searchDTO.responseTime = $event" nzShowTime></nz-date-picker>
+              </div>
+            </div>
+            <div nz-col nzXl='6' class="list-template__btns">
+              <button nz-button class="btn default ml8 mt0" (click)='search()'>搜索</button>
+              <button nz-button class="btn default ml8 mt0" (click)='reset()'>重置</button>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="tableWrap">
+        <nz-table class="hospitalTable" [nzData]="messageList" nzSize="small" [nzShowPagination]="false" [nzLoading]="loading">
+          <thead>
+            <tr class="thead">
+              <th nzWidth="12.5%">主叫号码</th>
+              <th nzWidth="12.5%">被叫号码</th>
+              <th nzWidth="12.5%">开始时间</th>
+              <th nzWidth="12.5%">结束时间</th>
+              <th nzWidth="12.5%">通话时长</th>
+              <th nzWidth="12.5%">已接/未接</th>
+              <th nzWidth="12.5%">呼入/呼出</th>
+              <th nzWidth="12.5%">操作</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr *ngFor="let data of messageList;let i = index;">
+              <td>{{ data.dTMFA }}</td>
+              <td>{{ data.dTMFB }}</td>
+              <td>{{ data.responseTime}}</td>
+              <td>{{ data.overTime}}</td>
+              <td *ngIf="data.longTime!==undefined">{{data.longTime}}秒</td>
+              <td *ngIf="data.longTime===undefined"></td>
+              <td>{{data.callState == 1?'已接':'未接'}}</td>
+              <td>{{data.callType == 1?'呼入':(data.callType == 0?'呼出':'')}}</td>
+              <td>
+                <div class="coop">
+                  <span *ngIf="data.path" (click)="recordcall(data)">回访录音</span>
+                </div>
+              </td>
+            </tr>
+          </tbody>
+        </nz-table>
+        <div class="pagination">
+          <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+          <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="total"
+            [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList()"
+            (nzPageSizeChange)="getList()" [nzShowTotal]="totalTemplate">
+          </nz-pagination>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- 回放录音模态框 -->
+<app-incident-recording [path]="coopData.relativePath" *ngIf="recordingModalShow" (closeModelHs)="closeRecordingModelOrder($event)"></app-incident-recording>
+
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>

src/app/components/incidentManagement/incident-ser-call/incident-ser-call.component.less

@@ -0,0 +1,240 @@
+@import "../../../../theme.less";
+.coop {
+  button{
+    color: #333;
+  }
+  span,button {
+    display: inline-block;
+    padding: 0 8px;
+    cursor: pointer;
+    position: relative;
+
+    &::after {
+      content: "|";
+      position: absolute;
+      top: 0;
+      right: 0;
+    }
+
+    &:hover,
+    &:active {
+      color: @primary-color;
+    }
+
+    &:nth-last-child(1) {
+      &::after {
+        content: "";
+      }
+    }
+  }
+}
+.tabs{
+  width: 100%;
+  height: 56px;
+  border-bottom: 1px solid #D9D9D9;
+  display: flex;
+  align-items: center;
+  .tab{
+    width: 100px;
+    display: flex;
+    height: 100%;
+    justify-content: center;
+    align-items: center;
+    font-size: #333;
+    cursor: pointer;
+    &.active{
+      color: @primary-color;
+      border-bottom: 2px solid @primary-color;
+    }
+  }
+}
+.modal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+  .tableWrap{
+    margin: 0 16px 16px!important;
+    background: #F9FAFB;
+    border-radius: 8px;
+    border: 1px solid #D9D9D9;
+    width: calc(100% - 32px);
+    min-height: 501px;
+    padding: 16px 16px 0;
+    ::ng-deep .ant-table-body{
+      margin: 0!important;
+    }
+  }
+  .hospitalTable {
+    width: 100%;
+    td {
+      text-align: center !important;
+      position: relative;
+      word-break: break-all;
+    }
+    .thead {
+      background-image: linear-gradient(to right, @bg-start, @bg-end);
+      th {
+        text-align: center !important;
+        color: #fff;
+        background: transparent;
+      }
+    }
+  }
+
+  .ji {
+    position: absolute;
+    right: 0px;
+    top: -3px;
+    width: 30px;
+  }
+
+  .list-template__top{
+    div{
+      text-align: left!important;
+    }
+  }
+
+  .modalBody {
+    width: 1315px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+    &.modalBody-search {
+      width: 480px;
+      min-height: 250px;
+    }
+
+    .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 {
+      min-height: 117px;
+      // background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      &.content-search {
+        min-height: 147px;
+        justify-content: start;
+        .defeat-search {
+          width: 100%;
+          height: 52px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          border-bottom: solid 1px #e5e9ed;
+          em {
+            color: #666;
+            font-style: normal;
+          }
+        }
+        .form {
+          width: 100%;
+          padding: 0 16px;
+          .ant-form-item-label,
+          .ant-form-explain {
+            text-align: left !important;
+          }
+        }
+      }
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.defeat {
+          color: #333;
+          font-size: 28px;
+        }
+        &.countDown {
+          font-size: 14px;
+          color: 666;
+          em {
+            font-style: normal;
+            color: @primary-color;
+          }
+        }
+
+        &.pagination {
+          font-size: 14px;
+          color: #666;
+          padding-top: 16px;
+          padding-bottom: 16px;
+          text-align: right;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}

src/app/components/incidentManagement/incident-ser-call/incident-ser-call.component.ts

@@ -0,0 +1,100 @@
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+import { format, startOfDay, endOfDay } from 'date-fns';
+import { MainService } from 'src/app/services/main.service';
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+@Component({
+  selector: 'app-incident-ser-call',
+  templateUrl: './incident-ser-call.component.html',
+  styleUrls: ['./incident-ser-call.component.less']
+})
+export class IncidentSerCallComponent implements OnInit {
+  // 切换科室，切换弹窗
+  loading = false;
+  messageList: any = [];// 通话记录列表
+  pageIndex: number = 1;//表格当前页码
+  pageSize: number = 10;//表格每页展示条数
+  total: number = 0;//表格总数据量
+
+  searchDTO: any = {};
+
+  @Input() itsmData:any;
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) { }
+
+  ngOnInit() {
+    this.getMessageList(1);
+  }
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit({ show: false });//emits(向上弹射)事件
+  }
+
+  // 搜索
+  search() {
+    this.getMessageList(1);
+  }
+  // 重置
+  reset() {
+    this.searchDTO = {};
+    this.getMessageList(1);
+  }
+
+  // 回放录音
+  coopData:any = {};
+  recordingModalShow = false; //弹窗开关
+  maskFlag:any = false;
+  recordcall(data) {
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService.getCallLogPath({ path: data.path, hosId: data.hosId }).subscribe((result) => {
+      this.message.remove(this.maskFlag);
+      this.maskFlag = false;
+      if (result["state"] == 200) {
+        this.coopData = { relativePath: result["relativePath"] };
+        this.recordingModalShow = true;
+      }
+    });
+  }
+  // 关闭弹窗
+  closeRecordingModelOrder(e) {
+    this.recordingModalShow = JSON.parse(e).show;
+  }
+
+  // 分页获取数据
+  getList(){
+    this.getMessageList();
+  }
+
+  // 获取通话记录列表
+  getMessageList(idx?) {
+    if (idx) {
+      this.pageIndex = 1;
+    }
+    let postData = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      callLog: {
+        "hosIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
+        dTMFA: this.searchDTO.dTMFA || undefined,
+        dTMFB: this.searchDTO.dTMFB || undefined,
+        responseTime: this.searchDTO.responseTime ? format(this.searchDTO.responseTime, 'yyyy-MM-dd HH:mm:ss') : undefined,
+      }
+    }
+    this.loading = true;
+    this.mainService.getFetchDataList('simple/data','callLog',postData).subscribe(data => {
+      this.loading = false;
+      this.messageList = data.list || [];
+      this.total = data.totalNum;
+    })
+  }
+}
+
+
+

src/app/components/incidentManagement/incident-ser-call/incident-ser-call.module.ts

@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { IncidentSerCallComponent } from './incident-ser-call.component';
+import { ShareModule } from 'src/app/share/share.module';
+import { IncidentRecordingModule } from '../incident-recording/incident-recording.module';
+
+
+@NgModule({
+  declarations: [
+    IncidentSerCallComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+    IncidentRecordingModule,
+  ],
+  exports: [
+    IncidentSerCallComponent,
+  ]
+})
+export class IncidentSerCallModule { }

src/app/components/incidentManagement/incident-ser-message/incident-ser-message.component.html

@@ -0,0 +1,73 @@
+<div class="modal display_flex align-items_center">
+  <div class="modalBody">
+    <div class="title">留言记录<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="content">
+      <div class="tabs">
+        <div class="tab" *ngFor="let item of tabs" (click)="clickTbab(item)" [ngClass]="{ active: activeTabValue === item.value }">{{ item.name }}</div>
+      </div>
+      <div class="list-template w100" style="padding: 16px;">
+        <div class="list-template__content">
+          <div class="list-template__top" nz-row style="padding: 0;">
+            <div nz-col nzXl='18' class="list-template__searchBox">
+              <div class="list-template__searchItem">
+                <span class="label">留言时间</span>：
+                <nz-range-picker style="width: 373px;" nzShowTime [(ngModel)]="searchDTO.dateRange" (nzOnCalendarChange)="onCalendarChangeDate($event)"></nz-range-picker>
+              </div>
+            </div>
+            <div nz-col nzXl='6' class="list-template__btns">
+              <button nz-button class="btn default ml8 mt0" (click)='search()'>搜索</button>
+              <button nz-button class="btn default ml8 mt0" (click)='reset()'>重置</button>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="tableWrap">
+        <nz-table class="hospitalTable" [nzData]="messageList" nzSize="small" [nzShowPagination]="false" [nzLoading]="loading">
+          <thead>
+            <tr class="thead">
+              <th nzWidth="8%">序号</th>
+              <th nzWidth="23%">留言时间</th>
+              <th nzWidth="23%">来电号码</th>
+              <th nzWidth="23%">处理状态</th>
+              <th nzWidth="23%">操作</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr *ngFor="let data of messageList;let i = index;">
+              <td>{{ (pageIndex - 1) * pageSize + i + 1 }}</td>
+              <td>{{ data.recTime | date:'yyyy-MM-dd HH:mm' }}</td>
+              <td>{{ data.ano}}</td>
+              <td>{{ data.isExcute == 1 ? '已受理' : (data.isExcute == 2 ? '不受理' : '未受理') }}</td>
+              <td>
+                <div class="coop">
+                  <span *ngIf="data.isExcute === 0" (click)="createOrder(data)">生成工单</span>
+                  <span *ngIf="data.isExcute === 0 || data.isExcute === 1" (click)="recordcall(data)">回访录音</span>
+                  <span *ngIf="data.isExcute === 0" (click)="showDelModal(data, '确认不受理后，将无法转换为事件工单!', '不受理', 'notAccepted')">不受理</span>
+                  <span *ngIf="data.isExcute === 1" (click)="openItsmDetails(data.incidentDTO)">查看故障单</span>
+                </div>
+              </td>
+            </tr>
+          </tbody>
+        </nz-table>
+        <div class="pagination">
+          <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+          <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="total"
+            [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList()"
+            (nzPageSizeChange)="getList()" [nzShowTotal]="totalTemplate">
+          </nz-pagination>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- 回放录音模态框 -->
+<app-incident-recording [path]="coopData.recFileName" *ngIf="recordingModalShow" (closeModelHs)="closeRecordingModelOrder($event)"></app-incident-recording>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow" [info]="promptInfo"></app-prompt-modal>
+
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading" (confirmDelEvent)="confirmDelFn()" [content]="tipsMsg1"></app-dialog-delete>
+
+<!-- 详情 -->
+<app-incident-detail [id]="coopData.id" *ngIf="detailModalShow" (closeModelHs)="closeDetailModelOrder($event)" (confirmModelHs)="confirmDetailModelOrder($event)"></app-incident-detail>

src/app/components/incidentManagement/incident-ser-message/incident-ser-message.component.less

@@ -0,0 +1,240 @@
+@import "../../../../theme.less";
+.coop {
+  button{
+    color: #333;
+  }
+  span,button {
+    display: inline-block;
+    padding: 0 8px;
+    cursor: pointer;
+    position: relative;
+
+    &::after {
+      content: "|";
+      position: absolute;
+      top: 0;
+      right: 0;
+    }
+
+    &:hover,
+    &:active {
+      color: @primary-color;
+    }
+
+    &:nth-last-child(1) {
+      &::after {
+        content: "";
+      }
+    }
+  }
+}
+.tabs{
+  width: 100%;
+  height: 56px;
+  border-bottom: 1px solid #D9D9D9;
+  display: flex;
+  align-items: center;
+  .tab{
+    width: 100px;
+    display: flex;
+    height: 100%;
+    justify-content: center;
+    align-items: center;
+    font-size: #333;
+    cursor: pointer;
+    &.active{
+      color: @primary-color;
+      border-bottom: 2px solid @primary-color;
+    }
+  }
+}
+.modal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+  .tableWrap{
+    margin: 0 16px 16px!important;
+    background: #F9FAFB;
+    border-radius: 8px;
+    border: 1px solid #D9D9D9;
+    width: calc(100% - 32px);
+    min-height: 501px;
+    padding: 16px 16px 0;
+    ::ng-deep .ant-table-body{
+      margin: 0!important;
+    }
+  }
+  .hospitalTable {
+    width: 100%;
+    td {
+      text-align: center !important;
+      position: relative;
+      word-break: break-all;
+    }
+    .thead {
+      background-image: linear-gradient(to right, @bg-start, @bg-end);
+      th {
+        text-align: center !important;
+        color: #fff;
+        background: transparent;
+      }
+    }
+  }
+
+  .ji {
+    position: absolute;
+    right: 0px;
+    top: -3px;
+    width: 30px;
+  }
+
+  .list-template__top{
+    div{
+      text-align: left!important;
+    }
+  }
+
+  .modalBody {
+    width: 1315px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+    &.modalBody-search {
+      width: 480px;
+      min-height: 250px;
+    }
+
+    .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 {
+      min-height: 117px;
+      // background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      &.content-search {
+        min-height: 147px;
+        justify-content: start;
+        .defeat-search {
+          width: 100%;
+          height: 52px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          border-bottom: solid 1px #e5e9ed;
+          em {
+            color: #666;
+            font-style: normal;
+          }
+        }
+        .form {
+          width: 100%;
+          padding: 0 16px;
+          .ant-form-item-label,
+          .ant-form-explain {
+            text-align: left !important;
+          }
+        }
+      }
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.defeat {
+          color: #333;
+          font-size: 28px;
+        }
+        &.countDown {
+          font-size: 14px;
+          color: 666;
+          em {
+            font-style: normal;
+            color: @primary-color;
+          }
+        }
+
+        &.pagination {
+          font-size: 14px;
+          color: #666;
+          padding-top: 16px;
+          padding-bottom: 16px;
+          text-align: right;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}

src/app/components/incidentManagement/incident-ser-message/incident-ser-message.component.ts

@@ -0,0 +1,181 @@
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+import { format, startOfDay, endOfDay } from 'date-fns';
+import { MainService } from 'src/app/services/main.service';
+import { ToolService } from 'src/app/services/tool.service';
+@Component({
+  selector: 'app-incident-ser-message',
+  templateUrl: './incident-ser-message.component.html',
+  styleUrls: ['./incident-ser-message.component.less']
+})
+export class IncidentSerMessageComponent implements OnInit {
+  // 切换科室，切换弹窗
+  loading = false;
+  messageList: any = [];// 留言列表
+  pageIndex: number = 1;//表格当前页码
+  pageSize: number = 10;//表格每页展示条数
+  total: number = 0;//表格总数据量
+
+  tabs:any[] = [
+    {id: 1, name: '全部', value: '', num: ''},
+    {id: 2, name: '未受理', value: 0, num: ''},
+    {id: 3, name: '已受理', value: 1, num: ''},
+    {id: 4, name: '不受理', value: 2, num: ''},
+  ]
+
+  searchDTO: any = {};
+
+  @Input() itsmData:any;
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  constructor(private mainService: MainService, private tool: ToolService) { }
+
+  ngOnInit() {
+    this.clickTbab(this.tabs[1]);
+  }
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit({ show: false });//emits(向上弹射)事件
+  }
+
+  // 点击tab
+  activeTabValue:any;
+  clickTbab(item){
+    this.activeTabValue = item.value;
+    this.getMessageList(1);
+  }
+
+  onCalendarChangeDate(dateArr){
+    console.log(dateArr)
+    if(dateArr.length == 2){
+      let dateStart = new Date(dateArr[0]);
+      let dateEnd = new Date(dateArr[1]);
+      dateStart.setHours(0,0,0);
+      dateEnd.setHours(23,59,59);
+      this.searchDTO.dateRange = [dateStart,dateEnd];
+    }
+  }
+
+  // 搜索
+  search() {
+    this.getMessageList(1);
+  }
+  // 重置
+  reset() {
+    this.searchDTO = {};
+    this.getMessageList(1);
+  }
+
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  coopData:any = {};
+  showDelModal(data, tipsMsg1: string, tipsMsg2: string, type: string) {
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopData = data;
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  btnLoading: boolean = false; //确认按钮loading状态
+  confirmDelFn() {
+    this.btnLoading = true;
+    if (this.confirmDelType === "notAccepted") {
+      //不受理
+      this.mainService
+        .simplePost("updData", "hjzxRecord", { ...this.coopData, item: undefined, isExcute: 2 })
+        .subscribe((data) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.status == 200) {
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
+    }
+  }
+
+  // 生成工单
+  createOrder(data){
+    this.closeModelHs.emit({ show: false, data: data });
+  }
+
+  // 回放录音
+  recordingModalShow = false; //弹窗开关
+  recordcall(data) {
+    this.coopData = data;
+    this.recordingModalShow = true;
+  }
+  // 关闭弹窗
+  closeRecordingModelOrder(e) {
+    this.recordingModalShow = JSON.parse(e).show;
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //是否展示提示框
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+      this.getList();
+    }, 100);
+  }
+
+  // 分页获取数据
+  getList(){
+    this.getMessageList();
+  }
+
+  // 获取留言列表
+  getMessageList(idx?) {
+    if (idx) {
+      this.pageIndex = 1;
+    }
+    let postData = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      hjzxRecord: {
+        isExcute: this.activeTabValue === '' ? undefined : this.activeTabValue,
+        startTime: this.searchDTO.dateRange ? format(startOfDay(this.searchDTO.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined,
+        endTime: this.searchDTO.dateRange ? format(endOfDay(this.searchDTO.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined,
+      }
+    }
+    this.loading = true;
+    this.mainService.getFetchDataList('simple/data','hjzxRecord',postData).subscribe(data => {
+      this.loading = false;
+      this.messageList = data.list || [];
+      this.total = data.totalNum;
+    })
+  }
+
+  // 查看ITSM工单详情
+  detailModalShow = false; //弹窗开关
+  openItsmDetails(data) {
+    this.coopData = data;
+    this.detailModalShow = true;
+  }
+  // 关闭弹窗
+  closeDetailModelOrder(e) {
+    this.detailModalShow = JSON.parse(e).show;
+  }
+  // 弹窗确定
+  confirmDetailModelOrder(e){
+    console.log(e);
+    this.detailModalShow = false;
+  }
+}
+
+
+

src/app/components/incidentManagement/incident-ser-message/incident-ser-message.module.ts

@@ -0,0 +1,24 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { IncidentSerMessageComponent } from './incident-ser-message.component';
+import { ShareModule } from 'src/app/share/share.module';
+import { IncidentDetailModule } from '../incident-detail/incident-detail.module';
+import { IncidentRecordingModule } from '../incident-recording/incident-recording.module';
+
+
+@NgModule({
+  declarations: [
+    IncidentSerMessageComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+    IncidentDetailModule,
+    IncidentRecordingModule,
+  ],
+  exports: [
+    IncidentSerMessageComponent,
+  ]
+})
+export class IncidentSerMessageModule { }

src/app/components/incidentManagement/incident-ser-visit/incident-ser-visit.component.html

@@ -0,0 +1,37 @@
+<div class="modal display_flex align-items_center">
+  <div class="modalBody">
+    <div class="title">待回访<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <overlay-scrollbars #osComponentRef1 class="content">
+      <nz-spin nzSimple [nzSpinning]="loading" class="mt8 text_align_center"></nz-spin>
+      <ng-container *ngIf="!loading">
+        <div class="items" *ngFor="let item of visitList">
+          <div class="row">
+            <div class="col">单号：{{item.incidentsign}}</div>
+            <div class="col">优先级：<span [ngClass]="priorityColor(item.priorityId)">{{item.priorityDTO?.name}}</span></div>
+            <div class="col">院区-科室名称：{{item.hosName}}-{{item.department?.dept}}</div>
+          </div>
+          <div class="row">
+            <div class="col">故障描述：{{item.description}}</div>
+          </div>
+          <div class="row">
+            <div class="col">详细地址：{{ item.place ? item.place.building.buildingName : '' }}{{ item.place ? item.place.floorName : '' }}{{ item.houseNumber }}</div>
+          </div>
+          <div class="row">
+            <div class="col">申请时间：{{ item.startDate | date: 'yyyy-MM-dd HH:mm'}}</div>
+            <div class="col">处理人：{{computedHandlerUser(item)}}</div>
+            <div class="col btns">
+              <input type="button" class="mid_bot mr8" value="回访" (click)="visit(item)" />
+              <input type="button" class="btm_bot" value="查看" (click)="openItsmDetails(item)" />
+            </div>
+          </div>
+        </div>
+      </ng-container>
+    </overlay-scrollbars>
+  </div>
+</div>
+
+<!-- 详情 -->
+<app-incident-detail [id]="coopData.id" *ngIf="detailModalShow" (closeModelHs)="closeDetailModelOrder($event)" (confirmModelHs)="confirmDetailModelOrder($event)"></app-incident-detail>
+
+<!-- 回访 -->
+<app-incident-visit [id]="coopData.id" *ngIf="visitModalShow" (closeModelHs)="closeVisitModelOrder($event)" (confirmModelHs)="confirmVisitModelOrder($event)"></app-incident-visit>

src/app/components/incidentManagement/incident-ser-visit/incident-ser-visit.component.less

@@ -0,0 +1,155 @@
+@import "../../../../theme.less";
+.modal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+  .hospitalTable {
+    width: 100%;
+    td {
+      text-align: center !important;
+      position: relative;
+      word-break: break-all;
+    }
+    .thead {
+      background-image: linear-gradient(to right, @bg-start, @bg-end);
+      th {
+        text-align: center !important;
+        color: #fff;
+        background: transparent;
+      }
+    }
+  }
+
+  .ji {
+    position: absolute;
+    right: 0px;
+    top: -3px;
+    width: 30px;
+  }
+
+  .list-template__top{
+    div{
+      text-align: left!important;
+    }
+  }
+
+  .tab {
+    width: 100%;
+    height: 60px;
+    border-bottom: 1px solid #e5e9ed;
+    background-color: #fff;
+
+    .item {
+      text-align: center;
+      line-height: 60px;
+      height: 100%;
+      border-right: 1px solid #e5e9ed;
+
+      &:nth-last-child(1) {
+        border: none;
+      }
+
+      &.checked {
+        background: #f0f6ed;
+      }
+    }
+  }
+
+  .modalBody {
+    width: 742px;
+    height: 707px;
+    background: #fff;
+    border-radius: 5px;
+    padding-bottom: 30px;
+    color: #333;
+    &.modalBody-search {
+      width: 480px;
+      min-height: 250px;
+    }
+
+    .title {
+      width: 100%;
+      height: 40px;
+      line-height: 40px;
+      text-align: center;
+      font-size: 16px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 16px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 16px;
+      }
+    }
+
+    .content {
+      height: calc(100% - 40px);
+      border-top: 1px solid #D9D9D9;
+      border-bottom: 1px solid #D9D9D9;
+      .items{
+        border-bottom: 1px solid #D9D9D9;
+        padding: 16px 48px;
+        font-size: 14px;
+        &:last-of-type{
+          border-bottom: none;
+        }
+        .row{
+          position: relative;
+          display: flex;
+          margin-top: 12px;
+          &:first-of-type{
+            margin-top: 0;
+          }
+          .col{
+            margin-right: 48px;
+            &:last-of-type{
+              margin-right: 0;
+            }
+            &.btns{
+              position: absolute;
+              bottom: 0;
+              right: 0;
+            }
+          }
+        }
+        /* 中按钮 */
+        .mid_bot {
+          width: 65px;
+          border-radius: 4px;
+          color: white;
+          background-color: @primary-color;
+          border: 1px @primary-color solid;
+          cursor: pointer;
+          height: 27px;
+        }
+
+        /* 下按钮 */
+        .btm_bot {
+          width: 65px;
+          border-radius: 4px;
+          color: #78797a;
+          background-color: #FFF;
+          border: 1px #e5e9ed solid;
+          cursor: pointer;
+          height: 27px;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+}

src/app/components/incidentManagement/incident-ser-visit/incident-ser-visit.component.ts

@@ -0,0 +1,123 @@
+import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angular/core';
+import { ToolService } from 'src/app/services/tool.service';
+import { MainService } from 'src/app/services/main.service';
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
+@Component({
+  selector: 'app-incident-ser-visit',
+  templateUrl: './incident-ser-visit.component.html',
+  styleUrls: ['./incident-ser-visit.component.less']
+})
+export class IncidentSerVisitComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  // 切换科室，切换弹窗
+  loading = false;
+  visitList: any = [];// 列表
+  pageIndex: number = 1;//表格当前页码
+  pageSize: number = 10;//表格每页展示条数
+  total: number = 0;//表格总数据量
+
+  @Input() itsmData:any;
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  constructor(private mainService: MainService, private tool: ToolService) { }
+
+  ngOnInit() {
+    this.getVisitList();
+  }
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+
+  // 优先级颜色
+  priorityColor(priorityId) {
+    // 极低|低
+    if(priorityId == 1 || priorityId == 2){
+      return '';
+    } else if(priorityId == 3){
+      return 'yellow';
+    } else if(priorityId == 4 || priorityId == 5){
+      return 'red';
+    }
+  }
+
+  // 处理人
+  computedHandlerUser(item){
+    if(item.state.value == 'pending' && item.currentLog){
+      return item.currentLog.workerName;
+    }
+    if(item.state.value != 'pending' && item.handlingPersonnelUser){
+      return item.handlingPersonnelUser.name;
+    }
+  }
+
+  // 查看ITSM工单详情
+  detailModalShow = false; //弹窗开关
+  coopData:any = {};
+  openItsmDetails(data) {
+    this.coopData = data;
+    this.detailModalShow = true;
+  }
+  // 关闭弹窗
+  closeDetailModelOrder(e) {
+    this.detailModalShow = JSON.parse(e).show;
+  }
+  // 弹窗确定
+  confirmDetailModelOrder(e){
+    console.log(e);
+    this.detailModalShow = false;
+  }
+
+  // 回访-弹窗
+  visitModalShow = false; //弹窗开关
+  visit(data) {
+    this.coopData = data;
+    this.visitModalShow = true;
+  }
+  // 关闭弹窗
+  closeVisitModelOrder(e) {
+    this.visitModalShow = JSON.parse(e).show;
+  }
+  // 弹窗确定
+  confirmVisitModelOrder(e){
+    console.log(e);
+    this.visitModalShow = false;
+    this.getList();
+  }
+
+  // 分页获取数据
+  getList(){
+    this.getVisitList();
+  }
+
+  // 获取回访列表
+  getVisitList(){
+    this.loading = true;
+    let postData: any = {
+      idx: 0,
+      sum: 9999,
+      incident: {
+        "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.map(v => v.id).toString() || undefined),
+        "hosIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
+        "urgentType": +this.itsmData.orderScopeRadio + 1,
+        "queryTask": "callback",
+        "assignee": this.tool.getCurrentUserId(),
+        "deleteFlag": 0,
+      },
+    };
+
+    this.mainService
+      .getFetchDataList("simple/data", "incident", postData)
+      .subscribe((result) => {
+        this.loading = false;
+        this.visitList = result.list.map(v => ({...v, endDeptsName: v.endDepts ? v.endDepts.map(v => v.dept).toString() : ''}));
+      });
+  }
+}
+
+
+

src/app/components/incidentManagement/incident-ser-visit/incident-ser-visit.module.ts

@@ -0,0 +1,24 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { IncidentSerVisitComponent } from './incident-ser-visit.component';
+import { ShareModule } from 'src/app/share/share.module';
+import { IncidentDetailModule } from '../incident-detail/incident-detail.module';
+import { IncidentVisitModule } from '../incident-visit/incident-visit.module';
+
+
+@NgModule({
+  declarations: [
+    IncidentSerVisitComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+    IncidentDetailModule,
+    IncidentVisitModule,
+  ],
+  exports: [
+    IncidentSerVisitComponent,
+  ]
+})
+export class IncidentSerVisitModule { }

src/app/services/httpInterceptor.service.ts

@@ -38,7 +38,6 @@ export class HttpInterceptorService implements HttpInterceptor {
               this.message.info('登录失效，请重新登录！').onClose!.subscribe(() => {
                 localStorage.removeItem("user");
                 localStorage.removeItem("menu");
-                localStorage.removeItem("phones");
                 localStorage.removeItem("index");
                 this.router.navigate(['/login']);
               })

src/app/services/main.service.ts

@@ -993,7 +993,7 @@ export class MainService {
 	    headers: this.headers,
 	  });
 	}
-	
+
 	// 调度台工单列表
 	orderList(data) {
 	  return this.http.post(host.host + `/ser/merge/orderList`,data, {

src/app/services/websocket-hjzx.service.ts

@@ -0,0 +1,19 @@
+/*
+ * @Author: seimin
+ * @Date: 2024-09-24 16:34:47
+ * @LastEditors: seimin
+ * @LastEditTime: 2024-09-29 15:38:58
+ * @Description: 呼叫中心websocket服务
+ */
+import { Injectable } from "@angular/core";
+declare const tlwsa: any;
+@Injectable({
+  providedIn: "root",
+})
+export class WebsocketHjzxService {
+  constructor() { }
+
+  closeWs(flag: boolean = false){
+    flag && tlwsa.tlaClose();
+  }
+}

src/app/services/websocket-incoming.service.ts

@@ -0,0 +1,111 @@
+/*
+ * @Author: seimin
+ * @Date: 2024-09-24 16:34:47
+ * @LastEditors: seimin
+ * @LastEditTime: 2024-09-29 15:41:54
+ * @Description: 来电弹屏websocket服务
+ */
+import { Injectable } from "@angular/core";
+import { Observable } from "rxjs";
+import { WebsocketPhoneService } from './websocket-phone.service';
+import { WebsocketHjzxService } from './websocket-hjzx.service';
+import { MainService } from './main.service';
+import http from "../../assets/js/http";
+
+@Injectable({
+  providedIn: "root",
+})
+export class WebsocketIncomingService {
+  constructor(
+    private mainService: MainService,
+    private phoneService: WebsocketPhoneService,
+    private hjzxService: WebsocketHjzxService,
+  ) { }
+
+  // 连接websocket { userCount }
+  private user = JSON.parse(localStorage.getItem("user")); //用户信息
+  connectWs(): Observable<any> {
+    let userCount = this.user.user.account + "|" + this.getPhoneNumber();
+    if(this.getSign() === 'box'){
+      return this.phoneService.connectWs(http.phoneWs, { userCount });
+    }
+  }
+  // 断开websocket
+  closeWs(flag: boolean = false) {
+    console.log('sign', this.getSign())
+    if(this.getSign() === 'box'){
+      this.phoneService.closeWs(flag);
+    }else if(this.getSign() === 'callCenter'){
+      this.hjzxService.closeWs(flag);
+    }
+  }
+
+  // 绑定的分机号码
+  private phoneNumber:string = '';
+  // 获取绑定分机号码
+  getPhoneNumber() {
+    return this.phoneNumber || sessionStorage.getItem('phoneNumber');
+  }
+  // 设置绑定分机号码
+  setPhoneNumber(phoneNumber: string) {
+    this.phoneNumber = phoneNumber;
+    sessionStorage.setItem('phoneNumber', phoneNumber);
+  }
+  // 删除绑定分机号码
+  removePhoneNumber() {
+    this.phoneNumber = '';
+    sessionStorage.removeItem('phoneNumber');
+  }
+
+  // 上次绑定的分机号码
+  private phoneNumberPre:string = '';
+  // 获取上次绑定分机号码
+  getPhoneNumberPre() {
+    return this.phoneNumberPre || sessionStorage.getItem('phoneNumberPre');
+  }
+  // 设置上次绑定分机号码
+  setPhoneNumberPre(phoneNumberPre: string) {
+    this.phoneNumberPre = phoneNumberPre;
+    sessionStorage.setItem('phoneNumberPre', phoneNumberPre);
+  }
+  // 删除上次绑定分机号码
+  removePhoneNumberPre() {
+    this.phoneNumberPre = '';
+    sessionStorage.removeItem('phoneNumberPre');
+  }
+
+  // 标识(呼叫中心或录音盒)
+  // callCenter|box
+  private sign:string = '';
+  // 获取绑定标识
+  getSign() {
+    return this.sign || sessionStorage.getItem('sign');
+  }
+  // 设置绑定标识
+  setSign(sign: string) {
+    this.sign = sign;
+    sessionStorage.setItem('sign', sign);
+  }
+  // 删除绑定标识
+  removeSign() {
+    this.sign = '';
+    sessionStorage.removeItem('sign');
+  }
+
+  // 呼叫中心服务地址
+  private socketUrl:string = '';
+  // 获取呼叫中心服务地址
+  getSocketUrl() {
+    return this.socketUrl || sessionStorage.getItem('socketUrl');
+  }
+  // 设置呼叫中心服务地址
+  setSocketUrl(socketUrl: string) {
+    this.socketUrl = socketUrl;
+    sessionStorage.setItem('socketUrl', socketUrl);
+  }
+  // 删除呼叫中心服务地址
+  removeSocketUrl() {
+    this.socketUrl = '';
+    sessionStorage.removeItem('socketUrl');
+  }
+}

src/app/services/websocket-phone.service.ts

@@ -1,3 +1,10 @@
+/*
+ * @Author: seimin
+ * @Date: 2024-03-11 11:11:09
+ * @LastEditors: seimin
+ * @LastEditTime: 2024-09-24 16:38:23
+ * @Description: 录音盒websocket服务
+ */
 import { Injectable } from "@angular/core";
 import { Subject, Observable, from } from "rxjs";
 import * as Atmosphere from "atmosphere.js";

src/app/views/data-dictionary/data-dictionary.component.ts

@@ -321,6 +321,9 @@ export class DataDictionaryComponent implements OnInit {
         this.hideModal();
         this.btnLoading = false;
         if (result["status"] == 200) {
+          if(this.checkedDictionary.type === 'dictionary'){
+            this.mainService.clearDictionary();
+          }
           this.showPromptModal(this.add ? "新增" : "编辑", true, "");
         } else {
           this.showPromptModal(
@@ -359,6 +362,9 @@ export class DataDictionaryComponent implements OnInit {
       this.hideDelDictionaryModal();
       this.btnLoading = false;
       if (result.status == 200) {
+        if(this.checkedDictionary.type === 'dictionary'){
+          this.mainService.clearDictionary();
+        }
         this.showPromptModal("删除", true, "");
       } else {
         this.showPromptModal("删除", false, result.msg);

src/app/views/fuwutai/fuwutai.component.less

@@ -255,7 +255,7 @@
       border-top: 0;
       border-radius: 0 0 4px 4px;
       cursor: pointer;
-      z-index: 9;
+      z-index: 8;
     }
   }
 
@@ -428,7 +428,7 @@
     padding: 0 15px;
     border-bottom: 1px rgb(225, 229, 232) solid;
     position: relative;
-    z-index: 9;
+    z-index: 8;
   }
 
   .lists .head .last_time {
@@ -485,7 +485,7 @@
     padding: 10px 2%;
     background: #f9fafb;
     position: relative;
-    z-index: 9;
+    z-index: 8;
     display: flex;
     justify-content: space-between;
     align-items: center;
@@ -671,7 +671,7 @@
     width: 70%;
     border-radius: 4px;
     color: #78797a;
-    background-color: #F0F6ED;
+    background-color: #FFF;
     border: 1px #e5e9ed solid;
     cursor: pointer;
     height: 27px;
@@ -951,10 +951,6 @@
     position: relative;
     overflow: hidden;
     display: flex;
-
-    .left_cots {
-      width: 98%;
-    }
   }
 
   /* 急标 */
@@ -1257,7 +1253,7 @@
     margin-top: 4px;
     border-radius: 4px;
     color: #78797a;
-    background-color: #F0F6ED;
+    background-color: #FFF;
     border: 1px #e5e9ed solid;
     cursor: pointer;
     height: 27px;
@@ -1557,6 +1553,19 @@
     z-index: 9;
     border-radius: 5px 0 0 5px;
 
+    &.maskFull{
+      &::after{
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        z-index: 8;
+        cursor: move;
+      }
+    }
+
     .fixedMark {
       position: fixed;
       left: 0;
@@ -1701,18 +1710,107 @@
       // opacity: .5;
       width: 80px;
       float: left;
-      background: rgba(255, 255, 255, 0.5);
+      // background: rgba(255, 255, 255, 0.5);
       border-radius: 5px 0 0 5px;
       position: relative;
       z-index: 8;
 
+      .fixedMenuWrap{
+        border-radius: 5px;
+        margin-bottom: 16px;
+        .fixedMenu{
+          border-radius: 0!important;
+        }
+      }
+
       .fixedMenu {
         border: 1px solid #e5e9ed;
         color: @primary-color;
-        background: rgba(255, 255, 255, 0.5);
+        background: rgb(255, 255, 255);
         text-align: center;
         border-radius: 5px 0 0 5px;
-        // box-shadow: -3px 4px 15px rgba(234, 233, 233, .5);
+
+        .menuItems {
+          .call-icon{
+            font-size: 26px;
+            color: @primary-color;
+            padding: 16px 0;
+            &.transport-shimang1{
+              color: red;
+            }
+          }
+          .call-status{
+            background-color: @primary-color;
+            color: #fff;
+            width: 100%;
+          }
+          .item {
+            height: 35px;
+            line-height: 35px;
+            padding: 0 6px;
+            cursor: pointer;
+            border-bottom: 1px solid #e5e9ed;
+            user-select: none;
+            &.itemLink {
+              border-bottom: none;
+            }
+
+            &.checked {
+              background: #fff;
+              color: #52ab77;
+              opacity: 1;
+              box-shadow: -3px 4px 7px #eae9e9;
+            }
+          }
+
+          .others {
+            transition: height 0.4s linear;
+            overflow: hidden;
+          }
+        }
+
+        .arrow {
+          cursor: pointer;
+        }
+      }
+    }
+  }
+
+  // 左侧悬浮菜单
+  .fixedLeft {
+    position: fixed;
+    top: 40%;
+    left: 0;
+    z-index: 8;
+    border-radius: 5px 0 0 5px;
+
+    &.maskFull{
+      &::after{
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        z-index: 8;
+        cursor: move;
+      }
+    }
+
+    .right {
+      width: 80px;
+      float: left;
+      // background: rgba(255, 255, 255, 0.5);
+      border-radius: 5px 0 0 5px;
+      position: relative;
+      z-index: 8;
+
+      .fixedMenu {
+        border: 1px solid #e5e9ed;
+        color: @primary-color;
+        background: rgb(255, 255, 255);
+        text-align: center;
+        border-radius: 0 5px 5px 0;
 
         &.hujiaozhongxin {
           margin-bottom: 5px;
@@ -1723,9 +1821,10 @@
             height: 35px;
             line-height: 35px;
             padding: 0 6px;
-            cursor: default;
+            cursor: pointer;
             border-bottom: 1px solid #e5e9ed;
             user-select: none;
+            text-align: left;
             &.itemLink {
               border-bottom: none;
             }
@@ -1952,6 +2051,16 @@
                     &.flex7{
                       flex: 7;
                     }
+                    .ant-input-clear-icon{
+                      align-self: center;
+                      font-style: normal;
+                      cursor: pointer;
+                      margin-left: 8px;
+                      font-size: 12px;
+                      border-bottom: 1px solid #49b856;
+                      color: #49b856;
+                      flex-shrink: 0;
+                    }
                     .name{
                       flex-shrink: 0;
                       width: 6em;

src/app/views/fuwutai/fuwutai.module.ts

@@ -12,6 +12,12 @@ import { KnowledgeLookModule } from 'src/app/components/knowledge-look/knowledge
 import { IncidentDetailModule } from 'src/app/components/incidentManagement/incident-detail/incident-detail.module';
 import { IncidentRejectModule } from 'src/app/components/incidentManagement/incident-reject/incident-reject.module';
 import { IncidentSubstitutionModule } from 'src/app/components/incidentManagement/incident-substitution/incident-substitution.module';
+import { IncidentHandleModule } from 'src/app/components/incidentManagement/incident-handle/incident-handle.module';
+import { IncidentSerVisitModule } from 'src/app/components/incidentManagement/incident-ser-visit/incident-ser-visit.module';
+import { IncidentSerMessageModule } from 'src/app/components/incidentManagement/incident-ser-message/incident-ser-message.module';
+import { IncidentSerCallModule } from 'src/app/components/incidentManagement/incident-ser-call/incident-ser-call.module';
+import { VirtualScrollerModule } from 'ngx-virtual-scroller';
+import { BindExtensionNumberModule } from 'src/app/components/bind-extension-number/bind-extension-number.module';
 
 
 @NgModule({
@@ -29,6 +35,12 @@ import { IncidentSubstitutionModule } from 'src/app/components/incidentManagemen
     IncidentDetailModule,
     IncidentRejectModule,
     IncidentSubstitutionModule,
+    IncidentHandleModule,
+    IncidentSerVisitModule,
+    IncidentSerMessageModule,
+    IncidentSerCallModule,
+    VirtualScrollerModule,
+    BindExtensionNumberModule,
   ]
 })
 export class FuwutaiModule { }

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

@@ -4473,7 +4473,6 @@ export class HushijiandanComponent implements OnInit {
     }
     localStorage.removeItem("user");
     localStorage.removeItem("menu");
-    localStorage.removeItem("phones");
     localStorage.removeItem("index");
 
     // 假退出
@@ -4486,7 +4485,6 @@ export class HushijiandanComponent implements OnInit {
         }
         localStorage.removeItem("user");
         localStorage.removeItem("menu");
-        localStorage.removeItem("phones");
         localStorage.removeItem("index");
       }
     });

src/app/views/incident-config/incident-config.component.html

@@ -18,7 +18,7 @@
   </ng-container>
   <!-- 数据字典 -->
   <ng-container *ngIf="activeTagId === 3">
-    <app-configuration-dictionary></app-configuration-dictionary>
+    <app-configuration-dictionary [dictionaryKeyList]="dictionaryKeyList"></app-configuration-dictionary>
   </ng-container>
   <!-- 消息通知 -->
   <ng-container *ngIf="activeTagId === 4">

src/app/views/incident-config/incident-config.component.ts

@@ -22,6 +22,17 @@ export class IncidentConfigComponent implements OnInit, AfterViewInit {
     { id: 7, name: '院区配置',},
   ];
 
+  // 数据字典
+  dictionaryKeyList:any[] = [
+    { id: 1, name: '积分配置', key: "incident_category_score"},
+    { id: 2, name: '事件来源', key: "incident_source"},
+    { id: 3, name: '处理结果', key: "incident_closecode"},
+    { id: 4, name: '处理方式', key: "incident_handle_type"},
+    { id: 5, name: '状态', key: "incident_status"},
+    { id: 6, name: '维修记录', key: "repair_type"},
+    { id: 7, name: '满意度评价', key: "incident_degree"},
+  ]
+
   ngOnInit(): void {}
 
   ngAfterViewInit(){

src/app/views/incident-config/incident-config.module.ts

@@ -6,11 +6,11 @@ import { IncidentConfigComponent } from './incident-config.component';
 import { ShareModule } from 'src/app/share/share.module';
 import { ConfigurationCategoryComponent } from 'src/app/components/configurationCenter/configuration-category/configuration-category.component';
 import { ConfigurationPriorityComponent } from 'src/app/components/configurationCenter/configuration-priority/configuration-priority.component';
-import { ConfigurationDictionaryComponent } from 'src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.component';
 import { ConfigurationManHourComponent } from 'src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component';
 import { ConfigurationDeptUserComponent } from 'src/app/components/configurationCenter/configuration-deptUser/configuration-deptUser.component';
 import { ConfigurationMessageComponent } from 'src/app/components/configurationCenter/configuration-message/configuration-message.component';
 import { ConfigurationHospitalComponent } from 'src/app/components/configurationCenter/configuration-hospital/configuration-hospital.component';
+import { ConfigurationDictionaryModule } from 'src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.module';
 
 
 @NgModule({
@@ -18,7 +18,6 @@ import { ConfigurationHospitalComponent } from 'src/app/components/configuration
     IncidentConfigComponent,
     ConfigurationCategoryComponent,
     ConfigurationPriorityComponent,
-    ConfigurationDictionaryComponent,
 		ConfigurationManHourComponent,
 		ConfigurationDeptUserComponent,
     ConfigurationMessageComponent,
@@ -27,7 +26,8 @@ import { ConfigurationHospitalComponent } from 'src/app/components/configuration
   imports: [
     CommonModule,
     IncidentConfigRoutingModule,
-    ShareModule
+    ShareModule,
+    ConfigurationDictionaryModule,
   ]
 })
 export class IncidentConfigModule { }

src/app/views/inspection-plan-config/inspection-plan-config.component.ts

@@ -207,7 +207,7 @@ export class InspectionPlanConfigComponent implements OnInit, AfterViewInit {
       group2: {
         groupName: keyword,
         hospitals: this.currentHospital.id,
-        type: 1,
+        type: 3,
       },
       idx: 0,
       sum: 10,

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

@@ -46,6 +46,7 @@
       <strong>点击下载谷歌浏览器👉</strong>
       <a [href]="http.domain+'/chrome64/ChromeSetup32.exe'">win32</a>
       <a [href]="http.domain+'/chrome64/ChromeSetup64.exe'">win64</a>
+      <a href="javascript:;" (click)="showScreen($event)">录屏</a>
     </div>
   </div>
 </div>

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

@@ -9,6 +9,8 @@ import { baseUrlType } from "src/app/type/types";
 import { ToolService } from 'src/app/services/tool.service';
 import { Title } from '@angular/platform-browser';
 import { MarkingService } from 'src/app/services/marking.service';
+
+declare var MediaRecorder: any;
 @Component({
   selector: "app-login",
   templateUrl: "./login.component.html",
@@ -301,4 +303,35 @@ export class LoginComponent implements OnInit {
     });
     return parents;
   }
+
+  // 录屏
+  isRecording:boolean = false;
+  async showScreen(e){
+    if(this.isRecording || !navigator.mediaDevices){
+      return;
+    }
+    e.preventDefault();
+    let stream = await (navigator.mediaDevices as any).getDisplayMedia({ video: true });
+    let mime = MediaRecorder.isTypeSupported("video/webm; codecs=vp9") ? "video/webm; codecs=vp9" : "video/webm";
+
+    let mediaRecorder = new MediaRecorder(stream, { mimeType: mime });
+    let chunks = [];
+    //录制
+    mediaRecorder.addEventListener('dataavailable', (e) => {
+      this.isRecording = true;
+      chunks.push(e.data)
+    })
+    //停止
+    mediaRecorder.addEventListener('stop', () => {
+      let blob = new Blob(chunks, { type: chunks[0].type });
+      let url = URL.createObjectURL(blob);
+      let a = document.createElement('a');
+      a.href = url;
+      a.download = 'video.webm';
+      a.click();
+      this.isRecording = false;
+    })
+    //手动启动
+    mediaRecorder.start()
+  }
 }

src/app/views/main/main.component.ts

@@ -504,7 +504,6 @@ export class MainComponent implements OnInit {
     }
     localStorage.removeItem("user");
     localStorage.removeItem("menu");
-    localStorage.removeItem("phones");
     localStorage.removeItem("index");
 
     // 假退出
@@ -517,7 +516,6 @@ export class MainComponent implements OnInit {
         }
         localStorage.removeItem("user");
         localStorage.removeItem("menu");
-        localStorage.removeItem("phones");
         localStorage.removeItem("index");
       }
     });

src/app/views/other-config/other-config.component.html

@@ -18,7 +18,7 @@
   </ng-container>
   <!-- 数据字典 -->
   <ng-container *ngIf="activeTagId === 3">
-    <!-- <app-configuration-dictionary></app-configuration-dictionary> -->
+    <app-configuration-dictionary [dictionaryKeyList]="dictionaryKeyList"></app-configuration-dictionary>
   </ng-container>
 </div>
 

src/app/views/other-config/other-config.component.ts

@@ -15,9 +15,14 @@ export class OtherConfigComponent implements OnInit, AfterViewInit {
   tagList:any = [
     { id: 1, name: '呼叫中心',},
     { id: 2, name: '微信配置',},
-    // { id: 3, name: '数据字典',},
+    { id: 3, name: '数据字典',},
   ];
 
+  // 数据字典
+  dictionaryKeyList:any[] = [
+    { id: 1, name: '呼叫中心分机号', key: "hjzx_cornet"},
+  ]
+
   ngOnInit(): void {}
 
   ngAfterViewInit(){

src/app/views/other-config/other-config.module.ts

@@ -6,6 +6,7 @@ import { OtherConfigComponent } from './other-config.component';
 import { ShareModule } from 'src/app/share/share.module';
 import { ConfigurationWechatComponent } from 'src/app/components/configurationCenter/configuration-wechat/configuration-wechat.component';
 import { ConfigurationCallcenterComponent } from 'src/app/components/configurationCenter/configuration-callcenter/configuration-callcenter.component';
+import { ConfigurationDictionaryModule } from 'src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.module';
 
 
 @NgModule({
@@ -17,7 +18,8 @@ import { ConfigurationCallcenterComponent } from 'src/app/components/configurati
   imports: [
     CommonModule,
     OtherConfigRoutingModule,
-    ShareModule
+    ShareModule,
+    ConfigurationDictionaryModule,
   ]
 })
 export class OtherConfigModule { }

src/app/views/pathology/pathology.component.ts

@@ -48,8 +48,8 @@ export class PathologyComponent implements OnInit, OnDestroy {
   })
   osComponentRef5: OverlayScrollbarsComponent;
   constructor(
-	private mainService: MainService, 
-	public router: Router, 
+	private mainService: MainService,
+	public router: Router,
 	private route: ActivatedRoute,
 	public tool: ToolService,
 	private fb: FormBuilder,
@@ -95,7 +95,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
   completedFlag = false;
   completedSearchKey = "";
   completedLoad = false;
-	
+
 	barCode:any; //条码搜索
   // other
   loginUser: any = localStorage.getItem("user")
@@ -117,7 +117,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	fixationModal:boolean = false //标本接收固定
 	verificationMoadl:boolean = false //标本核验
 	specimenCode:any; //标本条码
-	listOneData:any=[]; 
+	listOneData:any=[];
 	listOneLength:any;
 	pageOneIndex:any = 1;
 	pageSize:any = 10;
@@ -223,7 +223,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
       this.runTime();
     }, 500);
   }
-	
+
 	//tab切换
 	tabClick(type){
 		this.activeIndex = type
@@ -237,7 +237,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			this.getHospitalData()
 		}
 	}
-	
+
 	// 获取今日接收数据
 	getToday(){
 		this.mainService
@@ -252,7 +252,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	changeUserInp(e){
 		this.changeInpSubjectUser.next([e]);
 	}
-	
+
 	// 获取配送人
 	getUserData(e){
 		let query={
@@ -269,7 +269,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			this.userData = res.list
 		});
 	}
-	
+
 	// 搜索
 	search() {
 	  this.pageOneIndex = 1;
@@ -308,7 +308,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	      that.listOneLength = data.totalNum;
 	    });
 	}
-	
+
 	// 实时术中快速数据
 	getSpeedinessList() {
 		var that = this;
@@ -330,7 +330,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		    that.listTwoLength = data.totalNum;
 		  });
 	}
-	
+
 	// 打包配送
 	getPackList() {
 	  var that = this;
@@ -350,7 +350,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	      that.listThreeLength = data.totalNum;
 	    });
 	}
-	
+
 	// 查看
 	project:any = [];
 	oneLook(e,data){
@@ -372,7 +372,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			}
 		});
 	}
-	
+
 	// 关闭查看
 	closeDetail(){
 		this.listDetailMoadl = false
@@ -380,7 +380,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			document.getElementById('Binput').focus();
 		},200)
 	}
-	
+
 	// 接收
 	connect(){
 		this.mainService.generateBatchNumber()
@@ -395,7 +395,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			}
 		})
 	}
-	
+
 	// 打包
 	packaging(){
 		this.mainService.generateBatchNumber()
@@ -410,14 +410,14 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			}
 		})
 	}
-	
+
 	//打包查看标本
 	threeLook(e,data){
 		localStorage.setItem("pathologyActiveIndex",this.activeIndex)
 		localStorage.setItem("dataType",'');
 		this.router.navigateByUrl(`/pathologyScan?packId=${data.id}&businessType=packagLook`);
 	}
-	
+
 	// 配送
 	distributionModal:boolean = false
 	distribution(e,data){
@@ -431,7 +431,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		this.handoverUserId = null
 		this.distributionModal = true
 	}
-	
+
 	// 确定配送
 	submitDistributionForm(){
 		for (const i in this.validateForm.controls) {
@@ -459,9 +459,9 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		      this.message.error(data.msg)
 		    }
 		  });
-		
+
 	}
-	
+
 	// 取消配送
 	hideDistributionModal(){
 		this.distributionModal = false
@@ -469,16 +469,16 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			document.getElementById('Binput').focus();
 		},200)
 	}
-	
+
 	changeHospitalInp(e){
 		// this.changeInpSubjectHospital.next([e]);
 	}
-	
+
 	changeDepartmentInp(e){
 		this.isDeptLoading = true
 		this.changeInpSubjectDepartment.next([e]);
 	}
-	
+
 	// 获取院区
 	getHospitalData(){
 		let arr = this.tool.getHospitalList().filter(i=>i.parent==undefined)
@@ -496,7 +496,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		//     this.hospital = res.list;
 		//   });
 	}
-	
+
 	// 选择院区
 	hospitalId:any=null;
 	changeHospDate(e){
@@ -504,7 +504,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		this.hospitalId = e
 		this.getDepartmentData('',e)
 	}
-	
+
 	// 获取科室
 	isDeptLoading:boolean = false;
 	getDepartmentData(e,hospital){
@@ -527,7 +527,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			  });
 		});
 	}
-	
+
 	// 补打
 	printModal:boolean = false;
 	parintLoading:boolean = false;
@@ -535,7 +535,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		this.rowData = item
 		this.printModal = true
 	}
-	
+
 	// 取消补打
 	hidePrintModal(){
 		this.printModal = false
@@ -543,7 +543,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			document.getElementById('Binput').focus();
 		},200)
 	}
-	
+
 	// 确定补打
 	confirmPrintDel(){
 		this.parintLoading = true
@@ -571,9 +571,9 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				this.message.error(data.msg)
 			}
 		});
-		
+
 	}
-	
+
 	// 接收时间
 	startDate:any;
 	endDate:any;
@@ -582,12 +582,12 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		this.endDate = format(result[1], 'yyyy-MM-dd' +' '+'23:59:59');
 		this.acceptTime = [this.startDate,this.endDate]
 	}
-	
+
 	// 获取批次号
 	generateBatchNumber(){
 
 	}
-	
+
 	// 标本条码搜索
 	errorcODEMsg:any = null
 	batchNo:any = null;
@@ -625,7 +625,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				})
 			}
 		})
-		
+
 	}
 	// 获取标本接收数据
 	pageReceptionIndex:any = 1;
@@ -661,7 +661,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				this.listReceptionLength = res.totalNum;
 		  });
 	}
-	
+
 	// 确定接收包
 	submitReceptionForm(){
 		for (const i in this.validateConnectForm.controls) {
@@ -692,7 +692,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		    }
 		  });
 	}
-	
+
 	// 关闭配送接收
 	hideReceptionModal(){
 		this.receptionModal = false
@@ -700,12 +700,12 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			document.getElementById('Binput').focus();
 		},200)
 	}
-	
+
 	// 选择固定时间
 	formChangeDate(result){
 	  this.startDate = format(result, 'yyyy-MM-dd HH:mm:ss');
 	}
-	
+
 	// 监听人员交接接收人工号输入
 	connectUserId:any = null;
 	receptionName:any = null;
@@ -729,7 +729,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 监听人员交接配送人工号输入
 	dispatchingUserId:any = null;
 	dispatchingName:any = null;
@@ -753,7 +753,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 确定交接
 	mustReceived:any = null;
 	currReceived:any = null;
@@ -779,7 +779,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				this.dispatchingName = null;
 				this.dispatchingUserId = null
 			}
-			
+
 			this.receptionName = null;
 			this.connectUserId = null
 			this.connectModal = true
@@ -789,7 +789,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	hideConnectModal(){
 		this.connectModal = false
 	}
-	
+
 	// 确定人员交接
 	btnConnectLoading:boolean = false;
 	submitConnectForm(){
@@ -815,21 +815,21 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		    }
 		  });
 	}
-	
+
 	// 确定打包
 	packModal:boolean = false;
 	submitScanForm(){
 		this.packModal = true
 		// this.hideSpecimenModal()
 	}
-	
+
 	// 确定打包并打印
 	btnPackLoading:boolean = false;
 	printData:any = [];
 	submitPackForm(){
 		let that = this
 		let data: any = {
-			
+
 		};
 
 		this.btnPackLoading = true;
@@ -857,7 +857,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 关闭打包并打印
 	hidePackModal(){
 		this.packModal = false
@@ -865,7 +865,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			document.getElementById('specimen').focus();
 		},200)
 	}
-	
+
 	// 关闭交接/打包
 	hideSpecimenModal(){
 		this.barCode = null;
@@ -875,7 +875,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			document.getElementById('Binput').focus();
 		},200)
 	}
-	
+
 	// 获取标本详情
 	getSampleData(item){
 		// this.isSpinning = true
@@ -896,7 +896,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			}
 		});
 	}
-	
+
 	// 获取科室
 	getDept(){
 		this.setSpecimen()
@@ -925,7 +925,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			  .subscribe((res) => {
 			    that.operationData = res.list;
 			  });
-				
+
 			that.mainService
 			  .getFetchDataList("data", "department", data2)
 			  .subscribe((res) => {
@@ -934,7 +934,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			  });
 		});
 	}
-	
+
 	// 获取关联科室详情
 	getDeptDetail(){
 		this.mainService
@@ -954,7 +954,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 获取是否关联标本间
 	setSpecimen(){
 		this.validateForm = this.fb.group({
@@ -964,7 +964,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		});
 		this.relevanceModal = true
 	}
-	
+
 	// 确定关联科室
 	btnLoading:boolean = false;
 	submitForm(){
@@ -998,7 +998,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		    }
 		  });
 	}
-	
+
 	getNewDept(){
 		let postData = {
 		  currentHosId: this.hosId,
@@ -1024,12 +1024,12 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		  }
 		});
 	}
-	
+
 	// 获取当前用户信息
 	getCurrentUserNow() {
 	  this.mainService.getCurrentUser1().subscribe((data:any) => {
 	    if (data["status"] == 200) {
-				this.loginUser = data.data 
+				this.loginUser = data.data
 	      let user = JSON.parse(localStorage.getItem("user"));
 	      user.user.dept = data["data"].dept;
 	      user.user.currentHospital = data["data"].currentHospital;
@@ -1037,7 +1037,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	    }
 	  });
 	}
-	
+
 	// 输入工号查询姓名
 	handoverUserId:any = null;
 	numberChange(e){
@@ -1060,7 +1060,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 提交固定标本接收
 	submitVerificationForm(){
 		for (const i in this.validateVerificationForm.controls) {
@@ -1068,7 +1068,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		  this.validateVerificationForm.controls[i].updateValueAndValidity();
 		}
 		if (this.validateVerificationForm.invalid) return;
-		
+
 		let data: any = {
 			id:this.codeData.id,
 			specimenDeptId:this.validateForm.value.specimen,
@@ -1092,14 +1092,14 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			}
 		});
 	}
-	
+
 	// 成功/失败提示框
 	closeModel(){
 		this.hideReceptionModal()
 		this.hideConnectModal()
 		this.hideSpecimenModal()
 	}
-	
+
 	// 关闭配送信息
 	hideVerificationModal(){
 		this.verificationMoadl = false
@@ -1113,13 +1113,13 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		this.businessType = 'connect'
 		this.changeInpSubjectSpecimen.next([e]);
 	}
-	
+
 	// 监听交接/打包扫描条码
 	tableLoading:boolean = false;
 	codeChange(e){
 		this.changeInpSubject.next([e]);
 	}
-	
+
 	// 标本接收搜索条码
 	errorMsg:any = null;
 	searchSpecimenData(e){
@@ -1154,7 +1154,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			}
 		})
 	}
-	
+
 	// 关闭多只标本
 	hideMultiModal(){
 		this.multiModal = false
@@ -1162,7 +1162,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			document.getElementById('specimen').focus();
 		},200)
 	}
-	
+
 	// 监听多只标本扫描
 	codeMultiChange(e){
 		if(!e){
@@ -1191,7 +1191,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			})
 		},500)
 	}
-	
+
 	// 多只标本确定接受
 	btnMultiLoading:boolean = false;
 	submitMultiForm(){
@@ -1199,7 +1199,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		this.btnMultiLoading = false
 		this.hideMultiModal()
 	}
-	
+
 	pathologyLogs:any=[];
 	specimenList:any=[]
 	stepLength:any = 0;
@@ -1208,19 +1208,19 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	// 	this.getSampleData(item)
 	// 	clearInterval(this.logTimer);
 	// 	if(type==1){
-			
+
 	// 	}else if(type==2){
-			
+
 	// 	}else{
-			
+
 	// 	}
 	// }
-	
+
 	closeDetailMoadl(){
 		this.detailMoadl = false
 	}
-	
- 
+
+
   // 自动刷新倒计时
   autoUpdate(flag = true) {
     if (flag) {
@@ -1246,7 +1246,6 @@ export class PathologyComponent implements OnInit, OnDestroy {
     }
     localStorage.removeItem("user");
     localStorage.removeItem("menu");
-    localStorage.removeItem("phones");
     localStorage.removeItem("index");
 		localStorage.removeItem("scanCodeData");
 		localStorage.removeItem("dataType");
@@ -1261,7 +1260,6 @@ export class PathologyComponent implements OnInit, OnDestroy {
         }
         localStorage.removeItem("user");
         localStorage.removeItem("menu");
-        localStorage.removeItem("phones");
         localStorage.removeItem("index");
 				localStorage.removeItem("scanCodeData");
 				localStorage.removeItem("dataType");
@@ -1357,7 +1355,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
       }
     }, 1000);
   }
-	
+
 	promptModalShow:boolean = false;
 	promptContent:any = null;
 	ifSuccess:any = null;

src/app/views/pathologyScan/pathologyScan.component.ts

@@ -48,14 +48,14 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
   })
   osComponentRef5: OverlayScrollbarsComponent;
   constructor(
-	private mainService: MainService, 
-	public router: Router, 
+	private mainService: MainService,
+	public router: Router,
 	private route: ActivatedRoute,
 	public tool: ToolService,
 	private fb: FormBuilder,
 	private message: NzMessageService,
 	private sanitizer: DomSanitizer,
-	
+
 	) {}
   // 今日药单量
   todayTotal: undefined;
@@ -96,7 +96,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
   completedFlag = false;
   completedSearchKey = "";
   completedLoad = false;
-	
+
 	barCode:any; //条码搜索
   // other
   loginUser: any = localStorage.getItem("user")
@@ -118,7 +118,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 	fixationModal:boolean = false //标本接收固定
 	verificationMoadl:boolean = false //标本核验
 	specimenCode:any; //标本条码
-	listOneData:any=[]; 
+	listOneData:any=[];
 	listOneLength:any;
 	pageOneIndex:any = 1;
 	pageSize:any = 10;
@@ -210,7 +210,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			if(this.dataType=='pathologyPack'){
 				this.getJsData(4)
 			}
-			if(this.scanCodeData.pathologySpecimenDTOList && 
+			if(this.scanCodeData.pathologySpecimenDTOList &&
 			this.scanCodeData.pathologySpecimenDTOList.length>1){
 				this.muArr = []
 				for(let i of this.scanCodeData.pathologySpecimenDTOList){
@@ -219,7 +219,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 					}
 				}
 				this.getJsData(3)
-			}else if(this.scanCodeData.pathologySpecimenDTOList && 
+			}else if(this.scanCodeData.pathologySpecimenDTOList &&
 			this.scanCodeData.pathologySpecimenDTOList.length==1){
 				this.getJsData(1)
 			}
@@ -233,9 +233,9 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			}
 			this.getJsData(1)
 		}
-		
+
   }
-	
+
 	// 分页
 	noType:any='none';
 	pageChange(){
@@ -248,7 +248,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			this.getJsData(1)
 		}
 	}
-	
+
   // 当前时间日期
   runTime() {
     clearTimeout(this.timer);
@@ -266,7 +266,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			document.getElementById('specimen').focus();
 		},200)
 	}
-	
+
 	// 打包
 	packaging(){
 		this.fixationModal = true
@@ -275,7 +275,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			document.getElementById('specimen').focus();
 		},200)
 	}
-	
+
 	// 配送
 	distributionModal:boolean = false
 	distribution(e,data){
@@ -288,14 +288,14 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 		this.handoverUserId = null
 		this.distributionModal = true
 	}
-	
+
 	// 确定配送
 	submitDistributionForm(){
 		this.btnLoading = true
 		this.btnLoading = false
 		this.hideDistributionModal()
 	}
-	
+
 	// 取消配送
 	hideDistributionModal(){
 		this.distributionModal = false
@@ -303,23 +303,23 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			document.getElementById('Binput').focus();
 		},200)
 	}
-	
+
 	changeHospitalInp(e){
 		// this.changeInpSubjectHospital.next([e]);
 	}
-	
+
 	changeDepartmentInp(e){
 		// this.isDeptLoading = true
 		// this.changeInpSubjectDepartment.next([e]);
 	}
-	
+
 	// 补打
 	printModal:boolean = false;
 	parintLoading:boolean = false;
 	reprint(e,data){
 		this.printModal = true
 	}
-	
+
 	// 取消补打
 	hidePrintModal(){
 		this.printModal = false
@@ -327,7 +327,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			document.getElementById('Binput').focus();
 		},200)
 	}
-	
+
 	// 确定补打
 	confirmPrintDel(){
 		this.parintLoading = true
@@ -338,9 +338,9 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 		// } else {
 		// 	this.showPromptModal("操作", false, res.msg);
 		// }
-		
+
 	}
-	
+
 	// 接收时间
 	startDate:any;
 	endDate:any;
@@ -348,12 +348,12 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 		this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
 		this.endDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
 	}
-	
+
 	// 获取批次号
 	generateBatchNumber(){
 
 	}
-	
+
 	// 获取标本接收数据
 	pageReceptionIndex:any = 1;
 	listReceptionLength:any = 0;
@@ -403,7 +403,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 				this.listReceptionLength = res.totalNum;
 		  });
 	}
-	
+
 	// 配送中包交接完成
 	connectAccomplish(){
 		this.validateConnectForm = this.fb.group({
@@ -412,14 +412,14 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 		});
 		this.dispatchingName = this.scanCodeData.deliveryUserDTO.name;
 		this.dispatchingUserId = this.scanCodeData.deliveryUserDTO.id
-		
+
 		this.receptionName = this.userInfo.name;
 		this.connectUserId = this.userInfo.id;
-		
+
 		this.receptionModal = true
 		this.barCode = null
 	}
-	
+
 	// 确定接收包
 	submitReceptionForm(){
 		for (const i in this.validateConnectForm.controls) {
@@ -448,17 +448,17 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 关闭配送接收
 	hideReceptionModal(){
 		this.receptionModal = false
 	}
-	
+
 	// 选择固定时间
 	formChangeDate(result){
 	  this.startDate = format(result, 'yyyy-MM-dd HH:mm:ss');
 	}
-	
+
 	// 监听人员交接接收人工号输入
 	connectUserId:any = null;
 	receptionName:any = null;
@@ -482,7 +482,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 监听人员交接配送人工号输入
 	dispatchingUserId:any = null;
 	dispatchingName:any = null;
@@ -506,7 +506,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 确定交接
 	mustReceived:any = null;
 	currReceived:any = null;
@@ -541,7 +541,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 	hideConnectModal(){
 		this.connectModal = false
 	}
-	
+
 	// 确定人员交接
 	btnConnectLoading:boolean = false;
 	submitConnectForm(){
@@ -568,21 +568,21 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 		    }
 		  });
 	}
-	
+
 	// 确定打包
 	packModal:boolean = false;
 	submitScanForm(){
 		this.packModal = true
 		// this.hideSpecimenModal()
 	}
-	
+
 	// 确定打包并打印
 	btnPackLoading:boolean = false;
 	printData:any = [];
 	submitPackForm(){
 		let that = this
 		let data: any = {
-			batchNo:this.batchNo, 
+			batchNo:this.batchNo,
 			deptId:this.deptId
 		};
 
@@ -613,7 +613,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 关闭打包并打印
 	hidePackModal(){
 		this.packModal = false
@@ -621,14 +621,14 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			document.getElementById('specimen').focus();
 		},200)
 	}
-	
+
 	// 关闭交接/打包
 	hideSpecimenModal(){
 		// 清空data
 		localStorage.setItem("scanCodeData",'')
 		this.router.navigateByUrl(`/pathology?type=detail`)
 	}
-	
+
 	// 获取标本详情
 	project:any = [];
 	getSampleData(item){
@@ -649,7 +649,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			}
 		});
 	}
-	
+
 	// 获取科室
 	getDept(){
 		this.setSpecimen()
@@ -678,7 +678,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			  .subscribe((res) => {
 			    that.operationData = res.list;
 			  });
-				
+
 			that.mainService
 			  .getFetchDataList("data", "department", data2)
 			  .subscribe((res) => {
@@ -687,7 +687,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			  });
 		});
 	}
-	
+
 	// 获取关联科室详情
 	getDeptDetail(){
 		this.mainService
@@ -707,7 +707,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 获取是否关联标本间
 	setSpecimen(){
 		this.validateForm = this.fb.group({
@@ -717,7 +717,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 		});
 		this.relevanceModal = true
 	}
-	
+
 	// 确定关联科室
 	btnLoading:boolean = false;
 	submitForm(){
@@ -751,7 +751,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 		    }
 		  });
 	}
-	
+
 	getNewDept(){
 		let postData = {
 		  currentHosId: this.hosId,
@@ -777,12 +777,12 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 		  }
 		});
 	}
-	
+
 	// 获取当前用户信息
 	getCurrentUserNow() {
 	  this.mainService.getCurrentUser1().subscribe((data:any) => {
 	    if (data["status"] == 200) {
-				this.loginUser = data.data 
+				this.loginUser = data.data
 	      let user = JSON.parse(localStorage.getItem("user"));
 	      user.user.dept = data["data"].dept;
 	      user.user.currentHospital = data["data"].currentHospital;
@@ -790,7 +790,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 	    }
 	  });
 	}
-	
+
 	// 输入工号查询姓名
 	handoverUserId:any = null;
 	numberChange(e){
@@ -813,7 +813,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 提交固定标本接收
 	submitVerificationForm(){
 		for (const i in this.validateVerificationForm.controls) {
@@ -821,7 +821,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 		  this.validateVerificationForm.controls[i].updateValueAndValidity();
 		}
 		if (this.validateVerificationForm.invalid) return;
-		
+
 		let data: any = {
 			id:this.codeData.id,
 			specimenDeptId:this.validateForm.value.specimen,
@@ -845,13 +845,13 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			}
 		});
 	}
-	
+
 	// 成功/失败提示框
 	closeModel(){
 		localStorage.setItem("scanCodeData",'')
 		this.router.navigateByUrl(`/pathology?type=detail`);
 	}
-	
+
 	// 关闭配送信息
 	hideVerificationModal(){
 		this.verificationMoadl = false
@@ -860,13 +860,13 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 		},200)
 	}
 
-	
+
 	// 监听交接/打包扫描条码
 	tableLoading:boolean = false;
 	codeChange(e){
 		this.changeInpSubject.next([e]);
 	}
-	
+
 	// 标本接收搜索条码
 	errorMsg:any = null;
 	searchSpecimenData(e){
@@ -916,7 +916,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			}
 		})
 	}
-	
+
 	// 关闭多只标本
 	hideMultiModal(){
 		localStorage.setItem("scanCodeData",'');
@@ -928,7 +928,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			document.getElementById('specimen').focus();
 		},200)
 	}
-	
+
 	// 监听多只标本扫描
 	codeMultiChange(e){
 		if(!e){
@@ -975,7 +975,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			})
 		},500)
 	}
-	
+
 	// 多只标本确定接受
 	btnMultiLoading:boolean = false;
 	submitMultiForm(){
@@ -1003,7 +1003,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			},500)
 		});
 	}
-	
+
 	// 多只标本打包
 	submitMultiScanForm(){
 		let data1 = JSON.parse(localStorage.getItem("scanCodeData"))
@@ -1030,7 +1030,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			},500)
 		});
 	}
-	
+
 	// 查看详情
 	pathologyLogs:any=[];
 	specimenList:any=[]
@@ -1040,19 +1040,19 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 		this.getSampleData(item)
 		clearInterval(this.logTimer);
 		if(type==1){
-			
+
 		}else if(type==2){
-			
+
 		}else{
-			
+
 		}
 	}
-	
+
 	closeDetailMoadl(){
 		this.detailMoadl = false
 	}
-	
- 
+
+
   // 自动刷新倒计时
   autoUpdate(flag = true) {
     if (flag) {
@@ -1078,7 +1078,6 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
     }
     localStorage.removeItem("user");
     localStorage.removeItem("menu");
-    localStorage.removeItem("phones");
     localStorage.removeItem("index");
     // 假退出
     this.mainService.logOut().subscribe((data) => {
@@ -1090,7 +1089,6 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
         }
         localStorage.removeItem("user");
         localStorage.removeItem("menu");
-        localStorage.removeItem("phones");
         localStorage.removeItem("index");
       }
     });
@@ -1183,7 +1181,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
       }
     }, 1000);
   }
-	
+
 	promptModalShow:boolean = false;
 	promptContent:any = null;
 	ifSuccess:any = null;

src/app/views/pharmacy/pharmacy.component.ts

@@ -256,7 +256,6 @@ export class PharmacyComponent implements OnInit {
     }
     localStorage.removeItem("user");
     localStorage.removeItem("menu");
-    localStorage.removeItem("phones");
     localStorage.removeItem("index");
 
     // 假退出
@@ -269,7 +268,6 @@ export class PharmacyComponent implements OnInit {
         }
         localStorage.removeItem("user");
         localStorage.removeItem("menu");
-        localStorage.removeItem("phones");
         localStorage.removeItem("index");
       }
     });

src/app/views/pharmacy2/pharmacy2.component.ts

@@ -427,7 +427,6 @@ export class Pharmacy2Component implements OnInit, OnDestroy {
     }
     localStorage.removeItem("user");
     localStorage.removeItem("menu");
-    localStorage.removeItem("phones");
     localStorage.removeItem("index");
 
     // 假退出
@@ -440,7 +439,6 @@ export class Pharmacy2Component implements OnInit, OnDestroy {
         }
         localStorage.removeItem("user");
         localStorage.removeItem("menu");
-        localStorage.removeItem("phones");
         localStorage.removeItem("index");
       }
     });

src/app/views/repository-manage/repository-manage.component.ts

@@ -41,7 +41,7 @@ export class RepositoryManageComponent implements OnInit {
   ) {}
   ngOnInit() {
     this.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((e) => {
-			
+
     });
 		this.hosId = this.tool.getCurrentHospital().id;
     this.coopBtns = this.tool.initCoopBtns(this.route);
@@ -58,7 +58,7 @@ export class RepositoryManageComponent implements OnInit {
   validateForm: FormGroup; //新增/编辑表单
   coopId: number; //表格中执行操作的id
   department: number; //所属科室
-	hosId: number; 
+	hosId: number;
 	loadAllConsumeDept: boolean = true;//是否加载所有消耗科室
   solutionNumber; //编号
 	title; //标题
@@ -115,7 +115,7 @@ export class RepositoryManageComponent implements OnInit {
   hideDelModal1() {
     this.editModal = false;
   }
-	
+
   // 编辑保存
   confirmDel1() {
     var that = this;
@@ -180,7 +180,7 @@ export class RepositoryManageComponent implements OnInit {
         that.listLength = data.totalNum;
       });
   }
-	
+
 	// 版本号点击
 	versionsClick(data, index){
 		this.vIndex = index
@@ -192,14 +192,14 @@ export class RepositoryManageComponent implements OnInit {
 			this.richText = ''
 		}
 	}
-	
+
 	// 点击附件
 	fileClick(data){
 		console.log(222,data)
 		let a: any = document.createElement('a') // 创建一个元素
 		a.style = 'display: none' // 不能在页面中被看到，把他隐藏起来
 		a.style.height = '0px' // 给个0高度，避免影响页面布局
-		a.download = data.name; 
+		a.download = data.name;
 		a.href = data.url // 文件url地址
 		document.body.appendChild(a)  //  将其绑定在body上才能发挥作用
 		a.click() // 触发a标签的click事件
@@ -209,7 +209,7 @@ export class RepositoryManageComponent implements OnInit {
   hideModal() {
     this.modal = false;
   }
-	
+
 	// 审核通过
 	confirmDel4() {
 		let data: any = {
@@ -229,16 +229,16 @@ export class RepositoryManageComponent implements OnInit {
 				}
 			});
 	}
-	
+
 	hideDelModal4() {
 	  this.auditModal = false;
 	}
-	
+
 	// 审核驳回
 	rejectCancel(){
 		this.rejectModal = false
 	}
-	
+
 	// 审核驳回
 	rejectOk(){
 		if(this.rejectData==null){
@@ -263,11 +263,11 @@ export class RepositoryManageComponent implements OnInit {
 				}
 			});
 	}
-	
+
 	closeModel(){
 		this.hideModal()
 	}
-	
+
   // 表单提交
 	auditModal = false;
   submitForm(type): void {
@@ -279,18 +279,18 @@ export class RepositoryManageComponent implements OnInit {
 			this.rejectModal = true
 		}
   }
-	
+
 	// 升级
 	upgrade(e, data){
 		e.stopPropagation();
 		this.router.navigateByUrl(`/repositoryManageAdd/${data.id}?type=upgrade`);
 	}
-	
+
 	// 新增
 	addForm(){
 		this.router.navigateByUrl(`/repositoryManageAdd/0`);
 	}
-	
+
 	// 查看
 	look(e, data){
 		e.stopPropagation();
@@ -334,7 +334,7 @@ export class RepositoryManageComponent implements OnInit {
 				this.isSpinning = false
 			});
 	}
-	
+
 	getFile(){
 		this.mainService
 			.getPreviewImage('solution', this.rowId)
@@ -347,7 +347,7 @@ export class RepositoryManageComponent implements OnInit {
 				});
 			});
 	}
-	
+
 	// 审核
 	rowId=null;
 	audit(e, data){
@@ -375,22 +375,22 @@ export class RepositoryManageComponent implements OnInit {
 				this.detailData = data
 				this.richText = this.sanitizer.bypassSecurityTrustHtml(data[0].content);
 				for(let i of data[0].solutionLogs){
-					i.time = format(i.operationTime, 'yyyy-MM-dd HH:mm') 
+					i.time = format(i.operationTime, 'yyyy-MM-dd HH:mm')
 				}
 				this.lookData = data[0]
 				this.solutionLogs = data[0].solutionLogs
 				this.stepLength = this.solutionLogs.length
 				this.isSpinning = false
 			});
-	
+
 	}
-	
+
 	// 编辑
 	edit(e, data) {
 	  e.stopPropagation();
 	  this.router.navigateByUrl(`/repositoryManageAdd/${data.id}?type=edit`);
 	}
-	
+
 	// 停用
 	pauseModal = false;
 	pause(e, data){
@@ -398,7 +398,7 @@ export class RepositoryManageComponent implements OnInit {
 		this.pauseModal = true;
 		this.coopId = data.id;
 	}
-	
+
 	// 确认停用
 	confirmDel2() {
 	  var that = this;
@@ -419,12 +419,12 @@ export class RepositoryManageComponent implements OnInit {
 				}
 			});
 	}
-	
+
 	hideDelModal2() {
 	  this.pauseModal = false;
 	}
-	
-	
+
+
 	// 恢复
 	renewModal = false;
 	renew(e, data){
@@ -432,7 +432,7 @@ export class RepositoryManageComponent implements OnInit {
 		this.renewModal = true;
 		this.coopId = data.id;
 	}
-	
+
 	// 确认恢复
 	confirmDel3() {
 	  var that = this;
@@ -453,11 +453,11 @@ export class RepositoryManageComponent implements OnInit {
 				}
 			});
 	}
-	
+
 	hideDelModal3() {
 	  this.renewModal = false;
 	}
-	
+
 
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
   showPromptModal(con, success, promptInfo?) {

src/app/views/specimen-room-view/specimen-room-view.component.ts

@@ -47,8 +47,8 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
   })
   osComponentRef5: OverlayScrollbarsComponent;
   constructor(
-	private mainService: MainService, 
-	public router: Router, 
+	private mainService: MainService,
+	public router: Router,
 	public tool: ToolService,
 	private fb: FormBuilder,
 	private message: NzMessageService,
@@ -92,7 +92,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
   completedFlag = false;
   completedSearchKey = "";
   completedLoad = false;
-	
+
 	barCode:any; //条码搜索
   // other
   loginUser: any = localStorage.getItem("user")
@@ -113,7 +113,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 	fixationModal:boolean = false //标本接收固定
 	verificationMoadl:boolean = false //标本核验
 	specimenCode:any; //标本条码
-	listOfData:any=[]; 
+	listOfData:any=[];
 	fixativeData:any = []; //固体液类型
 	hosId:any;
 	userId:any;
@@ -161,7 +161,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
       this.runTime();
     }, 500);
   }
-	
+
 	// 标本条码搜索
 	searchSpecimen(e){
 		if(!this.barCode){
@@ -199,12 +199,12 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			}
 		})
 	}
-	
+
 	// 选择固定时间
 	formChangeDate(result){
 	  this.startDate = format(result, 'yyyy-MM-dd HH:mm:ss');
 	}
-	
+
 	// 确定接受固定标本
 	startDate:any;
 	submitFixationForm(){
@@ -224,7 +224,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			this.verificationMoadl = true
 		});
 	}
-	
+
 	// 关闭接受固定标本
 	hideSpecimenModal(){
 		this.autoUpdate()
@@ -236,7 +236,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			document.getElementById('Binput').focus();
 		},200)
 	}
-	
+
 	// 获取标本详情
 	project:any = [];
 	getSampleData(item){
@@ -256,7 +256,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		  this.detailMoadl = true
 		});
 	}
-	
+
 	// 获取科室
 	getDept(){
 		this.setSpecimen()
@@ -285,7 +285,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			  .subscribe((res) => {
 			    that.operationData = res.list;
 			  });
-				
+
 			that.mainService
 			  .getFetchDataList("data", "department", data2)
 			  .subscribe((res) => {
@@ -294,7 +294,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			  });
 		});
 	}
-	
+
 	// 获取关联科室详情
 	getDeptDetail(){
 		this.mainService
@@ -314,7 +314,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 获取是否关联标本间
 	setSpecimen(){
 		this.validateForm = this.fb.group({
@@ -324,7 +324,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		});
 		this.relevanceModal = true
 	}
-	
+
 	// 确定关联科室
 	btnLoading:boolean = false;
 	submitForm(){
@@ -364,7 +364,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		    }
 		  });
 	}
-	
+
 	getNewDept(){
 		let postData = {
 		  currentHosId: this.hosId,
@@ -390,12 +390,12 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		  }
 		});
 	}
-	
+
 	// 获取当前用户信息
 	getCurrentUserNow() {
 	  this.mainService.getCurrentUser1().subscribe((data:any) => {
 	    if (data["status"] == 200) {
-				this.loginUser = data.data 
+				this.loginUser = data.data
 	      let user = JSON.parse(localStorage.getItem("user"));
 	      user.user.dept = data["data"].dept;
 	      user.user.currentHospital = data["data"].currentHospital;
@@ -403,7 +403,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 	    }
 	  });
 	}
-	
+
 	// 输入工号查询姓名
 	handoverUserId:any = null;
 	numberChange(e){
@@ -427,7 +427,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 提交固定标本接收
 	submitVerificationForm(){
 		for (const i in this.validateVerificationForm.controls) {
@@ -435,7 +435,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		  this.validateVerificationForm.controls[i].updateValueAndValidity();
 		}
 		if (this.validateVerificationForm.invalid) return;
-		
+
 		let data: any = {
 			id:this.codeData.id,
 			specimenDeptId:this.validateForm.value.specimen,
@@ -466,7 +466,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			}
 		});
 	}
-	
+
 	closeModel(){
 		this.verificationMoadl = false
 		this.fixationModal = false
@@ -474,7 +474,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			document.getElementById('Binput').focus();
 		},200)
 	}
-	
+
 	// 关闭固定接受标本
 	hideVerificationModal(){
 		this.verificationMoadl = false
@@ -482,19 +482,19 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			document.getElementById('Binput').focus();
 		},200)
 	}
-	
+
 
 	// 监听标本条码
 	specimenCodeChange(e){
 		this.changeInpSubjectSpecimen.next([e]);
 	}
-	
+
 	// 监听接受固定标本条码
 	tableLoading:boolean = false;
 	codeChange(e){
 		this.changeInpSubject.next([e]);
 	}
-	
+
 	fixationError:any;
 	searchSpecimenData(e){
 		if(!e){
@@ -514,13 +514,13 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			this.specimenCode = null
 			if(res.status==200){
 				this.codeData = res.data[0]
-				this.fixationError = null 
+				this.fixationError = null
 			}else{
-				this.fixationError = res.msg 
+				this.fixationError = res.msg
 			}
 		})
 	}
-	
+
 	// 查看详情
 	detailMoadl:boolean = false;
 	pathologyLogs:any=[];
@@ -531,14 +531,14 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		this.getSampleData(item)
 		clearInterval(this.logTimer);
 		if(type==1){
-			
+
 		}else if(type==2){
-			
+
 		}else{
-			
+
 		}
 	}
-	
+
 	closeDetailMoadl(){
 		setTimeout(_=>{
 			document.getElementById('Binput').focus();
@@ -546,7 +546,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		this.detailMoadl = false
 		this.autoUpdate(false);
 	}
-	
+
   // 统计
   // total() {
   //   let launch = JSON.parse(localStorage.getItem("user")).user.dept.id;
@@ -570,7 +570,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
   //   console.log(item);
   //   this.router.navigateByUrl(`specimenView2/detailSample/${item.id}`);
   // }
-	
+
   // // 查看流程信息弹窗
   // logPromptModalShow = false; //弹窗开关
   // scode = ""; //查看记录携带
@@ -807,7 +807,6 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
     }
     localStorage.removeItem("user");
     localStorage.removeItem("menu");
-    localStorage.removeItem("phones");
     localStorage.removeItem("index");
     // 假退出
     this.mainService.logOut().subscribe((data) => {
@@ -819,7 +818,6 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
         }
         localStorage.removeItem("user");
         localStorage.removeItem("menu");
-        localStorage.removeItem("phones");
         localStorage.removeItem("index");
       }
     });
@@ -906,7 +904,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
       }
     }, 1000);
   }
-	
+
 	promptModalShow:boolean = false;
 	promptContent:any = null;
 	ifSuccess:any = null;

src/app/views/specimen-view2/specimen-view2.component.ts

@@ -461,7 +461,6 @@ export class SpecimenView2Component implements OnInit, OnDestroy {
     }
     localStorage.removeItem("user");
     localStorage.removeItem("menu");
-    localStorage.removeItem("phones");
     localStorage.removeItem("index");
     // 假退出
     this.mainService.logOut().subscribe((data) => {
@@ -473,7 +472,6 @@ export class SpecimenView2Component implements OnInit, OnDestroy {
         }
         localStorage.removeItem("user");
         localStorage.removeItem("menu");
-        localStorage.removeItem("phones");
         localStorage.removeItem("index");
       }
     });

src/app/views/users-management/users-management.component.ts

@@ -257,7 +257,7 @@ export class UsersManagementComponent implements OnInit {
     let groupData = {
       group2: {
         hospitals: hid,
-        type:1
+        typeIds: '1,3',
       },
       idx: 0,
       sum: 9999,
@@ -303,7 +303,7 @@ export class UsersManagementComponent implements OnInit {
     let groupData = {
       group2: {
         hospitals: id,
-        type:1
+        typeIds: '1,3',
       },
       idx: 0,
       sum: 9999,
@@ -469,7 +469,7 @@ export class UsersManagementComponent implements OnInit {
     let groupData = {
       group2: {
         hospitals: hid,
-        type:1
+        typeIds: '1,3',
       },
       idx: 0,
       sum: 9999,

src/assets/js/http.ts

@@ -15,5 +15,6 @@ const baseUrl: baseUrlType = {
   nurseWs: `${wsName}://${domainName}:${port}/webSocket/message/nurse`, //websocket护士端地址
   fwtWs: `${wsName}://${domainName}:${port}/webSocket/message/ser`, //websocket服务台地址
   phoneWs: `${wsName}://${domainName}:${port}/webSocket/message/phone`, //websocket服务台来电地址
+  // phoneWs: `${wsName}://192.168.3.108:29999/webSocket/message/phone`, //websocket服务台来电地址-测试
 };
 export default baseUrl;

src/assets/libs/ola_api.js

@@ -0,0 +1,418 @@
+/**
+201606
+
+基于WebSocket的坐席客户端范例
+
+1 验证码赋值 这个是向服务端验证身份的 变量名称固定为 authCode
+2 new一个TLWSA对象，每个页面只能有一个实例
+3 在页面载入完成后，调用一次 tlwsa的 initTLWSA方法，用于初始化
+4 写事件callack函数，并赋值给tlwsa的callback
+
+5 依次调用tlwsa的tlaOpen 方法连接服务器，tlaLogin方法登录，如果是IP坐席，还要调用 tlaSetPhoneNumber方法报告坐席使用的ip话机的电话号码
+6 等待呼入，或者调用 tlwsa的 tlaCallagc方法/tlaCall方法呼叫坐席和外线
+
+其他功能的调用方法请参考相关代码
+
+**/
+// var phoneNumber = '';
+var authCode="tlwsab"; //验证码，必须与服务端配置的验证码相同，否则不能通过验证，无法登录到服务器
+
+var tlwsa=new TLWSA(); //生成一个坐席客户端实例 每个页面只能有一个实例
+window.onload=function() //必须第一个调用的方法，初始化websocket相关变量
+{
+	tlwsa.initTLWSA();
+}
+
+//函数调用的应答  注意 是类TLWSA 不是实例tlwsa
+// TLWSA.onOpenreturn=onopenreturn;
+TLWSA.onOpenslaveserverreturn=onopenslaveserverreturn;
+
+// TLWSA.onLoginreturn=onloginreturn;
+TLWSA.onMutereturn=onmutereturn;
+TLWSA.onUnmutereturn=onunmutereturn;
+// TLWSA.onSetphonenumberreturn=onsetphonenumberreturn;
+// TLWSA.onLogoffreturn=onlogoffreturn; //主动注销结果
+// TLWSA.onAcwreturn=onacwreturn;
+// TLWSA.onWcareturn=onwcareturn;
+
+// TLWSA.onCallreturn=oncallreturn;
+TLWSA.onCancelcallreturn=oncancelcallreturn;
+// TLWSA.onTransferreturn=ontransferreturn;//调用转移方法之后，返回该事件 如果错误码为0，仅仅表示开始转移，不代表转移目标已经接听或已经拒绝
+TLWSA.onCanceltransferreturn=oncanceltransferreturn;
+TLWSA.onBlindtransferreturn=onblindtransferreturn;
+TLWSA.onTransfertoivrreturn=ontransfertoivrreturn;
+TLWSA.onTransfertoivrandwaitreturn=ontransfertoivrandwaitreturn;
+TLWSA.onStartlistenreturn=onstartlistenreturn;
+TLWSA.onStoplistenreturn=onstoplistenreturn;
+// TLWSA.onKillreturn=onkillreturn;
+TLWSA.onForceonhookreturn=onforceonhookreturn;
+TLWSA.onIntrudereturn=onintrudereturn;
+TLWSA.onGetcallreturn=ongetcallreturn;
+TLWSA.onAnswercallreturn=onanswercallreturn;
+TLWSA.onOnhookreturn=ononhookreturn;
+TLWSA.onHoldcallreturn=onholdcallreturn;
+TLWSA.onSwapcallreturn=onswapcallreturn;
+TLWSA.onActivatecallreturn=onactivatecallreturn;
+TLWSA.onUnholdcallreturn=onunholdcallreturn;
+TLWSA.onLoginotheragentreturn=onloginotheragentreturn;
+TLWSA.onSendmessagetoagentreturn=onsendmessagetoagentreturn;
+TLWSA.onAnswerqueuereturn=onanswerqueuereturn;
+// TLWSA.onSubscribestateinforeturn=onsubscribestateinforeturn;
+
+TLWSA.onConsulttransferreturn=onconsulttransferreturn;
+TLWSA.onCompleteconsulttransferreturn=oncompleteconsulttransferreturn;
+TLWSA.onGetnodestatereturn=ongetnodestatereturn;
+TLWSA.onTransfernodereturn=ontransfernodereturn;
+//会议相关
+TLWSA.onConferencestartreturn=onconferencestartreturn;
+TLWSA.onConferenceappendmemberreturn=onconferenceappendmemberreturn;
+TLWSA.onConferencequeryreturn=onconferencequeryreturn;
+TLWSA.onConferencedismissreturn=onconferencedismissreturn;
+TLWSA.onConferencekickoutreturn=onconferencekickoutreturn;
+TLWSA.onConferencechangememberstatereturn=onconferencechangememberstatereturn;
+//主动事件
+// TLWSA.onCallin=oncallin;
+// TLWSA.onCallend=oncallend;
+// TLWSA.onAcw=onacw;
+// TLWSA.onWca = onwca;
+TLWSA.onLogoff = onlogoff; //被强制注销事件
+// TLWSA.onCallresult=oncallresult;
+// TLWSA.onTransferresult=ontransferresult;
+TLWSA.onConsulttransfercalleeanswer=onconsulttransfercalleeanswer;
+TLWSA.onBlindtransferresult=onblindtransferresult;
+// TLWSA.onAnswer=onanswer;
+// TLWSA.onClosed=onclosed;
+TLWSA.onSlaveserverclosed=onslaveserverclosed; //备用服务器网络中断
+TLWSA.onHoldcallreleased=onholdcallreleased;
+TLWSA.onKeepcallreleased=onkeepcallreleased;
+TLWSA.onCalleealerting=oncalleealerting;
+TLWSA.onQueue=onqueue;
+TLWSA.onQuitqueue=onquitqueue;
+TLWSA.onRecvmsg=onrecvmsg;
+TLWSA.onHookstate=onhookstate;
+TLWSA.onHardwarefail=onhardwarefail;
+// TLWSA.onMisscall=onmisscall;
+TLWSA.onConferencememberstate=onconferencememberstate;
+TLWSA.onSlaveserverfail=onslaveserverfail; //备用服务器故障 例如硬件故障或者中继失步
+TLWSA.onSwitchtoslaveserver=onswitchtoslaveserver;
+// TLWSA.onStatechange=onstatechange;
+//应答回调
+// function onopenreturn(err)
+// {
+// 	err = Number(err);
+// 	if(!err){
+// 		console.log('呼叫中心连接成功-----seimin');
+// 		//如果设置过话机
+// 		if(localStorage.getItem('phoneNumber')){
+// 			// 登录并设置号码
+// 			phoneNumber = localStorage.getItem('phoneNumber');
+// 			tlwsa.tlaLogin(phoneNumber,1,-1);
+// 		}
+// 	}else{
+// 		console.log('呼叫中心连接失败-----seimin');
+// 	}
+// 	// console.log('应答:连接服务器结果 '+err);
+// }
+function onopenslaveserverreturn(err)
+{
+	console.log('应答:连接备用服务器结果 '+err);
+}
+
+// function onloginreturn(err) //登录结果
+// {
+// 	err = Number(err);
+// 	if(!err){
+// 		console.log('登录成功-----seimin');
+// 		setTimeout(function(){
+// 			console.log('开始设置号码【'+phoneNumber+'】-----seimin');
+// 			tlwsa.tlaSetphonenumber(phoneNumber);
+// 		},0)
+// 	}else{
+// 		console.log('登录失败-----seimin');
+// 	}
+// 	console.log('应答:登录请求结果 '+err);
+// }
+function onmutereturn(err)
+{
+	console.log('应答:静音请求结果 '+err);
+}
+function onunmutereturn(err)
+{
+	console.log('应答:取消静音请求结果 '+err);
+}
+// function onsetphonenumberreturn(err)
+// {
+// 	err = Number(err);
+// 	if(!err){
+// 		console.log('设置号码成功-----seimin');
+// 	}else{
+// 		console.log('设置号码失败-----seimin');
+// 	}
+// 	console.log('应答:报告坐席电话号码请求结果 '+err);
+// }
+// function onlogoffreturn(err) //注销请求结果
+// {
+// 	console.log('应答:注销请求结果 '+err);
+// }
+
+// function onacwreturn(err)
+// {
+// 	console.log('应答:离席请求结果 '+err);
+// }
+// function onwcareturn(err)
+// {
+// 	console.log('应答:复席请求结果 '+err);
+// }
+// function oncallreturn(err)
+// {
+// 	console.log('应答:呼叫请求结果 '+err);
+// }
+function oncancelcallreturn(err) {
+    console.log('应答:停止呼叫请求结果 ' + err);
+}
+// function ontransferreturn(err) {
+//     console.log('应答:转移请求结果 ' + err);
+// }
+function oncanceltransferreturn(err) {
+    console.log('应答:停止转移请求结果 ' + err);
+}
+function onblindtransferreturn(err) {
+    console.log('应答:盲转请求结果 ' + err);
+}
+function ontransfertoivrreturn(err) {
+    console.log('应答:转ivr请求结果 ' + err);
+}
+function ontransfertoivrandwaitreturn(err) {
+    console.log('应答:转ivr并等待请求结果 ' + err);
+}
+function onstartlistenreturn(err) {
+    console.log('应答:监听请求结果 ' + err);
+}
+function onstoplistenreturn(err) {
+    console.log('应答:停止监听请求结果 ' + err);
+}
+// function onkillreturn(err) {
+//     console.log('应答:强制处理请求结果 ' + err);
+// }
+function onforceonhookreturn(err) {
+    console.log('应答:强拆坐席请求结果 ' + err);
+}
+function onintrudereturn(err) {
+    console.log('应答:强插请求结果 ' + err);
+}
+function ongetcallreturn(err,caller,callee,data,crs) {
+    console.log('应答:代接请求结果 ' + err+' '+caller);
+}
+function onanswercallreturn(err) {
+    console.log('应答:应答请求结果 ' + err);
+}
+function ononhookreturn(err) {
+    console.log('应答:挂机请求结果 ' + err);
+}
+function onholdcallreturn(err) {
+    console.log('应答:保持请求结果 ' + err);
+}
+function onswapcallreturn(err) {
+    console.log('应答:切换呼叫请求结果 ' + err);
+}
+function onactivatecallreturn(err) {
+    console.log('应答:激活呼叫请求结果 ' + err);
+}
+function onunholdcallreturn(err) {
+    console.log('应答:取回保持呼叫请求结果 ' + err);
+}
+function onloginotheragentreturn(err) {
+    console.log('应答:登录其他坐席请求结果 ' + err);
+}
+function onsendmessagetoagentreturn(err) {
+    console.log('应答:发送消息请求结果 ' + err);
+}
+function onanswerqueuereturn(err) {
+    console.log('应答:应答队列中的外线请求结果 ' + err);
+}
+// function onsubscribestateinforeturn(err){
+// 	console.log('应答:订阅状态变化消息请求结果 ' + err);
+// }
+function onconsulttransferreturn(err){
+	console.log('应答：咨询转移请求结果 '+err);
+}
+
+function oncompleteconsulttransferreturn(err){
+	console.log('应答：完成咨询转移请求结果 '+err);
+}
+function ongetnodestatereturn(jso)
+{
+	console.log('node state 结果 '+JSON.stringify(jso));
+}
+function ontransfernodereturn(jso)
+{
+	console.log('transfer node 结果 '+JSON.stringify(jso))
+}
+function onconferencestartreturn(jso)
+{
+	console.log('启动会议 结果 '+jso.err+' 会议ID='+jso.conferenceid);
+	if(jso.err == 0)
+		conferenceid.value=jso.conferenceid;
+}
+function onconferenceappendmemberreturn(jso)
+{
+	console.log('添加会议成员 结果 '+JSON.stringify(jso))
+}
+function onconferencequeryreturn(jso)
+{
+	console.log('会议状态查询 结果 '+JSON.stringify(jso))
+}
+function onconferencedismissreturn(jso)
+{
+	console.log('解散会议 结果 '+JSON.stringify(jso))
+}
+function onconferencekickoutreturn(jso)
+{
+	console.log('踢出成员 结果 '+JSON.stringify(jso))
+}
+function onconferencechangememberstatereturn(jso)
+{
+	console.log('改变成员状态 结果 '+jso.err)
+}
+//主动事件回调
+// function oncallin(jso) //呼入通知
+// {
+// 	console.log('事件:呼入通知,相关数据:  '+JSON.stringify(jso));
+// }
+// function oncallend(jso) //呼叫结束通知
+// {
+// 	console.log('事件:通话结束' + JSON.stringify(jso));
+// }
+// function onacw()
+// {
+// 	console.log('事件:你已经进入离席状态');
+// }
+// function onwca()
+// {
+// 	console.log('事件:你已经进入就绪状态');
+// }
+function onlogoff() //被动注销事件（网络中断 / 被踢）
+{
+    console.log('事件:您已经被注销');
+}
+// function oncallresult(err)
+// {
+// 	console.log('事件:呼叫结果 '+JSON.stringify(err));
+// }
+// function ontransferresult(err) {
+//     console.log('事件:转移结果 ' + JSON.stringify(err));
+// }
+function onconsulttransfercalleeanswer(crs){
+	console.log('事件:咨询转移被叫应答 crs=' + crs);
+}
+function onblindtransferresult(err) {
+    console.log('事件:盲转结果 ' + JSON.stringify(err));
+}
+// function onanswer(err) {
+//     console.log('事件:应答'+err);
+// }
+// function onclosed(err) {
+//     console.log('事件:与服务器的网络连接中断');
+// }
+function onslaveserverclosed(err)
+{
+	console.log('事件:与备用服务器的网络连接中断');
+}
+function onholdcallreleased(err) {
+    console.log('事件:被保持的对方已挂机');
+}
+function onkeepcallreleased(err) {
+    console.log('事件:转回ivr并等待的外线已挂机');
+}
+function oncalleealerting(err) {
+    console.log('事件:呼叫的外线已经开始振铃');
+}
+function onqueue(crs,caller,callee,data)
+{
+    console.log('事件:外线进入队列，crs,caller,callee,data= '+crs+' '+caller+' '+callee+' '+data)
+}
+// function onstatechange()
+// {
+// 	console.log('事件:状态变化----------------------------------------------------');
+// 	queryAgentState();
+// }
+function onmystatechange(jso)
+{
+	console.log('事件:状态变化----------------------------------------------------');
+	console.log(JSON.stringify(jso));
+}
+function onquitqueue(crs)
+{
+    console.log('事件:外线退出队列,crs= '+crs)
+}
+function onrecvmsg(msg, from) {
+    console.log('事件:收到来自'+ from+'的消息:' + msg);
+}
+function onhookstate(jso) {
+    console.log('事件:坐席叉簧状态'+JSON.stringify(jso));
+}
+function onhardwarefail(err) {
+    console.log('事件:keygoe交换机硬件故障');
+}
+// function onmisscall(err) {
+//     console.log('事件:呼损');
+// }
+//新状态 1-呼叫失败  2-呼叫应答进入会议 3-会议中挂机退出会议
+function onconferencememberstate(jso)
+{
+	console.log('会议成员状态发生变化 ' + JSON.stringify(jso));
+}
+function onslaveserverfail(jso)
+{
+	console.log('注意：备用服务器已失联');
+}
+function onswitchtoslaveserver(jso)
+{
+	console.log('注意：主服务器故障，已经切换到备用服务器');
+}
+//事件回调函数结束
+
+function queryAgentState()
+{
+	console.log('排队外线数量 '+tlwsa.tlaGetacdlength());
+
+	console.log('外线总数量 '+tlwsa.tlaGettrknumber());
+
+	var agcount=tlwsa.tlaGetagentcount();
+	console.log('登录坐席数量 '+agcount);
+	for(var ind=0;ind<agcount;ind++)
+	{
+		console.log('agnet No. ' + ind + ' workid is '+tlwsa.tlaGetagentwid(ind) + ' state is ' + tlwsa.tlaGetagentstate(ind) + '  '+getStateInfo(tlwsa.tlaGetagentstate(ind) ) )
+	}
+}
+
+function getLicenseInfo()
+{
+	ajo=tlwsa.tlaGetlicenseinfo();
+	console.log('授权有效期 '+ajo.validdate+' 授权线数 '+ajo.lines+' 卡号 '+ajo.cardno);
+
+}
+function getStateInfo(state)
+{
+	switch(state)
+	{
+		case '0':
+		return '未登录';
+		case '1':
+		return '空闲';
+		case '2':
+		return '离席';
+		case '3':
+		return '正在振铃';
+		case '4':
+		return '播报工号';
+		case '5':
+		return '通话中';
+		case '6':
+		return '正在外呼';
+		case '7':
+		return '正在转移';
+		case '8':
+		return '正在监听';
+	}
+}

src/common.less

@@ -16,6 +16,9 @@
 .mt8 {
   margin-top: 8px !important;
 }
+.mt0 {
+  margin-top: 0 !important;
+}
 .ml16 {
   margin-left: 16px !important;
 }
@@ -165,6 +168,14 @@
   word-break: break-all;
 }
 
+.fl {
+  float: left !important;
+}
+
+.fr {
+  float: right !important;
+}
+
 .ellipsis-multiline {
   display: -webkit-box;
   -webkit-box-orient: vertical;
@@ -172,6 +183,16 @@
   overflow: hidden;
   text-overflow: ellipsis;
 }
+
+.ellipsis-oneline {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.cursorDefault{
+  cursor: default!important;
+}
 // list模板样式 end
 
 // button
@@ -237,13 +258,7 @@
     cursor: not-allowed;
     border: 1px solid rgba(0, 0, 0, 0.25);
   }
-  .fl {
-    float: left !important;
-  }
 
-  .fr {
-    float: right !important;
-  }
   .clearfixer :after {
     content: "";
     display: block;
@@ -261,7 +276,7 @@
 // list模板样式 start
 .list-template {
   padding: 8px;
-  .ant-calendar-picker {
+  nz-range-picker {
     width: 373px!important;
   }
   .list-template__content {