From 2a2d40d772e22a0a6d52660f558eb9461fd35698 Mon Sep 17 00:00:00 2001 From: mmc <1556375442@qq.com> Date: Tue, 28 Apr 2026 14:45:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A8=A1=E5=9D=97=E5=A2=9E?= =?UTF-8?q?=E5=88=A0=E6=94=B9=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mune/index.ts | 11 + src/components/Layout.tsx | 17 +- src/pages/Alerts.tsx | 461 +++++++++++++++++++------------------- src/pages/Login.tsx | 70 +++--- src/pages/MenuList.tsx | 413 ++++++++++++++++------------------ src/pages/Roles.tsx | 88 +++++--- 6 files changed, 532 insertions(+), 528 deletions(-) diff --git a/src/api/mune/index.ts b/src/api/mune/index.ts index b848ace..b1ec8ea 100644 --- a/src/api/mune/index.ts +++ b/src/api/mune/index.ts @@ -121,3 +121,14 @@ export function getDeptMenuTreeSelect(deptId) { method: 'get' }); } + + +//获取树形菜单/getRouters + +export function getTreeMenuList() { + return request({ + url: `/getRouters`, + method: 'get' + }); +} + diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx index e65d94a..47700fc 100644 --- a/src/components/Layout.tsx +++ b/src/components/Layout.tsx @@ -4,6 +4,8 @@ import { Layout, Menu, Button, Space, ConfigProvider, theme, Breadcrumb, Badge, message } from 'antd'; +// 先引入中文语言包 +import zhCN from 'antd/locale/zh_CN'; import { DashboardOutlined, ExperimentOutlined, VideoCameraOutlined, BellOutlined, DownloadOutlined, UserOutlined, LogoutOutlined, @@ -15,6 +17,7 @@ import { RootState, useAppDispatch } from '../store'; import { logout } from '../store/userSlice'; import { getMenuList } from '../api/mune'; + const { Header, Sider, Content } = Layout; export default function AppLayout() { @@ -26,6 +29,8 @@ export default function AppLayout() { const { userInfo } = useSelector((state: RootState) => state.user); const dispatch = useAppDispatch(); + + const getMenu = () => { getMenuList().then(res => { if (res.code == 200) { @@ -66,6 +71,7 @@ export default function AppLayout() { return ( - + {/* 左侧:菜单 + 下部区域 */} {/* 右侧:主内容 */} - + - + + ); } diff --git a/src/pages/Alerts.tsx b/src/pages/Alerts.tsx index 9f03a9b..fd87670 100644 --- a/src/pages/Alerts.tsx +++ b/src/pages/Alerts.tsx @@ -13,6 +13,7 @@ import { Select, DatePicker, List, + Layout, } from 'antd'; import { BellOutlined, @@ -22,74 +23,99 @@ import { ClockCircleOutlined, RiseOutlined, FallOutlined, + CloseOutlined, } from '@ant-design/icons'; -import { ALERTS } from '../constants'; -const { Text, Title } = Typography; +const { Text } = Typography; const { RangePicker } = DatePicker; +const AntdCard = Card as any; + +// 模拟数据 +const alertList = [ + { + id: 'AL20250525001', + content: '逆变器停机', + device: '逆变器 12 (组串式)', + level: '严重', + time: '2025-05-25 09:18:32', + duration: '2小时18分', + status: '处理中', + handler: '张运维', + }, + { + id: 'AL20250525002', + content: '发电量下降 > 15%', + device: '汇流箱 05', + level: '重要', + time: '2025-05-25 08:46:11', + duration: '3小时50分', + status: '处理中', + handler: '李工程师', + }, + { + id: 'AL20250525003', + content: '逆变器温度过高', + device: '逆变器 07 (组串式)', + level: '重要', + time: '2025-05-25 07:32:45', + duration: '4小时24分', + status: '待处理', + handler: '-', + }, +]; + +const stats = [ + { + title: '今日告警总数', + value: 36, + change: '+28.6%', + up: true, + extra: '昨日 28', + icon: , + }, + { + title: '严重告警', + value: 8, + change: '+33.3%', + up: true, + extra: '昨日 6', + icon: , + }, + { + title: '处理中', + value: 12, + change: '+20.0%', + up: true, + extra: '昨日 10', + icon: , + }, + { + title: '已关闭', + value: 16, + change: '+45.5%', + up: true, + extra: '昨日 11', + icon: , + }, + { + title: '平均响应时长', + value: '18分32秒', + change: '-12.6%', + up: false, + extra: '昨日 21分12秒', + icon: , + }, +]; export default function Alerts() { + // 控制右侧详情面板 + const [showDetail, setShowDetail] = useState(false); const [selectedAlert, setSelectedAlert] = useState(null); - const AntdCard = Card as any; - - // 模拟告警数据(和参考图一致) - const alertList = [ - { - id: 'AL20250525001', - content: '逆变器停机', - device: '逆变器 12 (组串式)', - level: '严重', - time: '2025-05-25 09:18:32', - duration: '2小时18分', - status: '处理中', - handler: '张运维' - }, - { - id: 'AL20250525002', - content: '发电量下降 > 15%', - device: '汇流箱 05', - level: '重要', - time: '2025-05-25 08:46:11', - duration: '3小时50分', - status: '处理中', - handler: '李工程师' - }, - { - id: 'AL20250525003', - content: '逆变器温度过高', - device: '逆变器 07 (组串式)', - level: '重要', - time: '2025-05-25 07:32:45', - duration: '4小时24分', - status: '待处理', - handler: '-' - }, - { - id: 'AL20250525004', - content: '通信中断', - device: '气象站 01', - level: '一般', - time: '2025-05-25 06:51:20', - duration: '5小时05分', - status: '待处理', - handler: '王运维' - }, - { - id: 'AL20250525005', - content: '数据异常', - device: '电表 01 (并网点)', - level: '提示', - time: '2025-05-25 06:20:18', - duration: '3小时36分', - status: '已关闭', - handler: '赵工程师' - }, - ]; const columns = [ { title: '告警编号', dataIndex: 'id', key: 'id', width: 120 }, { title: '告警内容', dataIndex: 'content', key: 'content' }, - { title: '来源设备', dataIndex: 'device', key: 'device', width: 140 }, + { title: '来源设备', dataIndex: 'device', key: 'device', width: 160 }, { title: '告警级别', dataIndex: 'level', @@ -97,16 +123,16 @@ export default function Alerts() { width: 80, render: (level: string) => { const colorMap: Record = { - '严重': 'red', - '重要': 'orange', - '一般': 'gold', - '提示': 'blue' + 严重: 'red', + 重要: 'orange', + 一般: 'gold', + 提示: 'blue', }; return {level}; - } + }, }, { title: '发生时间', dataIndex: 'time', key: 'time', width: 160 }, - { title: '持续时长', dataIndex: 'duration', key: 'duration', width: 100 }, + { title: '持续时长', dataIndex: 'duration', key: 'duration', width: 110 }, { title: '处理状态', dataIndex: 'status', @@ -114,209 +140,184 @@ export default function Alerts() { width: 100, render: (status: string) => { const colorMap: Record = { - '处理中': 'blue', - '待处理': 'orange', - '已关闭': 'green' + 处理中: 'blue', + 待处理: 'orange', + 已关闭: 'green', }; return {status}; - } + }, }, - { title: '负责人', dataIndex: 'handler', key: 'handler', width: 80 }, + { title: '负责人', dataIndex: 'handler', key: 'handler', width: 90 }, { title: '操作', key: 'action', - width: 60, - render: () => + width: 80, + render: (_, record) => ( + + ), }, ]; - // 顶部统计数据 - const stats = [ - { title: '今日告警总数', value: 36, suffix: '', change: '+28.6%', up: true, extra: '昨日 28', icon: }, - { title: '严重告警', value: 8, suffix: '', change: '+33.3%', up: true, extra: '昨日 6', icon: }, - { title: '处理中', value: 12, suffix: '', change: '+20.0%', up: true, extra: '昨日 10', icon: }, - { title: '已关闭', value: 16, suffix: '', change: '+45.5%', up: true, extra: '昨日 11', icon: }, - { title: '平均响应时长', value: '18分32秒', suffix: '', change: '-12.6%', up: false, extra: '昨日 21分12秒', icon: }, - ]; - return ( -
-

- 告警中心 -

- {/* 顶部筛选栏 */} - - - - - - - - - - - - - - - +
+ + {/* 左侧主内容区:宽度动态变化 */} + +
告警中心
- {/* 统计卡片 */} - - {stats.map((stat, idx) => ( - - - {stat.title}} - value={stat.value} - valueStyle={{ color: '#1f2329', fontWeight: 600, fontSize: 20 }} - prefix={stat.icon} - suffix={stat.suffix} - /> -
- {stat.extra} - - {stat.change} {stat.up ? : } - -
-
- - ))} -
+ {/* 筛选栏 */} + + + + + + + + + + + + + {/* 统计卡片 */} + + {stats.map((stat, idx) => ( + + + {stat.title}} + value={stat.value} + valueStyle={{ fontSize: 20, fontWeight: 600 }} + prefix={stat.icon} + /> +
+ {stat.extra} + + {stat.change} {stat.up ? : } + +
+
+ + ))} +
- - {/* 左侧主内容区 */} - {/* 告警列表 */} - - 告警列表 - (共36条) -
- } style={{ borderRadius: 8, marginBottom: 16 }}> + + 告警列表 + (共36条) +
+ } + style={{ borderRadius: 8 }} + > ({ onClick: () => setSelectedAlert(record) })} - rowSelection={{ selectedRowKeys: selectedAlert ? [selectedAlert.id] : [], type: 'radio' }} + onRow={(record) => ({ + onClick: () => { + setSelectedAlert(record); + setShowDetail(true); + }, + })} /> + - {/* 底部图表占位(和参考图结构一致) */} - - - -
- 趋势图占位 -
-
- - - -
- 占比图占位 -
-
- - - -
- 分布图占位 -
-
- - - - - {/* 右侧告警详情面板 */} - - - {selectedAlert ? ( + {/* 右侧详情面板:推挤式,非覆盖 */} + {showDetail && ( + + {selectedAlert && (
+
+ 告警详情 +
+
-
-
- - {selectedAlert.content} - {selectedAlert.level} -
- 告警编号 AL20250525001 +
+ + {selectedAlert.content} + {selectedAlert.level}
-
-
来源设备:{selectedAlert.device}(设备类型:逆变器)
-
发生时间:{selectedAlert.time} | 持续时长:{selectedAlert.duration}
-
处理状态:{selectedAlert.status} | 负责人:{selectedAlert.handler}
-
当前处理人:{selectedAlert.handler}({selectedAlert.time.split(' ')[0]} 接收)
-
告警描述:逆变器因内部故障自动停机,当前无功率输出。
+
+
告警编号:{selectedAlert.id}
+
来源设备:{selectedAlert.device}
+
发生时间:{selectedAlert.time}
+
持续时长:{selectedAlert.duration}
+
处理状态:{selectedAlert.status}
+
负责人:{selectedAlert.handler}
根因分析建议 - {item}} /> - -
- -
- 相关趋势 -
- 趋势图占位 -
+ {item}} + />
推荐处理措施 - {item}} /> - + {item}} + />
-
- 通知与订阅 - -
- 短信 - 已开启 -
-
- Telegram - 已开启 -
-
- 邮件 - 未开启 -
-
-
- - +
- ) : ( -
请选择一条告警查看详情
)} - - - + + )} +
); } diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx index 400aefe..94d31eb 100644 --- a/src/pages/Login.tsx +++ b/src/pages/Login.tsx @@ -1,4 +1,4 @@ -import React from 'react'; +import React, { useState } from 'react'; import { useNavigate } from 'react-router-dom'; import { Form, @@ -6,7 +6,6 @@ import { Button, Typography, Card, - message, Checkbox, App, } from 'antd'; @@ -22,50 +21,46 @@ import { useAppDispatch } from '../store'; import Cookies from 'js-cookie'; const { Text, Title } = Typography; +const AntdCard = Card as any; export default function Login() { const navigate = useNavigate(); const dispatch = useAppDispatch(); - const { message, } = App.useApp(); + const { message } = App.useApp(); + // 登录 loading 状态 + const [loading, setLoading] = useState(false); // 账号密码登录 const onFinish = async (values: any) => { try { + // 开启 loading + setLoading(true); + // 👇 调用 dispatch,并用 unwrap() 拿到 return 的数据 const loginResult = await dispatch(userLogin(values)).unwrap(); // loginResult 就是你 userLogin 里 return 的 res - console.log("登录成功返回的数据:", loginResult); if (loginResult.code == 200) { - //dispatch(setUserInfo(loginResult)) + message.success('登录成功'); const searchParams = new URLSearchParams(window.location.search); const goRemote = searchParams.get('goRemote'); if (Number(goRemote) == 1) { - const rawUserId = Cookies.get("userId"); // 比如 "32434" - + const rawUserId = Cookies.get('userId'); const encodedUserId = btoa(unescape(encodeURIComponent(rawUserId))); window.location.href = `https://ai.satabot.com/?userId=${encodedUserId}`; return; } - - - message.success(`登录成功`); navigate('/', { replace: true }); } else { - - message.error("登录失败:" + loginResult.msg); - - + message.error('登录失败:' + loginResult.msg); } - - // 登录成功后跳转 - } catch (err) { - message.error("登录失败:" + err.toString()); - + message.error('登录失败:' + err.toString()); + } finally { + // 无论成功失败,关闭 loading + setLoading(false); } - }; return ( @@ -82,7 +77,7 @@ export default function Login() { transition={{ duration: 0.4 }} className="w-full max-w-5xl" > - - {/* 记住密码 */} - {/* + {/* 用户协议 */} + value ? Promise.resolve() : Promise.reject(new Error('请阅读并同意用户协议')) }]} + > - 记住密码 + + 我已阅读并同意 用户协议 和 隐私政策 + - */} - - +
@@ -159,7 +148,6 @@ export default function Login() {
@@ -174,7 +162,7 @@ export default function Login() { />
- +
); diff --git a/src/pages/MenuList.tsx b/src/pages/MenuList.tsx index f1eab67..bbb6ce4 100644 --- a/src/pages/MenuList.tsx +++ b/src/pages/MenuList.tsx @@ -1,50 +1,16 @@ import React, { useState, useEffect } from 'react'; import { - Table, Button, Typography, Space, Modal, Form, Tree, message, - Input, Popconfirm, Select + Table, Button, Space, Modal, Form, Tree, message, + Input, Popconfirm, Select, Card, InputNumber } from 'antd'; import { PlusOutlined, EditOutlined, DeleteOutlined, SettingOutlined } from '@ant-design/icons'; +import { addMenu, deleteMenu, getMenuList, updateMenu } from '../api/mune'; -const { Title } = Typography; const { Option } = Select; -// 1. 完整菜单树 -const menuData = [ - { - id: 1, - title: '控制台', - path: '/dashboard', - parentId: 0, - children: [ - { id: 11, title: '概览', path: '/dashboard/overview', parentId: 1 }, - ], - }, - { - id: 2, - title: '设备管理', - path: '/device', - parentId: 0, - children: [ - { id: 21, title: '机器人管理', path: '/device/robot', parentId: 2 }, - { id: 22, title: '视频监控', path: '/device/video', parentId: 2 }, - ], - }, - { - id: 3, - title: '系统管理', - path: '/system', - parentId: 0, - children: [ - { id: 31, title: '用户管理', path: '/system/user', parentId: 3 }, - { id: 32, title: '角色管理', path: '/system/role', parentId: 3 }, - { id: 33, title: '菜单管理', path: '/system/menu', parentId: 3 }, - ], - }, -]; - -// 2. 角色列表 +// 角色列表 const roleList = [ { name: '平台admin', key: 'admin' }, { name: '区域机构管理员', key: 'region_admin' }, @@ -52,152 +18,176 @@ const roleList = [ { name: '场站员工', key: 'site_staff' }, ]; -// 扁平化菜单 -const flattenMenu = (menus) => { - let arr = []; - const loop = (list, parentPath = '') => { - list.forEach(item => { - const fullPath = parentPath ? `${parentPath}/${item.path}` : item.path; - arr.push({ ...item, fullPath }); - if (item.children?.length) loop(item.children, item.path); - }); - }; - loop(menus); - return arr; -}; - -// 转树形结构(用于Tree组件) -const buildTree = (flatten) => { +// 扁平数组 → 树形结构(给表格 + 权限树共用) +const buildTreeFromFlat = (data) => { const map = {}; const tree = []; - flatten.forEach(item => { - map[item.id] = { ...item, children: [] }; + + data.forEach(item => { + map[item.menuId] = { ...item, children: [] }; }); - flatten.forEach(item => { - if (item.parentId === 0) { - tree.push(map[item.id]); + + data.forEach(item => { + if (item.parentId === 0 || !item.parentId) { + tree.push(map[item.menuId]); } else { if (map[item.parentId]) { - map[item.parentId].children.push(map[item.id]); + map[item.parentId].children.push(map[item.menuId]); } } }); return tree; }; -// 存储角色权限 +// 菜单数据转 Tree组件 格式 +const buildPermTree = (treeData) => { + const loop = (list) => { + return list.map(item => { + const node = { + title: item.menuName, + key: item.menuId, + }; + if (item.children && item.children.length) { + node.children = loop(item.children); + } + return node; + }); + }; + return loop(treeData); +}; + const rolePermissionMap = {}; -export default function Roles() { - const [menus, setMenus] = useState(flattenMenu(menuData)); - const [menuTree, setMenuTree] = useState(buildTree(flattenMenu(menuData))); +export default function MenuList() { + const [rawMenuList, setRawMenuList] = useState([]); + const [menuTreeData, setMenuTreeData] = useState([]); + const [menuTree, setMenuTree] = useState([]); - // 新增/编辑菜单 const [menuModal, setMenuModal] = useState(false); const [menuForm] = Form.useForm(); const [editMenu, setEditMenu] = useState(null); - // 权限配置 const [permModal, setPermModal] = useState(false); const [selectedRole, setSelectedRole] = useState(''); const [checkedKeys, setCheckedKeys] = useState([]); + const [messageApi, contextHolder] = message.useMessage(); - // 菜单类型:一级/二级 - const menuType = Form.useWatch('menuType', menuForm); - - // 每次菜单变化,重新生成树形 - useEffect(() => { - setMenuTree(buildTree(menus)); - }, [menus]); - - // 打开编辑 - const handleEdit = (record) => { - setEditMenu(record); - menuForm.setFieldsValue({ - ...record, - menuType: record.parentId === 0 ? 'top' : 'sub', + // 获取菜单 + const getMenuListApi = () => { + getMenuList().then(res => { + if (res.code === 200) { + const data = res.data || []; + setRawMenuList(data); + // 扁平转树形 → 表格树形 & 权限树 + const tree = buildTreeFromFlat(data); + setMenuTreeData(tree); + setMenuTree(buildPermTree(tree)); + } + }).catch(() => { + messageApi.error('菜单加载失败'); }); + }; + + useEffect(() => { + getMenuListApi(); + }, []); + + // 编辑 + const handleEdit = (record) => { + console.log(record, "values11") + + setEditMenu(record); + menuForm.setFieldsValue({ ...record }); setMenuModal(true); }; - // 保存菜单(新增+编辑) + // 保存菜单 const handleSaveMenu = () => { menuForm.validateFields().then(values => { - const { menuType, parentId, title, path } = values; + console.log(values, "values") if (editMenu) { - // 编辑 - setMenus(menus.map(m => - m.id === editMenu.id - ? { - ...m, - title, - path, - parentId: menuType === 'top' ? 0 : Number(parentId) - } - : m - )); - message.success('编辑成功'); + const data = { + menuId: editMenu.menuId, + ...values + } + updateMenu(data).then(res => { + if (res.code === 200) { + messageApi.success("编辑成功"); + setMenuModal(false); + getMenuListApi(); + } else { + messageApi.error(res.msg); + } + }).catch(() => { + messageApi.error('编辑失败'); + }); } else { - // 新增 - const newMenu = { - id: Date.now(), - title, - path, - parentId: menuType === 'top' ? 0 : Number(parentId), - }; - setMenus([...menus, newMenu]); - message.success('新增菜单成功'); + addMenu(values).then(res => { + if (res.code === 200) { + messageApi.success("新增成功"); + setMenuModal(false); + getMenuListApi(); + } else { + messageApi.error(res.msg); + } + }).catch(() => { + messageApi.error('新增失败'); + }); } - setMenuModal(false); + }); }; - // 删除菜单 - const handleDelete = (id) => { - setMenus(menus.filter(m => m.id !== id)); - message.success('删除成功'); + // 删除 + const handleDelete = (menuId) => { + deleteMenu(menuId).then(res => { + if (res.code == 200) { + messageApi.success('删除成功'); + getMenuListApi(); + } else { + messageApi.error(res.msg); + } + }).catch(() => { + messageApi.error("删除失败"); + + }) + }; - // 打开权限配置 + // 权限弹窗 const handlePermOpen = () => { - if (!selectedRole) { - message.warning('请先选择角色'); - return; - } - const saved = rolePermissionMap[selectedRole] || []; - setCheckedKeys(saved); + if (!selectedRole) return messageApi.warning('请选择角色'); + setCheckedKeys(rolePermissionMap[selectedRole] || []); setPermModal(true); }; - // 保存权限 const handlePermSave = () => { rolePermissionMap[selectedRole] = checkedKeys; - message.success(`【${selectedRole}】权限保存成功`); + messageApi.success(`【${selectedRole}】权限保存成功`); setPermModal(false); }; - // 一级菜单列表(用于父级选择) - const topMenus = menus.filter(m => m.parentId === 0); + // 上级菜单下拉选项(只展示一级) + const topMenus = rawMenuList.filter(m => m.parentId === 0 || !m.parentId); const columns = [ - { title: '菜单名称', dataIndex: 'title', key: 'title', width: 180 }, - { title: '路由地址', dataIndex: 'fullPath', key: 'fullPath' }, + { + title: '菜单名称', + dataIndex: 'menuName', + key: 'menuName', + // 关键:antd 表格自带缩进树形 + }, + { title: '路由地址', dataIndex: 'path', key: 'path' }, + { title: '排序', dataIndex: 'orderNum', key: 'orderNum' }, { title: '操作', key: 'action', width: 220, render: (_, record) => ( - - handleDelete(record.id)} - > - + + handleDelete(record.menuId)}> + ), @@ -205,105 +195,84 @@ export default function Roles() { ]; return ( -
-
- 菜单权限管理 - - - - - -
- -
- - {/* 菜单 新增/编辑 弹窗 */} - setMenuModal(false)} - onOk={handleSaveMenu} - width={500} - > -
- - + {roleList.map(r => )} - + + + + - {/* 二级菜单才显示父级选择 */} - {menuType === 'sub' && ( - -
+ + {/* 新增/编辑弹窗 */} + setMenuModal(false)} + onOk={handleSaveMenu} + destroyOnClose + > + + + - )} - - - - - - - - - - - + + + - {/* 权限配置弹窗 */} - setPermModal(false)} - onOk={handlePermSave} - > - - + + + + + + + + + + + {/* 权限树弹窗 */} + setPermModal(false)} + onOk={handlePermSave} + > + + + ); } diff --git a/src/pages/Roles.tsx b/src/pages/Roles.tsx index e90672f..9474ca8 100644 --- a/src/pages/Roles.tsx +++ b/src/pages/Roles.tsx @@ -1,13 +1,14 @@ -import React, { useState, useEffect } from 'react'; +import React, { useState } from 'react'; import { Card, Row, Col, Button, Typography, Space, Modal, Form, Tree, message, Input, Popconfirm, Divider } from 'antd'; import { - PlusOutlined, LockOutlined, SettingOutlined, EditOutlined, DeleteOutlined + PlusOutlined, SettingOutlined, EditOutlined, DeleteOutlined, CloseOutlined } from '@ant-design/icons'; -const { Text, Title } = Typography; +const { Text } = Typography; +const AntdCard = Card as any; // 默认角色 const defaultRoles = [ @@ -46,7 +47,7 @@ export default function Roles() { const [editRole, setEditRole] = useState(null); // 打开权限配置 - const handleOpenPerm = async (role) => { + const handleOpenPerm = (role) => { setCurrentRole(role); setCheckedKeys([]); setPermVisible(true); @@ -54,7 +55,7 @@ export default function Roles() { // 保存权限 const handleSavePerm = () => { - message.success(`【${currentRole.name}】菜单权限配置成功!`); + message.success(`【${currentRole?.name}】菜单权限配置成功!`); setPermVisible(false); }; @@ -85,16 +86,14 @@ export default function Roles() { roleForm.validateFields().then(values => { const roleData = { ...values, - menuKeys: checkedKeys, // 保存菜单权限 + menuKeys: checkedKeys, level: editRole ? editRole.level : 'Level Custom' }; if (editRole) { - // 编辑 setRoles(roles.map(r => r.key === editRole.key ? { ...r, ...roleData } : r)); message.success('编辑成功'); } else { - // 新增 const newRole = { ...roleData, key: values.key || Date.now().toString(), @@ -107,52 +106,76 @@ export default function Roles() { }; return ( -
-
- 角色管理 - -
+
+ {/* 标题 */} +
角色管理
- + {/* 顶部操作栏 */} + +
+ +
+
+ + {/* 角色卡片列表 */} + {roles.map(role => ( -
- + } onClick={() => handleOpenPerm(role)} + style={{ fontSize: 12 }} > 菜单权限 , , handleDeleteRole(role.key)} + okText="确定" + cancelText="取消" > - + ]} > {role.name}} description={ - - {role.level} - {role.desc} + + {role.level} + {role.desc} } /> - + ))} @@ -164,6 +187,7 @@ export default function Roles() { width={520} onCancel={() => setPermVisible(false)} onOk={handleSavePerm} + closeIcon={} > - {/* ========== 新增/编辑角色弹窗(带菜单选择) ========== */} + {/* ========== 新增/编辑角色弹窗 ========== */} } >
- + - + - + - {/* ========== 新增角色时直接选择菜单权限 ========== */} - 菜单权限配置 + 菜单权限配置