Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/views/graduation_tasks/_public_navigation.json.jbuilder

@@ -2,4 +2,5 @@ json.partial! "graduation_topics/show_navigation", locals: {course: course, grad
 json.task_status task_curr_status(graduation, course)[:status]
 json.task_name graduation.name
 json.task_id graduation.id
-json.status graduation.status
+json.status graduation.status
+json.end_time graduation.end_time

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

@@ -2627,9 +2627,11 @@ class Listofworksstudentone extends Component {
 		//        return
 		//    }
 		this.setState({
-			loadingstate: true
+			loadingstate: true,
+			page:1,
+			limit:20,
 		})
-		this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, value, this.state.page, this.state.limit);
+		this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, value, 1,20);
 		// console.log(value)
 
 
@@ -2641,9 +2643,11 @@ class Listofworksstudentone extends Component {
 			// this.onSearch();
 			// console.log("使用了回车键");
 			this.setState({
-				loadingstate: true
+				loadingstate: true,
+				page:1,
+				limit:20,
 			})
-			this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
+			this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, 1,20);
 		}
 	}
 	//排序