root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/sso-server-merge-1228' of http://121.40.234.130:8899/root/lanzhouhailiang_one into feature/sso-server-merge-1228

Browse Source
This commit is contained in:
liyongde
2022-12-29 17:28:02 +08:00
parent eeaf69f928 a3e8073f9a
commit bd2d44eaf0
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lms/nladmin-ui/src/layout/components/Navbar.vue
View File

@@ -1,14 +1,14 @@
<template>
<div class="navbar">
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
<breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
<top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
<breadcrumb v-if="!topNav" id="breadcrumb-container" class="breadcrumb-container" />
<top-nav v-if="topNav" id="topmenu-container" class="topmenu-container" />
<div class="right-menu">
<template v-if="device!=='mobile'">
<search id="header-search" class="right-menu-item" />
<!-- <el-tooltip content="项目文档" effect="dark" placement="bottom">
<!-- <el-tooltip content="项目文档" effect="dark" placement="bottom">
<Doc class="right-menu-item hover-effect" />
</el-tooltip>-->
@@ -16,7 +16,7 @@
<screenfull id="screenfull" class="right-menu-item hover-effect" />
</el-tooltip>
<!-- <el-tooltip content="布局设置" effect="dark" placement="bottom">
<!-- <el-tooltip content="布局设置" effect="dark" placement="bottom">
<size-select id="size-select" class="right-menu-item hover-effect" />
</el-tooltip>-->
@@ -24,8 +24,8 @@
<img :src="Avatar" class="user-avatar">
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover">
<div class="avatar-wrapper">
<!-- <img :src="Avatar" class="user-avatar" style="border: #f5141e 1px solid">-->
<span class="user-nickname">{{ user.nickName }}</span>
<!-- <img :src="Avatar" class="user-avatar" style="border: #f5141e 1px solid">-->
<span class="user-nickname">{{ user.personName }}</span>
</div>
<el-dropdown-menu slot="dropdown">
<span style="display:block;" @click="show = true">

1
lms/nladmin-ui/src/store/getters.js
View File

@@ -9,6 +9,7 @@ const getters = {
cachedViews: state => state.tagsView.cachedViews,
roles: state => state.user.roles,
user: state => state.user.user,
depts: state => state.user.depts,
loadMenus: state => state.user.loadMenus,
permission_routers: state => state.permission.routers,
addRouters: state => state.permission.addRouters,

6
lms/nladmin-ui/src/store/modules/user.js
View File

@@ -20,6 +20,9 @@ const user = {
SET_ROLES: (state, roles) => {
state.roles = roles
},
SET_DEPTS: (state, depts) => {
state.depts = depts
},
SET_LOAD_MENUS: (state, loadMenus) => {
state.loadMenus = loadMenus
}
@@ -91,6 +94,9 @@ export const setUserInfo = (res, commit) => {
} else {
commit('SET_ROLES', res.roles)
}
if (res.depts && res.roles.length > 0) {
commit('SET_DEPTS', res.depts)
}
commit('SET_USER', res.user)
}

4
lms/nladmin-ui/src/views/system/user/index.vue
View File

@@ -172,12 +172,12 @@
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="crud.toEdit(scope.row)">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handdeleted(scope.row)">删除</el-button>
<el-dropdown v-hasPermi="['system:user:resetPwd', 'system:user:edit']" size="mini">
<el-dropdown size="mini">
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item icon="el-icon-refresh-right"><span @click="resetPassword(scope.row)">重置密码</span></el-dropdown-item>
<el-dropdown-item icon="el-icon-key">
<span @click="openDeptDrawer(scope.row)">部门权限</span>
<span @click="openDeptDrawer(scope.row)">分配部门</span>
</el-dropdown-item>
<el-dropdown-item icon="el-icon-key">
<span @click="openDataDialog(scope.row)">数据权限</span>