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

---
 .../courses/shixunHomework/Listofworksstudentone.js  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 0cd04f5d5..5eed392d5 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/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);
 		}
 	}
 	//排序

From 764d0cc071242da038549a43e960234d78514698 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 11 Oct 2019 09:48:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=AF=95=E8=AE=BE=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=9A=84=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/graduation_tasks/_public_navigation.json.jbuilder | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/graduation_tasks/_public_navigation.json.jbuilder b/app/views/graduation_tasks/_public_navigation.json.jbuilder
index 00280c31b..992d03fd8 100644
--- a/app/views/graduation_tasks/_public_navigation.json.jbuilder
+++ b/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
\ No newline at end of file
+json.status graduation.status
+json.end_time graduation.end_time
\ No newline at end of file