Merge branches 'dev_Ysl' and 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl

# Conflicts:
#	public/react/src/modules/courses/Index.js

public/react/src/modules/user/usersInfo/banks/BanksIndex.js

@@ -33,7 +33,33 @@ const GtopicBanksEdit = Loadable({
 const HomeworkBanksEdit = Loadable({
 	loader: () => import('./HomeworkBanksEdit'),
 	loading: Loading,
-})
+});
+
+//普通作业题库详情
+const Generaljobbankdetails =Loadable({
+  loader: () => import('../../../courses/questionbank/Generaljobbankdetails'),
+  loading: Loading,
+});
+//分组作业题库详情
+const GroupjobbankPage =Loadable({
+  loader: () => import('../../../courses/groupjobbank/GroupjobbankPage'),
+  loading: Loading,
+});
+//毕设选题详情
+const CompletetopicdePage =Loadable({
+  loader: () => import('../../../courses/comtopicdetails/CompletetopicdePage'),
+  loading: Loading,
+});
+//毕设任务详情
+const Completetaskpage =Loadable({
+  loader: () => import('../../../courses/completetaskdetails/Completetaskpage'),
+  loading: Loading,
+});
+//问卷编辑
+const PollNewQuestbank =Loadable({
+  loader: () => import('../../../courses/poll/PollNewQuestbank'),
+  loading: Loading,
+});
 
 class BanksIndex extends Component{
   constructor(props){
@@ -105,6 +131,36 @@ class BanksIndex extends Component{
                   return (<BanksTabIndex {...this.props} {...props} {...this.state} {...common} />)
                 }
             }></Route>
+            {/*题库问卷编辑详情*/}
+            <Route path="/courses/poll/:workid/edit"
+                   render={
+                     (props) => (<PollNewQuestbank {...this.props} {...props} {...this.state} {...common} />)
+                   }
+            ></Route>
+            {/*毕设任务题库详情*/}
+            <Route path="/banks/gtask/:workid"
+                   render={
+                     (props) => (<Completetaskpage {...this.props} {...props} {...this.state} {...common} />)
+                   }
+            ></Route>
+            {/*毕设内容题库详情*/}
+            <Route path="/banks/gtopic/:workid"
+                   render={
+                     (props) => (<CompletetopicdePage {...this.props} {...props} {...this.state}  {...common}/>)
+                   }
+            ></Route>
+            {/*分组作业题库详情*/}
+            <Route path="/banks/group/:workid"
+                   render={
+                     (props) => (<GroupjobbankPage {...this.props} {...props} {...this.state} {...common} />)
+                   }
+            ></Route>
+            {/*  普通作业题库详情*/}
+            <Route path="/banks/normal/:workid"
+                   render={
+                     (props) => (<Generaljobbankdetails {...this.props} {...props} {...this.state} />)
+                   }
+            ></Route>
           </Switch>
 
         </div>