Compare commits
No commits in common. "fdb3e1a163333238ee0d35e6baa3f605e40240f7" and "db0d27114a9a57cd888b696d42cd785489ba1819" have entirely different histories.
fdb3e1a163
...
db0d27114a
|
|
@ -44,23 +44,43 @@ const items = [
|
||||||
null,
|
null,
|
||||||
null,
|
null,
|
||||||
),
|
),
|
||||||
getItem(
|
|
||||||
"系统日志",
|
|
||||||
"/systemlog",
|
|
||||||
<i className="iconfont icon-icon-category" />,
|
|
||||||
null,
|
|
||||||
null,
|
|
||||||
),
|
|
||||||
getItem(
|
getItem(
|
||||||
"系统设置",
|
"系统设置",
|
||||||
"/admin",
|
"/admin",
|
||||||
<i className="iconfont icon-icon-user" />,
|
<i className="iconfont icon-icon-user" />,
|
||||||
[
|
[
|
||||||
getItem("部门设置", "/admin/department", null, null, null),
|
getItem("部门设置", "/admin/department", null, null, null),
|
||||||
getItem("角色设置", "/admin/role", null, 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 = () => {
|
const NavigationMenu: React.FC = () => {
|
||||||
|
|
@ -69,13 +89,11 @@ const NavigationMenu: React.FC = () => {
|
||||||
const children2Parent: any = {
|
const children2Parent: any = {
|
||||||
"^/plan/weekplan": ["/plan"],
|
"^/plan/weekplan": ["/plan"],
|
||||||
"^/plan/monthplan": ["/plan"],
|
"^/plan/monthplan": ["/plan"],
|
||||||
|
// 添加考核成绩子路径的匹配规则
|
||||||
|
"^/assessment/positionassessment": ["/assessment"],
|
||||||
|
"^/assessment/commonassessment": ["/assessment"],
|
||||||
|
"^/assessment/sportsassessment": ["/assessment"],
|
||||||
"^/admin/department": ["/admin"],
|
"^/admin/department": ["/admin"],
|
||||||
"^/admin/role": ["/admin"],
|
|
||||||
"^/admin/term": ["/admin"],
|
|
||||||
"^/admin/taxonomy": ["/admin"],
|
|
||||||
"^/admin/rolemap": ["/admin"],
|
|
||||||
"^/admin/transform": ["/admin"],
|
|
||||||
"^/admin/app_config": ["/admin"],
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// 选中的菜单
|
// 选中的菜单
|
||||||
|
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
export default function SystemLogPage() {
|
|
||||||
return <div>SystemLogPage</div>;
|
|
||||||
}
|
|
||||||
|
|
@ -9,7 +9,7 @@ const { Content } = Layout;
|
||||||
export default function AdminLayout() {
|
export default function AdminLayout() {
|
||||||
return (
|
return (
|
||||||
<Layout className="min-h-screen">
|
<Layout className="min-h-screen">
|
||||||
{/* <AdminSidebar routes={adminRoute.children || []} /> */}
|
<AdminSidebar routes={adminRoute.children || []} />
|
||||||
<Layout>
|
<Layout>
|
||||||
<Content>
|
<Content>
|
||||||
<Outlet />
|
<Outlet />
|
||||||
|
|
|
||||||
|
|
@ -15,9 +15,6 @@ import Dashboard from "../app/main/home/page";
|
||||||
import WeekPlanPage from "../app/main/plan/weekplan/page";
|
import WeekPlanPage from "../app/main/plan/weekplan/page";
|
||||||
import StaffInformation from "../app/main/staffinformation/page";
|
import StaffInformation from "../app/main/staffinformation/page";
|
||||||
import DeptSettingPage from "../app/main/admin/deptsettingpage/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 {
|
interface CustomIndexRouteObject extends IndexRouteObject {
|
||||||
name?: string;
|
name?: string;
|
||||||
breadcrumb?: string;
|
breadcrumb?: string;
|
||||||
|
|
@ -64,13 +61,47 @@ export const routes: CustomRouteObject[] = [
|
||||||
element: <StaffMessage></StaffMessage>,
|
element: <StaffMessage></StaffMessage>,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/systemlog",
|
path: "/admin",
|
||||||
element: <SystemLogPage></SystemLogPage>,
|
children: [
|
||||||
|
{
|
||||||
|
path: "department",
|
||||||
|
element: <DeptSettingPage></DeptSettingPage>,
|
||||||
|
},
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/admin",
|
path:"/plan",
|
||||||
element: <AdminLayout></AdminLayout>,
|
children:[
|
||||||
children:adminRoute.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>
|
||||||
|
}
|
||||||
|
]
|
||||||
},
|
},
|
||||||
|
|
||||||
],
|
],
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue