Merge branch 'develop' into lmm

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

@@ -6,29 +6,32 @@ import * as Atmosphere from "atmosphere.js";
   providedIn: "root",
 })
 export class WebsocketIndexService {
-  constructor() {}
+  constructor() { }
   private lockReconnect = false; //避免ws重复连接
-  ws; //定义websocket
+  ws = null; //定义websocket
   private url = ""; //ws连接地址
   private urlParams; //ws连接传参
   private isHandler = false; //是否手动
   private subject;
+  private reconnectTimer = null;//重连的计时器
   // 连接websocket
   connectWs(url, data): Observable<any> {
     this.url = url;
     this.urlParams = data;
     this.subject = new Subject<any>();
     let request: any = {
-      url,
-      contentType: "application/json",
-      shared: true, // 标签共享
+      webSocketUrl: url,
       trackMessageLength: true, //校验数据完整性
       transport: "websocket",
+      handleOnlineOffline: false,
+      suspend: false,
+      maxReconnectOnClose: 0,
     };
 
     request.onOpen = (response) => {
       console.log("ws连接成功" + new Date().toLocaleString());
       this.heartCheck.reset().start(this);
+      console.log(response);
       this.ws.push(JSON.stringify(data));
     };
 
@@ -36,7 +39,6 @@ export class WebsocketIndexService {
       this.heartCheck.reset().start(this);
       let message = response.responseBody;
       try {
-        // alert(message);
         console.log("收到消息" + message);
         if (message !== "pong") {
           this.subject.next(JSON.parse(message));
@@ -49,20 +51,20 @@ export class WebsocketIndexService {
 
     request.onClose = (response) => {
       console.log("ws连接关闭" + new Date().toLocaleString(), this.isHandler);
-      this.heartCheck.reset();
-      if (!this.isHandler) {
+      this.ws = null;
+      console.log(response)
+      if (!this.isHandler && response.status === 408) {
         this.reconnect(this.url, this.urlParams);
       }
     };
 
     request.onError = (response) => {
       console.log("ws连接错误", this.isHandler);
-      this.heartCheck.reset();
-      if (!this.isHandler) {
+      this.ws = null;
+      if (response.status === 0) {
         this.reconnect(this.url, this.urlParams);
       }
     };
-
     this.ws = Atmosphere.subscribe(request);
     return this.subject.asObservable();
   }
@@ -70,14 +72,14 @@ export class WebsocketIndexService {
   private reconnect(url, data) {
     if (this.lockReconnect) return;
     this.lockReconnect = true;
-    setTimeout(() => {
+    this.reconnectTimer = setTimeout(() => {
       //没连接上会一直重连，设置延迟避免请求过多
       this.connectWs(url, data);
       this.lockReconnect = false;
     }, 15000);
   }
   private heartCheck = {
-    timeout: 60000, //1分钟发一次心跳
+    timeout: 30000, //发一次心跳的间隔时间
     timeoutObj: null,
     serverTimeoutObj: null,
     reset: function () {
@@ -89,7 +91,9 @@ export class WebsocketIndexService {
       this.timeoutObj = setTimeout(() => {
         //这里发送一个心跳，后端收到后，返回一个心跳消息，
         //onmessage拿到返回的心跳就说明连接正常
-        _this.ws.push("ping");
+        if (_this.ws) {
+          _this.ws.push("ping");
+        }
         this.serverTimeoutObj = setTimeout(() => {
           //如果超过一定时间还没重置，说明后端主动断开了
           _this.closeWs(); //如果onclose会执行reconnect，我们执行ws.close()就行了.如果直接执行reconnect 会触发onclose导致重连两次
@@ -101,6 +105,11 @@ export class WebsocketIndexService {
   // 断开websocket
   closeWs(flag: boolean = false) {
     this.isHandler = flag;
-    this.ws.close();
+    if (flag) {
+      clearTimeout(this.reconnectTimer);
+    }
+    if (this.ws) {
+      this.ws.close();
+    }
   }
 }

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

@@ -6,29 +6,32 @@ import * as Atmosphere from "atmosphere.js";
   providedIn: "root",
 })
 export class WebsocketMainService {
-  constructor() {}
+  constructor() { }
   private lockReconnect = false; //避免ws重复连接
-  ws; //定义websocket
+  ws = null; //定义websocket
   private url = ""; //ws连接地址
   private urlParams; //ws连接传参
   private isHandler = false; //是否手动
   private subject;
+  private reconnectTimer = null;//重连的计时器
   // 连接websocket
   connectWs(url, data): Observable<any> {
     this.url = url;
     this.urlParams = data;
     this.subject = new Subject<any>();
     let request: any = {
-      url,
-      contentType: "application/json",
-      shared: true, // 标签共享
+      webSocketUrl: url,
       trackMessageLength: true, //校验数据完整性
       transport: "websocket",
+      handleOnlineOffline: false,
+      suspend: false,
+      maxReconnectOnClose: 0,
     };
 
     request.onOpen = (response) => {
       console.log("ws连接成功" + new Date().toLocaleString());
       this.heartCheck.reset().start(this);
+      console.log(response);
       this.ws.push(JSON.stringify(data));
     };
 
@@ -36,7 +39,6 @@ export class WebsocketMainService {
       this.heartCheck.reset().start(this);
       let message = response.responseBody;
       try {
-        // alert(message);
         console.log("收到消息" + message);
         if (message !== "pong") {
           this.subject.next(JSON.parse(message));
@@ -48,21 +50,21 @@ export class WebsocketMainService {
     };
 
     request.onClose = (response) => {
-      console.log("ws连接关闭" + new Date().toLocaleString(),this.isHandler);
-      this.heartCheck.reset();
-      if (!this.isHandler) {
+      console.log("ws连接关闭" + new Date().toLocaleString(), this.isHandler);
+      this.ws = null;
+      console.log(response)
+      if (!this.isHandler && response.status === 408) {
         this.reconnect(this.url, this.urlParams);
       }
     };
 
     request.onError = (response) => {
-      console.log("ws连接错误",this.isHandler);
-      this.heartCheck.reset();
-      if (!this.isHandler) {
+      console.log("ws连接错误", this.isHandler);
+      this.ws = null;
+      if (response.status === 0) {
         this.reconnect(this.url, this.urlParams);
       }
     };
-
     this.ws = Atmosphere.subscribe(request);
     return this.subject.asObservable();
   }
@@ -70,14 +72,14 @@ export class WebsocketMainService {
   private reconnect(url, data) {
     if (this.lockReconnect) return;
     this.lockReconnect = true;
-    setTimeout(() => {
+    this.reconnectTimer = setTimeout(() => {
       //没连接上会一直重连，设置延迟避免请求过多
       this.connectWs(url, data);
       this.lockReconnect = false;
     }, 15000);
   }
   private heartCheck = {
-    timeout: 60000, //1分钟发一次心跳
+    timeout: 30000, //发一次心跳的间隔时间
     timeoutObj: null,
     serverTimeoutObj: null,
     reset: function () {
@@ -89,7 +91,9 @@ export class WebsocketMainService {
       this.timeoutObj = setTimeout(() => {
         //这里发送一个心跳，后端收到后，返回一个心跳消息，
         //onmessage拿到返回的心跳就说明连接正常
-        _this.ws.push("ping");
+        if (_this.ws) {
+          _this.ws.push("ping");
+        }
         this.serverTimeoutObj = setTimeout(() => {
           //如果超过一定时间还没重置，说明后端主动断开了
           _this.closeWs(); //如果onclose会执行reconnect，我们执行ws.close()就行了.如果直接执行reconnect 会触发onclose导致重连两次
@@ -101,6 +105,11 @@ export class WebsocketMainService {
   // 断开websocket
   closeWs(flag: boolean = false) {
     this.isHandler = flag;
-    this.ws.close();
+    if (flag) {
+      clearTimeout(this.reconnectTimer);
+    }
+    if (this.ws) {
+      this.ws.close();
+    }
   }
 }

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

@@ -6,29 +6,32 @@ import * as Atmosphere from "atmosphere.js";
   providedIn: "root",
 })
 export class WebsocketNurseService {
-  constructor() {}
+  constructor() { }
   private lockReconnect = false; //避免ws重复连接
-  ws; //定义websocket
+  ws = null; //定义websocket
   private url = ""; //ws连接地址
   private urlParams; //ws连接传参
   private isHandler = false; //是否手动
   private subject;
+  private reconnectTimer = null;//重连的计时器
   // 连接websocket
   connectWs(url, data): Observable<any> {
     this.url = url;
     this.urlParams = data;
     this.subject = new Subject<any>();
     let request: any = {
-      url,
-      contentType: "application/json",
-      shared: true, // 标签共享
+      webSocketUrl: url,
       trackMessageLength: true, //校验数据完整性
       transport: "websocket",
+      handleOnlineOffline: false,
+      suspend: false,
+      maxReconnectOnClose: 0,
     };
 
     request.onOpen = (response) => {
       console.log("ws连接成功" + new Date().toLocaleString());
       this.heartCheck.reset().start(this);
+      console.log(response);
       this.ws.push(JSON.stringify(data));
     };
 
@@ -36,7 +39,6 @@ export class WebsocketNurseService {
       this.heartCheck.reset().start(this);
       let message = response.responseBody;
       try {
-        // alert(message);
         console.log("收到消息" + message);
         if (message !== "pong") {
           this.subject.next(JSON.parse(message));
@@ -48,21 +50,21 @@ export class WebsocketNurseService {
     };
 
     request.onClose = (response) => {
-      console.log("ws连接关闭" + new Date().toLocaleString(),this.isHandler);
-      this.heartCheck.reset();
-      if (!this.isHandler) {
+      console.log("ws连接关闭" + new Date().toLocaleString(), this.isHandler);
+      this.ws = null;
+      console.log(response)
+      if (!this.isHandler && response.status === 408) {
         this.reconnect(this.url, this.urlParams);
       }
     };
 
     request.onError = (response) => {
-      console.log("ws连接错误",this.isHandler);
-      this.heartCheck.reset();
-      if (!this.isHandler) {
+      console.log("ws连接错误", this.isHandler);
+      this.ws = null;
+      if (response.status === 0) {
         this.reconnect(this.url, this.urlParams);
       }
     };
-
     this.ws = Atmosphere.subscribe(request);
     return this.subject.asObservable();
   }
@@ -70,14 +72,14 @@ export class WebsocketNurseService {
   private reconnect(url, data) {
     if (this.lockReconnect) return;
     this.lockReconnect = true;
-    setTimeout(() => {
+    this.reconnectTimer = setTimeout(() => {
       //没连接上会一直重连，设置延迟避免请求过多
       this.connectWs(url, data);
       this.lockReconnect = false;
     }, 15000);
   }
   private heartCheck = {
-    timeout: 60000, //1分钟发一次心跳
+    timeout: 30000, //发一次心跳的间隔时间
     timeoutObj: null,
     serverTimeoutObj: null,
     reset: function () {
@@ -89,7 +91,9 @@ export class WebsocketNurseService {
       this.timeoutObj = setTimeout(() => {
         //这里发送一个心跳，后端收到后，返回一个心跳消息，
         //onmessage拿到返回的心跳就说明连接正常
-        _this.ws.push("ping");
+        if (_this.ws) {
+          _this.ws.push("ping");
+        }
         this.serverTimeoutObj = setTimeout(() => {
           //如果超过一定时间还没重置，说明后端主动断开了
           _this.closeWs(); //如果onclose会执行reconnect，我们执行ws.close()就行了.如果直接执行reconnect 会触发onclose导致重连两次
@@ -101,6 +105,11 @@ export class WebsocketNurseService {
   // 断开websocket
   closeWs(flag: boolean = false) {
     this.isHandler = flag;
-    this.ws.close();
+    if (flag) {
+      clearTimeout(this.reconnectTimer);
+    }
+    if (this.ws) {
+      this.ws.close();
+    }
   }
 }

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

@@ -6,29 +6,32 @@ import * as Atmosphere from "atmosphere.js";
   providedIn: "root",
 })
 export class WebsocketPhoneService {
-  constructor() {}
+  constructor() { }
   private lockReconnect = false; //避免ws重复连接
-  ws; //定义websocket
+  ws = null; //定义websocket
   private url = ""; //ws连接地址
   private urlParams; //ws连接传参
   private isHandler = false; //是否手动
   private subject;
+  private reconnectTimer = null;//重连的计时器
   // 连接websocket
   connectWs(url, data): Observable<any> {
     this.url = url;
     this.urlParams = data;
     this.subject = new Subject<any>();
     let request: any = {
-      url,
-      contentType: "application/json",
-      shared: true, // 标签共享
+      webSocketUrl: url,
       trackMessageLength: true, //校验数据完整性
       transport: "websocket",
+      handleOnlineOffline: false,
+      suspend: false,
+      maxReconnectOnClose: 0,
     };
 
     request.onOpen = (response) => {
       console.log("ws连接成功" + new Date().toLocaleString());
       this.heartCheck.reset().start(this);
+      console.log(response);
       this.ws.push(JSON.stringify(data));
     };
 
@@ -36,7 +39,6 @@ export class WebsocketPhoneService {
       this.heartCheck.reset().start(this);
       let message = response.responseBody;
       try {
-        // alert(message);
         console.log("收到消息" + message);
         if (message !== "pong") {
           this.subject.next(JSON.parse(message));
@@ -48,21 +50,21 @@ export class WebsocketPhoneService {
     };
 
     request.onClose = (response) => {
-      console.log("ws连接关闭" + new Date().toLocaleString(),this.isHandler);
-      this.heartCheck.reset();
-      if (!this.isHandler) {
+      console.log("ws连接关闭" + new Date().toLocaleString(), this.isHandler);
+      this.ws = null;
+      console.log(response)
+      if (!this.isHandler && response.status === 408) {
         this.reconnect(this.url, this.urlParams);
       }
     };
 
     request.onError = (response) => {
-      console.log("ws连接错误",this.isHandler);
-      this.heartCheck.reset();
-      if (!this.isHandler) {
+      console.log("ws连接错误", this.isHandler);
+      this.ws = null;
+      if (response.status === 0) {
         this.reconnect(this.url, this.urlParams);
       }
     };
-
     this.ws = Atmosphere.subscribe(request);
     return this.subject.asObservable();
   }
@@ -70,14 +72,14 @@ export class WebsocketPhoneService {
   private reconnect(url, data) {
     if (this.lockReconnect) return;
     this.lockReconnect = true;
-    setTimeout(() => {
+    this.reconnectTimer = setTimeout(() => {
       //没连接上会一直重连，设置延迟避免请求过多
       this.connectWs(url, data);
       this.lockReconnect = false;
     }, 15000);
   }
   private heartCheck = {
-    timeout: 60000, //1分钟发一次心跳
+    timeout: 30000, //发一次心跳的间隔时间
     timeoutObj: null,
     serverTimeoutObj: null,
     reset: function () {
@@ -89,7 +91,9 @@ export class WebsocketPhoneService {
       this.timeoutObj = setTimeout(() => {
         //这里发送一个心跳，后端收到后，返回一个心跳消息，
         //onmessage拿到返回的心跳就说明连接正常
-        _this.ws.push("ping");
+        if (_this.ws) {
+          _this.ws.push("ping");
+        }
         this.serverTimeoutObj = setTimeout(() => {
           //如果超过一定时间还没重置，说明后端主动断开了
           _this.closeWs(); //如果onclose会执行reconnect，我们执行ws.close()就行了.如果直接执行reconnect 会触发onclose导致重连两次
@@ -101,6 +105,11 @@ export class WebsocketPhoneService {
   // 断开websocket
   closeWs(flag: boolean = false) {
     this.isHandler = flag;
-    this.ws.close();
+    if (flag) {
+      clearTimeout(this.reconnectTimer);
+    }
+    if (this.ws) {
+      this.ws.close();
+    }
   }
 }

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

@@ -6,29 +6,32 @@ import * as Atmosphere from "atmosphere.js";
   providedIn: "root",
 })
 export class WebsocketSerService {
-  constructor() {}
+  constructor() { }
   private lockReconnect = false; //避免ws重复连接
-  ws; //定义websocket
+  ws = null; //定义websocket
   private url = ""; //ws连接地址
   private urlParams; //ws连接传参
   private isHandler = false; //是否手动
   private subject;
+  private reconnectTimer = null;//重连的计时器
   // 连接websocket
   connectWs(url, data): Observable<any> {
     this.url = url;
     this.urlParams = data;
     this.subject = new Subject<any>();
     let request: any = {
-      url,
-      contentType: "application/json",
-      shared: true, // 标签共享
+      webSocketUrl: url,
       trackMessageLength: true, //校验数据完整性
       transport: "websocket",
+      handleOnlineOffline: false,
+      suspend: false,
+      maxReconnectOnClose: 0,
     };
 
     request.onOpen = (response) => {
       console.log("ws连接成功" + new Date().toLocaleString());
       this.heartCheck.reset().start(this);
+      console.log(response);
       this.ws.push(JSON.stringify(data));
     };
 
@@ -36,7 +39,6 @@ export class WebsocketSerService {
       this.heartCheck.reset().start(this);
       let message = response.responseBody;
       try {
-        // alert(message);
         console.log("收到消息" + message);
         if (message !== "pong") {
           this.subject.next(JSON.parse(message));
@@ -48,21 +50,21 @@ export class WebsocketSerService {
     };
 
     request.onClose = (response) => {
-      console.log("ws连接关闭" + new Date().toLocaleString(),this.isHandler);
-      this.heartCheck.reset();
-      if (!this.isHandler) {
+      console.log("ws连接关闭" + new Date().toLocaleString(), this.isHandler);
+      this.ws = null;
+      console.log(response)
+      if (!this.isHandler && response.status === 408) {
         this.reconnect(this.url, this.urlParams);
       }
     };
 
     request.onError = (response) => {
-      console.log("ws连接错误",this.isHandler);
-      this.heartCheck.reset();
-      if (!this.isHandler) {
+      console.log("ws连接错误", this.isHandler);
+      this.ws = null;
+      if (response.status === 0) {
         this.reconnect(this.url, this.urlParams);
       }
     };
-
     this.ws = Atmosphere.subscribe(request);
     return this.subject.asObservable();
   }
@@ -70,14 +72,14 @@ export class WebsocketSerService {
   private reconnect(url, data) {
     if (this.lockReconnect) return;
     this.lockReconnect = true;
-    setTimeout(() => {
+    this.reconnectTimer = setTimeout(() => {
       //没连接上会一直重连，设置延迟避免请求过多
       this.connectWs(url, data);
       this.lockReconnect = false;
     }, 15000);
   }
   private heartCheck = {
-    timeout: 60000, //1分钟发一次心跳
+    timeout: 30000, //发一次心跳的间隔时间
     timeoutObj: null,
     serverTimeoutObj: null,
     reset: function () {
@@ -89,7 +91,9 @@ export class WebsocketSerService {
       this.timeoutObj = setTimeout(() => {
         //这里发送一个心跳，后端收到后，返回一个心跳消息，
         //onmessage拿到返回的心跳就说明连接正常
-        _this.ws.push("ping");
+        if (_this.ws) {
+          _this.ws.push("ping");
+        }
         this.serverTimeoutObj = setTimeout(() => {
           //如果超过一定时间还没重置，说明后端主动断开了
           _this.closeWs(); //如果onclose会执行reconnect，我们执行ws.close()就行了.如果直接执行reconnect 会触发onclose导致重连两次
@@ -101,6 +105,11 @@ export class WebsocketSerService {
   // 断开websocket
   closeWs(flag: boolean = false) {
     this.isHandler = flag;
-    this.ws.close();
+    if (flag) {
+      clearTimeout(this.reconnectTimer);
+    }
+    if (this.ws) {
+      this.ws.close();
+    }
   }
 }

src/app/views/fuwutai/fuwutai.component.html

@@ -579,7 +579,7 @@
     <div class="left"
       *ngIf="fixedTab!=''&&showLastItems&&fixedTab!='newOrder'&&fixedTab!='toSystem'&&fixedTab!='logout'">
       <!-- 绑定分机 -->
-      <div class="con bindingExtension" *ngIf="(fixedTab=='bindingExtension'&&fixedTab!='newOrder')">
+      <div class="con bindingExtension" *ngIf="(fixedTab=='bindingExtension'&&fixedTab!='newOrder'&&!phoneNumLoading)">
         <div class="title">绑定分机</div>
         <overlay-scrollbars #osComponentRef7 [ngStyle]="{ height:'152px' }" class="conditions">
           <div nz-row *ngIf="binding === 1">
@@ -618,7 +618,16 @@
             *ngIf="binding === 3">绑定分机</button>
           <button nz-button nzType="primary" nzValue="small" (click)="bindingHandle()"
             *ngIf="binding === 2">重新绑定</button>
-          <button nz-button nzType="primary" nzValue="small" *ngIf="binding === 1" (click)="bindingOk()">确定绑定</button>
+          <button nz-button nzType="primary" nzValue="small" *ngIf="binding === 1" (click)="bindingOk()" [nzLoading]="bindOkLoading">确定绑定</button>
+        </div>
+      </div>
+      <div class="con bindingExtension display_flex justify-content_flex-center align-items_center"
+        *ngIf="(fixedTab=='bindingExtension'&&fixedTab!='newOrder'&&phoneNumLoading)">
+        <div class="loadingFull display_flex justify-content_flex-center align-items_center">
+          <div class="loadingFullInner">
+            <img src="../../../assets/images/loading.gif" alt="">
+            <div>加载中...</div>
+          </div>
         </div>
       </div>
       <!-- 工单范围 -->
@@ -1446,4 +1455,4 @@
 <app-select-dept [createLoading]="createLoading" [deptFlag]="deptFlag" (submitFormHand)="submitFormHand($event)"
   (deptFlagHand)="deptFlagHand($event)" [hosId]="checkedHos" *ngIf="deptFlag"></app-select-dept>
 
-<router-outlet (deactivate)="refreshList($event)"></router-outlet>
+<router-outlet (deactivate)="refreshList($event)"></router-outlet>

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

@@ -106,7 +106,7 @@ export class FuwutaiComponent implements OnInit {
     private notification: NzNotificationService,
     private phones: WebsocketPhoneService,
     private sers: WebsocketSerService
-  ) {}
+  ) { }
   validateFormZy!: FormGroup;
   validateFormQt!: FormGroup;
   // ---------------------------------------
@@ -267,11 +267,11 @@ export class FuwutaiComponent implements OnInit {
     });
     this.router.navigateByUrl(
       "dispatchingDesk/allotWorker/" +
-        ids_types.join("-") +
-        "/" +
-        stateIds.join("-") +
-        "/2/" +
-        this.checkedHos
+      ids_types.join("-") +
+      "/" +
+      stateIds.join("-") +
+      "/2/" +
+      this.checkedHos
     );
   }
   // 批量撤回
@@ -355,8 +355,8 @@ export class FuwutaiComponent implements OnInit {
     if (newOrderShowFlag) {
       let goods = this.validateFormZy.controls.goods.value
         ? this.validateFormZy.controls.goods.value.filter(
-            (item) => item.checked === true
-          )
+          (item) => item.checked === true
+        )
         : [];
       goods = goods.map((current) => current.value).join();
       let postData = {
@@ -540,12 +540,8 @@ export class FuwutaiComponent implements OnInit {
   }
   ngOnDestroy() {
     clearInterval(this.refreshTimerId);
-    if (this.phones.ws) {
-      this.phones.closeWs(true);
-    }
-    if (this.sers.ws) {
-      this.sers.closeWs(true);
-    }
+    this.phones.closeWs(true);
+    this.sers.closeWs(true);
   }
   unassignedSearchCon: string = ""; //未分派搜索框内容
   arriveSearchCon: string = ""; //待到达搜索框内容
@@ -620,18 +616,23 @@ export class FuwutaiComponent implements OnInit {
       });
   }
   // 连接websocket---phone
+  bindOkLoading = false;
   getWebsocketPhone() {
+    this.bindOkLoading = true;
     let userCount =
       this.user.user.account + "|" + this.phoneNumListSelected.join("_");
     this.phones.connectWs(http.phoneWs, { userCount }).subscribe((data) => {
       // data = { status: 201, phone: '013581394341' };//ceshi
       console.log(data);
+      this.bindOkLoading = false;
       if (data.status == 200 && data.phone) {
         localStorage.setItem("phones", data.phone);
         this.phoneNumListBind = data.phone.split("_");
         this.phoneNumListBind.forEach((item) => {
-          this.phoneNumList.find((item1) => item1.value === item).checked =
-            true;
+          let obj = this.phoneNumList.find((item1) => item1.value === item);
+          if (obj) {
+            obj.checked = true;
+          }
         });
         this.binding = 2;
       } else if (data.status == 201 && data.phone) {
@@ -683,19 +684,16 @@ export class FuwutaiComponent implements OnInit {
   //确定绑定
   bindingOk() {
     if (this.phoneNumListSelected.length > 0) {
-      if (this.phones.ws) {
-        this.phones.closeWs(true);
-      }
+      this.phones.closeWs(true);
       this.getWebsocketPhone();
     } else {
       localStorage.removeItem("phones");
       this.binding = 3;
+      this.phoneNumListBind = [];
       this.phoneNumList.forEach((item) => {
         item.checked = false;
       });
-      if (this.phones.ws) {
-        this.phones.closeWs(true);
-      }
+      this.phones.closeWs(true);
     }
   }
   // 选择分机
@@ -1072,20 +1070,20 @@ export class FuwutaiComponent implements OnInit {
     if (flag == 1) {
       this.router.navigateByUrl(
         "dispatchingDesk/allotWorker/" +
-          id +
-          "/" +
-          stateId +
-          "/1/" +
-          this.checkedHos
+        id +
+        "/" +
+        stateId +
+        "/1/" +
+        this.checkedHos
       );
     } else {
       this.router.navigateByUrl(
         "dispatchingDesk/allotWorker/" +
-          id +
-          "/" +
-          stateId +
-          "/0/" +
-          this.checkedHos
+        id +
+        "/" +
+        stateId +
+        "/0/" +
+        this.checkedHos
       );
     }
   }
@@ -1277,9 +1275,10 @@ export class FuwutaiComponent implements OnInit {
     } else {
       this.binding = 3; //绑定分机
     }
+    this.getPhoneNumList();
   }
-  //获取所有分机号码列表,flag表示不自动连接
-  getPhoneNum(flag = true) {
+  //获取所有分机号码列表
+  getPhoneNumList() {
     this.phoneNumLoading = true;
     let postData = {
       idx: 0,
@@ -1296,24 +1295,42 @@ export class FuwutaiComponent implements OnInit {
         this.phoneNumList.map((item) => {
           return { ...item, checked: false };
         });
-        if (!flag) {
-          //切换院区的时候清除掉缓存中的号码
-          localStorage.removeItem("phones");
-        }
-        this.phoneNumListBind = localStorage.getItem("phones")
-          ? localStorage.getItem("phones").split("_")
-          : [];
-        this.phoneNumListSelected = localStorage.getItem("phones")
-          ? localStorage.getItem("phones").split("_")
-          : [];
-        if (this.phoneNumListBind.length) {
-          this.getWebsocketPhone();
-        }
+        this.phoneNumListBind.forEach((item) => {
+          let obj = this.phoneNumList.find((item1) => item1.value === item);
+          if (obj) {
+            obj.checked = true;
+          }
+        });
       });
   }
+  getPhoneNum(flag = true) {
+    if (!flag) {
+      //切换院区的时候清除掉缓存中的号码
+      localStorage.removeItem("phones");
+    }
+    this.phoneNumListBind = localStorage.getItem("phones")
+      ? localStorage.getItem("phones").split("_")
+      : [];
+    this.phoneNumListSelected = localStorage.getItem("phones")
+      ? localStorage.getItem("phones").split("_")
+      : [];
+    if (this.phoneNumListBind.length) {
+      this.getWebsocketPhone();
+    }
+  }
   // 绑定分机，重新绑定
   bindingHandle() {
     this.binding = 1;
+    this.phoneNumList.forEach((item) => {
+      item.checked = false;
+    })
+    this.phoneNumList.forEach((item) => {
+      this.phoneNumListBind.forEach(v => {
+        if (item.value == v) {
+          item.checked = true;
+        }
+      })
+    });
   }
   // 点击tab切换
   tabClick(key) {
@@ -2174,9 +2191,7 @@ export class FuwutaiComponent implements OnInit {
         if (data.status == 200) {
           that.showPromptModal("保存", true, "");
           // 关闭phone的websocket
-          if (this.phones.ws) {
-            this.phones.closeWs(true);
-          }
+          this.phones.closeWs(true);
           this.getPhoneNum(false);
           that.user.user.scope = data.data;
           localStorage.setItem("user", JSON.stringify(that.user));