Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

@@ -7,7 +7,7 @@ export function loginIn(username, password) {
     method: "post",
     method: "post",
   });
   });
 }
 }
-export function loginOut() {
+export function logout() {
   return request({
   return request({
     url: `${SERVER.MANAGEMENTAPI}/logout`,
     url: `${SERVER.MANAGEMENTAPI}/logout`,
     method: "post",
     method: "post",

@@ -22,7 +22,7 @@
 <script>
 <script>
 import sidebarLeft from "./Sidebar/sidebarLeft";
 import sidebarLeft from "./Sidebar/sidebarLeft";
 import sidebarRight from "./Sidebar/sidebarRight";
 import sidebarRight from "./Sidebar/sidebarRight";
-import { loginOut } from "@/api/login.js";
+import { logout } from "@/api/login.js";
 import { mapGetters } from "vuex";
 import { mapGetters } from "vuex";
 export default {
 export default {
   components: {
   components: {
@@ -34,10 +34,15 @@ export default {
   },
   },
   methods: {
   methods: {
     onCancel() {
     onCancel() {
-      loginOut()
+      logout()
         .then((res) => {
         .then((res) => {
           sessionStorage.removeItem("token");
           sessionStorage.removeItem("token");
-          this.$router.push("/login");
+          this.$router.replace({
+            path: "/login",
+            query: {
+              redirect: this.$route.fullPath,
+            },
+          });
         })
         })
         .catch((error) => {
         .catch((error) => {
           // console.dir(error);
           // console.dir(error);

 /**
 /**
  * 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器
  * 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器
  */
  */
-import axios from 'axios'
-import { Message } from 'element-ui'
-import { endLoadingSubCount } from './requestLoading'
+import axios from "axios";
+import { Message } from "element-ui";
+import { endLoadingSubCount } from "./requestLoading";
+import router from "../router";
 
 
 // create an axios instance
 // create an axios instance
 const service = axios.create({
 const service = axios.create({
-    baseURL: process.env.VUE_APP_BASE_API,
-    withCredentials: true,  //是否允许跨域
-    headers: {
-        'Content-Type': 'application/json; charset=utf-8'
-    },
-    timeout: 15000
-})
+  baseURL: process.env.VUE_APP_BASE_API,
+  withCredentials: true, //是否允许跨域
+  headers: {
+    "Content-Type": "application/json; charset=utf-8",
+  },
+  timeout: 15000,
+});
 
 
 // request interceptor
 // request interceptor
 service.interceptors.request.use(
 service.interceptors.request.use(
-    config => {
-        //调用登录接口时无token，也不需要传token，其他接口都传入token
-        config.headers.Authorization =  sessionStorage.getItem("token") || "";
-        config.headers.Accept = 'application/json'
-        return config
-    },
-    error => {
-        Message.error('请求超时!');
-        return Promise.reject(error)
-    }
-)
+  (config) => {
+    //调用登录接口时无token，也不需要传token，其他接口都传入token
+    config.headers.Authorization = sessionStorage.getItem("token") || "";
+    config.headers.Accept = "application/json";
+    return config;
+  },
+  (error) => {
+    Message.error("请求超时!");
+    return Promise.reject(error);
+  }
+);
 
 
 // response interceptor
 // response interceptor
 service.interceptors.response.use(
 service.interceptors.response.use(
-    response => {
-        /**
-         *  对响应数据判断:
-         *  如果成功返回数据，就通过return把数据返出去
-         *  如果请求不成功，就在拦截器这里统一处理（组件的代码就不用关注错误的情况了）
-         */
-        if (response.status == 200) {
-            // if (response.data.code == 500) {
-            //     Message({
-            //         message: response.data.message,
-            //         type: 'error',
-            //         duration: 5 * 1000
-            //     })
-            // }
-            return response.data;
-        } else {
-            handleErrorData(response.data);
-        }
-        return response;
-    },
-    error => {
-        endLoadingSubCount()
-        // 对响应错误做点什么
-        Message({
-            message: '服务器异常,请联系管理员',
-            type: 'error',
-            duration: 5 * 1000
-        })
-        return Promise.reject(error);
-    }
-)
-//对错误信息的处理函数
-function handleErrorData (errMes) {
-    if (errMes.message) {
-        Message.error(errMes.message);
+  (response) => {
+    /**
+     *  对响应数据判断:
+     *  如果成功返回数据，就通过return把数据返出去
+     *  如果请求不成功，就在拦截器这里统一处理（组件的代码就不用关注错误的情况了）
+     */
+    if (response.status == 200) {
+      return response.data;
     } else {
     } else {
-        switch (errMes.code) {
-            case 401:
-                Message.error("由于长时间未操作，请重新登录!");
-                window.location.href = `http://${window.location.host}`
-                break;
-            case 403:
-                Message.error("拒绝访问");
-                break;
-            case 404:
-                Message.error("很抱歉，资源未找到!");
-                break;
-            case 500:
-                Message.error("服务器错误!");
-                break;
-            default:
-                Message.error("服务正在联调中，请稍后!");
-                break;
-        }
+      // 对响应错误做点什么
+      Message({
+        message: "请求失败",
+        type: "error",
+        duration: 5 * 1000,
+      });
     }
     }
+    return response;
+  },
+  (error) => {
+    handleErrorData(error.response.status);
+    endLoadingSubCount();
+    return Promise.reject(error);
+  }
+);
+//对错误信息的处理函数
+function handleErrorData(status) {
+  switch (status) {
+    case 401:
+      Message.error("由于长时间未操作，请重新登录!");
+      router.replace({
+        path: "/login",
+        query: {
+          redirect: router.history.current.fullPath,
+        },
+      });
+      break;
+    case 403:
+      Message.error("拒绝访问");
+      break;
+    case 404:
+      Message.error("很抱歉，资源未找到!");
+      break;
+    case 500:
+      Message.error("服务器错误!");
+      break;
+    default:
+      Message.error("服务正在联调中，请稍后!");
+      break;
+  }
 }
 }
-export default service
-
-
+export default service;

@@ -79,10 +79,12 @@ export default {
           loginIn(self.user.account, self.user.password)
           loginIn(self.user.account, self.user.password)
             .then((res) => {
             .then((res) => {
               if (res.status === 1) {
               if (res.status === 1) {
+                //存储token
                 sessionStorage.setItem("token", `Bearer ${res.content}`);
                 sessionStorage.setItem("token", `Bearer ${res.content}`);
-                this.$router.push('/');
+                //路由判断有无
+                this.$router.replace(this.$route.query.redirect || '/')
               } else {
               } else {
-                alert(res.message);
+                //错误处理
               }
               }
             })
             })
             .catch((error) => {
             .catch((error) => {