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 | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/SunshineIns/src/index.jsx b/SunshineIns/src/index.jsx
index 3c3d478..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';
@@ -40,6 +42,7 @@
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';
@@ -51,11 +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={null} />
+ {/* <Route path='/questionnaire/newly' component={AttTree} /> */}
<Route component={Menu} />
</Switch>
<Switch>
@@ -72,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} />
@@ -96,7 +100,10 @@
{/* 问卷管理部分 */}
<Route path='/questionnaire/newlyList' component={NewlyList} />
- <Route path='/questionnaire/newly' component={Newly} />
+ <Route path='/questionnaire/newly/:id' component={Newly} />
+ {/* 问卷详情 */}
+ <Route path='/questionnaire/detail/:id' component={QuestionDetail} />
+
{/* 公安审核 */}
<Route path='/entry/policeSecurity' component={PoliceSecurity} />
--
Gitblit v1.8.0