Merge branch 'main' of http://113.45.157.195:3003/linfeng/staff_data

apps/web/src/app/main/layout/NavigationMenu.tsx

@@ -44,43 +44,23 @@ const items = [
     null,
     null,
   ),
+  getItem(
+    "系统日志",
+    "/systemlog",
+    <i className="iconfont icon-icon-category" />,
+    null,
+    null,
+  ),
   getItem(
     "系统设置",
     "/admin",
     <i className="iconfont icon-icon-user" />,
     [
       getItem("部门设置", "/admin/department", null, null, null),
+      getItem("角色设置", "/admin/role", null, null, null),
     ],
     null,
   ),
-  getItem(
-    "训练计划",
-    "/plan", 
-    <i className="iconfont icon-icon-user" />,
-    [
-      getItem("周训练计划", "/plan/weekplan", null, null, null),
-      getItem("月训练计划", "/plan/monthplan", null, null, null),
-    ],
-    null,
-  ),
-  getItem(
-    "每日填报",
-    "/daily",
-    <i className="iconfont icon-icon-user" />,
-    null,
-    null,
-  ),
-  getItem(
-    "考核成绩",
-    "/assessment",
-    <i className="iconfont icon-icon-user" />,
-    [
-      getItem("岗位", "/assessment/positionassessment", null, null, null),
-      getItem("共同", "/assessment/commonassessment", null, null, null),
-      getItem("体育", "/assessment/sportsassessment", null, null, null),
-    ],
-    null,
-  )
 ];
 
 const NavigationMenu: React.FC = () => {
@@ -89,11 +69,13 @@ const NavigationMenu: React.FC = () => {
   const children2Parent: any = {
     "^/plan/weekplan": ["/plan"],
     "^/plan/monthplan": ["/plan"],
-    // 添加考核成绩子路径的匹配规则
-    "^/assessment/positionassessment": ["/assessment"],
-    "^/assessment/commonassessment": ["/assessment"], 
-    "^/assessment/sportsassessment": ["/assessment"],
     "^/admin/department": ["/admin"],
+    "^/admin/role": ["/admin"],
+    "^/admin/term": ["/admin"],
+    "^/admin/taxonomy": ["/admin"],
+    "^/admin/rolemap": ["/admin"],
+    "^/admin/transform": ["/admin"],
+    "^/admin/app_config": ["/admin"],
   };
 
   // 选中的菜单

apps/web/src/app/main/systemlog/SystemLogPage.tsx

@@ -0,0 +1,3 @@
+export default function SystemLogPage() {
+    return <div>SystemLogPage</div>;
+}

apps/web/src/components/layout/admin/AdminLayout.tsx

@@ -9,7 +9,7 @@ const { Content } = Layout;
 export default function AdminLayout() {
 	return (
 		<Layout className="min-h-screen">
-			<AdminSidebar routes={adminRoute.children || []} />
+			{/* <AdminSidebar routes={adminRoute.children || []} /> */}
 			<Layout>
 				<Content>
 					<Outlet />

apps/web/src/routes/index.tsx

@@ -15,6 +15,9 @@ import Dashboard from "../app/main/home/page";
 import WeekPlanPage from "../app/main/plan/weekplan/page";
 import StaffInformation from "../app/main/staffinformation/page";
 import DeptSettingPage from "../app/main/admin/deptsettingpage/page";
+import { adminRoute } from "./admin-route";
+import AdminLayout from "../components/layout/admin/AdminLayout";
+import SystemLogPage from "../app/main/systemlog/SystemLogPage";
 interface CustomIndexRouteObject extends IndexRouteObject {
 	name?: string;
 	breadcrumb?: string;
@@ -60,48 +63,14 @@ export const routes: CustomRouteObject[] = [
 						path: "/staff",
 						element: <StaffMessage></StaffMessage>,
 					},
+					{
+						path: "/systemlog",
+						element: <SystemLogPage></SystemLogPage>,
+					},
 					{
 						path: "/admin",
-						children: [
+						element: <AdminLayout></AdminLayout>,
-							{
+						children:adminRoute.children
-								path: "department",
-							    element: <DeptSettingPage></DeptSettingPage>,
-							},
-						]
-					},
-					{
-						path:"/plan",
-						children:[
-							{
-								path:"weekplan",
-								element:<WeekPlanPage></WeekPlanPage>
-							},
-							{
-								path:"monthplan",
-								element:<DailyPage></DailyPage>
-							}
-						]
-					},
-					{
-						path:"/daily",
-						element:<DailyPage></DailyPage>
-					},
-					{
-						path:"/assessment",
-						children:[
-							{
-								path:"positionassessment",
-								element:<DailyPage></DailyPage>
-							},
-							{
-								path:"commonassessment",
-								element:<DailyPage></DailyPage>
-							},
-							{
-								path:"sportsassessment",
-								element:<DailyPage></DailyPage>
-							}
-						]
 					},
 
 				],