clay
/
ebts-demo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Binlin B Wang 2022-07-19 16:41:28 +08:00
parent 0d61d9bf47 35a62045d5
commit f96474e739
7 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ebts-ui/src/api/system/menu.js
View File

@ -26,9 +26,9 @@ export function treeselect() {
}
// 根据角色ID查询菜单下拉树结构
export function roleMenuTreeselect(roleId) {
export function roleMenuTreeSelect(roleId) {
return request({
url: '/system/menu/roleMenuTreeselect/' + roleId,
url: '/system/menu/roleMenuTreeSelect/' + roleId,
method: 'get'
})
}

2
ebts-ui/src/api/tool/regular.js
View File

@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询校验规则列表
export function listRegular(query) {
return request({
url: '/tool/regular/option',
url: '/tool/regular/list',
method: 'get',
params: query
})

15
ebts-ui/src/store/modules/user.js
View File

@ -37,8 +37,8 @@ const user = {
const uuid = userInfo.uuid
return new Promise((resolve, reject) => {
login(username, password, code, uuid).then(res => {
setToken(res.token)
commit('SET_TOKEN', res.token)
setToken(res.data)
commit('SET_TOKEN', res.data)
resolve()
}).catch(error => {
reject(error)
@ -50,18 +50,19 @@ const user = {
GetInfo({ commit, state }) {
return new Promise((resolve, reject) => {
getInfo(state.token).then(res => {
const user = res.user
let data = res.data
const user = data.user
// const avatar = user.avatar == "" ? require("@/assets/image/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
const avatar = user.avatar == "" ? require("@/assets/image/profile.jpg") : user.avatar;
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
commit('SET_ROLES', res.roles)
commit('SET_PERMISSIONS', res.permissions)
if (data.roles && data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
commit('SET_ROLES', data.roles)
commit('SET_PERMISSIONS', data.permissions)
} else {
commit('SET_ROLES', ['ROLE_DEFAULT'])
}
commit('SET_NAME', user.userName)
commit('SET_AVATAR', avatar)
resolve(res)
resolve(data)
}).catch(error => {
reject(error)
})

24
ebts-ui/src/views/system/role/index.vue
View File

@ -261,7 +261,7 @@
<script>
import { listRole, getRole, delRole, addRole, updateRole, exportRole, dataScope, changeRoleStatus } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
import { treeselect as menuTreeselect, roleMenuTreeSelect } from "@/api/system/menu";
import { treeselect as deptTreeselect, roleDeptTreeselect } from "@/api/system/dept";
export default {
@ -401,17 +401,19 @@ export default {
return checkedKeys;
},
/** 根据角色ID查询菜单树结构 */
getRoleMenuTreeselect(roleId) {
return roleMenuTreeselect(roleId).then(response => {
this.menuOptions = response.menus;
return response;
getRoleMenuTreeSelect(roleId) {
return roleMenuTreeSelect(roleId).then(res => {
let data = res.data
this.menuOptions = data.menus;
return data;
});
},
/** 根据角色ID查询部门树结构 */
getRoleDeptTreeselect(roleId) {
return roleDeptTreeselect(roleId).then(response => {
this.deptOptions = response.depts;
return response;
return roleDeptTreeselect(roleId).then(res => {
let data = res.data
this.deptOptions = data.deptList;
return data;
});
},
// 角色状态修改
@ -520,7 +522,7 @@ export default {
handleUpdate(row) {
this.reset();
const roleId = row.roleId || this.ids
const roleMenu = this.getRoleMenuTreeselect(roleId);
const roleMenu = this.getRoleMenuTreeSelect(roleId);
getRole(roleId).then(response => {
this.form = response.data;
this.open = true;
@ -535,12 +537,12 @@ export default {
/** 分配数据权限操作 */
handleDataScope(row) {
this.reset();
const roleDeptTreeselect = this.getRoleDeptTreeselect(row.roleId);
const roleDeptTreeSelect = this.getRoleDeptTreeselect(row.roleId);
getRole(row.roleId).then(response => {
this.form = response.data;
this.openDataScope = true;
this.$nextTick(() => {
roleDeptTreeselect.then(res => {
roleDeptTreeSelect.then(res => {
this.$refs.dept.setCheckedKeys(res.checkedKeys);
});
});

7
ebts-ui/src/views/system/user/index.vue
View File

@ -556,9 +556,10 @@ export default {
handleAdd() {
this.reset();
this.getTreeselect();
getUser().then(response => {
this.postOptions = response.posts;
this.roleOptions = response.roles;
getUser().then(res => {
let data = res.data
this.postOptions = data.posts;
this.roleOptions = data.roles;
this.open = true;
this.title = "添加用户";
this.form.password = this.initPassword;

9
ebts-ui/src/views/system/user/profile/index.vue
View File

@ -80,10 +80,11 @@ export default {
},
methods: {
getUser() {
getUserProfile().then(response => {
this.user = response.data;
this.roleGroup = response.roleGroup;
this.postGroup = response.postGroup;
getUserProfile().then(res => {
let data = res.data
this.user = data.user;
this.roleGroup = data.roleGroup;
this.postGroup = data.postGroup;
});
}
}

7
ebts-ui/src/views/system/user/profile/userAvatar.vue
View File

@ -124,11 +124,12 @@ export default {
this.$refs.cropper.getCropBlob(data => {
let formData = new FormData();
formData.append("avatarfile", data);
uploadAvatar(formData).then(response => {
uploadAvatar(formData).then(res => {
let data = res.data
this.open = false;
// this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
// this.options.img = process.env.VUE_APxP_BASE_API + response.imgUrl;
this.options.img = response.imgUrl;
this.options.img = data;
store.commit('SET_AVATAR', this.options.img);
this.msgSuccess("修改成功");
this.visible = false;