From c9458c88008504e3c36a1033f7d643f9467abe40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 4 Jul 2019 16:24:00 +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

---
 .../src/modules/courses/shixunHomework/ShixunStudentWork.js   | 4 ++--
 .../src/modules/tpm/challengesnew/css/TPMchallengesnew.css    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
index f5029d9c5..4f1ddb027 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
@@ -572,10 +572,10 @@ class ShixunStudentWork extends Component {
 					</div>
 						<div className="educontent mb30">
 						<p className=" fl color-black  summaryname" style={{heigth:"33px"}}>
-							{data&&data.homework_name}
+							{jobsettingsdata === undefined ? "" : jobsettingsdata.data.homework_name}
 						</p>
 						<CoursesListType
-							typelist={data&&data.homework_status}
+							typelist={jobsettingsdata === undefined ? [] : jobsettingsdata.data.homework_status}
 						/>
 						<a className="color-grey-9 fr font-16 summaryname  ml20 mr20"
 							 href={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" :jobsettingsdata.data.category.category_id}`}>返回</a>
diff --git a/public/react/src/modules/tpm/challengesnew/css/TPMchallengesnew.css b/public/react/src/modules/tpm/challengesnew/css/TPMchallengesnew.css
index 9a8af13e7..fb23ba4b8 100644
--- a/public/react/src/modules/tpm/challengesnew/css/TPMchallengesnew.css
+++ b/public/react/src/modules/tpm/challengesnew/css/TPMchallengesnew.css
@@ -60,7 +60,7 @@ a{
 
 #exercisememoMD .CodeMirror {
     margin-top: 31px !important;
-    height: 700px !important;
+    height: 374px !important;
     /*width: 579px !important;*/
 }
 
@@ -125,7 +125,7 @@ a{
 #neweditanswer .editormd-preview {
     top: 40px !important;
     height: 364px !important;
-    width: 578px !important;
+    width: 551px !important;
 }
 
 #repository_url_tip {