Merge branch 'master' into develop

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

@@ -831,14 +831,16 @@ export class FuwutaiComponent implements OnInit {
     let timer = null;
     TLWSA.onClosed = () => {
       _this.getState(0);
-      console.log('与服务器网络连接中断-----seimin');
-      _this.msg.info('与服务器网络连接中断,2分钟后重连')
-      console.log('2分钟后自动重连-----seimin')
       clearTimeout(timer);
-      timer = setTimeout(function () {
-        //连接
-        tlwsa.tlaOpen(_this.incomingService.getSocketUrl());
-      }, 120000)
+      if(location.hash === '#/dispatchingDesk'){
+        console.log('与服务器网络连接中断-----seimin');
+        _this.msg.info('与服务器网络连接中断,2分钟后重连')
+        console.log('2分钟后自动重连-----seimin')
+        timer = setTimeout(function () {
+          //连接
+          tlwsa.tlaOpen(_this.incomingService.getSocketUrl());
+        }, 120000)
+      }
     }
     //签入回调函数
     TLWSA.onLoginreturn = function (err) {