diff --git a/src/api/request.ts b/src/api/request.ts index 02db30e..2c948b7 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -3,10 +3,6 @@ import envConfig from '../../env'; import Cookies from 'js-cookie'; import { message } from 'antd'; -// 🔥 删掉这两行!!! -// import store from '../store'; -// import { logout } from '../store/userSlice'; - const API_BASE_URL = envConfig.baseURL; const api = axios.create({ @@ -18,7 +14,7 @@ const api = axios.create({ withCredentials: true, }); -// 请求拦截器:自动添加token +// 请求拦截器 api.interceptors.request.use( (config: InternalAxiosRequestConfig) => { const token = localStorage.getItem('token'); @@ -32,25 +28,51 @@ api.interceptors.request.use( } ); -// 响应拦截器 +// 响应拦截器(处理 401 + 网络错误 + 服务挂了) api.interceptors.response.use( (response) => { return response.data; }, - async (error: AxiosError) => { // 👈 加 async - if (error.response?.status === 401) { + async (error: AxiosError) => { + // ============================================== + // 👇 这里处理:服务挂了 / 断网 / 请求失败 / 500 + // ============================================== + if (!error.response) { + message.error('服务异常或网络断开,即将重新登录'); + localStorage.clear(); + Cookies.remove('userId'); + Cookies.remove('Admin-Token'); + + // 动态加载 store 避免循环引用 + const store = await import('../store'); + const { logout } = await import('../store/userSlice'); + store.default.dispatch(logout()); + + setTimeout(() => { + window.location.href = '/login'; + }, 800); + return Promise.reject(error); + } + + // ============================================== + // 👇 这里处理:401 未授权 / token 过期 + // ============================================== + if (error.response.status === 401) { localStorage.clear(); Cookies.remove('userId'); Cookies.remove('Admin-Token'); const store = await import('../store'); const { logout } = await import('../store/userSlice'); - store.default.dispatch(logout()); - window.location.href = '/login'; - message.error('会话已过期,请重新登录'); + + message.error('登录已过期,请重新登录'); + setTimeout(() => { + window.location.href = '/login'; + }, 800); } + // 其他错误(500等)不跳转,只返回错误 return Promise.reject(error); } ); diff --git a/src/api/role/index.ts b/src/api/role/index.ts index 986b8e4..cb7a6e5 100644 --- a/src/api/role/index.ts +++ b/src/api/role/index.ts @@ -34,5 +34,14 @@ export function deleteRole(data) { }); } +//通过角色id查看详情/system/role/{roleId} +export function getRoleDetailById(roleId) { + return request({ + url: `/system/role/${roleId}`, + method: 'get', + }); +} + + diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx index b3fdff9..9b66dbb 100644 --- a/src/components/Layout.tsx +++ b/src/components/Layout.tsx @@ -1,14 +1,13 @@ import React, { useState, useEffect } from 'react'; import { Outlet, useNavigate, useLocation } from 'react-router-dom'; import { - Layout, Menu, Button, Space, ConfigProvider, theme, - Breadcrumb, message + Layout, Menu, Button, Space, ConfigProvider, theme } from 'antd'; import zhCN from 'antd/locale/zh_CN'; import { DashboardOutlined, ExperimentOutlined, VideoCameraOutlined, - BellOutlined, DownloadOutlined, UserOutlined, LogoutOutlined, - TeamOutlined, MenuOutlined, AppstoreOutlined, SettingOutlined + BellOutlined, UserOutlined, LogoutOutlined, + AppstoreOutlined, SettingOutlined } from '@ant-design/icons'; import logo from '../assets/logo.png'; import { useSelector } from 'react-redux'; @@ -21,91 +20,53 @@ const { Header, Sider, Content } = Layout; export default function AppLayout() { const [collapsed, setCollapsed] = useState(false); const [time, setTime] = useState(new Date().toLocaleString()); - const [menuTree, setMenuTree] = useState([]); // 动态菜单树 + const [menuList, setMenuList] = useState([]); // 一级菜单列表 const navigate = useNavigate(); const location = useLocation(); const { userInfo } = useSelector((state: RootState) => state.user); const dispatch = useAppDispatch(); // ====================== - // 工具函数:构建树形菜单 - // ====================== - const buildMenuTree = (data) => { - const map = {}; - const roots = []; - - // 先把所有菜单放进map - data.forEach(item => { - map[item.menuId] = { ...item, children: [] }; - }); - - // 构建父子关系 - data.forEach(item => { - if (item.parentId !== 0) { - if (map[item.parentId]) { - map[item.parentId].children.push(map[item.menuId]); - } - } else { - roots.push(map[item.menuId]); - } - }); - - return roots; - }; - - // ====================== - // 把后端菜单转成 antd menu 格式 - // ====================== - const convertToAntdMenu = (tree) => { - return tree.map(node => { - // 自动匹配图标 - let IconComponent = MenuOutlined; - - if (node.path.includes('overview')) IconComponent = DashboardOutlined; - if (node.path.includes('device')) IconComponent = ExperimentOutlined; - if (node.path.includes('video')) IconComponent = VideoCameraOutlined; - if (node.path.includes('alert')) IconComponent = BellOutlined; - if (node.path.includes('user')) IconComponent = UserOutlined; - if (node.path.includes('role')) IconComponent = TeamOutlined; - if (node.path.includes('menu')) IconComponent = AppstoreOutlined; - if (node.path.includes('system')) IconComponent = SettingOutlined; - - const item = { - key: node.path || `/menu/${node.menuId}`, - icon: , - label: node.menuName, - }; - - // 有子菜单递归渲染 - if (node.children && node.children.length > 0) { - item.children = convertToAntdMenu(node.children); - } - - return item; - }); - }; - - // ====================== - // 获取动态菜单 + // 只取一级菜单(parentId=0) // ====================== const getMenu = () => { - const data = { - pageNum: 1, - pageSize: 10000 - } + const data = { pageNum: 1, pageSize: 10000 }; getMenuList(data).then(res => { - if (res.code === 200) { - const treeData = buildMenuTree(res.data || []); - const antdMenu = convertToAntdMenu(treeData); - setMenuTree(antdMenu); + if (res.code == 200) { + const rawList = res.rows || []; + // 只保留 parentId=0 的一级菜单 + const topMenus = rawList.filter(item => item.parentId === 0); + setMenuList(topMenus); } - }).catch(() => { }); }; + // ====================== + // 菜单图标映射 + // ====================== + const getIcon = (path) => { + if (path.includes('overview')) return ; + if (path.includes('device')) return ; + if (path.includes('monitor')) return ; + if (path.includes('alert')) return ; + if (path.includes('user')) return ; + if (path.includes('system')) return ; + if (path.includes('menu')) return ; + return ; + }; + + // ====================== + // 构造 antd menu items(纯平铺,无children) + // ====================== + const menuItems = menuList.map(item => ({ + key: item.path || `/menu/${item.menuId}`, + icon: getIcon(item.path), + label: item.menuName, + })); + useEffect(() => { const timer = setInterval(() => setTime(new Date().toLocaleString()), 1000); - getMenu(); // 加载动态菜单 + getMenu(); return () => clearInterval(timer); }, []); @@ -167,11 +128,12 @@ export default function AppLayout() { theme="light" style={{ borderRight: '1px solid #e5e7eb' }} > + {/* 纯平铺一级菜单 */} navigate(key)} /> diff --git a/src/pages/MenuList.tsx b/src/pages/MenuList.tsx index d91366d..51cc5d4 100644 --- a/src/pages/MenuList.tsx +++ b/src/pages/MenuList.tsx @@ -13,13 +13,6 @@ import { buildPermTree, buildTreeFromFlat } from '../lib/utils'; const { Option } = Select; -// 角色列表 -const roleList = [ - { name: '平台admin', key: 'admin' }, - { name: '区域机构管理员', key: 'region_admin' }, - { name: '单个场站管理员', key: 'site_admin' }, - { name: '场站员工', key: 'site_staff' }, -]; // 筛选常用图标(够用、不乱) const iconList = Object.keys(AllIcons).filter(item => { @@ -46,7 +39,7 @@ export default function MenuList() { // 分页状态 const [pagination, setPagination] = useState({ pageNum: 1, - pageSize: 10, + pageSize: 9999, total: 0 }); @@ -58,8 +51,9 @@ export default function MenuList() { }; getMenuList(params).then(res => { + console.log(res, "res") if (res.code === 200) { - const data = res.data || []; + const data = res.rows || []; setRawMenuList(data); const tree = buildTreeFromFlat(data); setMenuTreeData(tree); @@ -75,14 +69,6 @@ export default function MenuList() { }); }; - // 分页变化 - const handleTableChange = (newPagination) => { - setPagination({ - ...pagination, - pageNum: newPagination.current, - pageSize: newPagination.pageSize - }); - }; useEffect(() => { getMenuListApi(); @@ -160,18 +146,7 @@ export default function MenuList() { }); }; - // 权限弹窗 - const handlePermOpen = () => { - if (!selectedRole) return messageApi.warning('请选择角色'); - setCheckedKeys(rolePermissionMap[selectedRole] || []); - setPermModal(true); - }; - const handlePermSave = () => { - rolePermissionMap[selectedRole] = checkedKeys; - messageApi.success(`【${selectedRole}】权限保存成功`); - setPermModal(false); - }; const topMenus = rawMenuList.filter(m => m.parentId === 0 || !m.parentId); @@ -225,14 +200,8 @@ export default function MenuList() { columns={columns} dataSource={menuTreeData} rowKey="menuId" - pagination={{ - current: pagination.pageNum, - pageSize: pagination.pageSize, - total: pagination.total, - showSizeChanger: true, - showTotal: (total) => `共 ${total} 条` - }} - onChange={handleTableChange} + pagination={false} // 关闭分页 + bordered size="middle" indentSize={24} @@ -302,22 +271,7 @@ export default function MenuList() { - {/* 权限树弹窗 */} - setPermModal(false)} - onOk={handlePermSave} - > - - + ); diff --git a/src/pages/Roles.tsx b/src/pages/Roles.tsx index bf5dcee..cff2bae 100644 --- a/src/pages/Roles.tsx +++ b/src/pages/Roles.tsx @@ -58,7 +58,7 @@ export default function Roles() { getMenuList(params).then(res => { if (res.code === 200) { - const data = res.data || []; + const data = res.rows || []; const treeData = buildTreeFromFlat(data); const permTree = buildPermTree(treeData); setMenuTree(permTree); @@ -76,7 +76,7 @@ export default function Roles() { }; useEffect(() => { - getRole(); + //getRole(); getMenu(); }, [pagination.pageNum, pagination.pageSize]); diff --git a/src/pages/SystemSetting.tsx b/src/pages/SystemSetting.tsx index 48e33c2..fab798a 100644 --- a/src/pages/SystemSetting.tsx +++ b/src/pages/SystemSetting.tsx @@ -1,572 +1,207 @@ -import React, { useState } from 'react'; +import React, { useState, useEffect } from 'react'; import { - Layout, Menu, Card, Row, Col, Button, Form, Input, Select, Switch, Tag, Space, Typography, Statistic, message, Table, Divider + Layout, Menu, Card, Row, Col, Button, Form, Input, Select, Switch, Tag, Space, Typography, message, Table } from 'antd'; import { SettingOutlined, UserOutlined, BellOutlined, LinkOutlined, SafetyOutlined, SyncOutlined, CloudOutlined, TeamOutlined, FileTextOutlined, DatabaseOutlined, CalendarOutlined, - CheckCircleOutlined, CloseCircleOutlined, ReloadOutlined, DownloadOutlined, DeleteOutlined, - KeyOutlined, - AppstoreOutlined, - BankOutlined + CheckCircleOutlined, ReloadOutlined, DownloadOutlined, DeleteOutlined, + KeyOutlined, AppstoreOutlined, BankOutlined, + NotificationOutlined, + ExperimentOutlined } from '@ant-design/icons'; import UserRolePage from './UserPage'; import MenuList from './MenuList'; import Organization from './Organization'; import StationManage from './StationManage'; +import { getMenuList } from '../api/mune'; const { Header, Content } = Layout; -const { Title, Text } = Typography; +const { Text } = Typography; const { Option } = Select; const AntdCard = Card as any; -// 子页面组件,你可以替换成自己的 +// 基础设置 const BasicSettings = () => { const [form] = Form.useForm(); - - const handleSave = () => { - message.success('设置已保存'); - }; + const handleSave = () => { message.success('设置已保存'); }; return (
- {/* 顶部概览卡片 */} - - - -
- -
-
-
当前版本
-
v2.8.1 最新版
-
-
-
- - - - -
- -
-
-
在线用户
-
12 ↑ 2
-
-
-
- - - - -
- -
-
-
告警通道
-
3 / 4 正常
-
-
-
- - - - -
- -
-
-
数据备份状态
-
正常 ●
-
-
-
- - - - -
- -
-
-
最近更新
-
2025-05-20
-
-
-
- +
当前版本
v2.8.1 最新版
+
在线用户
12 ↑ 2
+
告警通道
3 / 4 正常
+
数据备份状态
正常 ●
+
最近更新
2025-05-20
- {/* 基础配置 */}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + +
- {/* 通知与告警策略 */} - - -
- -
-
-
- 短信 - -
- 已启用 -
-
- - - -
- -
-
-
- 邮件 - -
- 已启用 -
-
- - - -
- -
-
-
- Telegram - -
- 已启用 -
-
- - - -
- -
-
-
- 系统通知 - -
- 已启用 -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - +
短信
已启用
+
邮件
已启用
+
Telegram
已启用
+
系统通知
已启用
+ +
- {/* 用户与权限预览 */} - {t} }, - { title: '手机号', dataIndex: 'phone' }, - { title: '邮箱', dataIndex: 'email' }, - { title: '状态', dataIndex: 'status', render: () => ● 在线 }, - { title: '操作', render: () => } - ]} - dataSource={[ - { name: '张运维', role: '超级管理员', phone: '138****0001', email: 'zhangyw@pvsrmart.com' }, - { name: '李工程师', role: '运维工程师', phone: '139****0002', email: 'li.gongcheng@pvsrmart.com' }, - { name: '王班长', role: '巡检主管', phone: '137****0003', email: 'wang.banzhang@pvsrmart.com' }, - { name: '赵分析师', role: '数据分析师', phone: '136****0004', email: 'zhao.fx@pvsrmart.com' }, - ]} - /> +
管理员 }, + { title: '手机号', dataIndex: 'phone' }, + { title: '邮箱', dataIndex: 'email' }, + { title: '状态', render: () => ● 在线 }, + ]} dataSource={[ + { name: '张运维', phone: '138****0001', email: 'zhangyw@pvsrmart.com' }, + { name: '李工程师', phone: '139****0002', email: 'li.gongcheng@pvsrmart.com' }, + ]} /> ); }; -// 右侧面板组件 -const RightPanel = () => { - return ( -
- {/* 角色权限概览 */} - - -
- - -
-
- -
- 超级管理员 -
- 用户2人 | 权限28项 - - 全部权限 - 系统管理 - -
-
- - - - -
-
- -
- 运维工程师 -
- 用户5人 | 权限18项 - - 设备管理 - 工单管理 - -
-
- - - - -
-
- -
- 巡检主管 -
- 用户8人 | 权限12项 - - 巡检管理 - 告警处理 - -
-
- - - - -
-
- -
- 数据分析师 -
- 用户3人 | 权限15项 - - 数据分析 - 报表查看 - -
-
- - - +// 右侧面板 +const RightPanel = () => ( +
+ + +
超级管理员
全部权限
+
运维工程师
设备管理
+ + - {/* 设备接入状态 */} - 查看详情 }> - - - -
- 逆变器 - 5 / 5 ● 正常 -
-
- 汇流箱 - 20 / 20 ● 正常 -
-
- 气象站 - 1 / 1 ● 正常 -
-
- 摄像头 - 12 / 12 ● 正常 -
-
- 无人机 - 2 / 2 ● 正常 -
-
- 机器人 - 5 / 5 ● 正常 -
-
- API接口 - 正常 ● 正常 -
-
- Modbus - 正常 ● 正常 -
-
- - - {/* 这里可以放拓扑图,先用占位 */} -
-
- -
设备拓扑图
-
-
- - - + +
逆变器正常
+
- {/* 数据与安全 */} - - - - -
- 数据保留 - 3年 -
-
- 每日自动备份 - 02:00 -
-
- 最近备份时间 - 2025-05-24 02:00 -
-
- - - -
- 登录审计 - 已开启 -
-
- API密钥管理 - 正常 -
-
- SSL证书 - 有效期至 2026-12-31 -
-
- 双因素认证 - 已开启 -
-
- - - + +
数据保留3年
+
- {/* 系统维护 */} - 操作需管理员权限}> - - - - - - - - - - - - - - - - - ); -}; + + + + +); -// 主页面组件 +// ====================== +// 主页面 +// ====================== export default function SystemSettings() { const [activeTab, setActiveTab] = useState('basic'); + const [rawMenuList, setRawMenuList] = useState([]); + const [showTabs, setShowTabs] = useState([]); - const tabItems = [ - { key: 'basic', label: '基础设置', icon: }, - { key: 'user-role', label: '用户与角色', icon: }, - { key: 'menu', label: '菜单管理', icon: }, - { key: 'org', label: '组织管理', icon: }, // - { key: 'station', label: '场站管理', icon: }, - { key: 'notification', label: '通知策略', icon: }, - { key: 'device', label: '设备接入', icon: }, - { key: 'security', label: '数据与安全', icon: }, - { key: 'maintenance', label: '系统维护', icon: }, - ]; + // 获取菜单 + const getMenuListApi = () => { + const params = { pageNum: 1, pageSize: 99999 }; + return getMenuList(params); + }; + // 动态生成 tab + useEffect(() => { + getMenuListApi().then(res => { + if (res.code === 200) { + const data = res.rows || []; + // 系统设置 parentId = 3394 + const systemChild = data.filter(m => m.parentId == 3394); + + // ====================== + // 👇 按 orderNum 正序排序(数字越小越靠前) + // ====================== + systemChild.sort((a, b) => { + return (a.orderNum || 0) - (b.orderNum || 0); + }); + + const tabs = systemChild.map(item => { + if (item.path == '/systemSetting/basic') { + return { key: 'basic', label: '基础设置', icon: }; + } + if (item.path === '/systemSetting/User') { + return { key: 'user-role', label: '用户与角色', icon: }; + } + if (item.path === '/systemSetting/menu') { + return { key: 'menu', label: '菜单管理', icon: }; + } + if (item.path === '/systemSetting/notice') { + return { key: 'notice', label: '通知策略', icon: }; + } + if (item.path === '/systemSetting/deviceAccess') { + return { key: 'deviceAccess', label: '设备接入', icon: }; + } + if (item.path === '/systemSetting/dataSafety') { + return { key: 'dataSafety', label: '数据与安全', icon: }; + } + if (item.path === '/systemSetting/systemMaintenance') { + return { key: 'systemMaintenance', label: '系统维护', icon: }; + } + return null; + }).filter(Boolean); + + setShowTabs(tabs); + + // 默认选中第一个 + if (tabs.length > 0) { + setActiveTab(tabs[0].key); + } + } + }); + }, []); + const BasicSettingsPage = () =>

基础设置页面

; + const NoticePage = () =>

通知策略页面

; + const DeviceAccessPage = () =>

设备接入页面

; + const DataSafetyPage = () =>

数据与安全页面

; + const SystemMaintenancePage = () =>

系统维护页面

; + const DefaultPage = () =>

请选择菜单

; const renderTabContent = () => { switch (activeTab) { case 'basic': - return ( - -
- - - ); + return ; case 'user-role': return ; case 'menu': - return ; // 菜单管理 - case 'org': - return ; // 组织管理 - case 'station': - return ; // 场站管理 - case 'notification': - return
通知策略页面
; - case 'device': - return
设备接入页面
; - case 'security': - return
数据与安全页面
; - case 'maintenance': - return
系统维护页面
; + return ; + case 'notice': + return ; + case 'deviceAccess': + return ; + case 'dataSafety': + return ; + case 'systemMaintenance': + return ; default: - return null; + return ; } }; - return ( - {/* 固定在当前组件内部顶部,不随滚动 */} -
+
setActiveTab(key)} - items={tabItems} - style={{ border: 'none', height: 64, lineHeight: '64px', fontSize: 14 }} + items={showTabs} + style={{ border: 0, height: 64, lineHeight: '64px' }} />
- {/* 内容区域可滚动 */} {renderTabContent()} diff --git a/src/pages/UserPage.tsx b/src/pages/UserPage.tsx index d319c1c..dd876fe 100644 --- a/src/pages/UserPage.tsx +++ b/src/pages/UserPage.tsx @@ -9,9 +9,11 @@ import { } from '@ant-design/icons'; import { getMenuList } from '../api/mune'; import { buildPermTree, buildTreeFromFlat } from '../lib/utils'; -import { addRole, deleteRole, editRoleApi, getRoleList } from '../api/role'; +import { addRole, deleteRole, editRoleApi, getRoleDetailById, getRoleList } from '../api/role'; import { addUser, deleteUser, editUser, getUser } from '../api/user'; import EmptyData from '../components/Empty'; +import { useSelector } from 'react-redux'; +import { RootState } from '../store'; const { Text } = Typography; const { TabPane } = Tabs; @@ -38,6 +40,9 @@ export default function UserRolePage() { const [currentUser, setCurrentUser] = useState(null); const [rolesOption, setRolesOption] = useState([]); const [selectedUserIds, setSelectedUserIds] = useState([]); + const { userInfo } = useSelector((state: RootState) => state.user); + const [roleDetail, setRoleDetail] = useState(null); + // ====================== 统一分页 ====================== const [rolePagination, setRolePagination] = useState({ @@ -51,7 +56,7 @@ export default function UserRolePage() { const getRoleData = () => { const params = { pageNum: rolePagination.pageNum, - pageSize: rolePagination.pageSize + pageSize: rolePagination.pageSize, }; getRoleList(params).then(res => { if (res.code === 200) { @@ -67,8 +72,8 @@ export default function UserRolePage() { // ====================== 获取菜单树 ====================== const getMenuData = () => { getMenuList({ pageNum: 1, pageSize: 1000 }).then(res => { - if (res.code === 200) { - const treeData = buildTreeFromFlat(res.data || []); + if (res.code == 200) { + const treeData = buildTreeFromFlat(res.rows || []); setMenuTree(buildPermTree(treeData)); } }); @@ -93,15 +98,31 @@ export default function UserRolePage() { // ====================== 获取角色下拉框 ====================== const getRoleForSelect = () => { - getRoleList({ pageNum: 1, pageSize: 1000 }).then(res => { + getRoleList({ + pageNum: 1, pageSize: 1000, ...(userInfo?.roleId && { roleId: userInfo.roleId }), + }).then(res => { if (res.code === 200) setRolesOption(res.data || []); }); }; + + const getRoleById = () => { + const roleId = userInfo?.roleId; + getRoleDetailById(roleId).then(res => { + if (res.code === 200) { + setRoleDetail(res.data); + } else { + messageApi.error(res.msg || '获取角色详情失败'); + } + }).catch(() => { + }); + } + // ====================== 加载数据 ====================== useEffect(() => { getRoleData(); getMenuData(); + getRoleById(); }, [rolePagination.pageNum, rolePagination.pageSize]); useEffect(() => { @@ -121,7 +142,32 @@ export default function UserRolePage() { const handleEditRole = (record) => { setEditRole(record); roleForm.setFieldsValue({ ...record, status: record.status == 1 }); - setCheckedKeys((record.menuIds || []).map(Number)); + + // ============================== + // 工具:获取所有叶子节点(最底层菜单) + // ============================== + const getAllLeafKeys = (tree) => { + let leaves = []; + function traverse(nodes) { + nodes.forEach(node => { + if (!node.children || node.children.length === 0) { + leaves.push(node.key); + } else { + traverse(node.children); + } + }); + } + traverse(tree); + return leaves; + }; + + const leafKeys = getAllLeafKeys(menuTree); + + const leafChecked = (record.menuIds || []) + .map(Number) + .filter(id => leafKeys.includes(id)); + + setCheckedKeys(leafChecked); setRoleModalVisible(true); }; @@ -157,9 +203,35 @@ export default function UserRolePage() { const handleSaveRole = () => { roleForm.validateFields().then(values => { + + const getParentKeys = (key, tree) => { + for (let node of tree) { + if (node.key === key) { + return [node.key]; + } + if (node.children) { + const res = getParentKeys(key, node.children); + if (res.length > 0) { + return [...res, node.key]; + } + } + } + return []; + }; + + // 所有需要提交的菜单 ID(包含父级) + let allMenuIds = []; + checkedKeys.forEach(key => { + const keys = getParentKeys(key, menuTree); + allMenuIds.push(...keys); + }); + + // 去重 + allMenuIds = [...new Set(allMenuIds)]; + const params = { ...values, - menuIds: checkedKeys, + menuIds: allMenuIds, // 👈 这里用自动包含父级的数组 status: values.status ? 1 : 0, roleSort: values.roleSort || 1, }; @@ -167,9 +239,10 @@ export default function UserRolePage() { const api = editRole ? editRoleApi : addRole; api(params).then(res => { - if (res.code === 200) { + if (res.code == 200) { messageApi.success(editRole ? '编辑成功' : '新增成功'); setRoleModalVisible(false); + getRoleById(); getRoleData(); getRoleForSelect(); } else messageApi.error(res.msg || '保存失败'); @@ -376,12 +449,63 @@ export default function UserRolePage() { setRoleModalVisible(false)} onOk={handleSaveRole} width={560}>
- - - - - 菜单权限 - + + {/* 一行两个:角色名称 + 权限标识 */} + +
+ + + + + + + + + + + + {/* 一行两个:排序 + 状态 */} + + + + + + + + + + + + + + {/* 一行两个:是否有场站权限(占一半)+ 空着占位 */} + + + + + + + + + + + + {!userInfo.roleId && ( + <> + 菜单权限 + + + + )} + @@ -402,11 +526,18 @@ export default function UserRolePage() { - + - - + + + + + {roleDetail?.siteAccess && ( + )} + + + diff --git a/src/pages/Users.tsx b/src/pages/Users.tsx index 1dba169..3979b2a 100644 --- a/src/pages/Users.tsx +++ b/src/pages/Users.tsx @@ -65,7 +65,7 @@ export default function UserList() { useEffect(() => { getUserList(); - getRole(); + //getRole(); }, [pagination.pageNum, pagination.pageSize]); // 新增 diff --git a/src/store/userSlice.ts b/src/store/userSlice.ts index a119272..97c66ed 100644 --- a/src/store/userSlice.ts +++ b/src/store/userSlice.ts @@ -2,7 +2,6 @@ import { createSlice, createAsyncThunk } from '@reduxjs/toolkit'; import { login } from '@/api/login'; import Cookies from 'js-cookie'; import { setToken, setTokenAi } from '@/lib/utils'; -import { Cookie } from 'lucide-react'; export const userLogin = createAsyncThunk( 'user/login', @@ -15,15 +14,15 @@ export const userLogin = createAsyncThunk( } const res = await login(data); - localStorage.setItem('username', userInfo.username.trim()); + localStorage.setItem('userInfo', JSON.stringify(res)); // 👈 保存用户信息 const searchParams = new URLSearchParams(window.location.search); const goRemote = searchParams.get('goRemote'); - document.cookie = `sharetoken=${res.token}; path=/; domain=.satabot.com; secure`; localStorage.setItem('token', res.token); + if (goRemote) { setTokenAi(res.token); } else { @@ -31,7 +30,6 @@ export const userLogin = createAsyncThunk( } Cookies.set('userId', res.userId); - return res; } catch (err) { @@ -40,9 +38,19 @@ export const userLogin = createAsyncThunk( } ); +// 👇 刷新页面时,自动从本地存储恢复用户信息 +const loadUserFromStorage = () => { + try { + const user = localStorage.getItem('userInfo'); + return user ? JSON.parse(user) : null; + } catch { + return null; + } +}; + const initialState = { token: localStorage.getItem('token') || Cookies.get('Admin-Token') || null, - userInfo: null, + userInfo: loadUserFromStorage(), // 👈 刷新自动恢复 isAuthenticated: !!localStorage.getItem('token'), }; @@ -54,19 +62,21 @@ const userSlice = createSlice({ state.token = null; state.userInfo = null; state.isAuthenticated = false; + + // 清空本地 localStorage.clear(); Cookies.remove('userId'); Cookies.remove('Admin-Token'); }, setUserInfo: (state, action) => { state.userInfo = action.payload; + localStorage.setItem('userInfo', JSON.stringify(action.payload)); }, }, extraReducers: (builder) => { builder .addCase(userLogin.fulfilled, (state, action) => { state.userInfo = action.payload; - //state.token = action.payload.token; state.isAuthenticated = true; }) .addCase(userLogin.rejected, (state, action) => {