From f7e9b835c30e5b3287b2c04e24950871cafa907d Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Mon, 07 Sep 2020 15:28:45 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/huge/frontEnd/hugeOA
---
src/routeDom/oaRouteDom.jsx | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/src/routeDom/oaRouteDom.jsx b/src/routeDom/oaRouteDom.jsx
index 8533dee..0d981e1 100644
--- a/src/routeDom/oaRouteDom.jsx
+++ b/src/routeDom/oaRouteDom.jsx
@@ -9,7 +9,6 @@
import { Switch, Route, Redirect } from 'react-router-dom';
// 引进页面（pages）
-import Login from '../module/login/login';
import Workbench from '../module/oa/index/workbench'; //首页--工作台
import System from '../module/oa/index/System'; //首页--工作制度
import Announcement from '../module/oa/index/Announcement'; //全部通知
@@ -21,22 +20,30 @@
import Rawler from '../module/oa/logManage/Rawler'; //爬虫词条管理
import Information from '../module/oa/personal/information'; //个人信息
import UserManage from '../components/oa/basicConfig/UserManage'; //用户管理
+import MeritsOverview from '../module/oa/merits/meritsOverview';//绩效管理--绩效总览
+import MeritsDetail from '../module/oa/merits/meritsDetail';//绩效管理--绩效详情
+import MeritsDispose from '../module/oa/merits/meritsDispose';//绩效管理--绩效指标
+import MeritsExamine from '../module/oa/merits/meritsExamine';//绩效管理--绩效考核
export default function OaRouteDom({ }) {
- return (<Switch>
- <Route path="/baseManage/user" component={UserManage} />
- <Route path="/document/create/:id?" component={DocumentEdit} />
- <Route path="/document/detail/:id" component={DocumentDetail} />
- <Route path="/index/workbench/announcement" component={Announcement} />
- <Route path="/index/rules" component={System} />
- <Route path="/index" component={Workbench} />
- <Route path="/logManage/browseLog" component={BrowseLog} />
- <Route path="/logManage/operLog" component={OperLog} />
- <Route path="/logManage/rawler" component={Rawler} />
- <Route path="/personal/information" component={Information} />
- <Route path="/login" component={Login} />
- {/* <Route path="/" component={Workbench} /> */}
- <Redirect from="/" to="/index" component={Workbench} />
- </Switch>
+ return (
+ <React.Fragment>
+ <Route path="/baseManage/user" component={UserManage} />
+ <Route path="/document/create/:id?" component={DocumentEdit} />
+ <Route path="/document/detail/:id" component={DocumentDetail} />
+ <Route path="/index/workbench/announcement" component={Announcement} />
+ <Route path="/index/rules" component={System} />
+ <Route path="/index" component={Workbench} />
+ <Route path="/logManage/browseLog" component={BrowseLog} />
+ <Route path="/logManage/operLog" component={OperLog} />
+ <Route path="/logManage/rawler" component={Rawler} />
+ <Route path="/personal/information" component={Information} />
+ <Route path="/merits/meritsOverview/meritsDetail/:userId/:boolean/:meritsMonth" component={MeritsDetail} />
+ <Route path="/merits/meritsOverview" component={MeritsOverview} />
+ <Route path="/merits/meritsDispose" component={MeritsDispose} />
+ <Route path="/merits/meritsExamine" component={MeritsDetail} />
+ {/* <Route path="/" component={Workbench} /> */}
+ {/* <Redirect from="/" to="/index" component={Workbench} /> */}
+ </React.Fragment>
)
}
--
Gitblit v1.8.0