diff --git a/epmet-oper-web/src/router/index.js b/epmet-oper-web/src/router/index.js index 5c4c2a2..b0a4701 100644 --- a/epmet-oper-web/src/router/index.js +++ b/epmet-oper-web/src/router/index.js @@ -85,7 +85,7 @@ router.beforeEach((to, from, next) => { window.SITE_CONFIG['dictList'] = res.data }).catch(() => {}) // 获取菜单列表, 添加并全局变量保存 - http.get('/sys/menu/nav').then(({ data: res }) => { + http.get('/oper/access/menu/nav').then(({ data: res }) => { if (res.code !== 0) { Vue.prototype.$message.error(res.msg) return next({ name: 'login' }) diff --git a/epmet-oper-web/src/utils/request.js b/epmet-oper-web/src/utils/request.js index 19eab38..bc5df71 100644 --- a/epmet-oper-web/src/utils/request.js +++ b/epmet-oper-web/src/utils/request.js @@ -16,7 +16,7 @@ const http = axios.create({ */ http.interceptors.request.use(config => { config.headers['Accept-Language'] = Cookies.get('language') || 'zh-CN' - config.headers['token'] = Cookies.get('token') || '' + config.headers['Authorization'] = Cookies.get('token') || '' // 默认参数 var defaults = {} // 防止缓存,GET请求默认带_t参数 diff --git a/epmet-oper-web/src/views/main.vue b/epmet-oper-web/src/views/main.vue index b492646..6a22a9d 100644 --- a/epmet-oper-web/src/views/main.vue +++ b/epmet-oper-web/src/views/main.vue @@ -82,7 +82,7 @@ export default { }, // 获取当前管理员信息 getUserInfo () { - return this.$http.get('/sys/user/info').then(({ data: res }) => { + return this.$http.get('/epmetuser/operuser/queryOperUserDto').then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } @@ -94,7 +94,7 @@ export default { }, // 获取权限 getPermissions () { - return this.$http.get('/sys/menu/permissions').then(({ data: res }) => { + return this.$http.get('/oper/access/menu/permissions').then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } diff --git a/epmet-oper-web/src/views/modules/sys/user-add-or-update.vue b/epmet-oper-web/src/views/modules/sys/user-add-or-update.vue index 0f74ca8..a41499f 100644 --- a/epmet-oper-web/src/views/modules/sys/user-add-or-update.vue +++ b/epmet-oper-web/src/views/modules/sys/user-add-or-update.vue @@ -2,20 +2,20 @@ - - - - + + + + - - - + + + {{ $t('user.gender0') }} @@ -27,7 +27,7 @@ - + @@ -59,15 +59,12 @@ export default { roleIdListDefault: [], dataForm: { id: '', - username: '', - deptId: '0', - deptName: '', password: '', confirmPassword: '', realName: '', gender: 0, email: '', - mobile: '', + phone: '', roleIdList: [], status: 1 } @@ -147,7 +144,7 @@ export default { }, // 获取角色列表 getRoleList () { - return this.$http.get('/sys/role/list').then(({ data: res }) => { + return this.$http.get('/oper/access/operrole/list').then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } @@ -156,7 +153,7 @@ export default { }, // 获取信息 getInfo () { - this.$http.get(`/sys/user/${this.dataForm.id}`).then(({ data: res }) => { + this.$http.get(`/epmetuser/operuser/${this.dataForm.id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } @@ -181,7 +178,7 @@ export default { if (!valid) { return false } - this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/user', { + this.$http[!this.dataForm.id ? 'post' : 'put']('/epmetuser/operuser', { ...this.dataForm, roleIdList: [ ...this.dataForm.roleIdList, diff --git a/epmet-oper-web/src/views/modules/sys/user.vue b/epmet-oper-web/src/views/modules/sys/user.vue index 19f146c..093c37a 100644 --- a/epmet-oper-web/src/views/modules/sys/user.vue +++ b/epmet-oper-web/src/views/modules/sys/user.vue @@ -3,13 +3,7 @@
- - - - - - - + {{ $t('query') }} @@ -32,10 +26,9 @@ @sort-change="dataListSortChangeHandle" style="width: 100%;"> - - + - + - +