首页显示部门名字和昵称

src/layout/components/Navbar.vue

@@ -17,11 +17,12 @@
         <header-notice-vue />
       </div>
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
-        
+
         <div class="avatar-wrapper">
           <img :src="avatar" class="user-avatar" />
           <div class="cons">
-            <div class="nickName">{{ user.name }}</div>
+            <div class="nickName">{{ user.nickName }}</div>
+            <div>{{ user.deptName ? user.deptName : '无部门' }}</div>
           </div>
           <i class="el-icon-caret-bottom" />
         </div>
@@ -85,7 +86,7 @@ export default {
     RuoYiDoc
   },
   computed: {
-    ...mapGetters(['sidebar', 'avatar', 'device', 'sidebarRouters']),
+    ...mapGetters(['sidebar', 'avatar', 'device', 'sidebarRouters', 'deptName','nickName']),
     setting: {
       get() {
         return this.$store.state.settings.showSettings;
@@ -237,11 +238,17 @@ export default {
           font-size: 13px;
           margin-top: -4px;
           margin-left: 10px;
-          max-width: 100px;
+          //max-width: 100px;
           color: white;
+          width: auto;
           .nickName {
+            text-align: center;
             height: 10px;
+            margin-top: -7px;
+            margin-bottom: 5px;
+
           }
+          .deptName {}
           .desc {
             margin-top: 7px;
           }

src/store/getters.js

@@ -9,6 +9,8 @@ const getters = {
   avatar: state => state.user.avatar,
   name: state => state.user.name,
   userId: state => state.user.userId,
+  deptName: state => state.user.dept.deptName,
+  nickName: state => state.user.nickName,
   introduction: state => state.user.introduction,
   roles: state => state.user.roles,
   permissions: state => state.user.permissions,

src/store/modules/user.js

@@ -29,6 +29,12 @@ const user = {
     },
     SET_USERID: (state, userId) => {
       state.userId = userId
+    },
+    SET_DEPTNAME: (state, deptName) => {
+      state.deptName = deptName
+    },
+    SET_NICKNAME: (state, nickName) => {
+      state.nickName = nickName
     }
   },
 
@@ -65,6 +71,8 @@ const user = {
           commit('SET_NAME', user.userName)
           commit('SET_AVATAR', avatar)
           commit('SET_USERID', user.userId)
+          commit('SET_DEPTNAME', user.dept.deptName)
+          commit('SET_NICKNAME', user.nickName)
           resolve(res)
         }).catch(error => {
           reject(error)