diff --git a/src/api/auth/index.ts b/src/api/auth/index.ts index b4d819d2..57cf1e7c 100644 --- a/src/api/auth/index.ts +++ b/src/api/auth/index.ts @@ -1,44 +1,48 @@ import request from "@/utils/request"; -import { CaptchaResult, LoginData, LoginResult } from "./types"; +import { CaptchaResult, LoginData, LoginResult } from "./model"; -/** - * 登录API - * - * @param data {LoginData} - * @returns - */ -export function loginApi(data: LoginData) { - const formData = new FormData(); - formData.append("username", data.username); - formData.append("password", data.password); - formData.append("captchaKey", data.captchaKey || ""); - formData.append("captchaCode", data.captchaCode || ""); - return request>({ - url: "/api/v1/auth/login", - method: "post", - data: formData, - headers: { - "Content-Type": "multipart/form-data", - }, - }); +class AuthAPI { + /** + * 登录API + * + * @param data {LoginData} + * @returns + */ + static login(data: LoginData) { + const formData = new FormData(); + formData.append("username", data.username); + formData.append("password", data.password); + formData.append("captchaKey", data.captchaKey || ""); + formData.append("captchaCode", data.captchaCode || ""); + return request({ + url: "/api/v1/auth/login", + method: "post", + data: formData, + headers: { + "Content-Type": "multipart/form-data", + }, + }); + } + + /** + * 注销API + */ + static logout() { + return request({ + url: "/api/v1/auth/logout", + method: "delete", + }); + } + + /** + * 获取验证码 + */ + static getCaptcha() { + return request({ + url: "/api/v1/auth/captcha", + method: "get", + }); + } } -/** - * 注销API - */ -export function logoutApi() { - return request({ - url: "/api/v1/auth/logout", - method: "delete", - }); -} - -/** - * 获取验证码 - */ -export function getCaptchaApi() { - return request>({ - url: "/api/v1/auth/captcha", - method: "get", - }); -} +export default AuthAPI; diff --git a/src/api/auth/types.ts b/src/api/auth/model.ts similarity index 100% rename from src/api/auth/types.ts rename to src/api/auth/model.ts diff --git a/src/api/dept/index.ts b/src/api/dept/index.ts index 2dc5b5a6..45f689a6 100644 --- a/src/api/dept/index.ts +++ b/src/api/dept/index.ts @@ -1,76 +1,80 @@ import request from "@/utils/request"; -import { DeptForm, DeptQuery, DeptVO } from "./types"; +import { DeptForm, DeptQuery, DeptVO } from "./model"; -/** - * 部门树形表格 - * - * @param queryParams - */ -export function listDepts(queryParams?: DeptQuery) { - return request>({ - url: "/api/v1/dept", - method: "get", - params: queryParams, - }); +class DeptAPI { + /** + * 部门树形表格 + * + * @param queryParams + */ + static getList(queryParams?: DeptQuery) { + return request({ + url: "/api/v1/dept", + method: "get", + params: queryParams, + }); + } + + /** + * 部门下拉列表 + */ + static getOptions() { + return request({ + url: "/api/v1/dept/options", + method: "get", + }); + } + + /** + * 获取部门详情 + * + * @param id + */ + static getFormData(id: number) { + return request({ + url: "/api/v1/dept/" + id + "/form", + method: "get", + }); + } + + /** + * 新增部门 + * + * @param data + */ + static add(data: DeptForm) { + return request({ + url: "/api/v1/dept", + method: "post", + data: data, + }); + } + + /** + * 修改部门 + * + * @param id + * @param data + */ + static update(id: number, data: DeptForm) { + return request({ + url: "/api/v1/dept/" + id, + method: "put", + data: data, + }); + } + + /** + * 删除部门 + * + * @param ids + */ + static deleteByIds(ids: string) { + return request({ + url: "/api/v1/dept/" + ids, + method: "delete", + }); + } } -/** - * 部门下拉列表 - */ -export function getDeptOptions() { - return request>({ - url: "/api/v1/dept/options", - method: "get", - }); -} - -/** - * 获取部门详情 - * - * @param id - */ -export function getDeptForm(id: number) { - return request>({ - url: "/api/v1/dept/" + id + "/form", - method: "get", - }); -} - -/** - * 新增部门 - * - * @param data - */ -export function addDept(data: DeptForm) { - return request({ - url: "/api/v1/dept", - method: "post", - data: data, - }); -} - -/** - * 修改部门 - * - * @param id - * @param data - */ -export function updateDept(id: number, data: DeptForm) { - return request({ - url: "/api/v1/dept/" + id, - method: "put", - data: data, - }); -} - -/** - * 删除部门 - * - * @param ids - */ -export function deleteDept(ids: string) { - return request({ - url: "/api/v1/dept/" + ids, - method: "delete", - }); -} +export default DeptAPI; diff --git a/src/api/dept/types.ts b/src/api/dept/model.ts similarity index 100% rename from src/api/dept/types.ts rename to src/api/dept/model.ts diff --git a/src/api/dict/index.ts b/src/api/dict/index.ts index a00be1c7..adef210f 100644 --- a/src/api/dict/index.ts +++ b/src/api/dict/index.ts @@ -6,140 +6,144 @@ import { DictQuery, DictForm, DictPageResult, -} from "./types"; +} from "./model"; -/** - * 字典类型分页列表 - * - * @param queryParams - */ -export function getDictTypePage(queryParams: DictTypeQuery) { - return request>({ - url: "/api/v1/dict/types/page", - method: "get", - params: queryParams, - }); +class DictAPI { + /** + * 字典类型分页列表 + * + * @param queryParams + */ + static getDictTypePage(queryParams: DictTypeQuery) { + return request({ + url: "/api/v1/dict/types/page", + method: "get", + params: queryParams, + }); + } + + /** + * 字典类型表单数据 + * + * @param id + */ + static getDictTypeForm(id: number) { + return request>({ + url: "/api/v1/dict/types/" + id + "/form", + method: "get", + }); + } + + /** + * 新增字典类型 + * + * @param data + */ + static addDictType(data: DictTypeForm) { + return request({ + url: "/api/v1/dict/types", + method: "post", + data: data, + }); + } + + /** + * 修改字典类型 + * + * @param id + * @param data + */ + static updateDictType(id: number, data: DictTypeForm) { + return request({ + url: "/api/v1/dict/types/" + id, + method: "put", + data: data, + }); + } + + /** + * 删除字典类型 + */ + static deleteDictTypes(ids: string) { + return request({ + url: "/api/v1/dict/types/" + ids, + method: "delete", + }); + } + + /** + * 获取字典类型的数据项 + * + * @param typeCode 字典类型编码 + */ + static getDictOptions(typeCode: string) { + return request({ + url: "/api/v1/dict/" + typeCode + "/options", + method: "get", + }); + } + + /** + * 字典分页列表 + */ + static getDictPage(queryParams: DictQuery) { + return request({ + url: "/api/v1/dict/page", + method: "get", + params: queryParams, + }); + } + + /** + * 获取字典表单数据 + * + * @param id + */ + static getDictFormData(id: number) { + return request({ + url: "/api/v1/dict/" + id + "/form", + method: "get", + }); + } + + /** + * 新增字典 + * + * @param data + */ + static addDict(data: DictForm) { + return request({ + url: "/api/v1/dict", + method: "post", + data: data, + }); + } + + /** + * 修改字典项 + * + * @param id + * @param data + */ + static updateDict(id: number, data: DictForm) { + return request({ + url: "/api/v1/dict/" + id, + method: "put", + data: data, + }); + } + + /** + * 删除字典 + * + * @param ids 字典项ID,多个以英文逗号(,)分割 + */ + static deleteDictByIds(ids: string) { + return request({ + url: "/api/v1/dict/" + ids, + method: "delete", + }); + } } -/** - * 字典类型表单数据 - * - * @param id - */ -export function getDictTypeForm(id: number) { - return request>({ - url: "/api/v1/dict/types/" + id + "/form", - method: "get", - }); -} - -/** - * 新增字典类型 - * - * @param data - */ -export function addDictType(data: DictTypeForm) { - return request({ - url: "/api/v1/dict/types", - method: "post", - data: data, - }); -} - -/** - * 修改字典类型 - * - * @param id - * @param data - */ -export function updateDictType(id: number, data: DictTypeForm) { - return request({ - url: "/api/v1/dict/types/" + id, - method: "put", - data: data, - }); -} - -/** - * 删除字典类型 - */ -export function deleteDictTypes(ids: string) { - return request({ - url: "/api/v1/dict/types/" + ids, - method: "delete", - }); -} - -/** - * 获取字典类型的数据项 - * - * @param typeCode 字典类型编码 - */ -export function getDictOptions(typeCode: string) { - return request>({ - url: "/api/v1/dict/" + typeCode + "/options", - method: "get", - }); -} - -/** - * 字典分页列表 - */ -export function getDictPage(queryParams: DictQuery) { - return request>({ - url: "/api/v1/dict/page", - method: "get", - params: queryParams, - }); -} - -/** - * 获取字典表单数据 - * - * @param id - */ -export function getDictFormData(id: number) { - return request>({ - url: "/api/v1/dict/" + id + "/form", - method: "get", - }); -} - -/** - * 新增字典 - * - * @param data - */ -export function addDict(data: DictForm) { - return request({ - url: "/api/v1/dict", - method: "post", - data: data, - }); -} - -/** - * 修改字典项 - * - * @param id - * @param data - */ -export function updateDict(id: number, data: DictForm) { - return request({ - url: "/api/v1/dict/" + id, - method: "put", - data: data, - }); -} - -/** - * 删除字典 - * - * @param ids 字典项ID,多个以英文逗号(,)分割 - */ -export function deleteDict(ids: string) { - return request({ - url: "/api/v1/dict/" + ids, - method: "delete", - }); -} +export default DictAPI; diff --git a/src/api/dict/types.ts b/src/api/dict/model.ts similarity index 100% rename from src/api/dict/types.ts rename to src/api/dict/model.ts diff --git a/src/api/file/index.ts b/src/api/file/index.ts index 07705504..82364624 100644 --- a/src/api/file/index.ts +++ b/src/api/file/index.ts @@ -1,33 +1,37 @@ import request from "@/utils/request"; -import { FileInfo } from "./types"; +import { FileInfo } from "./model"; -/** - * 上传文件 - * - * @param file - */ -export function uploadFileApi(file: File) { - const formData = new FormData(); - formData.append("file", file); - return request>({ - url: "/api/v1/files", - method: "post", - data: formData, - headers: { - "Content-Type": "multipart/form-data", - }, - }); +class FileAPI { + /** + * 上传文件 + * + * @param file + */ + static upload(file: File) { + const formData = new FormData(); + formData.append("file", file); + return request({ + url: "/api/v1/files", + method: "post", + data: formData, + headers: { + "Content-Type": "multipart/form-data", + }, + }); + } + + /** + * 删除文件 + * + * @param filePath 文件完整路径 + */ + static deleteByPath(filePath?: string) { + return request({ + url: "/api/v1/files", + method: "delete", + params: { filePath: filePath }, + }); + } } -/** - * 删除文件 - * - * @param filePath 文件完整路径 - */ -export function deleteFileApi(filePath?: string) { - return request({ - url: "/api/v1/files", - method: "delete", - params: { filePath: filePath }, - }); -} +export default FileAPI; diff --git a/src/api/file/types.ts b/src/api/file/model.ts similarity index 100% rename from src/api/file/types.ts rename to src/api/file/model.ts diff --git a/src/api/menu/index.ts b/src/api/menu/index.ts index 33883ca3..9657fcb3 100644 --- a/src/api/menu/index.ts +++ b/src/api/menu/index.ts @@ -1,87 +1,90 @@ import request from "@/utils/request"; -import type { RouteRecordRaw } from "vue-router"; -import { MenuQuery, MenuVO, MenuForm } from "./types"; +import { MenuQuery, MenuVO, MenuForm, RouteVO } from "./model"; -/** - * 获取路由列表 - */ -export function listRoutes() { - return request>({ - url: "/api/v1/menus/routes", - method: "get", - }); +class MenuAPI { + /** + * 获取路由列表 + */ + static getRoutes() { + return request({ + url: "/api/v1/menus/routes", + method: "get", + }); + } + + /** + * 获取菜单树形列表 + * + * @param queryParams + */ + static getList(queryParams: MenuQuery) { + return request({ + url: "/api/v1/menus", + method: "get", + params: queryParams, + }); + } + + /** + * 获取菜单下拉数据源 + */ + static getOptions() { + return request({ + url: "/api/v1/menus/options", + method: "get", + }); + } + + /** + * 获取菜单表单数据 + * + * @param id + */ + static getFormData(id: number) { + return request({ + url: "/api/v1/menus/" + id + "/form", + method: "get", + }); + } + + /** + * 添加菜单 + * + * @param data + */ + static add(data: MenuForm) { + return request({ + url: "/api/v1/menus", + method: "post", + data: data, + }); + } + + /** + * 修改菜单 + * + * @param id + * @param data + */ + static update(id: string, data: MenuForm) { + return request({ + url: "/api/v1/menus/" + id, + method: "put", + data: data, + }); + } + + /** + * 删除菜单 + * + * @param id 菜单ID + */ + static deleteById(id: number) { + return request({ + url: "/api/v1/menus/" + id, + method: "delete", + }); + } } -/** - * 获取菜单树形列表 - * - * @param queryParams - */ -export function listMenus(queryParams: MenuQuery) { - return request>({ - url: "/api/v1/menus", - method: "get", - params: queryParams, - }); -} - -/** - * 获取菜单下拉树形列表 - */ -export function getMenuOptions() { - return request>({ - url: "/api/v1/menus/options", - method: "get", - }); -} - -/** - * 获取菜单表单数据 - * - * @param id - */ -export function getMenuForm(id: number) { - return request>({ - url: "/api/v1/menus/" + id + "/form", - method: "get", - }); -} - -/** - * 添加菜单 - * - * @param data - */ -export function addMenu(data: MenuForm) { - return request({ - url: "/api/v1/menus", - method: "post", - data: data, - }); -} - -/** - * 修改菜单 - * - * @param id - * @param data - */ -export function updateMenu(id: string, data: MenuForm) { - return request({ - url: "/api/v1/menus/" + id, - method: "put", - data: data, - }); -} - -/** - * 删除菜单 - * - * @param id 菜单ID - */ -export function deleteMenu(id: number) { - return request({ - url: "/api/v1/menus/" + id, - method: "delete", - }); -} +export default MenuAPI; diff --git a/src/api/menu/types.ts b/src/api/menu/model.ts similarity index 67% rename from src/api/menu/types.ts rename to src/api/menu/model.ts index 38101e8a..408a577e 100644 --- a/src/api/menu/types.ts +++ b/src/api/menu/model.ts @@ -122,3 +122,60 @@ export interface MenuForm { */ alwaysShow?: number; } + +/** + * RouteVO,路由对象 + */ +export interface RouteVO { + /** + * 子路由列表 + */ + children: RouteVO[]; + /** + * 组件路径 + */ + component?: string; + meta?: Meta; + /** + * 路由名称 + */ + name?: string; + /** + * 路由路径 + */ + path?: string; + /** + * 跳转链接 + */ + redirect?: string; +} + +/** + * Meta,路由属性类型 + */ +export interface Meta { + /** + * 【目录】只有一个子路由是否始终显示 + */ + alwaysShow?: boolean; + /** + * 是否隐藏(true-是 false-否) + */ + hidden?: boolean; + /** + * ICON + */ + icon?: string; + /** + * 【菜单】是否开启页面缓存 + */ + keepAlive?: boolean; + /** + * 拥有路由权限的角色编码 + */ + roles?: string[]; + /** + * 路由title + */ + title?: string; +} diff --git a/src/api/role/index.ts b/src/api/role/index.ts index a6231754..148a2518 100644 --- a/src/api/role/index.ts +++ b/src/api/role/index.ts @@ -1,104 +1,108 @@ import request from "@/utils/request"; -import { RoleQuery, RolePageResult, RoleForm } from "./types"; +import { RoleQuery, RolePageResult, RoleForm } from "./model"; -/** - * 获取角色分页数据 - * - * @param queryParams - */ -export function getRolePage(queryParams?: RoleQuery) { - return request>({ - url: "/api/v1/roles/page", - method: "get", - params: queryParams, - }); +class RoleAPI { + /** + * 获取角色分页数据 + * + * @param queryParams + */ + static getPage(queryParams?: RoleQuery) { + return request({ + url: "/api/v1/roles/page", + method: "get", + params: queryParams, + }); + } + + /** + * 获取角色下拉数据源 + * + * @param queryParams + */ + static getOptions(queryParams?: RoleQuery) { + return request({ + url: "/api/v1/roles/options", + method: "get", + params: queryParams, + }); + } + + /** + * 获取角色的菜单ID集合 + * + * @param queryParams + */ + static getRoleMenuIds(roleId: number) { + return request({ + url: "/api/v1/roles/" + roleId + "/menuIds", + method: "get", + }); + } + + /** + * 分配菜单权限给角色 + * + * @param queryParams + */ + static updateRoleMenus(roleId: number, data: number[]) { + return request({ + url: "/api/v1/roles/" + roleId + "/menus", + method: "put", + data: data, + }); + } + + /** + * 获取角色表单数据 + * + * @param id + */ + static getFormData(id: number) { + return request({ + url: "/api/v1/roles/" + id + "/form", + method: "get", + }); + } + + /** + * 添加角色 + * + * @param data + */ + static add(data: RoleForm) { + return request({ + url: "/api/v1/roles", + method: "post", + data: data, + }); + } + + /** + * 更新角色 + * + * @param id + * @param data + */ + static update(id: number, data: RoleForm) { + return request({ + url: "/api/v1/roles/" + id, + method: "put", + data: data, + }); + } + + /** + * 批量删除角色,多个以英文逗号(,)分割 + * + * @param ids + */ + static deleteByIds(ids: string) { + return request({ + url: "/api/v1/roles/" + ids, + method: "delete", + }); + } } -/** - * 获取角色下拉数据 - * - * @param queryParams - */ -export function getRoleOptions(queryParams?: RoleQuery) { - return request>({ - url: "/api/v1/roles/options", - method: "get", - params: queryParams, - }); -} - -/** - * 获取角色的菜单ID集合 - * - * @param queryParams - */ -export function getRoleMenuIds(roleId: number) { - return request>({ - url: "/api/v1/roles/" + roleId + "/menuIds", - method: "get", - }); -} - -/** - * 分配菜单权限给角色 - * - * @param queryParams - */ -export function updateRoleMenus(roleId: number, data: number[]) { - return request({ - url: "/api/v1/roles/" + roleId + "/menus", - method: "put", - data: data, - }); -} - -/** - * 获取角色详情 - * - * @param id - */ -export function getRoleForm(id: number) { - return request>({ - url: "/api/v1/roles/" + id + "/form", - method: "get", - }); -} - -/** - * 添加角色 - * - * @param data - */ -export function addRole(data: RoleForm) { - return request({ - url: "/api/v1/roles", - method: "post", - data: data, - }); -} - -/** - * 更新角色 - * - * @param id - * @param data - */ -export function updateRole(id: number, data: RoleForm) { - return request({ - url: "/api/v1/roles/" + id, - method: "put", - data: data, - }); -} - -/** - * 批量删除角色,多个以英文逗号(,)分割 - * - * @param ids - */ -export function deleteRoles(ids: string) { - return request({ - url: "/api/v1/roles/" + ids, - method: "delete", - }); -} +export default RoleAPI; diff --git a/src/api/role/types.ts b/src/api/role/model.ts similarity index 100% rename from src/api/role/types.ts rename to src/api/role/model.ts diff --git a/src/api/user/index.ts b/src/api/user/index.ts index 6862a12f..306bfb44 100644 --- a/src/api/user/index.ts +++ b/src/api/user/index.ts @@ -1,137 +1,141 @@ import request from "@/utils/request"; -import { UserForm, UserInfo, UserPageVO, UserQuery } from "./types"; +import { UserForm, UserInfo, UserPageVO, UserQuery } from "./model"; -/** - * 登录成功后获取用户信息(昵称、头像、权限集合和角色集合) - */ -export function getUserInfoApi() { - return request>({ - url: "/api/v1/users/me", - method: "get", - }); +class UserAPI { + /** + * 登录成功后获取用户信息(昵称、头像、权限集合和角色集合) + */ + static getInfo() { + return request({ + url: "/api/v1/users/me", + method: "get", + }); + } + + /** + * 获取用户分页列表 + * + * @param queryParams + */ + static getPage(queryParams: UserQuery) { + return request>({ + url: "/api/v1/users/page", + method: "get", + params: queryParams, + }); + } + + /** + * 获取用户表单详情 + * + * @param userId + */ + static getFormData(userId: number) { + return request({ + url: "/api/v1/users/" + userId + "/form", + method: "get", + }); + } + + /** + * 添加用户 + * + * @param data + */ + static add(data: UserForm) { + return request({ + url: "/api/v1/users", + method: "post", + data: data, + }); + } + + /** + * 修改用户 + * + * @param id + * @param data + */ + static update(id: number, data: UserForm) { + return request({ + url: "/api/v1/users/" + id, + method: "put", + data: data, + }); + } + + /** + * 修改用户密码 + * + * @param id + * @param password + */ + static updatePassword(id: number, password: string) { + return request({ + url: "/api/v1/users/" + id + "/password", + method: "patch", + params: { password: password }, + }); + } + + /** + * 删除用户 + * + * @param ids + */ + static deleteByIds(ids: string) { + return request({ + url: "/api/v1/users/" + ids, + method: "delete", + }); + } + + /** + * 下载用户导入模板 + * + * @returns + */ + static downloadTemplate() { + return request({ + url: "/api/v1/users/template", + method: "get", + responseType: "arraybuffer", + }); + } + + /** + * 导出用户 + * + * @param queryParams + * @returns + */ + static export(queryParams: UserQuery) { + return request({ + url: "/api/v1/users/export", + method: "get", + params: queryParams, + responseType: "arraybuffer", + }); + } + + /** + * 导入用户 + * + * @param file + */ + static import(deptId: number, file: File) { + const formData = new FormData(); + formData.append("file", file); + return request({ + url: "/api/v1/users/import", + method: "post", + params: { deptId: deptId }, + data: formData, + headers: { + "Content-Type": "multipart/form-data", + }, + }); + } } -/** - * 获取用户分页列表 - * - * @param queryParams - */ -export function getUserPage(queryParams: UserQuery) { - return request>>({ - url: "/api/v1/users/page", - method: "get", - params: queryParams, - }); -} - -/** - * 获取用户表单详情 - * - * @param userId - */ -export function getUserForm(userId: number) { - return request>({ - url: "/api/v1/users/" + userId + "/form", - method: "get", - }); -} - -/** - * 添加用户 - * - * @param data - */ -export function addUser(data: UserForm) { - return request({ - url: "/api/v1/users", - method: "post", - data: data, - }); -} - -/** - * 修改用户 - * - * @param id - * @param data - */ -export function updateUser(id: number, data: UserForm) { - return request({ - url: "/api/v1/users/" + id, - method: "put", - data: data, - }); -} - -/** - * 修改用户密码 - * - * @param id - * @param password - */ -export function updateUserPassword(id: number, password: string) { - return request({ - url: "/api/v1/users/" + id + "/password", - method: "patch", - params: { password: password }, - }); -} - -/** - * 删除用户 - * - * @param ids - */ -export function deleteUsers(ids: string) { - return request({ - url: "/api/v1/users/" + ids, - method: "delete", - }); -} - -/** - * 下载用户导入模板 - * - * @returns - */ -export function downloadTemplateApi() { - return request({ - url: "/api/v1/users/template", - method: "get", - responseType: "arraybuffer", - }); -} - -/** - * 导出用户 - * - * @param queryParams - * @returns - */ -export function exportUser(queryParams: UserQuery) { - return request({ - url: "/api/v1/users/_export", - method: "get", - params: queryParams, - responseType: "arraybuffer", - }); -} - -/** - * 导入用户 - * - * @param file - */ -export function importUser(deptId: number, file: File) { - const formData = new FormData(); - formData.append("file", file); - return request({ - url: "/api/v1/users/_import", - method: "post", - params: { deptId: deptId }, - data: formData, - headers: { - "Content-Type": "multipart/form-data", - }, - }); -} +export default UserAPI; diff --git a/src/api/user/types.ts b/src/api/user/model.ts similarity index 100% rename from src/api/user/types.ts rename to src/api/user/model.ts diff --git a/src/components/Dictionary/index.vue b/src/components/Dictionary/index.vue index b2e01d0f..a3804ff3 100644 --- a/src/components/Dictionary/index.vue +++ b/src/components/Dictionary/index.vue @@ -16,7 +16,7 @@ diff --git a/src/components/PageContent/index.vue b/src/components/PageContent/index.vue index 64f6d942..a0b0a961 100644 --- a/src/components/PageContent/index.vue +++ b/src/components/PageContent/index.vue @@ -265,7 +265,7 @@ function fetchPageData(formData: IObject = {}, isRestart = false) { } props.contentConfig .indexAction({ ...queryParams, ...formData }) - .then(({ data }) => { + .then((data) => { total.value = data.total; pageData.value = data.list; }) diff --git a/src/components/Upload/MultiUpload.vue b/src/components/Upload/MultiUpload.vue index 735f7a3e..5bf141cd 100644 --- a/src/components/Upload/MultiUpload.vue +++ b/src/components/Upload/MultiUpload.vue @@ -1,9 +1,4 @@ - - + +@/api/dict/model diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index 98918541..fdd0ad6b 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -148,21 +148,15 @@ +@/api/dict/model diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 33e5e2d3..b889c170 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -312,21 +312,12 @@ +@/api/menu/model diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 2b15d3aa..86e70c51 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -181,18 +181,10 @@ +@/api/role/model diff --git a/src/views/system/user/components/dept-tree.vue b/src/views/system/user/components/dept-tree.vue index 6394b328..2f386063 100644 --- a/src/views/system/user/components/dept-tree.vue +++ b/src/views/system/user/components/dept-tree.vue @@ -21,8 +21,7 @@ diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 526cba56..5e98bf53 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -332,21 +332,11 @@ defineOptions({ inheritAttrs: false, }); -import { - getUserPage, - getUserForm, - deleteUsers, - addUser, - updateUser, - updateUserPassword, - downloadTemplateApi, - exportUser, - importUser, -} from "@/api/user"; -import { getDeptOptions } from "@/api/dept"; -import { getRoleOptions } from "@/api/role"; +import UserAPI from "@/api/user"; +import DeptAPI from "@/api/dept"; +import RoleAPI from "@/api/role"; -import { UserForm, UserQuery, UserPageVO } from "@/api/user/types"; +import { UserForm, UserQuery, UserPageVO } from "@/api/user/model"; import type { UploadInstance } from "element-plus"; import { genFileId } from "element-plus"; @@ -418,8 +408,9 @@ const rules = reactive({ /** 查询 */ function handleQuery() { loading.value = true; - getUserPage(queryParams) - .then(({ data }) => { + UserAPI.getPage(queryParams) + .then((data) => { + console.log("handleQuery", data); pageData.value = data.list; total.value = data.total; }) @@ -458,7 +449,7 @@ function resetPassword(row: { [key: string]: any }) { ElMessage.warning("请输入新密码"); return false; } - updateUserPassword(row.id, value).then(() => { + UserAPI.updatePassword(row.id, value).then(() => { ElMessage.success("密码重置成功,新密码是:" + value); }); }); @@ -466,15 +457,15 @@ function resetPassword(row: { [key: string]: any }) { /** 加载角色下拉数据源 */ async function loadRoleOptions() { - getRoleOptions().then((response) => { - roleList.value = response.data; + RoleAPI.getOptions().then((data) => { + roleList.value = data; }); } /** 加载部门下拉数据源 */ async function loadDeptOptions() { - getDeptOptions().then((response) => { - deptList.value = response.data; + DeptAPI.getOptions().then((data) => { + deptList.value = data; }); } @@ -494,7 +485,7 @@ async function openDialog(type: string, id?: number) { await loadRoleOptions(); if (id) { dialog.title = "修改用户"; - getUserForm(id).then(({ data }) => { + UserAPI.getFormData(id).then((data) => { Object.assign(formData, { ...data }); }); } else { @@ -535,7 +526,7 @@ const handleSubmit = useThrottleFn(() => { const userId = formData.id; loading.value = true; if (userId) { - updateUser(userId, formData) + UserAPI.update(userId, formData) .then(() => { ElMessage.success("修改用户成功"); closeDialog(); @@ -543,7 +534,7 @@ const handleSubmit = useThrottleFn(() => { }) .finally(() => (loading.value = false)); } else { - addUser(formData) + UserAPI.add(formData) .then(() => { ElMessage.success("新增用户成功"); closeDialog(); @@ -562,8 +553,8 @@ const handleSubmit = useThrottleFn(() => { ElMessage.warning("上传Excel文件不能为空"); return false; } - importUser(importData?.deptId, importData?.file).then((response) => { - ElMessage.success(response.data); + UserAPI.import(importData?.deptId, importData?.file).then((data) => { + ElMessage.success("导入用户成功"); closeDialog(); resetQuery(); }); @@ -583,7 +574,7 @@ function handleDelete(id?: number) { cancelButtonText: "取消", type: "warning", }).then(function () { - deleteUsers(userIds).then(() => { + UserAPI.deleteByIds(userIds).then(() => { ElMessage.success("删除成功"); resetQuery(); }); @@ -592,7 +583,7 @@ function handleDelete(id?: number) { /** 下载导入模板 */ function downloadTemplate() { - downloadTemplateApi().then((response: any) => { + UserAPI.downloadTemplate().then((response: any) => { const fileData = response.data; const fileName = decodeURI( response.headers["content-disposition"].split(";")[1].split("=")[1] @@ -631,7 +622,7 @@ function handleFileExceed(files: any) { /** 导出用户 */ function handleExport() { - exportUser(queryParams).then((response: any) => { + UserAPI.export(queryParams).then((response: any) => { const fileData = response.data; const fileName = decodeURI( response.headers["content-disposition"].split(";")[1].split("=")[1]