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

app/controllers/ecs/reach_evaluations_controller.rb

@@ -1,7 +1,7 @@
 class Ecs::ReachEvaluationsController < Ecs::BaseController
 
   def show
-    preload = { ec_graduation_subitems: { ec_course_support: [:ec_course, :ec_graduation_requirement_calculation] } }
+    preload = { ec_graduation_subitems: { ec_course_supports: [:ec_course, :ec_graduation_requirement_calculation] } }
     @graduation_requirements = current_year.ec_graduation_requirements.includes(preload)
 
     respond_to do |format|

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

@@ -1169,9 +1169,11 @@ class GraduationTaskssettingapp extends Component{
                 <div className="stud-class-set bor-bottom-greyE pd20 edu-back-white pl36">
                   <div className={" font-16 color-dark h20 mb20"}>评分设置 </div>
                   <div className={"font-16 h20 mb20"}>最终成绩组成 <span className={"font-14 color-grey-c"}>（取各教师最终评分的平均分）</span></div>
-                  <Checkbox className="ml40 font-16" checked={crosscomment} onChange={this.funcrosscomment}
-														disabled={this.props.isAdmin()===true?flagPageEdit===true?commentstatustype===3?true:false:true:true} >启用交叉评阅 <span className={"font-14 color-grey-c"}>（给老师分配其他指导老师的学生作品）</span>
-                  </Checkbox>
+									<Tooltip placement="bottom" title={this.props.isAdmin()===true?flagPageEdit===true?commentstatustype===3?"正在交叉评阅，不可取消":"":"":""}>
+										<Checkbox className="ml40 font-16" checked={crosscomment} onChange={this.funcrosscomment}
+															disabled={this.props.isAdmin()===true?flagPageEdit===true?commentstatustype===3?true:false:true:true} >启用交叉评阅 <span className={"font-14 color-grey-c"}>（给老师分配其他指导老师的学生作品）</span>
+										</Checkbox>
+									</Tooltip>
                   {crosscomment===true?<div>
                   <div className={"h20 mb30 ml30 mt20 ml87"}>
                     <span>开始时间：</span>

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

@@ -40,7 +40,7 @@ class GraduationTaskssettinglist extends Component{
 			task_status:undefined,
 			cross_comment:null,
 			search:null,
-			order:"updated_at",
+			order:"update_time",
 			b_order:"desc",
 			course_group:undefined,
 			loadingstate:true,
@@ -92,6 +92,7 @@ class GraduationTaskssettinglist extends Component{
 
 	seacthdata=(teacher_comment,task_status,course_group,cross_comment,order,b_order,search,pages)=>{
      let{page,limit}=this.state;
+
 		// console.log(teacher_comment,task_status,course_group,cross_comment,order,b_order,search)
 		let task_Id=this.props.match.params.task_Id;
 		let url="/graduation_tasks/"+task_Id+"/tasks_list.json";
@@ -106,7 +107,7 @@ class GraduationTaskssettinglist extends Component{
 				order:order===null?undefined:order,
 				b_order:b_order===null?undefined:b_order,
 				search:search===null?undefined:search,
-				page:pages===null?undefined:page,
+				page:pages,
 				limit:20,
 			},
 			paramsSerializer: function(params) {
@@ -281,8 +282,6 @@ class GraduationTaskssettinglist extends Component{
 	funtaskstatus=(checkedValues,key)=>{
 		// console.log(checkedValues)
 
-		console.log(checkedValues);
-
 		let {teacher_comment, course_group, cross_comment, order, b_order, search} = this.state;
 
 
@@ -599,7 +598,7 @@ class GraduationTaskssettinglist extends Component{
 		this.cannerassocition();
 		let {taskslistdata}=this.state;
 		let url = "/graduation_tasks/"+taskslistdata.task_id+"/graduation_works/cancel_relate_project.json";
-		console.log(url)
+
 		axios.get(url).then((result)=>{
 
 			if(result.data.status===0){
@@ -655,8 +654,7 @@ class GraduationTaskssettinglist extends Component{
 
 	/// 确认是否下载
 	confirmysl(url){
-		debugger;
-		console.log(1);
+
 		let  {teacher_comment, task_status, course_group, cross_comment, order, b_order, search,page} =this.state;
 
 		let params ={
@@ -958,7 +956,7 @@ class GraduationTaskssettinglist extends Component{
 
 		}
 
-		console.log(this.props.questionslist.status)
+
 		return(
 			<React.Fragment>
 
@@ -1221,10 +1219,10 @@ class GraduationTaskssettinglist extends Component{
 													{this.props.isAdmin()===true?<div className="fr color-grey-6 edu-menu-panel">
 														<p>
 															<a data-remote="true" class="color-grey-6 font-12">
-															{order==="updated_at"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}排序</a>
+															{order==="update_time"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}排序</a>
 															<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i></p>
 														<ul className="edu-menu-list edu-menu-lists" style={{width: '87px'}}>
-															<li onClick={(e)=>this.funorder("updated_at")}><a data-remote="true">更新时间</a>
+															<li onClick={(e)=>this.funorder("update_time")}><a data-remote="true">更新时间</a>
 															</li>
 															<li onClick={(e)=>this.funorder("work_score" )}><a  data-remote="true">最终成绩</a>
 															</li>
@@ -1415,10 +1413,10 @@ class GraduationTaskssettinglist extends Component{
 																	</span>
 																	 <div className="fr color-grey-6 edu-menu-panel">
 																		<p><a data-remote="true">
-																			{order==="updated_at"?"时间":order==="work_score"?"成绩":order==="student_id"?"学号":""}排序</a><i
+																			{order==="update_time"?"时间":order==="work_score"?"成绩":order==="student_id"?"学号":""}排序</a><i
 																			className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i></p>
 																		<ul className="edu-menu-list">
-																			<li onClick={(e)=>this.funorder("updated_at")} className={order==="updated_at"?"none":""}><a data-remote="true">时间</a>
+																			<li onClick={(e)=>this.funorder("update_time")} className={order==="update_time"?"none":""}><a data-remote="true">时间</a>
 																			</li>
 																			<li onClick={(e)=>this.funorder("work_score" )} className={order==="work_score"?"none":""}><a  data-remote="true">成绩</a>
 																			</li>