From 242eedb5eda789781116d835a02de97bcd90bd4e Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 8 Feb 2023 09:18:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=BB=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8F=B3=E4=B8=8A=E8=A7=92=E4=B8=AD=E9=83=A8=E9=97=A8=E3=80=81?=
 =?UTF-8?q?=E5=B2=97=E4=BD=8D=E3=80=81=E5=A7=93=E5=90=8D=E3=80=81=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E6=8C=89=E9=92=AE=E7=9A=84=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 anrui-system-ui/src/store/modules/user.js |  4 +-
 anrui-system-ui/src/views/Home/Home.vue   | 46 +++++++++++++----------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/anrui-system-ui/src/store/modules/user.js b/anrui-system-ui/src/store/modules/user.js
index a5c891d503..01ddfc7c87 100644
--- a/anrui-system-ui/src/store/modules/user.js
+++ b/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)
diff --git a/anrui-system-ui/src/views/Home/Home.vue b/anrui-system-ui/src/views/Home/Home.vue
index 8a8c6b8c54..bcc7f736e6 100644
--- a/anrui-system-ui/src/views/Home/Home.vue
+++ b/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">
-        <p>欢迎您</p>
-        <p>
+      <div class="head_info" style="display: flex;flex-direction: row;justify-content:space-between;align-items: center">
+        <div>欢迎您</div>
+        <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>
-        <p>{{ roleName }} {{ name }}</p>
-        <p @click="logout()" class="dy"><img src="@/assets/images/dy.png"/></p>
+        </div>
+        <div style="padding-right: 5px">
+          <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 {
-  width: 25px;
-  margin-top: 20px;
-  margin-left: 30px;
-  margin-right: 10px;
-  float: left;
-}
-
-.head_info .dy {
-  margin-left: 10px;
-  margin-right: 20px;
-}
+//.head_info img {
+//  width: 25px;
+//  margin-top: 20px;
+//  margin-left: 30px;
+//  margin-right: 10px;
+//  float: left;
+//}
+//
+//.head_info .dy {
+//  margin-left: 10px;
+//  margin-right: 20px;
+//}
 
 .container1 {
   background: #E9F1F7;