From efed5441b3b416afcb3c7c7f2e7aaab73201db00 Mon Sep 17 00:00:00 2001 From: mmc <1556375442@qq.com> Date: Tue, 28 Apr 2026 16:36:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/role/index.ts | 16 +++ src/components/Empty.tsx | 38 ++++++ src/pages/Roles.tsx | 260 ++++++++++++++++++++------------------- 3 files changed, 190 insertions(+), 124 deletions(-) create mode 100644 src/components/Empty.tsx diff --git a/src/api/role/index.ts b/src/api/role/index.ts index d87968c..8ffa9c7 100644 --- a/src/api/role/index.ts +++ b/src/api/role/index.ts @@ -8,5 +8,21 @@ export function addRole(data) { data }); } +//获取角色列表 +export function getRoleList() { + return request({ + url: '/system/role/selectRoleAll', + method: 'get', + }); +} + +//删除角色/system/role/{roleIds} +export function deleteRole(data) { + return request({ + url: `/system/role/${data}`, + method: 'delete', + }); +} + diff --git a/src/components/Empty.tsx b/src/components/Empty.tsx new file mode 100644 index 0000000..6a489ea --- /dev/null +++ b/src/components/Empty.tsx @@ -0,0 +1,38 @@ +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 +}) => { + return ( +
+ } + description={{description}} + /> +
+ ); +}; + +export default EmptyData; diff --git a/src/pages/Roles.tsx b/src/pages/Roles.tsx index 744622f..7aa68cc 100644 --- a/src/pages/Roles.tsx +++ b/src/pages/Roles.tsx @@ -1,43 +1,43 @@ import React, { useState, useEffect } from 'react'; import { Card, Row, Col, Button, Typography, Space, Modal, Form, Tree, message, - Input, Popconfirm, Divider + Input, Popconfirm, Divider, InputNumber, Switch } from 'antd'; import { PlusOutlined, SettingOutlined, EditOutlined, DeleteOutlined, CloseOutlined } from '@ant-design/icons'; -// 引入你的菜单接口 import { getMenuList } from '../api/mune'; import { buildPermTree, buildTreeFromFlat } from '../lib/utils'; +import { addRole, deleteRole, getRoleList } from '../api/role'; +import EmptyData from '../components/Empty'; + const { Text } = Typography; const AntdCard = Card as any; -// 默认角色 -const defaultRoles = [ - { name: '超级管理员', key: 'admin', desc: '系统全权限', level: 'Level 1' }, - { name: '机构管理员', key: 'operator', desc: '设备/警报/视频管理', level: 'Level 2' }, - { name: '场站管理员', key: 'site_admin', desc: '场站管理权限', level: 'Level 2' }, - { name: '场站操作员', key: 'viewer', desc: '只读查看', level: 'Level 3' }, -]; - -// ====================== 【和菜单管理完全一样的树形方法】 ====================== - export default function Roles() { - const [roles, setRoles] = useState(defaultRoles); - const [menuTree, setMenuTree] = useState([]); // 从接口获取 + const [roles, setRoles] = useState([]); + const [menuTree, setMenuTree] = useState([]); const [checkedKeys, setCheckedKeys] = useState([]); const [permVisible, setPermVisible] = useState(false); const [currentRole, setCurrentRole] = useState(null); - // 新增/编辑角色弹窗 const [roleModalVisible, setRoleModalVisible] = useState(false); const [roleForm] = Form.useForm(); const [editRole, setEditRole] = useState(null); const [messageApi, contextHolder] = message.useMessage(); - // ====================== 加载菜单(和菜单管理完全一样) ====================== - useEffect(() => { + // 获取角色列表 + const getRole = () => { + getRoleList().then(res => { + if (res.code == 200) { + setRoles(res.data || []); + } + }) + } + + // 获取菜单树 + const getMenu = () => { getMenuList().then(res => { if (res.code === 200) { const data = res.data || []; @@ -46,64 +46,99 @@ export default function Roles() { setMenuTree(permTree); } }); + } + + useEffect(() => { + getMenu(); + getRole(); }, []); // 打开权限配置 const handleOpenPerm = (role) => { setCurrentRole(role); - setCheckedKeys(role.menuKeys || []); + setCheckedKeys(role.menuIds || []); setPermVisible(true); }; // 保存权限 const handleSavePerm = () => { - messageApi.success(`【${currentRole?.name}】菜单权限配置成功!`); + messageApi.success(`【${currentRole?.roleName}】菜单权限配置成功!`); setPermVisible(false); }; - // 打开新增角色 + // 新增角色 const handleAddRole = () => { roleForm.resetFields(); setCheckedKeys([]); setEditRole(null); + // 🔥 新增时默认值 + roleForm.setFieldsValue({ + status: true, + roleSort: 1, + isAdmin: false, + isManager: false + }); setRoleModalVisible(true); }; - // 打开编辑角色 + // 编辑角色 const handleEditRole = (record) => { setEditRole(record); - roleForm.setFieldsValue(record); - setCheckedKeys(record.menuKeys || []); + roleForm.setFieldsValue({ + ...record, + status: record.status == 1, + }); + setCheckedKeys(record.menuIds || []); setRoleModalVisible(true); }; // 删除角色 - const handleDeleteRole = (key) => { - setRoles(roles.filter(item => item.key !== key)); - messageApi.success('删除成功'); + const handleDeleteRole = (roleId) => { + deleteRole([roleId]).then(res => { + if (res.code == 200) { + messageApi.success('删除成功'); + getRole(); + + } else { + messageApi.error(res.msg || '删除失败'); + } + }).catch(() => { + messageApi.error('删除失败'); + }) }; // 提交保存角色 const handleSaveRole = () => { roleForm.validateFields().then(values => { - const roleData = { + const params = { ...values, - menuKeys: checkedKeys, - level: editRole ? editRole.level : 'Level Custom' + menuIds: checkedKeys, + status: values.status ? 1 : 0, + roleSort: values.roleSort || 1, + admin: values.admin ? true : false, + manager: values.manager ? true : false + }; if (editRole) { - setRoles(roles.map(r => r.key === editRole.key ? { ...r, ...roleData } : r)); + // 编辑 + setRoles(roles.map(r => r.roleId === editRole.roleId ? { ...r, ...params } : r)); messageApi.success('编辑成功'); + setRoleModalVisible(false); } else { - const newRole = { - ...roleData, - key: values.key || Date.now().toString(), - }; - setRoles([...roles, newRole]); - messageApi.success('新增角色成功'); + // 新增 + addRole(params).then(res => { + if (res.code == 200) { + messageApi.success('新增角色成功'); + getRole(); + setRoleModalVisible(false); + } else { + messageApi.error(res.msg || "新增失败"); + } + }).catch(() => { + messageApi.error("新增失败"); + }); } - setRoleModalVisible(false); }); }; @@ -111,87 +146,63 @@ export default function Roles() {
{contextHolder} - {/* 标题 */}
角色管理
- {/* 顶部操作栏 */} - -
- -
-
+
+ +
- {/* 角色卡片列表 */} - {roles.map(role => ( - - } - onClick={() => handleOpenPerm(role)} - style={{ fontSize: 12 }} - > - 菜单权限 - , - , - handleDeleteRole(role.key)} - okText="确定" - cancelText="取消" - > - - - ]} - > - {role.name}} - description={ - - {role.level} - {role.desc} - - } - /> - + {roles && roles.length > 0 ? ( + roles.map(role => ( + + } onClick={() => handleOpenPerm(role)}> + 菜单权限 + , + , + handleDeleteRole(role.roleId)}> + + + ]} + > + {role.roleName}} + description={ + + 状态:{role.status == 1 ? '正常' : '停用'} + + {role.isAdmin && '【超级管理员】'} + {role.isManager && '【机构管理员】'} + + + } + /> + + + )) + ) : ( + + - ))} + )} - {/* ========== 菜单权限配置弹窗 ========== */} + {/* 菜单权限弹窗 */} setPermVisible(false)} onOk={handleSavePerm} - closeIcon={} > - {/* ========== 新增/编辑角色弹窗 ========== */} + {/* 新增/编辑弹窗 */} setRoleModalVisible(false)} onOk={handleSaveRole} - maskClosable={false} width={550} - closeIcon={} + maskClosable={false} >
- - + + - - + + - - + + - 菜单权限配置 + {/* 🔥 三个 Switch 一行 */} + + + + + + + + + + 菜单权限配置