完善主页面右上角中部门、岗位、姓名、关闭按钮的布局

anrui-system-ui/src/store/modules/user.js

@@ -43,7 +43,8 @@ const actions = {
           pNameAndDepartmentNameAndPostName: data.pNameAndDepartmentNameAndPostName,
           roleName: data.roleName,
           defaultOrgPathName: data.defaultOrgPathName,
-          defaultOrgPath: data.defaultOrgPath
+          defaultOrgPath: data.defaultOrgPath,
+          postName: data.postName
         }
         commit('SET_UESRINFO', user)
         window.sessionStorage.setItem('userSid', user.userSid)
@@ -54,6 +55,7 @@ const actions = {
         window.sessionStorage.setItem('roleName', user.roleName)
         window.sessionStorage.setItem('defaultOrgPathName', user.defaultOrgPathName)
         window.sessionStorage.setItem('defaultOrgPath', user.defaultOrgPath)
+        window.sessionStorage.setItem('postName', user.postName)
         resolve(data)
       }).catch(error => {
         reject(error)

anrui-system-ui/src/views/Home/Home.vue

@@ -2,15 +2,21 @@
   <div style="height: 100%;">
     <div class="header">
       <p class="title"><img src="../../assets/loginImg/logo.png"/>安瑞集团信息化平台</p>
-      <div class="head_info">
+      <div class="head_info" style="display: flex;flex-direction: row;justify-content:space-between;align-items: center">
-        <p>欢迎您</p>
+        <div>欢迎您</div>
-        <p>
+        <div>
           <el-select v-model="defaultOrgPathName" class="selectStyle" size="small" placeholder="" @change="changeOrg" filterable>
             <el-option v-for="item in orgDept_list" :key="item.orgPath" :label="item.orgName" :value="item.orgName"/>
           </el-select>
-        </p>
+        </div>
-        <p>{{ roleName }} {{ name }}</p>
+        <div style="padding-right: 5px">
-        <p @click="logout()" class="dy"><img src="@/assets/images/dy.png"/></p>
+          <el-tooltip placement="top">
+            <div slot="content">{{ roleName }}</div>
+            <el-button style="color: #FFFFFF;font-size: 17px" type="text">{{ postName }}</el-button>
+          </el-tooltip>
+        </div>
+        <div>{{ name }}</div>
+        <div @click="logout()" style="display: flex;flex-direction: row;justify-content:center;align-items: center;padding-left: 20px;padding-right: 10px"><img src="@/assets/images/dy.png"/></div>
       </div>
     </div>
     <div class="container1">
@@ -260,6 +266,7 @@ export default {
       defaultOrgPathName: '',
       defaultOrgPath: '',
       roleName: '',
+      postName: '',
       year: ''
     }
   },
@@ -276,6 +283,7 @@ export default {
     this.defaultOrgPathName = window.sessionStorage.getItem('defaultOrgPathName')
     this.defaultOrgPath = window.sessionStorage.getItem('defaultOrgPath')
     this.roleName = window.sessionStorage.getItem('roleName')
+    this.postName = window.sessionStorage.getItem('postName')
     this.name = window.sessionStorage.getItem('name')
     var nowDate = new Date()
     this.year = nowDate.getFullYear()
@@ -295,7 +303,7 @@ export default {
       })
       User.getOrgListByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
         if (res.success) {
-          this.orgDept_list= res.data
+          this.orgDept_list = res.data
         }
       })
     },
@@ -464,18 +472,18 @@ p {
   }
 }
 
-.head_info img {
+//.head_info img {
-  width: 25px;
+//  width: 25px;
-  margin-top: 20px;
+//  margin-top: 20px;
-  margin-left: 30px;
+//  margin-left: 30px;
-  margin-right: 10px;
+//  margin-right: 10px;
-  float: left;
+//  float: left;
-}
+//}
-
+//
-.head_info .dy {
+//.head_info .dy {
-  margin-left: 10px;
+//  margin-left: 10px;
-  margin-right: 20px;
+//  margin-right: 20px;
-}
+//}
 
 .container1 {
   background: #E9F1F7;