From b6fd01e789451c3fbd039a02aaf91c5629122a80 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 20 六月 2022 19:59:13 +0800
Subject: [PATCH] 1.角色清单新增修改、设置完成
---
src/layout/components/Navbar.vue | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 5 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index aeb09b7..56bf3c0 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -7,8 +7,13 @@
<div class="right-menu">
<el-dropdown class="avatar-container" trigger="click">
<div class="avatar-wrapper">
- <img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">
- <i class="el-icon-caret-bottom" />
+ <!-- <img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
+ <div style="display: flex;align-items: center;margin-top: -5px">
+ <div class="headerImg"><i class="el-icon-user" /></div>
+ <div class="headerName">{{ username }}</div>
+ </div>
+
+ <!-- <i class="el-icon-caret-bottom" />-->
</div>
<el-dropdown-menu slot="dropdown" class="user-dropdown">
<!-- <router-link to="/">-->
@@ -22,6 +27,9 @@
<!-- <a target="_blank" href="https://panjiachen.github.io/vue-element-admin-site/#/">-->
<!-- <el-dropdown-item>Docs</el-dropdown-item>-->
<!-- </a>-->
+ <!-- <el-dropdown-item @click.native="logout">-->
+ <!-- <span style="display:block;">淇敼瀵嗙爜</span>-->
+ <!-- </el-dropdown-item>-->
<!-- divided-->
<el-dropdown-item @click.native="logout">
<span style="display:block;">閫�鍑�</span>
@@ -36,6 +44,9 @@
import { mapGetters } from 'vuex'
import Breadcrumb from '@/components/Breadcrumb'
import Hamburger from '@/components/Hamburger'
+import { getCookie, removeCookie, removeToken } from '@/utils/auth'
+import { logout } from '@/api/user'
+import { resetRouter } from '@/router'
export default {
components: {
@@ -48,13 +59,40 @@
'avatar'
])
},
+ created() {
+ this.username = getCookie('admin')
+ },
+ data() {
+ return {
+ username: ''
+ }
+ },
methods: {
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
},
async logout() {
- await this.$store.dispatch('user/logout')
- this.$router.push(`/login?redirect=${this.$route.fullPath}`)
+ // await this.$store.dispatch('user/logout')
+ const usercode = getCookie('navTabId')
+ const username = getCookie('admin')
+ const usertype = getCookie('usertype')
+ const data = {
+ usercode,
+ username,
+ usertype
+ }
+ const res = await logout(data)
+ if (res.code === '200') {
+ removeToken()
+ resetRouter()
+ removeCookie('admin')
+ removeCookie('navTabId')
+ removeCookie('usertype')
+ this.$message.success('閫�鍑烘垚鍔燂紒')
+ this.$router.push(`/login?redirect=${this.$route.fullPath}`)
+ // this.$router.push(`/login?redirect=${this.$route.fullPath}`)
+ }
+ // this.$router.push(`/login`)
}
}
}
@@ -118,10 +156,18 @@
.avatar-wrapper {
margin-top: 5px;
position: relative;
+ cursor: pointer;
+ .headerImg{
+ margin: 5px;
+ }
+
+ .headerName{
+ font-weight: bolder;
+ }
.user-avatar {
cursor: pointer;
- width: 40px;
+ width: 60px;
height: 40px;
border-radius: 10px;
}
--
Gitblit v1.9.3