This commit is contained in:
mmc
2026-04-28 16:36:22 +08:00
parent b540f842ab
commit efed5441b3
3 changed files with 190 additions and 124 deletions

View File

@@ -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',
});
}

38
src/components/Empty.tsx Normal file
View File

@@ -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<EmptyDataProps> = ({
description = '暂无数据',
height = 220,
iconSize = 56
}) => {
return (
<div
style={{
width: '100%',
height,
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
background: 'transparent'
}}
>
<Empty
image={<FileTextOutlined style={{ fontSize: iconSize, color: '#c5c8ce' }} />}
description={<span style={{ color: '#999', fontSize: 16 }}>{description}</span>}
/>
</div>
);
};
export default EmptyData;

View File

@@ -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() {
<div style={{ padding: '16px', background: '#f4f7f9', minHeight: '100%' }}>
{contextHolder}
{/* 标题 */}
<div style={{ fontSize: 16, fontWeight: 600, marginBottom: 16 }}>角色管理</div>
{/* 顶部操作栏 */}
<AntdCard size="small" style={{ borderRadius: 8, marginBottom: 16 }}>
<div style={{ display: 'flex', justifyContent: 'flex-end' }}>
<Button
type="primary"
icon={<PlusOutlined />}
onClick={handleAddRole}
style={{ borderRadius: 2 }}
>
新增角色
</Button>
</div>
</AntdCard>
<div style={{ display: 'flex', justifyContent: 'flex-start', marginBottom: 16 }}>
<Button type="primary" icon={<PlusOutlined />} onClick={handleAddRole}>
新增角色
</Button>
</div>
{/* 角色卡片列表 */}
<Row gutter={[16, 16]}>
{roles.map(role => (
<Col xs={24} sm={12} md={8} lg={6} key={role.key}>
<AntdCard
size="small"
hoverable
style={{ borderRadius: 8, boxShadow: '0 2px 8px rgba(0,0,0,0.06)' }}
actions={[
<Button
type="text"
icon={<SettingOutlined />}
onClick={() => handleOpenPerm(role)}
style={{ fontSize: 12 }}
>
菜单权限
</Button>,
<Button
type="text"
icon={<EditOutlined />}
onClick={() => handleEditRole(role)}
style={{ fontSize: 12 }}
>
编辑
</Button>,
<Popconfirm
title="确定删除该角色?"
onConfirm={() => handleDeleteRole(role.key)}
okText="确定"
cancelText="取消"
>
<Button
type="text"
danger
icon={<DeleteOutlined />}
style={{ fontSize: 12 }}
>
删除
</Button>
</Popconfirm>
]}
>
<Card.Meta
title={<span style={{ fontWeight: 600, fontSize: 14 }}>{role.name}</span>}
description={
<Space direction="vertical" size={2} style={{ width: '100%' }}>
<Text type="secondary" style={{ fontSize: 11 }}>{role.level}</Text>
<Text type="secondary" style={{ fontSize: 12, lineHeight: 1.4 }}>{role.desc}</Text>
</Space>
}
/>
</AntdCard>
{roles && roles.length > 0 ? (
roles.map(role => (
<Col xs={24} sm={12} md={8} lg={6} key={role.roleId}>
<AntdCard
size="small"
hoverable
style={{ borderRadius: 8 }}
actions={[
<Button type="text" icon={<SettingOutlined />} onClick={() => handleOpenPerm(role)}>
菜单权限
</Button>,
<Button type="text" icon={<EditOutlined />} onClick={() => handleEditRole(role)}>
编辑
</Button>,
<Popconfirm title="确定删除?" onConfirm={() => handleDeleteRole(role.roleId)}>
<Button type="text" danger icon={<DeleteOutlined />}>删除</Button>
</Popconfirm>
]}
>
<Card.Meta
title={<span style={{ fontWeight: 600 }}>{role.roleName}</span>}
description={
<Space direction="vertical" size={2}>
<Text type="secondary">状态:{role.status == 1 ? '正常' : '停用'}</Text>
<Text type="secondary">
{role.isAdmin && '【超级管理员】'}
{role.isManager && '【机构管理员】'}
</Text>
</Space>
}
/>
</AntdCard>
</Col>
))
) : (
<Col span={24}>
<EmptyData height={260} description="暂无角色数据" />
</Col>
))}
)}
</Row>
{/* ========== 菜单权限配置弹窗 ========== */}
{/* 菜单权限弹窗 */}
<Modal
title={`【${currentRole?.name}】菜单权限`}
title={`【${currentRole?.roleName}】菜单权限`}
open={permVisible}
width={520}
onCancel={() => setPermVisible(false)}
onOk={handleSavePerm}
closeIcon={<CloseOutlined />}
>
<Tree
checkable
@@ -202,38 +213,39 @@ export default function Roles() {
/>
</Modal>
{/* ========== 新增/编辑角色弹窗 ========== */}
{/* 新增/编辑弹窗 */}
<Modal
title={editRole ? '编辑角色' : '新增角色'}
open={roleModalVisible}
onCancel={() => setRoleModalVisible(false)}
onOk={handleSaveRole}
maskClosable={false}
width={550}
closeIcon={<CloseOutlined />}
maskClosable={false}
>
<Form form={roleForm} layout="vertical">
<Form.Item
name="name"
label="角色名称"
rules={[{ required: true, message: '请输入角色名称' }]}
>
<Input placeholder="例如:运维管理员" style={{ borderRadius: 2 }} />
<Form.Item name="roleName" label="角色名称" rules={[{ required: true }]}>
<Input placeholder="请输入角色名称" />
</Form.Item>
<Form.Item
name="key"
label="角色标识"
rules={[{ required: true, message: '请输入角色标识' }]}
>
<Input placeholder="例如:operation" style={{ borderRadius: 2 }} />
<Form.Item name="roleKey" label="角色权限" rules={[{ required: true }]}>
<Input placeholder="例如:admin" />
</Form.Item>
<Form.Item name="desc" label="角色描述">
<Input.TextArea rows={3} placeholder="描述该角色的权限范围" style={{ borderRadius: 2 }} />
<Form.Item name="roleSort" label="角色排序">
<InputNumber style={{ width: '100%' }} min={1} />
</Form.Item>
<Divider orientation="left" style={{ margin: '16px 0' }}>菜单权限配置</Divider>
{/* 🔥 三个 Switch 一行 */}
<Row gutter={16}>
<Col span={8}>
<Form.Item name="status" label="状态" valuePropName="checked">
<Switch checkedChildren="正常" unCheckedChildren="停用" />
</Form.Item>
</Col>
</Row>
<Divider>菜单权限配置</Divider>
<Tree
checkable
treeData={menuTree}