From 08897e51828f110e67e7b9a05cde8172e6f30c16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 8 Jul 2019 16:26:25 +0800
Subject: [PATCH] =?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/ShixunStudentWork.js       | 10 +++++++
 .../shixunHomework/ShixunWorkReport.js        | 10 +++----
 .../Shixunworkdetails/ShixunWorkModal.js      |  5 ++--
 .../OfficialAcademicTranscript.js             | 26 ++++++++++++++-----
 4 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
index 070744cdb..66ca6fbe4 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
@@ -135,6 +135,10 @@ class ShixunStudentWork extends Component {
 				this.setState({
 					duplicatechecking: true
 				})
+				notification.open({
+					message:"提示",
+					description: response.data.message
+				});
 			}
 
 			if (response.data.status === -1) {
@@ -144,6 +148,8 @@ class ShixunStudentWork extends Component {
 				});
 			}
 
+
+
 		}).catch((error) => {
 			console.log(error)
 		});
@@ -197,6 +203,10 @@ class ShixunStudentWork extends Component {
 				this.setState({
 					duplicatechecking: true
 				})
+				notification.open({
+					message:"提示",
+					description: response.data.message
+				});
 			}
 
 			if (response.data.status === -1) {
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
index 50cb0e81c..359ae50f4 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
@@ -142,7 +142,7 @@ class ShixunWorkReport extends Component {
 					<div className="stud-class-set bor-bottom-greyE">
 						<div className="clearfix edu-back-white poll_list">
 
-							<div className="font-16 color-dark-21 shixunreporttitle ml20">总体评价</div>
+							<div className="font-16 color-dark-21 shixunreporttitle ml20 pd20">总体评价</div>
 
               <ConclusionEvaluation
 	              data={data}
@@ -154,7 +154,7 @@ class ShixunWorkReport extends Component {
 					<div className="stud-class-set">
 						<div className="clearfix edu-back-white poll_list">
 
-							<div className="font-16 color-dark-21 shixunreporttitle ml20">阶段成绩</div>
+							<div className="font-16 color-dark-21 shixunreporttitle ml20 pd20">阶段成绩</div>
 
 							<OfficialAcademicTranscript
 								data={data}
@@ -168,7 +168,7 @@ class ShixunWorkReport extends Component {
 					      style={{display:data&&data.work_description===null?"none":""}}
 					>
 						<div className="clearfix edu-back-white poll_list">
-							<div className="font-16 color-dark-21 shixunreporttitle ml20">个人总结</div>
+							<div className="font-16 color-dark-21 shixunreporttitle ml20 pd20">个人总结</div>
 							<style>
 								{`
 								.personalsummary{
@@ -202,7 +202,7 @@ class ShixunWorkReport extends Component {
 
 					<div className="stud-class-set bor-bottom-greyE">
 						<div className="clearfix edu-back-white poll_list">
-							<div className="font-16 color-dark-21 shixunreporttitle ml20">图形统计</div>
+							<div className="font-16 color-dark-21 shixunreporttitle ml20 pd20">图形统计</div>
 							<Shixunechart
 								data={data}
 							/>
@@ -212,7 +212,7 @@ class ShixunWorkReport extends Component {
 					<div className="stud-class-set bor-bottom-greyE">
 
 						<div className="clearfix edu-back-white poll_list pad40px">
-							<div className="font-16 color-dark-21 shixunreporttitle ml20">实训详情</div>
+							<div className="font-16 color-dark-21 shixunreporttitle ml20 pd20">实训详情</div>
               <style>
 	              {`
 	              .poll_list a{
diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
index 173346c81..9cf381455 100644
--- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
+++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
@@ -180,6 +180,7 @@ class ShixunWorkModal extends Component{
 				group_ids: group_ids,
 			})
 			.then((response) => {
+				// console.log(this.props)
 				if (response.data.status === 0) {
 					this.props.updatas()
 					this.props.issCancel()
@@ -187,7 +188,7 @@ class ShixunWorkModal extends Component{
 						message:"提示",
 						description: response.data.message
 					});
-					console.log(this.props)
+					this.props.history.replace(`/courses/${this.props.match.params.coursesId}/shixun_homeworks/${this.props.match.params.homeworkid}/student_work`);
 				}else if(response.data.status === -1){
 					notification.open({
 						message:"提示",
@@ -223,7 +224,7 @@ class ShixunWorkModal extends Component{
 		let {course_groups,group_ids,onChangetype,group_list}=this.state;
 		// let {data}=this.props;
 		// console.log(group_list)
-	  console.log(group_list)
+	  // console.log(group_list)
 		return(
 			<div>
 				<Modal
diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js b/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js
index fb24e6a3e..4e9b22831 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js
@@ -57,9 +57,10 @@ class OfficialAcademicTranscript extends Component {
 			title: '任务名称',
 			dataIndex: 'taskname',
 			key: 'taskname',
+			className:"TaskForms",
 			render: (text, record) => (
 				<span>
-					<span className={"task-hide"} style={{color:"#676767"}}><a className="tasknameName font-14" onClick={()=>this.myjumptopic("id"+record.customs)} >{record.taskname.name}</a></span>
+					<span className={"task-hide"} style={{color:"#676767"}}><a className="tasknameName font-14" onClick={()=>this.myjumptopic("id"+record.customs)} title={record.taskname.name} >{record.taskname.name}</a></span>
            {record.taskname.complete_status===2?<span className={"tasknamebox ml10"}>延时</span>:record.taskname.complete_status===3?<span className={"tasknameboxs ml10"}>延时</span>:""}
         </span>
 			),
@@ -152,17 +153,30 @@ class OfficialAcademicTranscript extends Component {
             font-size:14px;
 					}
 					.task-hide{
-					    max-width: 345px;
-					    overflow: hidden;
-					    white-space: nowrap;
-					    text-overflow: ellipsis;
+						max-width: 345px;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
 					}
 					.ant-table-tbody > tr{
 					   height:64px;
 					}
 					.tasknameName:link{color:#676767}
 					.tasknameName:hover{color:#4CACFF}
-				
+					.tasknameName{
+					     overflow: hidden;
+								text-overflow: ellipsis;
+								white-space: nowrap;
+						    width: 500px;
+						    text-align: left !important;
+					}
+					.TaskForms{
+					   width: 500px;
+					}
+				  .TaskForms.ant-table-header-column{
+						width: 100%;
+						text-align: center;
+				  }
 			`}
 				</style>
 				{datas===undefined?"":<Table