From a92f3c4d10bebbdc55270e72ccd97cd1ba7d4e28 Mon Sep 17 00:00:00 2001
From: LAPTOP-RI7D261L\Mr Ke <545800322@qq.com>
Date: Wed, 26 Feb 2020 16:40:55 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/nsjcy/frontEnd/nsjcy
---
SunshineIns/src/index.jsx | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 deletions(-)
diff --git a/SunshineIns/src/index.jsx b/SunshineIns/src/index.jsx
index 5d52f65..73d63ab 100644
--- a/SunshineIns/src/index.jsx
+++ b/SunshineIns/src/index.jsx
@@ -14,6 +14,8 @@
import BusDetail from './page/BusDetail';
import SupPerson from './page/SupPerson';
import Company from './page/Company';
+// 涉未成年负责部门组织
+import UnderAgeList from './page/UnderAgeList';
import ActiveManage from './page/ActiveManage';
import ActiveManageEdit from './page/ActiveManageEdit';
import KnowledgeBase from './page/KnowledgeBase';
@@ -30,6 +32,21 @@
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 QuestionDetail from './page/QuestionDetail';
+
+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';
@@ -37,10 +54,11 @@
ReactDOM.render(
<LocaleProvider locale={zh_CN}>
<Router history={hashHistory()}>
- <Layout style={{ minHeight: '100vh' }}>
+ <Layout style={{ height: '100%' }}>
<Switch>
<Route path="/bus/attachment/:busId/:attachmentId" component={AttTree} />
<Route path="/bus/attachment/:busId" component={AttTree} />
+ {/* <Route path='/questionnaire/newly' component={AttTree} /> */}
<Route component={Menu} />
</Switch>
<Switch>
@@ -57,6 +75,7 @@
<Route path='/active' component={Active} />
<Route path='/supPerson' component={SupPerson} />
<Route path='/company' component={Company} />
+ <Route path='/underAgeList' component={UnderAgeList} />
<Route path='/knowledgeBase' component={KnowledgeBase} />
<Route path='/articlePublish' component={ArticlePublish} />
<Route path='/articleEidt/:id' component={ArticleEidt} />
@@ -70,6 +89,29 @@
<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/:id' component={Newly} />
+ {/* 问卷详情 */}
+ <Route path='/questionnaire/detail/:id' component={QuestionDetail} />
+
+
+ {/* 公安审核 */}
+ <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