From 74e6504ac2e05e85e6c4c6999520e5085c75f0a7 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, 9 Sep 2019 14:53:59 +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/exercise/Ecerciseallbackagain.js | 5 +++--
public/react/src/modules/paths/PathDetail/PathDetailIndex.js | 4 ++--
public/react/src/modules/tpm/component/TPMRightSection.js | 4 ++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js b/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js
index 0deddfacf..11c0fd07b 100644
--- a/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js
+++ b/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js
@@ -159,6 +159,7 @@ class Ecerciseallbackagain extends Component{
<div>
<Modal
className={"HomeworkModal"}
+ style={{ top: 20 }}
title={this.props.modalname}
visible={this.props.visible}
closable={false}
@@ -182,7 +183,7 @@ class Ecerciseallbackagain extends Component{
</ul>
{datalist===undefined?"":
- <ul className="upload_select_box fl clearfix mt10 mb10" style={{"overflow-y":"auto",height: "319px"}}
+ <ul className="upload_select_box fl clearfix mt10 mb10" style={{"overflow-y":"auto",height: "217px"}}
id="search_not_members_list"
onScroll={this.contentViewScroll}
>
@@ -220,7 +221,7 @@ class Ecerciseallbackagain extends Component{
<Checkbox checked={onChangetype} onChange={this.onChange}>{onChangetype===true?"清除":"全选"}</Checkbox>
</div>
- <div className="clearfix mt30 edu-txt-center mb10">
+ <div className="clearfix edu-txt-center">
<a className="task-btn color-white mr30" onClick={this.issCancel}>取消</a>
<a className="task-btn task-btn-orange" onClick={this.isSave}>确认</a>
</div>
diff --git a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
index f1b0a3bbb..3866f3f16 100644
--- a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
+++ b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
@@ -459,8 +459,8 @@ class PathDetailIndex extends Component{
this.props.checkIfLogin()===false?"":progress === undefined ? "" : progress === null ? "" :
<div className="edu-back-white myProgress padding40-20 mb10">
<p className="mb20">
- <span className="font-16 mr10">我的进展</span>
- <Tooltip placement="bottom" title="获得经验值/总经验值">
+ <span className="font-16 mr10">关卡数</span>
+ <Tooltip placement="bottom" title="已通过数/总关卡数">
<span className="color-green" >{progress.my_score} / {progress.all_score}</span>
</Tooltip>
</p>
diff --git a/public/react/src/modules/tpm/component/TPMRightSection.js b/public/react/src/modules/tpm/component/TPMRightSection.js
index fd96454c4..f824e7d83 100644
--- a/public/react/src/modules/tpm/component/TPMRightSection.js
+++ b/public/react/src/modules/tpm/component/TPMRightSection.js
@@ -121,7 +121,7 @@ class TPMRightSection extends Component {
<div className="padding20 edu-back-white mb10 mt10" style={{
display: TPMRightSectionData === undefined?"none":TPMRightSectionData.paths===undefined?"":TPMRightSectionData.paths.length === 0 ? "none" : "block"
}}>
- <p className="mb20 font-16 clearfix">相关实践课程</p>
+ <p className="mb20 font-16 clearfix">所属课程</p>
<div className="recommend-list" >
{
TPMRightSectionData===undefined?"":TPMRightSectionData.paths===undefined?"":TPMRightSectionData.paths.map((i,k)=>{
@@ -164,7 +164,7 @@ class TPMRightSection extends Component {
<div className="padding20 edu-back-white"
style={{
display:
- TPMRightSectionData === undefined?"none":TPMRightSectionData.recommands===undefined?"none":TPMRightSectionData.recommands.length === 0 ? "none" : "block"
+ TPMRightSectionData === undefined?"none":TPMRightSectionData.recommands===undefined?"none":TPMRightSectionData.recommands.length === 0 ||TPMRightSectionData.paths===undefined?"":TPMRightSectionData.paths.length === 0 ? "none" : "block"
}}
>
<p className="mb20 font-16 clearfix">推荐实训</p>