m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

Browse Source
dev_cs
杨树林 5 years ago
parent bd46760cba 8c78318c68
commit ef419271b1
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File

5
public/react/src/modules/courses/exercise/Ecerciseallbackagain.js
Unescape View File

@ -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>

4
public/react/src/modules/paths/PathDetail/PathDetailIndex.js
Unescape View File

@ -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>

4
public/react/src/modules/tpm/component/TPMRightSection.js
Unescape View File

@ -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>

Write Preview
Loading…
Cancel
Save