diff --git a/tansci-boot-ui/src/api/auth.ts b/tansci-boot-ui/src/api/auth.ts index 750c815..7941304 100644 --- a/tansci-boot-ui/src/api/auth.ts +++ b/tansci-boot-ui/src/api/auth.ts @@ -1,6 +1,6 @@ import request from '@/utils/request' +import global from '@/utils/global' -const userKey:string = 'tansci_boot_user' const tokenKey:string = 'tansci_boot_token' const menuKey:string = 'tansci_boot_menu' @@ -15,18 +15,6 @@ export function removeToken() { sessionStorage.removeItem(tokenKey); } -// 用户信息 -export function getUser() { - let user = sessionStorage.getItem(userKey); - return user ? JSON.parse(user) : null; -} -export function setUser(data:any) { - return sessionStorage.setItem(userKey, JSON.stringify(data)); -} -export function removeUser() { - return sessionStorage.removeItem(userKey); -} - // 菜单信息 export function getMenus() { let menu = sessionStorage.getItem(menuKey); @@ -50,11 +38,10 @@ export function login(data:any){ code: data.code } }).then((res:any) => { - setToken(res.data.result.token) - setUser(res.data.result) - resolve(res.data.result.token) + setToken(res.data.result.token) + resolve(res.data.result.token) }).catch((e:any) => { - reject(e) + reject(e) }) }) } @@ -66,7 +53,6 @@ export function logout(){ method: 'get' }).then(() => { removeToken() - removeUser() location.reload() }) } @@ -83,4 +69,15 @@ export function getCode(){ reject(e) }) }) +} + +export async function getUserInfo() { + await request({ + url: '/tansci/sysuser/info', + method: 'get' + }).then((res:any) => { + if(res.data.result){ + global.user.info = res.data.result + } + }) } \ No newline at end of file diff --git a/tansci-boot-ui/src/assets/image/login-icon.png b/tansci-boot-ui/src/assets/image/login-icon.png deleted file mode 100644 index 02b3640..0000000 Binary files a/tansci-boot-ui/src/assets/image/login-icon.png and /dev/null differ diff --git a/tansci-boot-ui/src/assets/image/login-left.png b/tansci-boot-ui/src/assets/image/login-left.png new file mode 100644 index 0000000..6f6e730 Binary files /dev/null and b/tansci-boot-ui/src/assets/image/login-left.png differ diff --git a/tansci-boot-ui/src/components/layout/Index.vue b/tansci-boot-ui/src/components/layout/Index.vue index fb5638d..78c266d 100644 --- a/tansci-boot-ui/src/components/layout/Index.vue +++ b/tansci-boot-ui/src/components/layout/Index.vue @@ -1,17 +1,29 @@ \ No newline at end of file diff --git a/tansci-boot-ui/src/views/monitor/LoginLog.vue b/tansci-boot-ui/src/views/monitor/LoginLog.vue index fbb81f7..e9c0fbd 100644 --- a/tansci-boot-ui/src/views/monitor/LoginLog.vue +++ b/tansci-boot-ui/src/views/monitor/LoginLog.vue @@ -1,9 +1,8 @@ \ No newline at end of file diff --git a/tansci-boot-ui/src/views/system/Org.vue b/tansci-boot-ui/src/views/system/Org.vue index 792cdc7..ef85c14 100644 --- a/tansci-boot-ui/src/views/system/Org.vue +++ b/tansci-boot-ui/src/views/system/Org.vue @@ -1,11 +1,10 @@