From 54321380dfe9628f79b36e909b826cf921098a7d Mon Sep 17 00:00:00 2001
From: LAPTOP-RI7D261L\Mr Ke <545800322@qq.com>
Date: Thu, 20 Feb 2020 10:36:50 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/nsjcy/frontEnd/nsjcy

---
 SunshineIns/src/index.jsx |   35 +++++++++++++++++++++++++++++++++++
 1 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/SunshineIns/src/index.jsx b/SunshineIns/src/index.jsx
index 5d52f65..3c3d478 100644
--- a/SunshineIns/src/index.jsx
+++ b/SunshineIns/src/index.jsx
@@ -30,6 +30,20 @@
 import UserDetail from './page/UserDetail';
 import InsideUser from './page/InsideUser';
 import UpdatePWD from './page/UpdatePWD';
+import CareList from './page/CareList';
+import CareListEdit from './page/CareListEdit';
+// 入职查询
+import ApplyFor from './page/ApplyFor';
+import ApplyForEdit from './page/ApplyForEdit';
+import Examine from './page/Examine';
+import ExamineEdit from './page/ExamineEdit';
+import NewlyList from './page/NewlyList';
+import Newly from './page/Newly';
+import SignIn from './page/SignIn';
+
+import PoliceSecurity from './page/PoliceSecurity';
+import policeSecurityEdit from './page/policeSecurityEdit';
+
 import { LocaleProvider } from 'antd';
 import zh_CN from 'antd/lib/locale-provider/zh_CN';
 import 'moment/locale/zh-cn';
@@ -41,6 +55,7 @@
         <Switch>
           <Route path="/bus/attachment/:busId/:attachmentId" component={AttTree} />
           <Route path="/bus/attachment/:busId" component={AttTree} />
+          <Route path='/questionnaire/newly' component={null} />
           <Route component={Menu} />
         </Switch>
         <Switch>
@@ -70,6 +85,26 @@
           <Route path='/userDetail/:id/:flag' component={UserDetail} />
           <Route path='/insideUser' component={InsideUser} />
           <Route path='/updatePWD/:id' component={UpdatePWD} />
+          {/* 社会关护 */}
+          <Route path='/careList' component={CareList} />
+          <Route path='/careListEdit/:id' component={CareListEdit} />
+          {/* 入职查询 */}
+          <Route path='/entry/applyFor' component={ApplyFor} />
+          <Route path='/entry/ApplyForEdit/:id' component={ApplyForEdit} />
+          <Route path='/entry/examine' component={Examine} />
+          <Route path='/entry/examineEdit/:id' component={ExamineEdit} />
+
+          {/* 问卷管理部分 */}
+          <Route path='/questionnaire/newlyList' component={NewlyList} />
+          <Route path='/questionnaire/newly' component={Newly} />
+          
+          {/* 公安审核 */}
+          <Route path='/entry/policeSecurity' component={PoliceSecurity} />
+          <Route path='/entry/policeSecurityEdit/:id' component={policeSecurityEdit} />
+
+          {/* 签到墙 */}
+          <Route path='/signIn/:id' component={SignIn} />
+          
           <Route path='/' component={Index} />
         </Switch>
       </Layout>

--
Gitblit v1.8.0