From a402370c1a596d78c5d42fc7dd5e45c2a946b171 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 10 Sep 2019 17:32:48 +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

---
 .../shixunHomework/ShixunHomeworkPage.js      | 42 +++++++++++++++++--
 .../shixunreport/Shixunechart.js              |  2 +-
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index 4f403205d..789514130 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -20,6 +20,7 @@ import Startshixuntask from "../coursesPublic/Startshixuntask";
 
 import TPMMDEditor from "../../tpm/challengesnew/TPMMDEditor";
 import DownloadMessageysl from "../../modals/DownloadMessageysl";
+import Modals from "../../modals/Modals";
 class ShixunHomeworkPage extends Component {
 	constructor(props) {
 		super(props);
@@ -34,6 +35,9 @@ class ShixunHomeworkPage extends Component {
 			showmodel:false,
 			child:undefined,
 			yslpros:false,
+			Modalstopval:"你在该实训的学习记录将被清空，无法恢复",
+			ModalsBottomval:"是否确认重做？",
+			ModalsType:false,
 		}
 
 	}
@@ -107,9 +111,28 @@ class ShixunHomeworkPage extends Component {
 	workshowmodels(child){
 		child.workshowmodel();
 	}
-	/// 确认是否下载
-
-
+	/// 重做的确认
+	ModalSaves=()=>{
+   this.setState({
+		 ModalsType:false,
+		 Modalstopval:""
+	 })
+	};
+	//取消重做
+	ModalCancels=()=>{
+		this.setState({
+			ModalsType:false,
+			Modalstopval:""
+		})
+	};
+	//打开重做弹框
+	Modalcancelss=()=>{
+		this.setState({
+			Modalstopval:"你在该实训的学习记录将被清空，无法恢复",
+			ModalsBottomval:"是否确认重做？",
+			ModalsType:true,
+		})
+	}
 	bindRef = ref => { this.child = ref }
 ///////////////教师截止
   gotohome=()=>{
@@ -128,7 +151,15 @@ class ShixunHomeworkPage extends Component {
 
 		return (
 			<div className="newMain clearfix ">
-
+				{/*<Modals*/}
+				{/*	modalsType={this.state.ModalsType}*/}
+				{/*	modalsTopval={this.state.Modalstopval}*/}
+				{/*	modalsBottomval={this.state.ModalsBottomval}*/}
+				{/*	modalSave={this.ModalSaves}*/}
+				{/*	modalCancel={this.ModalCancels}*/}
+				{/*	loadtype={false}*/}
+				{/*>*/}
+				{/*</Modals>*/}
 
 				<div className={"educontent mt10 mb20"} style={{width: "1200px"}}>
 
@@ -251,6 +282,9 @@ class ShixunHomeworkPage extends Component {
 									{...this.props}
 									data={teacherdatapage}
 								/>}
+								{/*{this.props.isStudent() ?*/}
+								{/*		<a className="fr color-blue font-16" onClick={()=>this.Modalcancelss()}>重做</a>*/}
+								{/*		: "" }*/}
 							</div>
 						</div>
 					</div>
diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js b/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js
index c62750977..1855fd1f2 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js
@@ -83,7 +83,7 @@ function startechart(data){
 			{
 				name:'',
 				type:'scatter',
-				data:data.echart_data===undefined?"":data.echart_data.efficiency_list,
+				data:data.echart_data===undefined?"":data.echart_data.efficiency_list.reverse(),
 				itemStyle:{
 					normal:{color:'#2e65ad'}
 				},

From 82dbb7d4f0418f9e00b16f8d738e66c16fb9cb15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 10 Sep 2019 17:34:06 +0800
Subject: [PATCH 2/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

---
 .../modules/courses/shixunHomework/shixunreport/Shixunechart.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js b/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js
index 1855fd1f2..c62750977 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js
@@ -83,7 +83,7 @@ function startechart(data){
 			{
 				name:'',
 				type:'scatter',
-				data:data.echart_data===undefined?"":data.echart_data.efficiency_list.reverse(),
+				data:data.echart_data===undefined?"":data.echart_data.efficiency_list,
 				itemStyle:{
 					normal:{color:'#2e65ad'}
 				},