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

public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js

@@ -300,9 +300,9 @@ class CommonWorkDetailIndex extends Component{
                         className={`${isListModule ? 'active' : '' } `}
                         to={`/courses/${courseId}/${moduleEngName}/${workId}/list`}>作品列表</Link>
                   <Link 
-                        onClick={() => this.setState({moduleName: '作业问答'})}
+                        onClick={() => this.setState({moduleName: '作业描述'})}
-                        className={`${childModuleName == '作业问答' ? 'active' : '' } `}
+                        className={`${childModuleName == '作业描述' ? 'active' : '' } `}
-                        to={`/courses/${courseId}/${moduleEngName}/${workId}/question`}>作业问答</Link>
+                        to={`/courses/${courseId}/${moduleEngName}/${workId}/question`}>作业描述</Link>
                   {view_answer == true && <Link 
                         onClick={() => this.setState({moduleName: '参考答案'})}
                         className={`${childModuleName == '参考答案' ? 'active' : '' } `} 

public/react/src/modules/courses/busyWork/CommonWorkListTemplate.js

@@ -105,7 +105,7 @@ class CommonWorkSetting extends Component{
                   <Link 
                         className="active"
                         to={"/courses/"+courseId+"/graduation/graduation_tasks/"+category_id+"/"+task_Id+"/list"}>作品列表</Link>
-                  <Link to={"/courses/"+courseId+"/graduation/graduation_tasks/"+category_id+"/"+task_Id+"/questions"}>作业问答</Link>
+                  <Link to={"/courses/"+courseId+"/graduation/graduation_tasks/"+category_id+"/"+task_Id+"/questions"}>作业描述</Link>
                   <Link to={"/courses/"+courseId+"/graduation/graduation_tasks/"+category_id+"/"+task_Id+"/questions"}>参考答案</Link>
                   <Link 
                         style={{paddingLeft:'38px'}}

public/react/src/modules/courses/busyWork/CommonWorkQuestion.js

@@ -45,7 +45,7 @@ class CommonWorkQuestion extends Component{
         }, () => {
         })
         this.props.initWorkDetailCommonState && this.props.initWorkDetailCommonState( Object.assign({...result.data}, {
-          moduleName: '作业问答'
+          moduleName: '作业描述'
         }))
       }
 

public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js

@@ -139,8 +139,8 @@ class WorkDetailPageHeader extends Component{
                         className={`${childModuleName == '作品列表' ? 'active' : '' } `}
                         to={`/courses/${courseId}/${moduleEngName}/${workId}/list`}>作品列表</Link>
                   <Link 
-                        className={`${childModuleName == '作业问答' ? 'active' : '' } `}
+                        className={`${childModuleName == '作业描述' ? 'active' : '' } `}
-                        to={`/courses/${courseId}/${moduleEngName}/${workId}/question`}>作业问答</Link>
+                        to={`/courses/${courseId}/${moduleEngName}/${workId}/question`}>作业描述</Link>
                   {view_answer == true && <Link 
                         className={`${childModuleName == '参考答案' ? 'active' : '' } `}
                         to={`/courses/${courseId}/${moduleEngName}/${workId}/answer`}>参考答案</Link>}

public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js

@@ -1088,7 +1088,7 @@ class GraduationTaskssettingapp extends Component{
                 <div className="mt10 clearfix edu-back-white poll_list pl20" id={"publishtimeend"}>
 
                   <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/list"}>任务列表</Link>
-                  <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/questions"}>任务问答</Link>
+                  <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/questions"}>毕设描述</Link>
                   <Link className="active"
                         style={{paddingLeft:'38px'}}
                         to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/setting?tab=3"}>设置</Link>

public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js

@@ -1117,7 +1117,7 @@ class GraduationTaskssettinglist extends Component{
 											{/*<a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xls"} className={"fr color-blue font-16"}>导出成绩</a>*/}
 											{/*<a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.zip"} className={"fr color-blue font-16"}>导出作品附件</a>*/}
 											<Link className="active"  to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/list"}>任务列表</Link>
-											<Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/questions"}>任务问答</Link>
+											<Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/questions"}>毕设描述</Link>
 											<Link style={{paddingLeft:'38px'}}
 											      to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/setting?tab=3"}>设置</Link>
 
@@ -1415,7 +1415,7 @@ class GraduationTaskssettinglist extends Component{
 											<div className="mt10 clearfix edu-back-white poll_list pl20">
 
 												<Link className="active"  to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/list"}>任务列表</Link>
-												<Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/questions"}>任务问答</Link>
+												<Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/questions"}>毕设描述</Link>
 												<Link style={{paddingLeft:'38px'}}
 												      to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/setting"}>设置</Link>
 

public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js

@@ -330,7 +330,7 @@ class GraduationTasksquestions extends Component{
                 <div className="mt10 clearfix edu-back-white poll_list pl20">
 
                   <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/list"}>任务列表</Link>
-                  <Link className="active"  to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/questions"}>任务问答</Link>
+                  <Link className="active"  to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/questions"}>毕设描述</Link>
                   <Link style={{paddingLeft:'38px'}}
                         to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/setting?tab=3"}>设置</Link>
 

public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js

@@ -121,7 +121,7 @@ class GraduateTopicDetail extends Component{
               <div className="fl mt6 task_menu_ul ml30">
                 <Menu mode="horizontal" defaultSelectedKeys="1" onClick={this.onChangeStatus}>
                   <Menu.Item key="1">选题列表</Menu.Item>
-                  <Menu.Item key="2">选题问答</Menu.Item>
+                  <Menu.Item key="2">选题描述</Menu.Item>
                 </Menu>
               </div>
               {/* null: 未选题 0：待确认 1：已同意 2：已拒绝 */}

public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js

@@ -162,7 +162,7 @@ class ShixunHomeworkPage extends Component {
 						<div className="stud-class-set bor-bottom-greyE ">
 							<div className=" clearfix edu-back-white poll_list">
 								<a className={parseInt(tab) === 0 ? "active" : ""} onClick={(e) => this.ChangeTab(0)}>作品列表</a>
-								<a className={parseInt(tab) === 1 ? "active" : ""} onClick={(e) => this.ChangeTab(1)}>作业问答</a>
+								<a className={parseInt(tab) === 1 ? "active" : ""} onClick={(e) => this.ChangeTab(1)}>作业描述</a>
 								{this.props.isAdmin() ?
 									this.state.code_review === true || jobsettingsdatapage === undefined ? [""] : jobsettingsdatapage.data.homework_status[0] === "未发布" ? "" :
 										<a

public/react/src/modules/courses/studentWork/StudentHomework.js

@@ -60,7 +60,7 @@ class StudentHomework extends Component{
               <div className="stud-class-set bor-bottom-greyE">
                 <div className="mt10 clearfix edu-back-white poll_list pl20">
                   <a className="active">作业列表</a>
-                  <a>作业问答</a>
+                  <a>作业描述</a>
                   <a>配置</a>
                   <a className={"fr color-blue font-16"}>立即发布</a>
                   <a className={"fr color-blue font-16"}>导出成绩</a>