diff --git a/src/pages/MenuList.tsx b/src/pages/MenuList.tsx
index 51cc5d4..e800509 100644
--- a/src/pages/MenuList.tsx
+++ b/src/pages/MenuList.tsx
@@ -234,13 +234,7 @@ export default function MenuList() {
- {/* 图标选择(带选择按钮+预览) */}
-
-
-
-
-
-
+
@@ -249,7 +243,7 @@ export default function MenuList() {
{/* 图标选择弹窗 */}
- setIconModal(false)}
@@ -269,7 +263,7 @@ export default function MenuList() {
))}
-
+ */}
diff --git a/src/pages/SystemSetting.tsx b/src/pages/SystemSetting.tsx
index fab798a..a7a265a 100644
--- a/src/pages/SystemSetting.tsx
+++ b/src/pages/SystemSetting.tsx
@@ -8,7 +8,8 @@ import {
CheckCircleOutlined, ReloadOutlined, DownloadOutlined, DeleteOutlined,
KeyOutlined, AppstoreOutlined, BankOutlined,
NotificationOutlined,
- ExperimentOutlined
+ ExperimentOutlined,
+ EnvironmentOutlined
} from '@ant-design/icons';
import UserRolePage from './UserPage';
import MenuList from './MenuList';
@@ -136,6 +137,12 @@ export default function SystemSettings() {
if (item.path === '/systemSetting/menu') {
return { key: 'menu', label: '菜单管理', icon: };
}
+ if (item.path === '/systemSetting/org') {
+ return { key: 'org', label: '组织管理', icon: };
+ }
+ if (item.path === '/systemSetting/site') {
+ return { key: 'site', label: '场站管理', icon: };
+ }
if (item.path === '/systemSetting/notice') {
return { key: 'notice', label: '通知策略', icon: };
}
@@ -174,6 +181,10 @@ export default function SystemSettings() {
return ;
case 'menu':
return ;
+ case 'org':
+ return ;
+ case 'site':
+ return ;
case 'notice':
return ;
case 'deviceAccess':
diff --git a/src/pages/UserPage.tsx b/src/pages/UserPage.tsx
index dd876fe..a56f597 100644
--- a/src/pages/UserPage.tsx
+++ b/src/pages/UserPage.tsx
@@ -24,7 +24,6 @@ export default function UserRolePage() {
const [messageApi, contextHolder] = message.useMessage();
const { modal } = App.useApp();
-
const [roles, setRoles] = useState([]);
const [menuTree, setMenuTree] = useState([]);
const [checkedKeys, setCheckedKeys] = useState([]);
@@ -43,7 +42,6 @@ export default function UserRolePage() {
const { userInfo } = useSelector((state: RootState) => state.user);
const [roleDetail, setRoleDetail] = useState(null);
-
// ====================== 统一分页 ======================
const [rolePagination, setRolePagination] = useState({
pageNum: 1, pageSize: 12, total: 0
@@ -69,7 +67,7 @@ export default function UserRolePage() {
});
};
- // ====================== 获取菜单树 ======================
+ // ====================== 获取菜单树(只加载一次) ======================
const getMenuData = () => {
getMenuList({ pageNum: 1, pageSize: 1000 }).then(res => {
if (res.code == 200) {
@@ -99,32 +97,33 @@ export default function UserRolePage() {
// ====================== 获取角色下拉框 ======================
const getRoleForSelect = () => {
getRoleList({
- pageNum: 1, pageSize: 1000, ...(userInfo?.roleId && { roleId: userInfo.roleId }),
+ 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(() => {
+ if (!userInfo?.roleId) return; // 无 roleId 不请求
+ getRoleDetailById(userInfo.roleId).then(res => {
+ if (res.code == 200) setRoleDetail(res.data);
});
- }
+ };
- // ====================== 加载数据 ======================
+ // ====================== 【核心优化】只在首次加载请求 ======================
+ useEffect(() => {
+ getMenuData(); // 菜单树只请求一次
+ getRoleById(); // 角色详情只请求一次
+ }, []); // 空依赖 → 只执行一次
+
+ // ====================== 角色分页变化 ======================
useEffect(() => {
getRoleData();
- getMenuData();
- getRoleById();
}, [rolePagination.pageNum, rolePagination.pageSize]);
+ // ====================== 用户分页变化 ======================
useEffect(() => {
getUserData();
getRoleForSelect();
@@ -143,18 +142,13 @@ export default function UserRolePage() {
setEditRole(record);
roleForm.setFieldsValue({ ...record, status: record.status == 1 });
- // ==============================
- // 工具:获取所有叶子节点(最底层菜单)
- // ==============================
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);
- }
+ } else traverse(node.children);
});
}
traverse(tree);
@@ -162,7 +156,6 @@ export default function UserRolePage() {
};
const leafKeys = getAllLeafKeys(menuTree);
-
const leafChecked = (record.menuIds || [])
.map(Number)
.filter(id => leafKeys.includes(id));
@@ -173,12 +166,13 @@ export default function UserRolePage() {
const handleDeleteRole = (roleId) => {
deleteRole([roleId]).then(res => {
- if (res.code === 200) { messageApi.success('删除成功'); getRoleData(); }
- else messageApi.error(res.msg || '删除失败');
+ if (res.code == 200) {
+ messageApi.success('删除成功');
+ getRoleData();
+ } else messageApi.error(res.msg || '删除失败');
});
};
- // 批量删除角色 + 确认弹窗
const handleBatchDeleteRoles = () => {
if (selectedRoleIds.length == 0) return messageApi.warning('请选择要删除的角色');
modal.confirm({
@@ -193,9 +187,7 @@ export default function UserRolePage() {
messageApi.success('批量删除成功');
setSelectedRoleIds([]);
getRoleData();
- } else {
- messageApi.error(res.msg || '删除失败');
- }
+ } else messageApi.error(res.msg || '删除失败');
});
}
});
@@ -203,35 +195,26 @@ 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.key === key) return [node.key];
if (node.children) {
const res = getParentKeys(key, node.children);
- if (res.length > 0) {
- return [...res, node.key];
- }
+ if (res.length > 0) return [...res, node.key];
}
}
return [];
};
- // 所有需要提交的菜单 ID(包含父级)
let allMenuIds = [];
checkedKeys.forEach(key => {
- const keys = getParentKeys(key, menuTree);
- allMenuIds.push(...keys);
+ allMenuIds.push(...getParentKeys(key, menuTree));
});
-
- // 去重
allMenuIds = [...new Set(allMenuIds)];
const params = {
...values,
- menuIds: allMenuIds, // 👈 这里用自动包含父级的数组
+ menuIds: allMenuIds,
status: values.status ? 1 : 0,
roleSort: values.roleSort || 1,
};
@@ -243,6 +226,7 @@ export default function UserRolePage() {
messageApi.success(editRole ? '编辑成功' : '新增成功');
setRoleModalVisible(false);
getRoleById();
+
getRoleData();
getRoleForSelect();
} else messageApi.error(res.msg || '保存失败');
@@ -265,16 +249,15 @@ export default function UserRolePage() {
const handleDeleteUser = (userId) => {
deleteUser(userId).then(res => {
- if (res.code === 200) { messageApi.success('删除成功'); getUserData(); }
- else messageApi.error(res.msg || '删除失败');
+ if (res.code === 200) {
+ messageApi.success('删除成功');
+ getUserData();
+ } else messageApi.error(res.msg || '删除失败');
});
};
- // 批量删除用户 + 确认弹窗
const handleBatchDeleteUsers = () => {
-
if (selectedUserIds.length === 0) return messageApi.warning('请选择要删除的用户');
- console.log(selectedUserIds, "selectedUserIds")
modal.confirm({
title: '批量删除用户',
content: `确定要删除已选中的 ${selectedUserIds.length} 个用户吗?`,
@@ -320,7 +303,6 @@ export default function UserRolePage() {
}}>
{contextHolder}
- {/* 整体卡片 */}
@@ -446,51 +428,54 @@ export default function UserRolePage() {
{/* ========== 角色弹窗 ========== */}
- setRoleModalVisible(false)} onOk={handleSaveRole} width={560}>
+ setRoleModalVisible(false)}
+ onOk={handleSaveRole}
+ width={560}
+ >
- {!userInfo.roleId && (
+ {/* 菜单权限 */}
+ {userInfo?.roleId == 23 && (
<>
菜单权限
>
-
)}
-
{/* ========== 用户弹窗 ========== */}
- setModalVisible(false)} onOk={handleSaveUser} width={680} destroyOnClose>
+ setModalVisible(false)}
+ onOk={handleSaveUser}
+ width={680}
+ destroyOnClose
+ >