From 8f66ac3854531281d41e986cbc49bfa493afd10e Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Mon, 18 Jul 2022 15:11:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/security.js             |  9 +++++++--
 src/store/getters.js        |  1 +
 src/store/modules/portal.js | 15 +++++++++++++--
 src/views/Login.vue         |  2 +-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/security.js b/src/security.js
index 26c51716..6d70133c 100644
--- a/src/security.js
+++ b/src/security.js
@@ -21,7 +21,7 @@ router.beforeEach((to, from, next) => {
   }else{
     constants.fileBaseUrl = window.location.protocol+'//'+window.location.host+configPath;
   }
-  
+
 
   NProgress.start();
 
@@ -66,7 +66,12 @@ router.beforeEach((to, from, next) => {
     }else{
 
         //next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
-        location.href=process.env.VUE_APP_LOGIN_URL;
+        //设置之前的路径
+        //store.commit('portal/SetBackUrl',location.href);
+        //console.log(location.href,'location.href');
+        //let urlPre=window.location.protocol+'//'+window.location.host;
+        //let backUrl=location.href.substring(urlPre.length);
+        location.href=process.env.VUE_APP_LOGIN_URL+"?returnUrl="+location.href;
         NProgress.done()
 
     }
diff --git a/src/store/getters.js b/src/store/getters.js
index 45352469..fd54a91b 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -16,6 +16,7 @@ const getters = {
     sidebarRouters: state => state.permission.sidebarRouters,
     portalCase: state => state.portal.case,
     portalLoginRememberMe: state => state.portal.loginRememberMe,
+    portalBackUrl: state => state.portal.backUrl,
     resOwnerMap:state => state.resOwner.resOwnerMap,
     sysTypeMap:state => state.sysType.sysTypeMap,
     userMsg:state => state.user.msg,
diff --git a/src/store/modules/portal.js b/src/store/modules/portal.js
index 30d32b46..48b9a4ea 100644
--- a/src/store/modules/portal.js
+++ b/src/store/modules/portal.js
@@ -2,7 +2,8 @@ const state = {
   case: {
     readProtocol: sessionStorage.getItem("readProtocol") == null ? false : JSON.parse(sessionStorage.getItem("readProtocol"))
   },
-  loginRememberMe: sessionStorage.getItem("loginRememberMe") == null ? {} : JSON.parse(sessionStorage.getItem("loginRememberMe"))
+  loginRememberMe: sessionStorage.getItem("loginRememberMe") == null ? {} : JSON.parse(sessionStorage.getItem("loginRememberMe")),
+  backUrl:''
 }
 
 const mutations = {
@@ -13,7 +14,10 @@ const mutations = {
   SET_LoginRememberMe: (state, iden) => {
     state.loginRememberMe = iden;
     sessionStorage.setItem("loginRememberMe", JSON.stringify(iden));
-  }
+  },
+  SET_BackUrl: (state, u) => {
+    state.backUrl = u;
+  },
 }
 
 const actions = {
@@ -34,6 +38,13 @@ const actions = {
       commit('SET_LoginRememberMe', iden);
       resolve();
     })
+  },
+  //设置登录返回的地址
+  SetBackUrl({commit}, url) {
+    return new Promise((resolve) => {
+      commit('SET_BackUrl', url);
+      resolve();
+    })
   }
 }
 
diff --git a/src/views/Login.vue b/src/views/Login.vue
index bcc18ea0..8a77d185 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -37,7 +37,7 @@
   import loginApi from "@/api/login";
   export default {
     computed: {
-      ...mapGetters(['portalLoginRememberMe'])
+      ...mapGetters(['portalLoginRememberMe','portalBackUrl'])
     },
     data(){
       return {