From 7af09e42b49cd18f160c19297f47c4622b1eedc3 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Wed, 24 Jun 2020 17:14:37 +0800
Subject: [PATCH] ...

---
 src/routeDom/oaRouteDom.jsx |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/routeDom/oaRouteDom.jsx b/src/routeDom/oaRouteDom.jsx
index 8533dee..e7ccc56 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,6 +20,10 @@
 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>
@@ -34,7 +37,12 @@
     <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="/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>

--
Gitblit v1.8.0