调整退出登录

src/App.vue

@@ -16,7 +16,6 @@ import { notice } from '@/services/bus/system';
 import eventBus from '@/utils/eventBus/index';
 import TimerUtils from '@/utils/timer/timerUtil';
 import Router from '@/router';
-import APP from '@/services';
 import { Modal } from 'ant-design-vue';
 import { setLoadComplete } from '@/common/methods';
 import { isLogin, logout } from '@/services/bus/login';
@@ -24,13 +23,6 @@ import zhCN from 'ant-design-vue/es/locale/zh_CN';
 import { initTheme } from '@/common/config/theme';
 let lastTime = new Date().getTime();
 
-function logoutAction() {
-  logout();
-  APP.closeServer();
-  APP.closeQuote();
-  Router.replace('/login');
-}
-
 // 设置太久没有操作界面，自动退出界面功能
 function setOvertime() {
   window.addEventListener('mousemove', () => {
@@ -51,7 +43,7 @@ function setOvertime() {
             okText: '确定',
             keyboard: false,
           });
-          logoutAction();
+          logout();
         }
       }
     },
@@ -74,7 +66,7 @@ export default defineComponent({
       TimerUtils.setTimeout(
         () => {
           spinning.value = false;
-          logoutAction();
+          logout();
         },
         1000,
         'logoutTimer'
@@ -84,7 +76,7 @@ export default defineComponent({
     // 注册市场状态变更通知
     eventBus.$onOnly('marketStatusChangeNtf', ({ Status }: { Status: number }) => {
       if (Status === 1) {
-        logoutAction();
+        logout();
         Modal.info({
           title: '系统提示:',
           content: '系统结算，请重新登录',

src/services/bus/login.ts

@@ -14,10 +14,14 @@ import { logoutResponse } from '../socket/login';
 import { loginAction } from '../socket/login/index';
 import { LoginResponse } from '../socket/login/interface/index';
 import { getMarketByTradeMode } from './market';
+import Router from '@/router';
 
 export const logout = (): void => {
-    // removeLoginData();
     logoutResponse();
+    removeLoginData();
+    APP.closeServer();
+    APP.closeQuote();
+    Router.replace('/login');
 };
 
 export const login = async (logidCode: string, password: string, byteArr: Uint8Array[], isEncryt = false): Promise<LoginResponse> => {