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, 19 insertions(+), 20 deletions(-)
diff --git a/src/routeDom/oaRouteDom.jsx b/src/routeDom/oaRouteDom.jsx
index e7ccc56..0d981e1 100644
--- a/src/routeDom/oaRouteDom.jsx
+++ b/src/routeDom/oaRouteDom.jsx
@@ -26,25 +26,24 @@
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="/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} />
- </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