diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts index beb6e515..715d4c7e 100644 --- a/src/api/system/user/index.ts +++ b/src/api/system/user/index.ts @@ -22,11 +22,6 @@ export const getUserPage = (params: PageParam) => { return request.get({ url: '/system/user/page', params }) } -// 查询所有用户列表 -export const getAllUser = () => { - return request.get({ url: '/system/user/all' }) -} - // 查询用户详情 export const getUser = (id: number) => { return request.get({ url: '/system/user/get?id=' + id }) @@ -48,7 +43,7 @@ export const deleteUser = (id: number) => { } // 导出用户 -export const exportUser = (params) => { +export const exportUser = (params: any) => { return request.download({ url: '/system/user/export', params }) } @@ -58,7 +53,7 @@ export const importUserTemplate = () => { } // 用户密码重置 -export const resetUserPwd = (id: number, password: string) => { +export const resetUserPassword = (id: number, password: string) => { const data = { id, password diff --git a/src/views/system/menu/MenuForm.vue b/src/views/system/menu/MenuForm.vue index ac37937c..ddc3d3e1 100644 --- a/src/views/system/menu/MenuForm.vue +++ b/src/views/system/menu/MenuForm.vue @@ -147,6 +147,7 @@ const formData = ref({ }) const formRules = reactive({ name: [{ required: true, message: '菜单名称不能为空', trigger: 'blur' }], + type: [{ required: true, message: '菜单类型不能为空', trigger: 'blur' }], sort: [{ required: true, message: '菜单顺序不能为空', trigger: 'blur' }], path: [{ required: true, message: '路由地址不能为空', trigger: 'blur' }], status: [{ required: true, message: '状态不能为空', trigger: 'blur' }] diff --git a/src/views/system/role/RoleDataPermissionForm.vue b/src/views/system/role/RoleDataPermissionForm.vue index 758d47ad..12434353 100644 --- a/src/views/system/role/RoleDataPermissionForm.vue +++ b/src/views/system/role/RoleDataPermissionForm.vue @@ -20,7 +20,7 @@ diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index dd8395f2..ce7ed186 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -41,7 +41,7 @@ @@ -345,7 +345,7 @@ const handleResetPwd = async (row: UserApi.UserVO) => { ) const password = result.value // 发起重置 - await UserApi.resetUserPwd(row.id, password) + await UserApi.resetUserPassword(row.id, password) message.success('修改成功,新密码是:' + password) } catch {} }