diff --git a/.DS_Store b/.DS_Store index b42fc84..0f7c77f 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/public/Index.vue b/public/Index.vue index 6c2f5bf..5e79c55 100644 --- a/public/Index.vue +++ b/public/Index.vue @@ -219,9 +219,12 @@ export default { }, computed: { currentUser () { + console.log(this.$store.getters) return { name: this.$store.getters.nickname, - avatar: this.$store.getters.avatar + avatar: this.$store.getters.avatar, + isManage: this.$store.getters.isManage, + username: this.$store.getters.username } } }, diff --git a/src/api/permissions.js b/src/api/permissions.js index c881da5..4842364 100644 --- a/src/api/permissions.js +++ b/src/api/permissions.js @@ -1,10 +1,45 @@ import request from '@/utils/request' // 用户列表 -export function getList (parameter) { +export function getMiddlesManageUsers (parameter) { return request({ - url: '/middles/user/children', + url: '/middles/manage/users', method: 'get', params: parameter }) } + +// 新增管理账号 +export function addMiddlesManageUser (parameter) { + return request({ + url: '/middles/manage/users', + method: 'post', + params: parameter + }) +} + +// 修改管理账号 +export function editMiddlesManageUser (middleId, parameter) { + return request({ + url: `/middles/manage/users/${middleId}`, + method: 'put', + params: parameter + }) +} + +// 删除管理账号 +export function delMiddlesManageUser (middleId) { + return request({ + url: `/middles/manage/users/${middleId}`, + method: 'DELETE' + }) +} + +// 删除管理账号 +export function setMiddlesManageUserStatus (middleId, parameter) { + return request({ + url: `/middles/manage/users/${middleId}/set_status`, + method: 'post', + params: parameter + }) +} diff --git a/src/components/GlobalHeader/AvatarDropdown.vue b/src/components/GlobalHeader/AvatarDropdown.vue index d713274..e389c6e 100644 --- a/src/components/GlobalHeader/AvatarDropdown.vue +++ b/src/components/GlobalHeader/AvatarDropdown.vue @@ -14,9 +14,9 @@ 修改密码 - + - 权限管理 + 管理员管理 diff --git a/src/components/GlobalHeader/RightContent.vue b/src/components/GlobalHeader/RightContent.vue index bd7ec80..ac4ebb7 100644 --- a/src/components/GlobalHeader/RightContent.vue +++ b/src/components/GlobalHeader/RightContent.vue @@ -60,6 +60,7 @@ export default { return { name: this.$store.getters.nickname, avatar: this.$store.getters.avatar, + isManage: this.$store.getters.isManage, username: this.$store.getters.username } } diff --git a/src/config/routes/permission.js b/src/config/routes/permission.js index 13c839b..cf7beee 100644 --- a/src/config/routes/permission.js +++ b/src/config/routes/permission.js @@ -14,7 +14,7 @@ export default [ component: () => import('@/views/permissions/Index'), hidden: true, meta: { - title: '权限管理', + title: '管理员管理', icon: 'cluster' } } diff --git a/src/store/getters.js b/src/store/getters.js index 12a879b..5d4599d 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -8,6 +8,7 @@ const getters = { user_id: state => state.user.user_id, username: state => state.user.username, nickname: state => state.user.nickname, + isManage: state => state.user.is_manage, roles: state => state.user.roles, userInfo: state => state.user.info, addRouters: state => state.permission.addRouters, diff --git a/src/store/modules/user.js b/src/store/modules/user.js index a5a320f..efb5674 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -10,6 +10,7 @@ const user = { username: '', nickname: '', avatar: '', + is_manage: false, roles: [], info: {} }, @@ -33,6 +34,9 @@ const user = { SET_NICKNAME: (state, name) => { state.nickname = name }, + SET_IS_MANAGE: (state, isManage) => { + state.is_manage = isManage + }, SET_AVATAR: (state, avatar) => { state.avatar = avatar }, @@ -85,13 +89,10 @@ const user = { GetMiddleUser ({ commit }) { return new Promise((resolve, reject) => { getMiddleUser().then(res => { - // storage.set('middleground_id', res.middleground_id) commit('SET_USER_ID', res.middleground_id) - // commit('SET_USERTYPE', res.type) commit('SET_USERNAME', res.username) commit('SET_NICKNAME', res.name) - // commit('SET_AVATAR', res.avatar || '') - // commit('SET_INFO', res || '') + commit('SET_IS_MANAGE', res.is_manage) resolve(res) }).catch(error => { reject(error) @@ -105,6 +106,7 @@ const user = { commit('SET_TOKEN', '') commit('SET_ORG_ID', '') commit('is_subscribe', '') + commit('SET_IS_MANAGE', false) commit('SET_ROLES', []) storage.remove(ACCESS_TOKEN) storage.remove('is_subscribe') diff --git a/src/views/exception/noRight.vue b/src/views/exception/noRight.vue new file mode 100644 index 0000000..523b085 --- /dev/null +++ b/src/views/exception/noRight.vue @@ -0,0 +1,18 @@ + + + diff --git a/src/views/home/Index.vue b/src/views/home/Index.vue index 222af08..91f8c83 100644 --- a/src/views/home/Index.vue +++ b/src/views/home/Index.vue @@ -34,7 +34,9 @@ export default { currentUser () { return { name: this.$store.getters.nickname, - avatar: this.$store.getters.avatar + avatar: this.$store.getters.avatar, + isManage: this.$store.getters.isManage, + username: this.$store.getters.username } } }, diff --git a/src/views/permissions/Index.vue b/src/views/permissions/Index.vue index 7489966..e38232a 100644 --- a/src/views/permissions/Index.vue +++ b/src/views/permissions/Index.vue @@ -2,26 +2,19 @@ - +
- - - - {{ item.name }} - - - - + @@ -37,29 +30,21 @@ ref="table" :columns="columns" :data="loadData" - :rowKey="row => row.user.user_id" + :rowKey="row => row.middleground_id" showPagination="auto" bordered size="default" > -
-
{{ record.name }}
-
{{ record.username }}
+
+
-
{{ record.type }}
- +
修改 - + diff --git a/src/views/permissions/modules/AddPromissions.vue b/src/views/permissions/modules/AddPromissions.vue index 3aec948..970495d 100644 --- a/src/views/permissions/modules/AddPromissions.vue +++ b/src/views/permissions/modules/AddPromissions.vue @@ -44,7 +44,7 @@ - - diff --git a/src/views/permissions/modules/EditPromissions.vue b/src/views/permissions/modules/EditPromissions.vue index 1634896..d8af5a9 100644 --- a/src/views/permissions/modules/EditPromissions.vue +++ b/src/views/permissions/modules/EditPromissions.vue @@ -1,6 +1,20 @@