From c424983aece529b951489662b97d26e8fae94230 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Mon, 2 Sep 2019 15:31:15 +0800
Subject: [PATCH 01/10] add previousPathName

---
 public/react/src/modules/courses/Index.js | 133 ++++++++++++----------
 1 file changed, 71 insertions(+), 62 deletions(-)

diff --git a/public/react/src/modules/courses/Index.js b/public/react/src/modules/courses/Index.js
index 1b1c523c0..7da04dd0e 100644
--- a/public/react/src/modules/courses/Index.js
+++ b/public/react/src/modules/courses/Index.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import { SnackbarHOC } from 'educoder';
 import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
+import { withRouter } from 'react-router'
 import Loadable from 'react-loadable';
 import Loading from '../../Loading';
 import axios from 'axios';
@@ -309,6 +310,13 @@ class CoursesIndex extends Component{
 
     componentDidMount(){
         // this.updataleftNav()
+        this.historyArray = []
+        this.props.history.listen( location =>  {
+			console.log(location)
+            this.historyArray.unshift(location.pathname)
+            this.historyArray.length = 2;
+			//Do your stuff here
+		});
     }
 
     updataleftNav=()=>{
@@ -443,6 +451,7 @@ class CoursesIndex extends Component{
 
     render() {
         const common = {
+            previousPathName: this.historyArray && this.historyArray[1]
             // isAdmin: this.isAdmin,
             // isStudent: this.isStudent,
             // isAdminOrStudent: this.isAdminOrStudent,
@@ -464,47 +473,47 @@ class CoursesIndex extends Component{
               {/*毕设任务题库详情*/}
               <Route path="/banks/gtopic_topics/:workid"
                      render={
-                       (props) => (<Completetaskpage {...this.props} {...props} {...this.state} />)
+                       (props) => (<Completetaskpage {...this.props} {...props} {...this.state} {...common}/>)
                      }
               ></Route>
               {/*毕设内容题库详情*/}
               <Route path="/banks/gtask_topics/:workid"
                      render={
-                       (props) => (<CompletetopicdePage {...this.props} {...props} {...this.state} />)
+                       (props) => (<CompletetopicdePage {...this.props} {...props} {...this.state} {...common}/>)
                      }
               ></Route>
               {/*分组作业题库详情*/}
               <Route path="/banks/group_topics/:workid"
                      render={
-                       (props) => (<GroupjobbankPage {...this.props} {...props} {...this.state} />)
+                       (props) => (<GroupjobbankPage {...this.props} {...props} {...this.state} {...common}/>)
                      }
               ></Route>
               {/*  普通作业题库详情*/}
               <Route path="/banks/normal_topics/:workid"
                      render={
-                       (props) => (<Generaljobbankdetails {...this.props} {...props} {...this.state} />)
+                       (props) => (<Generaljobbankdetails {...this.props} {...props} {...this.state} {...common}/>)
                      }
               ></Route>
                 {/* 资源列表页  */}
                 <Route path="/courses/:coursesId/file/:Id" exact
                        render={
-                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
                 <Route path="/courses/:coursesId/files/:main_id"
                        render={
-                         (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                         (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
                 <Route exact path="/courses/:coursesId/boards/:boardId"
                     render={
-                        (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                        (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                     }
                 ></Route>
                 {/*课堂讨论*/}
                 <Route path="/courses/:coursesId/boards/:boardId"
                        render={
-                           (props) => (<BoardIndex {...this.props} {...props} {...this.state} />)
+                           (props) => (<BoardIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
@@ -512,19 +521,19 @@ class CoursesIndex extends Component{
                 {/* 毕设问答 */}
                 <Route path="/courses/:coursesId/graduation_topics/postwork/new"
                        render={
-                           (props) => (<GraduateTopicPostWorksNew {...this.props} {...props} {...this.state} />)
+                           (props) => (<GraduateTopicPostWorksNew {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 毕设选题新建页 */}
                 <Route path="/courses/:coursesId/graduation_topics/new"
                        render={
-                           (props) => (<GraduateTopicNew {...this.props} {...props} {...this.state} />)
+                           (props) => (<GraduateTopicNew {...this.props} {...props} {...this.state} {...common}/>)
                        }></Route>
                 {/* 毕设选题编辑页*/}
                 <Route path="/courses/:coursesId/graduation_topics/:topicId/edit"
                        render={
-                           (props) => (<GraduateTopicNew {...this.props} {...props} {...this.state} />)
+                           (props) => (<GraduateTopicNew {...this.props} {...props} {...this.state} {...common}/>)
                        }></Route>
 
                 {/* 毕设选题详情页 */}
@@ -537,7 +546,7 @@ class CoursesIndex extends Component{
                 {/* 毕设选题列表 */}
                 <Route path="/courses/:coursesId/graduation_topics/:Id" exact
                        render={
-                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }></Route>
 
 
@@ -545,21 +554,21 @@ class CoursesIndex extends Component{
                 {/* 作品评阅 https://www.trustie.net/issues/19981 */}
                 <Route path="/courses/:coursesId/graduation_tasks/:category_id/appraise"
                        render={
-                           (props) => (<GraduationTasksappraise {...this.props} {...props} {...this.state} />)
+                           (props) => (<GraduationTasksappraise {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 新建作品 */}
                 <Route path="/courses/:coursesId/graduation_tasks/:category_id/:task_Id/works/new"
                        render={
-                           (props) => (<GraduationTasksSubmitnewApp {...this.props} {...props} {...this.state} />)
+                           (props) => (<GraduationTasksSubmitnewApp {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 修改作品  */}
                 <Route path="/courses/:coursesId/graduation_tasks/:category_id/:work_Id/works/edit"
                        render={
-                           (props) => (<GraduationTasksSubmiteditApp {...this.props} {...props} {...this.state} />)
+                           (props) => (<GraduationTasksSubmiteditApp {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
@@ -567,20 +576,20 @@ class CoursesIndex extends Component{
 
                 <Route path="/courses/:coursesId/graduation_tasks/:category_id/:task_Id/setting"
                        render={
-                           (props) => (<GraduationTaskssetting {...this.props} {...props} {...this.state} />)
+                           (props) => (<GraduationTaskssetting {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
 
                 <Route path="/courses/:coursesId/graduation_tasks/:category_id/:task_Id/questions"
                        render={
-                           (props) => (<GraduationTasksquestions {...this.props} {...props} {...this.state} />)
+                           (props) => (<GraduationTasksquestions {...this.props} {...props} {...this.state} {...common}/>)
                        }></Route>
 
 
                 <Route path="/courses/:coursesId/graduation_tasks/:category_id/:task_Id/list"
                        render={
-                           (props) => (<GraduationTaskssettinglist {...this.props} {...props} {...this.state} />)
+                           (props) => (<GraduationTaskssettinglist {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
@@ -589,7 +598,7 @@ class CoursesIndex extends Component{
                 {/* 修改毕设任务 https://www.trustie.net/issues/19981 */}
                 <Route path="/courses/:coursesId/graduation_tasks/:category_id/edit"
                        render={
-                           (props) => (<GraduationTaskseditApp {...this.props} {...props} {...this.state} />)
+                           (props) => (<GraduationTaskseditApp {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
@@ -597,7 +606,7 @@ class CoursesIndex extends Component{
                 {/* 新建毕设任务 https://www.trustie.net/issues/19981 */}
                 <Route path="/courses/:coursesId/graduation_tasks/:category_id/new"
                        render={
-                           (props) => (<GraduationTasksnewApp {...this.props} {...props} {...this.state} />)
+                           (props) => (<GraduationTasksnewApp {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
@@ -605,87 +614,87 @@ class CoursesIndex extends Component{
                 {/* 毕设任务列表 https://www.trustie.net/issues/19981 */}
                 <Route path="/courses/:coursesId/graduation_tasks/:Id" exact
                        render={
-                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/*/!* 毕业设计主 https://www.trustie.net/issues/19981 *!/*/}
                 {/*<Route path="/courses/:coursesId/graduation"*/}
                        {/*render={*/}
-                           {/*(props) => (<GraduationTopics {...this.props} {...props} {...this.state} />)*/}
+                           {/*(props) => (<GraduationTopics {...this.props} {...props} {...this.state} {...common}/>)*/}
                        {/*}*/}
                 {/*></Route>*/}
 
                 {/*/!* 资源子目录 https://www.trustie.net/issues/19917 *!/*/}
                 {/*<Route path="/courses/:coursesId/attachment/attachment/:attachmentId"*/}
                 {/*render={*/}
-                {/*(props) => (<Files {...this.props} {...props} {...this.state} />)*/}
+                {/*(props) => (<Files {...this.props} {...props} {...this.state} {...common}/>)*/}
                 {/*}*/}
                 {/*></Route>*/}
                 {/* 教师列表*/}
                 <Route path="/courses/:coursesId/teachers"
                        render={
-                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
                 {/* 学生列表*/}
                 <Route path="/courses/:coursesId/students"
                        render={
-                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
                 {/* 分班列表 */}
                 <Route path="/courses/:coursesId/course_groups/:course_group_id"
                        render={
-                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
                 
                 {/* 普通作业 */}
                 <Route path="/courses/:coursesId/common_homeworks/:category_id" exact 
                 render={
-                    (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                    (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                 }
                 ></Route>
                 {/* 分组作业 */}
                 <Route path="/courses/:coursesId/group_homeworks/:category_id" exact 
                        render={
-                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 普通作业 */}
                 <Route path="/courses/:coursesId/common_homeworks/" strict
                        render={
-                           (props) => (<CommonWork {...this.props} {...props} {...this.state} />)
+                           (props) => (<CommonWork {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 分组作业 */}
                 <Route path="/courses/:coursesId/group_homeworks/" strict
                        render={
-                           (props) => (<GroupWork {...this.props} {...props} {...this.state} />)
+                           (props) => (<GroupWork {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 问卷答题 */}
                 <Route path="/courses/:coursesId/polls/:pollId/users/:login"
                        render={
-                           (props) => (<PollInfo {...this.props} {...props} {...this.state} />)
+                           (props) => (<PollInfo {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 问卷详情  */}
                 <Route path="/courses/:coursesId/polls/:pollId/detail"
                        render={
-                           (props) => (<PollDetail {...this.props} {...props} {...this.state} />)
+                           (props) => (<PollDetail {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 问卷新建 */}
                 <Route path="/courses/:coursesId/polls/:pollid/:news"
                        render={
-                           (props) => (<PollNew {...this.props} {...props} {...this.state} />)
+                           (props) => (<PollNew {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
                 {/*/!* 问卷编辑 *!/*/}
@@ -697,7 +706,7 @@ class CoursesIndex extends Component{
                 {/* 问卷  */}
                 <Route path="/courses/:coursesId/polls/:Id"
                        render={
-                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
@@ -705,20 +714,20 @@ class CoursesIndex extends Component{
                 {/* 试卷查看/评阅 */}
                 <Route exact path="/courses/:coursesId/exercises/:Id/users/:userId"
                     render={
-                    (props)=>(<ExerciseReviewAndAnswer {...this.props} {...props} {...this.state} />)
+                    (props)=>(<ExerciseReviewAndAnswer {...this.props} {...props} {...this.state} {...common}/>)
                     }
                 ></Route>
 
                 {/*试卷新建  */}
                 <Route exact path="/courses/:coursesId/exercises/new"
                     render={
-                    (props) => (<ExerciseNew {...this.props} {...props} {...this.state} />)
+                    (props) => (<ExerciseNew {...this.props} {...props} {...this.state} {...common}/>)
                     }
                 ></Route>
                 {/*试卷新建  */}
                 <Route exact path="/courses/:coursesId/exercises/:Id/edit"
                     render={
-                    (props) => (<ExerciseNew {...this.props} {...props} {...this.state} />)
+                    (props) => (<ExerciseNew {...this.props} {...props} {...this.state} {...common}/>)
                     }
                 ></Route>
 
@@ -726,7 +735,7 @@ class CoursesIndex extends Component{
 
                 <Route path="/courses/:coursesId/exercises/:Id/student_exercise_list"
                        render={
-                           (props) => (<Testpapersettinghomepage {...this.props} {...props} {...this.state} />)
+                           (props) => (<Testpapersettinghomepage {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
@@ -735,14 +744,14 @@ class CoursesIndex extends Component{
                 <Route
                     path="/courses/:coursesId/exercises/:Id/Studentshavecompletedthelist"
                     render={
-                        (props) => (<Studentshavecompletedthelist {...this.props} {...props} {...this.state} />)
+                        (props) => (<Studentshavecompletedthelist {...this.props} {...props} {...this.state} {...common}/>)
                     }
                 >
                 </Route>
                 {/* 试卷  */}
                 <Route path="/courses/:coursesId/exercises/:Id"
                        render={
-                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
@@ -750,65 +759,65 @@ class CoursesIndex extends Component{
                 {/*实训查重详情*/}
                 <Route path="/courses/:coursesId/shixun_homeworks/:homeworkid/review_detail/:userid"
                        render={
-                           (props) => (<ShixunWorkDetails {...this.props} {...props}  {...this.state} />)
+                           (props) => (<ShixunWorkDetails {...this.props} {...props}  {...this.state} {...common}/>)
                        }
                 ></Route>
               <Route path="/courses/:coursesId/shixun_homework/:homeworkid/review_detail/:userid"
                      render={
-                       (props) => (<ShixunWorkDetails {...this.props} {...props}  {...this.state} />)
+                       (props) => (<ShixunWorkDetails {...this.props} {...props}  {...this.state} {...common}/>)
                      }
               ></Route>
 
                 {/*实训查重列表*/}
                 <Route path="/courses/:coursesId/shixun_homeworks/:homeworkid/student_work"
                        render={
-                           (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} />)
+                           (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                        }
                 ></Route>
               <Route path="/courses/:coursesId/shixun_homework/:homeworkid/student_work"
                      render={
-                       (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} />)
+                       (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                      }
               ></Route>
 
                 {/*实训报告*/}
                 <Route path="/courses/:coursesId/shixun_homeworks/:homeworkid/shixun_work_report"
                        render={
-                           (props) => (<ShixunWorkReport {...this.props} {...props}  {...this.state} />)
+                           (props) => (<ShixunWorkReport {...this.props} {...props}  {...this.state} {...common}/>)
                        }
                 ></Route>
               <Route path="/courses/:coursesId/shixun_homework/:homeworkid/shixun_work_report"
                      render={
-                       (props) => (<ShixunWorkReport {...this.props} {...props}  {...this.state} />)
+                       (props) => (<ShixunWorkReport {...this.props} {...props}  {...this.state} {...common}/>)
                      }
               ></Route>
 
                 {/*教师列表*/}
                 <Route path="/courses/:coursesId/shixun_homeworks/:homeworkid/list"
                        render={
-                           (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} />)
+                           (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                        }
                 ></Route>
               <Route path="/courses/:coursesId/shixun_homework/:homeworkid/list"
                      render={
-                       (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} />)
+                       (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                      }
               ></Route>
                {/*实训作业page*/}
               <Route path="/courses/:coursesId/shixun_homeworks/:homeworkid/Page"
                      render={
-                       (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} />)
+                       (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                      }
               ></Route>
                 {/*实训作业设置*/}
                 <Route path="/courses/:coursesId/shixun_homeworks/:homeworkid/settings"
                        render={
-                           (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} />)
+                           (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                        }
                 ></Route>
               <Route path="/courses/:coursesId/shixun_homework/:homeworkid/settings"
                      render={
-                       (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} />)
+                       (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                      }
               ></Route>
                 {/*/!*实训作品列表教师*!/*/}
@@ -847,21 +856,21 @@ class CoursesIndex extends Component{
               {/*实训作业问答主目录*/}
                 <Route path="/courses/:coursesId/shixun_homeworks/:homeworkid/questions"
                        render={
-                           (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} />)
+                           (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                        }
                 ></Route>
 
               {/*实训作业问答子目录*/}
               <Route path="/courses/:coursesId/shixun_homework/:homeworkid/questions"
                      render={
-                       (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} />)
+                       (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                      }
               ></Route>
 
                 {/*新建课堂*/}
                 <Route path="/courses/new"
                        render={
-                           (props) => (<WrappedCoursesNewApp {...this.props} {...props} {...this.state} />)
+                           (props) => (<WrappedCoursesNewApp {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
               {/*新建精品课堂*/}
@@ -869,47 +878,47 @@ class CoursesIndex extends Component{
               {/*id 是否是私有或者公有*/}
               <Route path="/courses/news/:subjectid/newgold/:id"
                      render={
-                       (props) => (<WrappedCoursesNewAppGoldclass {...this.props} {...props} {...this.state} />)
+                       (props) => (<WrappedCoursesNewAppGoldclass {...this.props} {...props} {...this.state} {...common}/>)
                      }
               ></Route>
               {/*修改精品课堂*/}
               <Route path="/courses/:coursesId/newgolds/settings"
                      render={
-                       (props) => (<WrappedCoursesNewAppGoldclass {...this.props} {...props} {...this.state} />)
+                       (props) => (<WrappedCoursesNewAppGoldclass {...this.props} {...props} {...this.state} {...common}/>)
                      }
               ></Route>
                 {/*修改课堂*/}
                 <Route path="/courses/:coursesId/settings"
                        render={
-                           (props) => (<WrappedCoursesNewApp {...this.props} {...props} {...this.state} />)
+                           (props) => (<WrappedCoursesNewApp {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 实训作业子页面*/}
                 <Route path="/courses/:coursesId/shixun_homework/:category_id"
                        render={
-                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 实训作业页面*/}
                 <Route path="/courses/:coursesId/shixun_homeworks/:main_id"
                        render={
-                         (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                         (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/*/!*实训作业and课堂详情页*!/*/}
                 <Route path="/courses/:coursesId"
                         render={
-                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                         }
                 ></Route>
 
                 {/*课堂首页*/}
                 <Route path="/courses"
                        render={
-                           (props) => (<CoursesHome {...this.props} {...props} {...this.state} />)
+                           (props) => (<CoursesHome {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
                 {/*<Route exact path="/courses" component={CoursesHome}  {...this.props}  {...props}  {...this.state} ></Route>*/}
@@ -919,4 +928,4 @@ class CoursesIndex extends Component{
     }
 }
 
-export default ImageLayerOfCommentHOC({imgSelector: '.imageLayerParent img, .imageLayerParent .imageTarget', parentSelector: '.newMain'}) (CNotificationHOC() ( SnackbarHOC() ( TPMIndexHOC(CoursesIndex) )));
\ No newline at end of file
+export default withRouter(ImageLayerOfCommentHOC({imgSelector: '.imageLayerParent img, .imageLayerParent .imageTarget', parentSelector: '.newMain'}) (CNotificationHOC() ( SnackbarHOC() ( TPMIndexHOC(CoursesIndex) ))));
\ No newline at end of file

From ec11918b6e4ee562057026fe671ed5ee6d959746 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Mon, 2 Sep 2019 16:00:33 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/busyWork/CommonWorkQuestion.js      | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkQuestion.js b/public/react/src/modules/courses/busyWork/CommonWorkQuestion.js
index 472ebd557..04ff2a066 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkQuestion.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkQuestion.js
@@ -81,11 +81,7 @@ class CommonWorkQuestion extends Component{
     let category_id=this.props.match.params.category_id;
     let task_Id=this.props.match.params.task_Id;
     const isGroup = this.props.isGroup()
-    /** 
-    <React.Fragment>
-                <a className={"fr color-blue font-16"} href={exportResultUrl}>导出成绩</a>
-              </React.Fragment>
-    */
+    
     return(
       <React.Fragment>
         

From 9cbbda67449c27bf369de3205a468d60402ee0d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Mon, 2 Sep 2019 16:19:03 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/message/js/MessagSub.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js
index 04b893ddb..fccfbb0b2 100644
--- a/public/react/src/modules/message/js/MessagSub.js
+++ b/public/react/src/modules/message/js/MessagSub.js
@@ -584,7 +584,7 @@ class MessagSub extends Component{
 													 	`
 													 }
 												 </style>
-												 <p className="color-grey-6 break_word_firefox yslspansk markdown-body mt10" style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML(item.content).replace(/▁/g, "▁▁▁")}} ></p>
+												 <p className="color-grey-6 yslspansk markdown-body mt10" style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML(item.content).replace(/▁/g, "▁▁▁")}} ></p>
 											 </div>
 
 											 <span className={item.new_tiding===true?"new-point fr mr40 mt22":""}></span>

From 5ec82e8032a56777b0d989d9eba1bd7afc62e880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Mon, 2 Sep 2019 16:27:26 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/courses/poll/PollNew.js | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js
index fb079d621..70fff7e13 100644
--- a/public/react/src/modules/courses/poll/PollNew.js
+++ b/public/react/src/modules/courses/poll/PollNew.js
@@ -1834,8 +1834,8 @@ class PollNew extends Component {
 					question_title: object.question.question_title,
 					question_type: number,
 					is_necessary: object.question.is_necessary,
-					max_choices: max_choicess===undefined?length:max_choicess===null?length:max_choicess===0?length:max_choicess,
-					min_choices: min_choicess===undefined?2:min_choicess===null?2:min_choicess===0?2:min_choicess,
+					max_choices: max_choicess===undefined||max_choicess===null||max_choicess===0||max_choicess==="0"?null:max_choicess,
+					min_choices: min_choicess===undefined||min_choicess===null||min_choicess===0||min_choicess==="0"?null:min_choicess,
 					question_answers: option,
 					question_other_answer: null,
 					insert_id: insert_id
@@ -1911,8 +1911,8 @@ class PollNew extends Component {
 					question_title: object.question.question_title,
 					question_type: number,
 					is_necessary: object.question.is_necessary,
-					max_choices: max_choicess===undefined?length:max_choicess===null?length:max_choicess===0?length:max_choicess,
-					min_choices: min_choicess===undefined?2:min_choicess===null?2:min_choicess===0?2:min_choicess,
+					max_choices: max_choicess===undefined||max_choicess===null||max_choicess===0||max_choicess==="0"?null:max_choicess,
+					min_choices: min_choicess===undefined||min_choicess===null||min_choicess===0||min_choicess==="0"?null:min_choicess,
 					question_answers: option,
 					question_other_answer: null,
 				};
@@ -2775,7 +2775,7 @@ class PollNew extends Component {
 									<span
 										className="selectAnswer ml10">{item.question.is_necessary === 1 ? "必答" : item.question.question_type === 2 ? "选答" : "选答"}</span>
 									<span style={{color: "#4B4B4B"}}
-												className="font-16 mt10 ml10">{(item.question.min_choices === undefined && item.question.max_choices === undefined ? "" : item.question.min_choices === null && item.question.max_choices === null ? "" : item.question.min_choices === 0 && item.question.max_choices === 0 ? "" : "可选" + item.question.min_choices + "-" + item.question.max_choices + "项")}</span>
+												className="font-16 mt10 ml10">{(item.question.min_choices === undefined && item.question.max_choices === undefined ? "不限制" : item.question.min_choices === null && item.question.max_choices === null ? "不限制" : item.question.min_choices === 0 && item.question.max_choices === 0 ? "": item.question.min_choices === "null" && item.question.max_choices === "null" ? "不限制"  : "可选" + item.question.min_choices + "-" + (item.question.max_choices===undefined||item.question.max_choices===null||item.question.max_choices===""||item.question.max_choices==="null"?item.question.answers.length:item.question.max_choices) + "项")}</span>
 									{
 										polls_status === undefined || polls_status === 1 ?
 											<span className="fr">
@@ -2963,7 +2963,7 @@ class PollNew extends Component {
                                                         <span
 																													className="color-grey-6 mr20 font-16 lineh-40 fl">可选</span>
 																						<div className="mr40 flex1 ">
-																							{/*可选最小*/}
+																							{/*可选最小1*/}
 																							<style>
 																								{
 																									`
@@ -2981,8 +2981,7 @@ class PollNew extends Component {
 																							</style>
 																							<Select className="fl  w100"
 																											onChange={(value) => this.HandleGradationGroupChangee(value, indexo, itemo.question.max_choices, itemo.question.answers.length)}
-																											value={itemo.question.min_choices === 0 || itemo.question.min_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.min_choices}
-
+																											value={itemo.question.min_choices === null || itemo.question.min_choices === undefined ||itemo.question.min_choices === "null"|| itemo.question.min_choices === 0 || itemo.question.min_choices === "0"?"0": itemo.question.min_choices}
 																							>
 																								<Option value={"0"}>--</Option>
 																								{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {
@@ -2993,10 +2992,10 @@ class PollNew extends Component {
 																							</Select>
 																							<span
 																								className="ml10 mr10 color-grey-6 lineh-40 fl">~</span>
-																							{/*可选最大*/}
+																							{/*可选最大2*/}
 																							<Select className="fl w100"
 																											onChange={(value) => this.HandleGradationGroupChangeee(value, indexo,itemo.question.min_choices,itemo.question.answers.length)}
-																											value={itemo.question.max_choices === 0 || itemo.question.max_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.max_choices}
+																											value={itemo.question.max_choices === null || itemo.question.max_choices === undefined ||itemo.question.max_choices === "null"|| itemo.question.max_choices === 0 || itemo.question.max_choices === "0"?"0": itemo.question.max_choices}
 																							>
 																								<Option value={"0"}>--</Option>
 																								{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {
@@ -3224,8 +3223,7 @@ class PollNew extends Component {
 																								</style>
 																								<Select className="fl  w100"
 																												onChange={(value) => this.HandleGradationGroupChangee(value, indexo, itemo.question.max_choices, itemo.question.answers.length)}
-																												value={itemo.question.min_choices === 0 || itemo.question.min_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.min_choices}
-
+																												value={itemo.question.min_choices === null || itemo.question.min_choices === undefined ||itemo.question.min_choices === "null"|| itemo.question.min_choices === 0 || itemo.question.min_choices === "0"?"0": itemo.question.min_choices}
 																								>
 																									<Option value={String("0")}>--</Option>
 																									{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {
@@ -3239,7 +3237,7 @@ class PollNew extends Component {
 																								{/*可选最大*/}
 																								<Select className="fl w100"
 																												onChange={(value) => this.HandleGradationGroupChangeee(value, indexo,itemo.question.min_choices,itemo.question.answers.length)}
-																												value={itemo.question.max_choices === 0 || itemo.question.max_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.max_choices}
+																												value={itemo.question.max_choices === null || itemo.question.max_choices === undefined ||itemo.question.max_choices === "null"|| itemo.question.max_choices === 0 || itemo.question.max_choices === "0"?"0": itemo.question.max_choices}
 																								>
 																									<Option value={String("0")}>--</Option>
 																									{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {
@@ -3476,8 +3474,7 @@ class PollNew extends Component {
 																					</style>
 																					<Select className="fl  w100"
 																									onChange={(value) => this.HandleGradationGroupChangee(value, indexo, itemo.question.max_choices, itemo.question.answers.length)}
-																									value={itemo.question.min_choices === 0 || itemo.question.min_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.min_choices}
-
+																									value={itemo.question.min_choices === null || itemo.question.min_choices === undefined ||itemo.question.min_choices === "null"|| itemo.question.min_choices === 0 || itemo.question.min_choices === "0"?"0": itemo.question.min_choices}
 																					>
 																						<Option value={String("0")}>--</Option>
 																						{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {
@@ -3491,7 +3488,7 @@ class PollNew extends Component {
 																					{/*可选最大*/}
 																					<Select className="fl w100"
 																									onChange={(value) => this.HandleGradationGroupChangeee(value, indexo,itemo.question.min_choices,itemo.question.answers.length)}
-																									value={itemo.question.max_choices === 0 || itemo.question.max_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.max_choices}
+																									value={itemo.question.max_choices === null || itemo.question.max_choices === undefined ||itemo.question.max_choices === "null"|| itemo.question.max_choices === 0 || itemo.question.max_choices === "0"?"0": itemo.question.max_choices}
 																					>
 																						<Option value={String("0")}>--</Option>
 																						{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {

From d89037d07cfbf09c2df5b424689e37a48c344df3 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Mon, 2 Sep 2019 16:27:56 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/members/studentsList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js
index fc8346fa3..08f4971ce 100644
--- a/public/react/src/modules/courses/members/studentsList.js
+++ b/public/react/src/modules/courses/members/studentsList.js
@@ -600,7 +600,7 @@ class studentsList extends Component{
                     font-size: 14px;
                 }
                 .drop_down_menu {
-                    width: 93px;
+                    /*width: 93px;*/
                 }
                 .drop_down_menu li {
                     width:100%;

From b860e61e006a842839a969a28eb299ee0b51b563 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Mon, 2 Sep 2019 16:29:16 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/busyWork/CommonWorkDetailIndex.js | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
index 0e86cf420..5693b3788 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
@@ -129,20 +129,21 @@ class CommonWorkDetailIndex extends Component{
           })
         }
       }else {
-        this.props.showNotification(`正在下载中`);
-
-        this.setState({ donwloading: true })
-        downloadFile({
-          url: url,
-          successCallback: (url) => {
-            this.setState({ donwloading: false })
-            console.log('successCallback')
-          },
-          failCallback: (responseHtml, url) => {
-            this.setState({ donwloading: false })
-            console.log('failCallback')
-          }
-        })
+        this.props.slowDownload(url)
+
+        // this.props.showNotification(`正在下载中`);
+        // this.setState({ donwloading: true })
+        // downloadFile({
+        //   url: url,
+        //   successCallback: (url) => {
+        //     this.setState({ donwloading: false })
+        //     console.log('successCallback')
+        //   },
+        //   failCallback: (responseHtml, url) => {
+        //     this.setState({ donwloading: false })
+        //     console.log('failCallback')
+        //   }
+        // })
         // window.open("/api"+url, '_blank');
       }
     }).catch((error) => {

From 81e11909d1f94d1298ccdca01c95213f03995d19 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Mon, 2 Sep 2019 16:30:51 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/busyWork/common/TabRightComponents.js    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/common/TabRightComponents.js b/public/react/src/modules/courses/busyWork/common/TabRightComponents.js
index 5320dd0ca..34044330d 100644
--- a/public/react/src/modules/courses/busyWork/common/TabRightComponents.js
+++ b/public/react/src/modules/courses/busyWork/common/TabRightComponents.js
@@ -63,8 +63,9 @@ class TabRightComponents extends Component{
           })
         }
       }else {
-        this.props.showNotification(`正在下载中`);
-        window.open("/api"+url, '_blank');
+        this.props.slowDownload(url)
+        // this.props.showNotification(`正在下载中`);
+        // window.open("/api"+url, '_blank');
       }
     }).catch((error) => {
       console.log(error)

From 9d832a09c69fcc004dc8c67c26917e378a438927 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Mon, 2 Sep 2019 16:31:31 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E9=A2=98=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_commons_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb
index 081e2fdf1..8268382bd 100644
--- a/app/controllers/homework_commons_controller.rb
+++ b/app/controllers/homework_commons_controller.rb
@@ -1322,6 +1322,8 @@ class HomeworkCommonsController < ApplicationController
           else
             new_homework_bank = add_to_homework_bank_f homework
             new_homework_bank.save!
+
+            homework.update_attributes!(homework_bank_id: new_homework_bank.id)
           end
 
         rescue Exception => e

From 306fcab4347f4af2ebd5beabe692db8fd237298c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Mon, 2 Sep 2019 16:32:13 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/poll/PollNew.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js
index 70fff7e13..9c00ae30d 100644
--- a/public/react/src/modules/courses/poll/PollNew.js
+++ b/public/react/src/modules/courses/poll/PollNew.js
@@ -2775,7 +2775,7 @@ class PollNew extends Component {
 									<span
 										className="selectAnswer ml10">{item.question.is_necessary === 1 ? "必答" : item.question.question_type === 2 ? "选答" : "选答"}</span>
 									<span style={{color: "#4B4B4B"}}
-												className="font-16 mt10 ml10">{(item.question.min_choices === undefined && item.question.max_choices === undefined ? "不限制" : item.question.min_choices === null && item.question.max_choices === null ? "不限制" : item.question.min_choices === 0 && item.question.max_choices === 0 ? "": item.question.min_choices === "null" && item.question.max_choices === "null" ? "不限制"  : "可选" + item.question.min_choices + "-" + (item.question.max_choices===undefined||item.question.max_choices===null||item.question.max_choices===""||item.question.max_choices==="null"?item.question.answers.length:item.question.max_choices) + "项")}</span>
+												className="font-16 mt10 ml10">{(item.question.min_choices === undefined && item.question.max_choices === undefined ? "不限制" : item.question.min_choices === null && item.question.max_choices === null ? "不限制" : item.question.min_choices === 0 && item.question.max_choices === 0 ? "": item.question.min_choices === "null" && item.question.max_choices === "null" ? "不限制"  : "可选" +(item.question.min_choices===undefined||item.question.min_choices===null||item.question.min_choices===""||item.question.min_choices==="null"?2:item.question.min_choices) + "-" + (item.question.max_choices===undefined||item.question.max_choices===null||item.question.max_choices===""||item.question.max_choices==="null"?item.question.answers.length:item.question.max_choices) + "项")}</span>
 									{
 										polls_status === undefined || polls_status === 1 ?
 											<span className="fr">

From bc06f54ce92ea73c9434fd4258713b6134c4c8f0 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Mon, 2 Sep 2019 16:39:45 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E9=A2=98=E5=BA=93=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/exercises_controller.rb        | 1 +
 app/controllers/graduation_tasks_controller.rb | 1 +
 app/controllers/polls_controller.rb            | 1 +
 3 files changed, 3 insertions(+)

diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb
index 5db704fce..3be35345e 100644
--- a/app/controllers/exercises_controller.rb
+++ b/app/controllers/exercises_controller.rb
@@ -354,6 +354,7 @@ class ExercisesController < ApplicationController
             #   question_bank = QuestionBank.new ques_params
             #   question_bank.save
             # end
+            exercise.update_attributes!(exercise_bank_id: current_ex_bank.id)
           end
           # 试卷的问题的输入
           exercise.exercise_questions.each do |q|
diff --git a/app/controllers/graduation_tasks_controller.rb b/app/controllers/graduation_tasks_controller.rb
index 727bdb77e..fe7511e29 100644
--- a/app/controllers/graduation_tasks_controller.rb
+++ b/app/controllers/graduation_tasks_controller.rb
@@ -301,6 +301,7 @@ class GraduationTasksController < ApplicationController
                                               course_list_id: @course.course_list_id)
 
             task_bank.save!
+            task.update_attributes!(gtask_bank_id: task_bank.id)
           end
           task.attachments.each do |attachment|
             att = attachment.copy
diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb
index bc549cf1d..7cb7ee800 100644
--- a/app/controllers/polls_controller.rb
+++ b/app/controllers/polls_controller.rb
@@ -562,6 +562,7 @@ class PollsController < ApplicationController
               question_bank = QuestionBank.new ques_params
               question_bank.save
             end
+            poll.update_attributes!(exercise_bank_id: current_ex_bank.id)
           end
           # 问卷的问题的输入
           poll.poll_questions.each do |f|