From 00def159bfbdba118c0f64db6a45359f60d14da8 Mon Sep 17 00:00:00 2001
From: mmc <1556375442@qq.com>
Date: Thu, 30 Apr 2026 10:49:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/request.ts | 44 ++-
src/api/role/index.ts | 9 +
src/components/Layout.tsx | 112 +++----
src/pages/MenuList.tsx | 58 +---
src/pages/Roles.tsx | 4 +-
src/pages/SystemSetting.tsx | 637 ++++++++----------------------------
src/pages/UserPage.tsx | 165 +++++++++-
src/pages/Users.tsx | 2 +-
src/store/userSlice.ts | 22 +-
9 files changed, 388 insertions(+), 665 deletions(-)
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' }}
>
+ {/* 纯平铺一级菜单 */}