完善系统右上角角色显示

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

@@ -6,7 +6,7 @@ import router, { resetRouter } from '@/router'
 const state = {
   token: getStorage(),
   userInfo: '',
-  menus: '',
+  menus: ''
 }
 
 const mutations = {
@@ -40,14 +40,16 @@ const actions = {
           orgSid: data.organizationSid,
           Orgname: data.organizationName,
           dwjb: data.dwjb,
-          pNameAndDepartmentNameAndPostName:data.pNameAndDepartmentNameAndPostName
+          pNameAndDepartmentNameAndPostName: data.pNameAndDepartmentNameAndPostName,
+          roleName: data.roleName
         }
         commit('SET_UESRINFO', user)
-        window.sessionStorage.setItem('userSid', user.userSid);
+        window.sessionStorage.setItem('userSid', user.userSid)
-        window.sessionStorage.setItem('Orgname', user.Orgname);
+        window.sessionStorage.setItem('Orgname', user.Orgname)
-        window.sessionStorage.setItem('departmentName', user.departmentName);
+        window.sessionStorage.setItem('departmentName', user.departmentName)
-        window.sessionStorage.setItem('name', user.name);
+        window.sessionStorage.setItem('name', user.name)
-        window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', user.pNameAndDepartmentNameAndPostName);
+        window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', user.pNameAndDepartmentNameAndPostName)
+        window.sessionStorage.setItem('roleName', user.roleName)
         resolve(data)
       }).catch(error => {
         reject(error)
@@ -78,9 +80,9 @@ const actions = {
         }
         commit('SET_UESRINFO', user)
         resolve(data)
-      }).catch(error => {
+      }).catch((error) => {
         removeStorage()
-        router.push({path: '/'})
+        router.push({ path: '/' })
         // reject(error)
       })
     })
@@ -111,7 +113,7 @@ const actions = {
         reject(error)
       })
     })
-  },
+  }
 
   // remove token
   // resetToken({ commit }) {

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

@@ -5,7 +5,7 @@
       <div class="head_info">
 <!--        <p>{{Orgname}},</p>-->
         <!--<p>{{$store.getters.userInfo.Orgname}}</p>-->
-        <p>欢迎您，{{pNameAndDepartmentNameAndPostName}} {{name}}</p>
+        <p>欢迎您，{{pNameAndDepartmentNameAndPostName}} {{ roleName }} {{name}}</p>
         <!--<img src="@/assets/images/info.png" />-->
         <p @click="logout()" class="dy"><img src="@/assets/images/dy.png"/></p>
       </div>
@@ -213,8 +213,9 @@
         Orgname: '',
         departmentName: '',
         name: '',
-        pNameAndDepartmentNameAndPostName:'',
+        pNameAndDepartmentNameAndPostName: '',
-        year:''
+        roleName: '',
+        year: ''
       }
     },
     beforeCreate() {
@@ -228,6 +229,7 @@
       this.Orgname = window.sessionStorage.getItem('Orgname')
       this.departmentName = window.sessionStorage.getItem('departmentName')
       this.pNameAndDepartmentNameAndPostName = window.sessionStorage.getItem('pNameAndDepartmentNameAndPostName')
+      this.roleName = window.sessionStorage.getItem('roleName')
       this.name = window.sessionStorage.getItem('name')
       var nowDate = new Date()
       this.year = nowDate.getFullYear()