From 0ec802e93557b2b1422ddbd68aafa994fa68f455 Mon Sep 17 00:00:00 2001
From: Mr Ke <kelq@hugeinfo.com.cn>
Date: Wed, 27 May 2020 10:04:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/nsjcy/frontEnd/nsjcy
---
SunshineIns/src/index.jsx | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/SunshineIns/src/index.jsx b/SunshineIns/src/index.jsx
index e18b46a..0365b5c 100644
--- a/SunshineIns/src/index.jsx
+++ b/SunshineIns/src/index.jsx
@@ -14,7 +14,7 @@
import BusDetail from './page/BusDetail';
import SupPerson from './page/SupPerson';
import Company from './page/Company';
-// 涉未成年负责部门组织
+// 社会组织维护
import UnderAgeList from './page/UnderAgeList';
import KeyWord from './page/KeyWord';
import ActiveManage from './page/ActiveManage';
@@ -48,6 +48,12 @@
import Newly from './page/Newly';
import SignIn from './page/SignIn';
import QuestionDetail from './page/QuestionDetail';
+import QuestionPersonDetail from './page/QuestionPersonDetail';
+//顶部图片设置
+import TopImage from './page/TopImage';
+// 刑执监督管理
+import CriminalExecution from './page/CriminalExecution';
+
import NoInspectionReportList from './page/NoInspectionReportList';
import NoInspectionReportDetail from './page/NoInspectionReportDetail';
@@ -69,8 +75,8 @@
{/* <Route path='/questionnaire/newly' component={AttTree} /> */}
{/* 问卷详情 */}
<Route path='/activeManageEditquestionnaire/:id' component={null} />
- {/* 签到墙 */}
- <Route path='/signIn/:id' component={null} />
+ {/* 签到墙 */}
+ <Route path='/signIn/:id' component={null} />
<Route component={Menu} />
</Switch>
<Switch>
@@ -88,12 +94,13 @@
<Route path='/supPerson' component={SupPerson} />
<Route path='/company' component={Company} />
<Route path='/underAgeList' component={UnderAgeList} />
- <Route path='/keyWord' component={KeyWord} />
+ <Route path='/dxWords' component={KeyWord} />
<Route path='/knowledgeBase' component={KnowledgeBase} />
<Route path='/articlePublish' component={ArticlePublish} />
<Route path='/articleEidt/:id' component={ArticleEidt} />
<Route path='/typeManage' component={TypeList} />
<Route path='/activeManage' component={ActiveManage} />
+ <Route path='/topImage' component={TopImage} />
<Route path='/activeManageEdit/:id' component={ActiveManageEdit} />
<Route path='/activeManageEditquestionnaire/:id' component={ActiveManageEditquestionnaire} />
<Route path='/snapshot' component={Snapshot} />
@@ -113,14 +120,21 @@
<Route path='/entry/ApplyForEdit/:id' component={ApplyForEdit} />
<Route path='/entry/examine' component={Examine} />
<Route path='/entry/examineEdit/:id' component={ExamineEdit} />
+ <Route path='/topImage' component={TopImage} />
+ {/* 刑执监督管理 */}
+ <Route path='/criminalExecution' component={CriminalExecution} />
+
+
{/* 问卷管理部分 */}
<Route path='/questionnaire/newlyList' component={NewlyList} />
<Route path='/questionnaire/newly/:id' component={Newly} />
{/* 问卷详情 */}
<Route path='/questionnaire/detail/:id' component={QuestionDetail} />
+ {/* 小程序提交的任务详情 */}
+ <Route path='/questionnaire/persondetail/:id/:userId' component={QuestionPersonDetail} />
-
+
{/* 公安审核 */}
<Route path='/entry/policeSecurity' component={PoliceSecurity} />
<Route path='/entry/policeSecurityEdit/:id' component={policeSecurityEdit} />
@@ -133,7 +147,7 @@
<Route path='/noInspectionReportDetail/:id/:flag' component={NoInspectionReportDetail} />
-
+
<Route path='/' component={Index} />
</Switch>
</Layout>
--
Gitblit v1.8.0