From 935b2eb46ab4717cfea8de85e22d3a6011b41478 Mon Sep 17 00:00:00 2001 From: mmc <1556375442@qq.com> Date: Wed, 29 Apr 2026 12:49:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/user/index.ts | 54 +++++ src/components/Empty.tsx | 10 +- src/components/Layout.tsx | 2 +- src/pages/Roles.tsx | 20 +- src/pages/Users.tsx | 407 +++++++++++++++++++------------------- 5 files changed, 273 insertions(+), 220 deletions(-) create mode 100644 src/api/user/index.ts diff --git a/src/api/user/index.ts b/src/api/user/index.ts new file mode 100644 index 0000000..266a0ac --- /dev/null +++ b/src/api/user/index.ts @@ -0,0 +1,54 @@ +import request from '../request'; + + +export function addUser(data) { + return request({ + url: '/system/user', + method: 'post', + data + }); +} + + +export function deleteUser(data) { + return request({ + url: `/system/user/${data}`, + method: 'delete', + }); +} + +export function editUser(data) { + return request({ + url: `/system/user`, + method: 'put', + data + }); +} + + +export function getUser(params) { + return request({ + url: `/system/user/list`, + method: 'get', + params + }); +} + +//通过角色查找 用户 + + +export function getUserByRole(params) { + return request({ + url: `/system/user/getByRoleId`, + method: 'get', + params + }); +} + + + + + + + + diff --git a/src/components/Empty.tsx b/src/components/Empty.tsx index 6a489ea..dc1eec3 100644 --- a/src/components/Empty.tsx +++ b/src/components/Empty.tsx @@ -1,20 +1,16 @@ import React from 'react'; import { Empty } from 'antd'; -import { FileTextOutlined } from '@ant-design/icons'; interface EmptyDataProps { /** 自定义文案 */ description?: string; /** 组件高度 */ height?: number | string; - /** 图标大小 */ - iconSize?: number; } const EmptyData: React.FC = ({ description = '暂无数据', - height = 220, - iconSize = 56 + height = 220 }) => { return (
= ({ }} > } - description={{description}} + image={Empty.PRESENTED_IMAGE_SIMPLE} + description={{description}} />
); diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx index 47700fc..4829cb8 100644 --- a/src/components/Layout.tsx +++ b/src/components/Layout.tsx @@ -43,7 +43,7 @@ export default function AppLayout() { useEffect(() => { const timer = setInterval(() => setTime(new Date().toLocaleString()), 1000); - getMenu(); + //getMenu(); return () => clearInterval(timer); }, []); diff --git a/src/pages/Roles.tsx b/src/pages/Roles.tsx index 9b96e3b..bf5dcee 100644 --- a/src/pages/Roles.tsx +++ b/src/pages/Roles.tsx @@ -4,7 +4,8 @@ import { Input, Popconfirm, Divider, InputNumber, Switch, Pagination } from 'antd'; import { - PlusOutlined, EditOutlined, DeleteOutlined, CloseOutlined + PlusOutlined, EditOutlined, DeleteOutlined, CloseOutlined, + UserOutlined } from '@ant-design/icons'; import { getMenuList } from '../api/mune'; import { buildPermTree, buildTreeFromFlat } from '../lib/utils'; @@ -191,9 +192,18 @@ export default function Roles() { type="text" icon={} onClick={() => handleEditRole(role)} + style={{ color: '#1677ff' }} > 编辑 , + , handleDeleteRole(role.roleId)} @@ -211,9 +221,11 @@ export default function Roles() { {role.roleName}} description={ - + 权限标识:{role.roleKey} - 状态:{role.status == 1 ? '正常' : '停用'} + + 状态:{role.status == 1 ? '正常' : '停用'} + {role.admin && '【超级管理员】'} {role.manager && '【机构管理员】'} @@ -226,7 +238,7 @@ export default function Roles() { )) ) : ( - + )} diff --git a/src/pages/Users.tsx b/src/pages/Users.tsx index eb83a18..be5948e 100644 --- a/src/pages/Users.tsx +++ b/src/pages/Users.tsx @@ -1,199 +1,156 @@ -import React, { useState } from 'react'; +import React, { useState, useEffect } from 'react'; import { Card, Table, Button, Typography, Space, Modal, Form, - Input, Select, Popconfirm, message, Tag, TreeSelect, Divider + Input, Select, Popconfirm, message, Tag, Row, Col, Switch } from 'antd'; import { - PlusOutlined, EditOutlined, DeleteOutlined, UserOutlined, - KeyOutlined, TeamOutlined + PlusOutlined, EditOutlined, DeleteOutlined, UserOutlined } from '@ant-design/icons'; +import { addUser, deleteUser, editUser, getUser } from '../api/user'; const { Title } = Typography; const { Option } = Select; -// ---------------------- 1. 角色配置(和你的权限表对齐) ---------------------- -const roleOptions = [ - { - label: '平台admin', - value: 'admin', - desc: '全局配置、机构/菜单/设备权限分配、核心参数配置、平台级异常审核' - }, - { - label: '区域机构管理员', - value: 'region_admin', - desc: '区域场站/账号管理、跨站机器人调度、区域报表统计' - }, - { - label: '单个场站管理员', - value: 'site_admin', - desc: '场站配置、设备/机器人管理、场站告警处置、运维记录审核' - }, - { - label: '场站员工', - value: 'site_staff', - desc: '机器人启停/参数调整、任务执行、巡检文件上传、故障处置' - }, -]; - -// 模拟机构/场站数据(数据权限用) -const orgTreeData = [ - { - title: '华东区域', - value: 'region_east', - children: [ - { title: '上海光伏场站', value: 'site_shanghai' }, - { title: '苏州风电场站', value: 'site_suzhou' }, - ] - }, - { - title: '华北区域', - value: 'region_north', - children: [ - { title: '张家口光伏场站', value: 'site_zhangjiakou' }, - ] - } -]; - -// 模拟用户数据(带角色+数据权限) -const initUserList = [ - { - id: 1, - username: 'admin', - nickName: '平台超级管理员', - role: 'admin', - roleLabel: '平台admin', - dataScope: ['region_east', 'region_north'], - status: '0' - }, - { - id: 2, - username: 'region_shanghai', - nickName: '华东区域管理员', - role: 'region_admin', - roleLabel: '区域机构管理员', - dataScope: ['region_east'], - status: '0' - }, - { - id: 3, - username: 'site_shanghai01', - nickName: '上海场站管理员', - role: 'site_admin', - roleLabel: '单个场站管理员', - dataScope: ['site_shanghai'], - status: '0' - }, - { - id: 4, - username: 'staff_zhang', - nickName: '上海场站运维员', - role: 'site_staff', - roleLabel: '场站员工', - dataScope: ['site_shanghai'], - status: '0' - }, -]; - export default function UserList() { - const [userList, setUserList] = useState(initUserList); - const [loading, setLoading] = useState(false); - - // 新增/编辑弹窗 + const [userList, setUserList] = useState([]); const [modalVisible, setModalVisible] = useState(false); const [form] = Form.useForm(); const [currentUser, setCurrentUser] = useState(null); + const [messageApi, contextHolder] = message.useMessage(); - // 打开新增 + // 统一分页 + const [pagination, setPagination] = useState({ + pageNum: 1, + pageSize: 10, + total: 0 + }); + + // 获取用户列表 + const getUserList = () => { + const params = { + pageNum: pagination.pageNum, + pageSize: pagination.pageSize + }; + getUser(params).then(res => { + if (res.code === 200) { + setUserList(res.rows || []); + setPagination({ + ...pagination, + total: res.total || res.rows?.length || 0 + }); + } + }); + }; + + // 分页切换 + const handleTableChange = (newPagination) => { + setPagination({ + ...pagination, + pageNum: newPagination.current, + pageSize: newPagination.pageSize + }); + }; + + useEffect(() => { + getUserList(); + }, [pagination.pageNum, pagination.pageSize]); + + // 新增 const handleAdd = () => { form.resetFields(); setCurrentUser(null); setModalVisible(true); }; - // 打开编辑 + // 编辑 const handleEdit = (record) => { - form.setFieldsValue(record); setCurrentUser(record); + form.setFieldsValue({ + ...record + }); setModalVisible(true); }; - // 删除用户 - const handleDelete = (id) => { - setUserList(userList.filter(u => u.id !== id)); - message.success('删除成功'); + // 删除 + const handleDelete = (userId) => { + deleteUser(userId).then(res => { + if (res.code === 200) { + messageApi.success('删除成功'); + getUserList(); + } else { + messageApi.error(res.msg || '删除失败'); + } + }); }; - // 提交保存 + // 提交保存(完全匹配后端字段) const handleSubmit = () => { form.validateFields().then(values => { - // 角色标签回填,方便表格展示 - const roleInfo = roleOptions.find(r => r.value === values.role); - const payload = { + // 构建后端需要的完整参数 + const params = { ...values, - roleLabel: roleInfo?.label + roleIds: values.roleId ? [values.roleId] : [] // 角色ID数组 }; if (currentUser) { // 编辑 - setUserList(userList.map(u => u.id === currentUser.id ? { ...u, ...payload } : u)); - message.success('编辑成功'); + editUser(params).then(res => { + if (res.code === 200) { + messageApi.success('编辑成功'); + getUserList(); + setModalVisible(false); + } + }); } else { // 新增 - const newUser = { ...payload, id: Date.now() }; - setUserList([...userList, newUser]); - message.success('新增用户成功'); + addUser(params).then(res => { + if (res.code === 200) { + messageApi.success('新增成功'); + getUserList(); + setModalVisible(false); + } + }); } - setModalVisible(false); }); }; - // 表格列(增强角色+数据权限展示) + // 表格列 const columns = [ { - title: '用户信息', - key: 'userInfo', - render: (_, record) => ( - - -
-
{record.nickName}
-
账号:{record.username}
-
-
- ) + title: '用户账号', + dataIndex: 'userName' + }, + { + title: '用户昵称', + dataIndex: 'nickName' + }, + { + title: '手机号', + dataIndex: 'phonenumber' + }, + { + title: '邮箱', + dataIndex: 'email' }, { title: '角色', - dataIndex: 'roleLabel', - key: 'roleLabel', - render: (text) => {text} - }, - { - title: '数据权限', - dataIndex: 'dataScope', - key: 'dataScope', - render: (dataScope) => { - if (!dataScope?.length) return '-'; - const count = dataScope.length; - return 已分配 {count} 个机构/场站; - } + dataIndex: 'roleNames', + render: (t) => {t || '未分配'} }, { title: '状态', dataIndex: 'status', - key: 'status', render: (s) => s === '0' ? 正常 : - 禁用 + 停用 }, { title: '操作', - key: 'action', - render: (_, record) => ( + render: (_, r) => ( - - handleDelete(record.id)}> - + + handleDelete(r.userId)}> + ) @@ -201,88 +158,122 @@ export default function UserList() { ]; return ( - -
- 用户管理(角色+数据权限) - -
+
+ {contextHolder} + +
+ +
- +
`共 ${t} 条` + }} + onChange={handleTableChange} + bordered + /> + - {/* 新增/编辑弹窗:角色+数据权限双配置 */} + {/* 新增/编辑弹窗(完全匹配后端字段) */} setModalVisible(false)} onOk={handleSubmit} - maskClosable={false} - width={600} + destroyOnClose >
- - + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - 权限配置 - - - - - - - - - - + - + ); }