diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 40357dd..31bb101 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -51,7 +51,24 @@ >
- {{ nickName }} + + {{ nickName }} + + + + {{ selectDictLabel(dict.type.sys_normal_disable, status) || "-" }} + + + + 所属单位 + + {{ dept.deptName }} + +
@@ -115,6 +132,7 @@ import SystemSettingDialog from "./SystemSettingDialog"; import AboutDialog from "./AboutDialog"; export default { + dicts: ["sys_normal_disable"], components: { Breadcrumb, Logo, @@ -149,7 +167,14 @@ export default { }, }, computed: { - ...mapGetters(["sidebar", "avatar", "device", "nickName"]), + ...mapGetters([ + "sidebar", + "avatar", + "device", + "nickName", + "dept", + "status", + ]), setting: { get() { return this.$store.state.settings.showSettings; @@ -166,6 +191,9 @@ export default { }, }, }, + created() { + console.log(this.$store.state.user); + }, methods: { toggleSideBar() { this.$store.dispatch("app/toggleSideBar"); diff --git a/src/layout/components/SystemSettingDialog.vue b/src/layout/components/SystemSettingDialog.vue index 5e6a241..8c0d85f 100644 --- a/src/layout/components/SystemSettingDialog.vue +++ b/src/layout/components/SystemSettingDialog.vue @@ -92,9 +92,9 @@ - + diff --git a/src/store/getters.js b/src/store/getters.js index d29bd1f..d1bd48d 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -14,6 +14,8 @@ const getters = { nickName: state => state.user.nickName, introduction: state => state.user.introduction, roles: state => state.user.roles, + status: state => state.user.status, + dept: state => state.user.dept, permissions: state => state.user.permissions, permission_routes: state => state.permission.routes, topbarRouters: state => state.permission.topbarRouters, diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 9cb7345..9dafdcf 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -15,7 +15,9 @@ const user = { nickName: '', avatar: '', roles: [], - permissions: [] + permissions: [], + dept: '', + status: '' }, mutations: { @@ -39,6 +41,12 @@ const user = { }, SET_PERMISSIONS: (state, permissions) => { state.permissions = permissions + }, + SET_DEPT: (state, dept) => { + state.dept = dept + }, + SET_STATUS: (state, status) => { + state.status = status } }, @@ -80,6 +88,8 @@ const user = { commit('SET_NAME', user.userName) commit('SET_NICK_NAME', user.nickName) commit('SET_AVATAR', avatar) + commit('SET_DEPT', user.dept) + commit('SET_STATUS', user.status) cache.session.set('pwrChrtype', res.pwdChrtype) /* 初始密码提示 */ if(res.isDefaultModifyPwd) {