liuyanpeng пре 2 година
родитељ
комит
9b72a779a1
2 измењених фајлова са 15 додато и 5 уклоњено
  1. 7 5
      src/main.js
  2. 8 0
      src/routes/route-base-v4.js

+ 7 - 5
src/main.js

@@ -77,11 +77,13 @@ if (window.performance.navigation.type == 1) {
 router.beforeEach((to, from, next) => {
   let allowSound = localStorage.getItem('allowSound')
   // 不是登录页才进行消息推送
-  if(to.fullPath !== '/login' || !to.path.includes('/login')){
-    PushMessage.openWebSocket()
-    if(allowSound && allowSound == 'false'){
-      PushMessage.messageModal()
-    } 
+  if(to.fullPath !== '/login' || !to.path.includes('login')){
+    if(to.path !== '/samlLogin'){
+      PushMessage.openWebSocket()
+      if(allowSound && allowSound == 'false'){
+        PushMessage.messageModal()
+      } 
+    }
   } else {
     PushMessage.closeWebsocket()
   }

+ 8 - 0
src/routes/route-base-v4.js

@@ -58,6 +58,7 @@ import {
     ExcelImport,
     IdentityManager,
     CreateIdentity,
+    SamlLogin,
 } from 'client-base-v4/dist/client-base-v4.js';
 
 
@@ -70,6 +71,13 @@ const router = [
             loginRequired: false,
         },
     },
+    {
+        path: '/samlLogin',
+        component: SamlLogin,
+        meta: {
+            loginRequired: false,
+        },
+    },
     {
         path: '/desktop', component: Desktop,
         children: [