Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

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

@@ -1103,8 +1103,8 @@ class GraduationTaskssettingapp extends Component{
                   {this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr20 mt20" style={{"paddingLeft":"0px"}}>
                     导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
                     <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
-                      <li><a onClick={()=>this.confirmysl("/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx")} className="color-dark">导出成绩</a></li>
-                      <li><a onClick={()=>this.confirmysl("/api/graduation_tasks/"+task_Id+"/tasks_list.zip")} className="color-dark">导出作品附件</a></li>
+                      <li><a onClick={()=>this.confirmysl("/graduation_tasks/"+task_Id+"/tasks_list.xlsx")} className="color-dark">导出成绩</a></li>
+                      <li><a onClick={()=>this.confirmysl("/graduation_tasks/"+task_Id+"/tasks_list.zip")} className="color-dark">导出作品附件</a></li>
                     </ul>
                   </li>:""}
 

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

@@ -73,14 +73,14 @@ class GraduationTaskssettinglist extends Component{
 		//get 数组
 		axios.get(url,{
 			params: {
-				teacher_comment:teacher_comment,
-				task_status:task_status,
-				course_group:course_group,
-				cross_comment:cross_comment,
-				order:order,
-				b_order:b_order,
-				search:search,
-				page:pages,
+				teacher_comment:teacher_comment===null?undefined:teacher_comment,
+				task_status:task_status===null?undefined:task_status,
+				course_group:course_group===null?undefined:course_group,
+				cross_comment:cross_comment===null?undefined:cross_comment,
+				order:order===null?undefined:order,
+				b_order:b_order===null?undefined:b_order,
+				search:search===null?undefined:search,
+				page:pages===null?undefined:pages,
 				limit:20,
 			},
 			paramsSerializer: function(params) {
@@ -144,11 +144,16 @@ class GraduationTaskssettinglist extends Component{
 		let {teacher_comment, task_status, course_group, cross_comment, order, b_order, search} = this.state;
 
 		this.setState({
-			teacher_comment:list.length===key?null:list,
+			teacher_comment:list.length===key?undefined:list[0],
 			loadingstate:true
 		})
 
-		this.seacthdata(list.length===key?undefined:list, task_status, course_group, cross_comment, order, b_order, search,this.state.page);
+		if(list.length===key){
+
+		}else{
+			this.seacthdata(list[0], task_status, course_group, cross_comment, order, b_order, search,this.state.page);
+
+		}
 
 	}
 
@@ -1079,8 +1084,8 @@ class GraduationTaskssettinglist extends Component{
 											{this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr20 mt20" style={{"paddingLeft":"0px"}}>
 												导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
 												<ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
-													<li><a onClick={()=>this.confirmysl("/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx")} className="color-dark">学生成绩</a></li>
-													<li><a onClick={()=>this.confirmysl("/api/graduation_tasks/"+task_Id+"/tasks_list.zip")} className="color-dark">作品附件</a></li>
+													<li><a onClick={()=>this.confirmysl("/graduation_tasks/"+task_Id+"/tasks_list.xlsx")} className="color-dark">学生成绩</a></li>
+													<li><a onClick={()=>this.confirmysl("/graduation_tasks/"+task_Id+"/tasks_list.zip")} className="color-dark">作品附件</a></li>
 												</ul>
 											</li>:""}
 

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

@@ -352,8 +352,8 @@ class GraduationTasksquestions extends Component{
                   {this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr20 mt20" style={{"paddingLeft":"0px"}}>
                     导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
                     <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
-                      <li><a onClick={()=>this.confirmysl("/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx")} className="color-dark">导出成绩</a></li>
-                      <li><a onClick={()=>this.confirmysl("/api/graduation_tasks/"+task_Id+"/tasks_list.zip")} className="color-dark">导出作品附件</a></li>
+                      <li><a onClick={()=>this.confirmysl("/graduation_tasks/"+task_Id+"/tasks_list.xlsx")} className="color-dark">导出成绩</a></li>
+                      <li><a onClick={()=>this.confirmysl("/graduation_tasks/"+task_Id+"/tasks_list.zip")} className="color-dark">导出作品附件</a></li>
                     </ul>
                   </li>:""}