From 0f4147892ab19f2977873c0f5d913fb5687854b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 20 Jul 2019 21:48:56 +0800
Subject: [PATCH] =?UTF-8?q?=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/shixunHomework/ShixunHomeworkPage.js       |  5 ++++-
 .../courses/shixunHomework/ShixunStudentWork.js        | 10 ++++++++--
 .../modules/courses/shixunHomework/ShixunWorkReport.js |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index a1f670d03..48bb26ad3 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -111,6 +111,9 @@ class ShixunHomeworkPage extends Component {
 		let {tab, teacherdata,  jobsettingsdata} = this.state;
 
 		const isAdmin = this.props.isAdmin();
+
+		console.log(this.props)
+		console.log(this.state)
 		return (
 			<div className="newMain clearfix ">
 				<div className={"educontent mb20"} style={{width: "1200px"}}>
@@ -222,7 +225,7 @@ class ShixunHomeworkPage extends Component {
 										<a className="fr color-blue font-16" onClick={(child)=>this.workshowmodels(this.child)}>代码查重</a>
 										: "" : ""}
 								{this.state.view_report === true ? <Link className="fr color-blue font-16" target={"_blank"}
-																												 to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${this.props.match.params.homeworkid}/shixun_work_report`}>
+																												 to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${teacherdata&&teacherdata.work_id}/shixun_work_report`}>
 									查看实训报告
 								</Link> : ""}
 								{
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
index ed399af98..2da778707 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
@@ -759,7 +759,13 @@ class ShixunStudentWork extends Component {
 													top: 72%;}
 								}
 							`}</style>
-							{datalist === undefined ? "" : <Table
+							
+							{datalist === undefined ? "" : datalist.length===0? <div className="alltask">
+								<div className="edu-tab-con-box clearfix edu-txt-center">
+									<img className="edu-nodata-img mb20" src="/images/educoder/nodata.png" />
+									<p className="edu-nodata-p mb20">暂无数据哦~</p>
+								</div>
+							</div>:<Table
 								dataSource={datalist}
 								columns={columns}
 								pagination={false}
@@ -770,7 +776,7 @@ class ShixunStudentWork extends Component {
 				</div>
 
 						{
-							datalist === undefined ? "":datalist.length<11?
+							datalist === undefined ? "":datalist.length===0?"":datalist.length<11?
 								<div className="edu-txt-center mt30 mb20">
 									<Pagination showQuickJumper current={page}
 															onChange={this.TablePagination} pageSize={10}
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
index 6dc407c5f..d11ff7fe4 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
@@ -103,7 +103,7 @@ class ShixunWorkReport extends Component {
 	}
 	render() {
 		let{data} =this.state;
-		let category_id=data===undefined?"":data.category.category_id;
+		let category_id=data===undefined?"":data.category===null?"":data.category.category_id;
 		let homework_common_id=data===undefined?"":data.homework_common_id;
 		let homeworkid=this.props.match.params.homeworkid;
 		const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;