From 0be3ac0f2f83c1b58249d43850a0e4b4f531a8db Mon Sep 17 00:00:00 2001
From: Mr Ke <kelq@hugeinfo.com.cn>
Date: Fri, 04 Sep 2020 10:56:17 +0800
Subject: [PATCH] 合并用户权限菜单,屏蔽首页工作台最新通知通知内容展示

---
 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