diff --git a/src/api/role.ts b/src/api/role.ts index 8f84c08..5566a71 100644 --- a/src/api/role.ts +++ b/src/api/role.ts @@ -1,71 +1,82 @@ import request, {getData} from "@/utils/request"; -const getRoleListUrl = '/admin/role/tree'; +const getRoleTreeUrl = '/admin/role/tree'; const roleUrl = "/admin/role"; const saveRoleMenuUrl = "/admin/role/menu"; const getDetailsUrl = "/admin/role/details"; +const getRoleListUrl = "/admin/role/list"; -export function getRoleList(current: number, size: number, name?: string) { - return new Promise((resolve, reject) => { - const params: any[] = ["current=" + current, "size=" + size]; - if (name) params.push("roleName=" + name); - getData(getRoleListUrl + "?" + params.join("&")).then((res: any) => { - resolve(res.data) - }).catch(error => { - resolve(error) +export function getRoleTree(current: number, size: number, name?: string) { + return new Promise((resolve, reject) => { + const params: any[] = ["current=" + current, "size=" + size]; + if (name) params.push("roleName=" + name); + getData(getRoleTreeUrl + "?" + params.join("&")).then((res: any) => { + resolve(res.data) + }).catch(error => { + resolve(error) + }) + }) +} + +export function getRoleList() { + return new Promise(resolve => { + getData(getRoleListUrl).then((res: any) => { + resolve(res.data); + }).catch(err => { + resolve(err); }) }) } export function addRole(role: any) { - return new Promise((resolve, reject) => { - request.postForm(roleUrl, role).then((res: any) => { - resolve(res.data); - }).catch(err => { - resolve(err); - }) - }) + return new Promise((resolve, reject) => { + request.postForm(roleUrl, role).then((res: any) => { + resolve(res.data); + }).catch(err => { + resolve(err); + }) + }) } export function updateRole(role: any) { - return new Promise(resolve => { - request.put(roleUrl, role).then(res => { - resolve(res.data); - }).catch(err => { - resolve(err); - }) - }) + return new Promise(resolve => { + request.put(roleUrl, role).then(res => { + resolve(res.data); + }).catch(err => { + resolve(err); + }) + }) } export function saveRoleMenus(roleId: string, menuIds: string) { - return new Promise(resolve => { - request.put(saveRoleMenuUrl, {roleId, menuIds}) - .then(res => { - resolve(res.data); - }).catch(err => { - resolve(err); - }) - }) + return new Promise(resolve => { + request.put(saveRoleMenuUrl, {roleId, menuIds}) + .then(res => { + resolve(res.data); + }).catch(err => { + resolve(err); + }) + }) } export function getDetails(id: string) { - return new Promise(resolve => { - request(getDetailsUrl + "/" + id).then(res => { - resolve(res.data); - }).catch(err => { - resolve(err); - }) - }) + return new Promise(resolve => { + request(getDetailsUrl + "/" + id).then(res => { + resolve(res.data); + }).catch(err => { + resolve(err); + }) + }) } export function deleteById(ids: []) { - return new Promise(resolve => { - request.delete(roleUrl, {data: ids}) - .then(res => { - resolve(res.data) - }).catch(err => { - resolve(err); - }); - }) + return new Promise(resolve => { + request.delete(roleUrl, {data: ids}) + .then(res => { + resolve(res.data) + }).catch(err => { + resolve(err); + }); + }) } diff --git a/src/views/permissions-manage/role-manage.vue b/src/views/permissions-manage/role-manage.vue index 076a322..93d466b 100644 --- a/src/views/permissions-manage/role-manage.vue +++ b/src/views/permissions-manage/role-manage.vue @@ -104,7 +104,7 @@ function init() { } function getRoleList() { - roleApi.getRoleList(current, size, queryParams.value).then((res: any) => { + roleApi.getRoleTree(current, size, queryParams.value).then((res: any) => { if (res.code == 0) { total.value = res.data.total tableData.value = res.data.records diff --git a/vite.config.ts b/vite.config.ts index aced26f..c4ee5c5 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -23,15 +23,15 @@ export default defineConfig({ server: { proxy: { '/api': { - //target: 'http://192.168.137.235:9999', // 目标服务器地址 target: 'http://localhost:9999', // 目标服务器地址 + // target: 'http://110.41.142.124:6379', // 目标服务器地址 ws: true, // 是否启用 WebSocket changeOrigin: true, // 是否修改请求头中的 Origin 字段 rewrite: (path) => path.replace(/^\/api/, ''), }, '/socket.io': { - //target: 'ws://192.168.137.235:9999', target: 'ws://localhost:9999', + // target: 'ws://110.41.142.124:6379', ws: true, changeOrigin: true, rewrite: (path) => path.replace(/^\/socket.io/, ''),