Merge pull request 'zwq' (#48) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #48
This commit is contained in:
commit
3a8debc3be
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* @Date: 2021-01-04 17:34:38
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2021-04-12 14:23:30
|
||||
* @LastEditTime: 2022-03-10 16:42:55
|
||||
* @FilePath: \basic-admin\src\api\org.js
|
||||
* @Description: 框架基础模块——组织结构
|
||||
*/
|
||||
@ -10,7 +10,7 @@ import request from '@/utils/request'
|
||||
// 获取组织结构列表
|
||||
export function getOrgList(data) {
|
||||
return request({
|
||||
url: '/upms/org/page',
|
||||
url: '/api/upms/org/page',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@ -18,7 +18,7 @@ export function getOrgList(data) {
|
||||
|
||||
export function getOrgDetail(id) { // 获取组织结构单条数据
|
||||
return request({
|
||||
url: '/upms/org/get',
|
||||
url: '/api/upms/org/get',
|
||||
method: 'post',
|
||||
data: { id }
|
||||
})
|
||||
@ -26,7 +26,7 @@ export function getOrgDetail(id) { // 获取组织结构单条数据
|
||||
|
||||
// export function getOrgAllList(data) {
|
||||
// return request({
|
||||
// url: '/upms/org/list',
|
||||
// url: '/api/upms/org/list',
|
||||
// method: 'post',
|
||||
// data
|
||||
// })
|
||||
@ -35,7 +35,7 @@ export function getOrgDetail(id) { // 获取组织结构单条数据
|
||||
// 添加组织结构
|
||||
export function addOrg(data) {
|
||||
return request({
|
||||
url: '/upms/org/add',
|
||||
url: '/api/upms/org/add',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@ -44,7 +44,7 @@ export function addOrg(data) {
|
||||
// 修改组织
|
||||
export function editOrg(data) {
|
||||
return request({
|
||||
url: '/upms/org/update',
|
||||
url: '/api/upms/org/update',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@ -53,7 +53,7 @@ export function editOrg(data) {
|
||||
// 删除组织结构
|
||||
export function delOrg(id) {
|
||||
return request({
|
||||
url: '/upms/org/delete',
|
||||
url: '/api/upms/org/delete',
|
||||
method: 'post',
|
||||
data: { id }
|
||||
})
|
||||
|
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* @Date: 2020-12-14 09:07:03
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-01-11 15:45:54
|
||||
* @LastEditTime: 2022-03-10 16:41:55
|
||||
* @FilePath: \basic-admin\src\api\user.js
|
||||
* @Description: 用户管理 & 登录用户的相关api接口定义
|
||||
*/
|
||||
@ -38,7 +38,7 @@ export function getUserInfo(data) {
|
||||
// 修改当前用户密码
|
||||
export function editUserPW(data) {
|
||||
return request({
|
||||
url: '/upms/user/modifyPassword',
|
||||
url: '/api/upms/user/modifyPassword',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@ -47,17 +47,17 @@ export function editUserPW(data) {
|
||||
// 当前用户 找回密码
|
||||
export function findUserPW(data) {
|
||||
return request({
|
||||
url: '/upms/user/findPassword',
|
||||
url: '/api/upms/user/findPassword',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
// 下面为:用户管理列表
|
||||
// 获取用户列表 (根据需求可以考虑换成带分页的 /upms/user/page)
|
||||
// 获取用户列表 (根据需求可以考虑换成带分页的 /api/upms/user/page)
|
||||
export function getUserList(data) {
|
||||
return request({
|
||||
url: '/upms/user/page',
|
||||
url: '/api/upms/user/page',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@ -66,7 +66,7 @@ export function getUserList(data) {
|
||||
// 新增用户
|
||||
export function addUser(data) {
|
||||
return request({
|
||||
url: '/upms/user/add',
|
||||
url: '/api/upms/user/add',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@ -75,7 +75,7 @@ export function addUser(data) {
|
||||
// 删除用户
|
||||
export function delUser(data) {
|
||||
return request({
|
||||
url: '/upms/user/delete',
|
||||
url: '/api/upms/user/delete',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@ -84,7 +84,7 @@ export function delUser(data) {
|
||||
// 修改用户信息
|
||||
export function editUser(data) {
|
||||
return request({
|
||||
url: '/upms/user/update',
|
||||
url: '/api/upms/user/update',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@ -93,7 +93,7 @@ export function editUser(data) {
|
||||
// 获取用户详细信息
|
||||
export function getUserDetail(data) {
|
||||
return request({
|
||||
url: '/upms/user/get',
|
||||
url: '/api/upms/user/get',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@ -102,7 +102,7 @@ export function getUserDetail(data) {
|
||||
// 管理员重置用户的密码
|
||||
export function resetUserPW(data) {
|
||||
return request({
|
||||
url: '/upms/user/resetPassword',
|
||||
url: '/api/upms/user/resetPassword',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@ -111,7 +111,7 @@ export function resetUserPW(data) {
|
||||
// 启停用户信息
|
||||
export function enableUser(data) {
|
||||
return request({
|
||||
url: '/upms/user/enabled',
|
||||
url: '/api/upms/user/enabled',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
|
@ -34,16 +34,6 @@
|
||||
<!-- <i class="el-icon-caret-bottom" /> -->
|
||||
</div>
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<router-link to="/profile/index">
|
||||
<el-dropdown-item>
|
||||
<svg-icon class="item-icon" icon-class="user" />
|
||||
{{ 'navbar.profile' | i18nFilter }}
|
||||
</el-dropdown-item>
|
||||
</router-link>
|
||||
<el-dropdown-item @click.native="toHome">
|
||||
<svg-icon class="item-icon" icon-class="help" />
|
||||
{{ 'navbar.help' | i18nFilter }}
|
||||
</el-dropdown-item>
|
||||
<el-dropdown-item @click.native="logout">
|
||||
<svg-icon class="item-icon" icon-class="logout" />
|
||||
{{ 'navbar.logOut' | i18nFilter }}
|
||||
|
Loading…
Reference in New Issue
Block a user