Merge branch 'dev'

 /*
 /*
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-06-26 10:18:09
+ * @LastEditTime: 2023-06-26 11:11:23
  */
  */
 import Vue from 'vue'
 import Vue from 'vue'
 import axios from 'axios'
 import axios from 'axios'
@@ -65,12 +65,7 @@ router.beforeEach(async (to, from, next) => {
         ...accessRoutes,
         ...accessRoutes,
         { path: "*", redirect: "/404", hidden: true }
         { path: "*", redirect: "/404", hidden: true }
       ]);
       ]);
-      const routeTo = Cookies.get("routerTo");
-      if (routeTo && routeTo !== "/") {
-        next({ ...to, replace: true });
-      } else {
-        next(path)
-      }
+      next(path)
     }
     }
   }
   }
   if (window._config.casEnable === true) {
   if (window._config.casEnable === true) {
@@ -110,13 +105,13 @@ router.beforeEach(async (to, from, next) => {
         window.location.href = window._config.services.management + `/management/cas/status?loginUrl=${window._config.baseUrl}/sjsb/&hash=/login`
         window.location.href = window._config.services.management + `/management/cas/status?loginUrl=${window._config.baseUrl}/sjsb/&hash=/login`
       }
       }
     } else {
     } else {
+      permission()
       if (to.path === '/login') {
       if (to.path === '/login') {
         const redirectUrl = getUrlParam('redirectUrl');
         const redirectUrl = getUrlParam('redirectUrl');
         if (redirectUrl && redirectUrl !== '') {
         if (redirectUrl && redirectUrl !== '') {
           window.location.href = redirectUrl
           window.location.href = redirectUrl
           return
           return
         } else {
         } else {
-          permission()
           next('/');
           next('/');
           return
           return
         }
         }