From 0476381d5787bed1b37cb8cb14e3aebc0d98131d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 19 十月 2023 16:22:00 +0800
Subject: [PATCH] 代码提交

---
 Source/UBCS-WEB/src/permission.js |   82 +++++++++++++++++++++++-----------------
 1 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/Source/UBCS-WEB/src/permission.js b/Source/UBCS-WEB/src/permission.js
index 2f88c34..035ff10 100644
--- a/Source/UBCS-WEB/src/permission.js
+++ b/Source/UBCS-WEB/src/permission.js
@@ -13,48 +13,60 @@
 router.beforeEach((to, from, next) => {
   const meta = to.meta || {};
   const isMenu = meta.menu === undefined ? to.query.menu : meta.menu;
+  const updataid=JSON.parse(localStorage.getItem("updataid"))
   store.commit('SET_IS_MENU', isMenu === undefined);
   if (getToken()) {
-    if (store.getters.isLock && to.path !== lockPage) { //濡傛灉绯荤粺婵�娲婚攣灞忥紝鍏ㄩ儴璺宠浆鍒伴攣灞忛〉
-      next({path: lockPage})
-    } else if (to.path === '/login') { //濡傛灉鐧诲綍鎴愬姛璁块棶鐧诲綍椤佃烦杞埌涓婚〉
-      next({path: '/'})
-    } else {
-      //濡傛灉鐢ㄦ埛淇℃伅涓虹┖鍒欒幏鍙栫敤鎴蜂俊鎭紝鑾峰彇鐢ㄦ埛淇℃伅澶辫触锛岃烦杞埌鐧诲綍椤�
-      if (store.getters.token.length === 0) {
-        store.dispatch('FedLogOut').then(() => {
-          next({path: '/login'})
-        })
+    //鎷垮埌鏈湴瀛樺偍鐨勫瘑鐮佺瓥鐣ヤ慨鏀瑰��
+      if (store.getters.isLock && to.path !== lockPage) { //濡傛灉绯荤粺婵�娲婚攣灞忥紝鍏ㄩ儴璺宠浆鍒伴攣灞忛〉
+        next({path: lockPage})
+      } else if (to.path === '/login' && updataid.strategyUpdateStatus !=0) {//濡傛灉鐧诲綍鎴愬姛璁块棶鐧诲綍椤佃烦杞埌涓婚〉
+        //杩欓噷鍐嶅姞涓婂垽鏂� 濡傛灉瀵嗙爜绛栫暐淇敼鍚庢病鏈夋敼瀵嗙爜鐨勬儏鍐典笅鍒锋柊椤甸潰涓嶄細杩涘叆棣栭〉
+        next({path: '/'})
       } else {
-        const value = to.query.src || to.fullPath;
-        const label = to.query.name || to.name;
-        const meta = to.meta || router.$avueRouter.meta || {};
-        const i18n = to.query.i18n;
-        if (to.query.target) {
-          window.open(value)
-        } else if (meta.isTab !== false && !validatenull(value) && !validatenull(label)) {
-          store.commit('ADD_TAG', {
-            label: label,
-            value: value,
-            params: to.params,
-            query: to.query,
-            meta: (() => {
-              if (!i18n) {
-                return meta
-              }
-              return {
-                i18n: i18n
-              }
-            })(),
-            group: router.$avueRouter.group || []
-          });
+        //濡傛灉鐢ㄦ埛淇℃伅涓虹┖鍒欒幏鍙栫敤鎴蜂俊鎭紝鑾峰彇鐢ㄦ埛淇℃伅澶辫触锛岃烦杞埌鐧诲綍椤�
+        if (store.getters.token.length === 0 ) {
+          store.dispatch('FedLogOut').then(() => {
+            next({path: '/login'})
+          })
+        } else {
+          let query=JSON.parse(JSON.stringify(to.query));
+         for(var q in to.query) {
+           if (to.query[q].indexOf('@name=') != -1) {
+             query[q] = to.query[q].split('@name=')[0]
+             query['name'] = to.query[q].split('@name=')[1]
+           }
+         }
+          const value = query.src || to.fullPath|| to.path ;
+          const label = query.name || to.name;
+          const meta = to.meta || router.$avueRouter.meta || {};
+          const i18n = to.query.i18n;
+          if (to.query.target) {
+            window.open(value)
+          } else if (meta.isTab !== false && !validatenull(value) && !validatenull(label)) {
+            store.commit('ADD_TAG', {
+              label: label,
+              value: value,
+              params: to.params,
+              query: to.query,
+              meta: (() => {
+                if (!i18n) {
+                  return meta
+                }
+                return {
+                  i18n: i18n
+                }
+              })(),
+              group: router.$avueRouter.group || []
+            });
+          }
+          next()
         }
-        next()
-      }
+
     }
+
   } else {
     //鍒ゆ柇鏄惁闇�瑕佽璇侊紝娌℃湁鐧诲綍璁块棶鍘荤櫥褰曢〉
-    if (meta.isAuth === false) {
+    if (meta.isAuth === false ) {
       next()
     } else {
       next('/login')

--
Gitblit v1.9.3