diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 77dd96b..e5eebc1 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -7,7 +7,8 @@ import { import { getToken, setToken, - removeToken + removeToken, + removeWzglUser } from '@/utils/auth' import { resetRouter @@ -139,7 +140,8 @@ const actions = { console.log("logout",state.token) logout(state.token).then(() => { removeToken() // must remove token first - resetRouter() + resetRouter() + removeWzglUser() commit('RESET_STATE') resolve() }).catch(error => { @@ -153,7 +155,8 @@ const actions = { commit }) { return new Promise(resolve => { - removeToken() // must remove token first + removeToken() // must remove token first + removeWzglUser() commit('RESET_STATE') resolve() }) diff --git a/src/utils/auth.js b/src/utils/auth.js index b47e5c1..ccd9d0e 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -1,6 +1,8 @@ import Cookies from 'js-cookie' const TokenKey = 'patrol_wzgl_token' +const UserInfo = 'patrol_wzgl_user' + export function getToken() { //return Cookies.get(TokenKey) @@ -22,3 +24,24 @@ export function removeToken() { return Cookies.remove(TokenKey) } + +export function getWzglUser() { + //return Cookies.get(TokenKey) + + if (Cookies.get(UserInfo)) { + return Cookies.get(UserInfo) + } else { + return sessionStorage.getItem(UserInfo); + } +} + +export function setWzglUser(User) { + sessionStorage.setItem(UserInfo, User); + return Cookies.set(UserInfo, User) +} + +export function removeWzglUser() { + sessionStorage.clear(); + return Cookies.remove(UserInfo) + +} diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 46cc687..e85b2d5 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -40,6 +40,9 @@ import { getInfo } from '../../api/user.js' + import { + setWzglUser + } from '@/utils/auth.js' export default { components: { @@ -183,6 +186,7 @@ getInfo().then(response => { console.log(response) this.user = response + setWzglUser(this.user) }).catch(error => {}) this.start_time = this.recentTime(-14, 'yyyy-MM-dd') this.end_time = this.getNowDate() diff --git a/src/views/outbounds/component/addoutbounds.vue b/src/views/outbounds/component/addoutbounds.vue index 1286cc1..b0ee046 100644 --- a/src/views/outbounds/component/addoutbounds.vue +++ b/src/views/outbounds/component/addoutbounds.vue @@ -1,683 +1,684 @@ - - - - - + + + + + \ No newline at end of file diff --git a/src/views/outbounds/index.vue b/src/views/outbounds/index.vue index 82d6d91..9c48129 100644 --- a/src/views/outbounds/index.vue +++ b/src/views/outbounds/index.vue @@ -8,7 +8,9 @@ + @click="$refs['addoutbounds'].isShow = true,$refs['addoutbounds'].type = 'add', + $refs['addoutbounds'].chukuType = chukuType, + $refs['addoutbounds'].authName=authName">添加 @@ -21,7 +23,8 @@ :table-item="table">