From e846eefa54a7a2274a34d43d4601e192a1ada3d9 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 25 六月 2022 13:16:07 +0800
Subject: [PATCH] 1.项目整体样式的配置2.实现工艺设置动态添加的静态样式

---
 src/layout/components/Navbar.vue |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index aeb09b7..4b04a7c 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,43 @@
       '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 userid = getCookie('userid')
+      const data = {
+        usercode,
+        username,
+        usertype,
+        userid
+      }
+      const res = await logout(data)
+      if (res.code === '200') {
+        removeToken()
+        resetRouter()
+        removeCookie('admin')
+        removeCookie('navTabId')
+        removeCookie('usertype')
+        removeCookie('userid')
+        this.$message.success('閫�鍑烘垚鍔燂紒')
+        this.$router.push('/login')
+        // this.$router.push(`/login?redirect=${this.$route.fullPath}`)
+      }
+      // this.$router.push(`/login`)
     }
   }
 }
@@ -118,10 +159,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