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

调整

Browse Source
chromesetting
杨树明 5 years ago
parent 1347f3c0eb
commit 3b6daa3d7b
9 changed files with 51 additions and 40 deletions
Show Stats Download Patch File Download Diff File

8
public/react/src/modules/tpm/TPMBanner.js
Unescape View File

@ -857,7 +857,7 @@ class TPMBanner extends Component {
` `
.shixunDetail_top{ .shixunDetail_top{
height: 180px !important; height: 180px !important;
padding-top:35px !important; padding-top:50px !important;
} }
.ant-popover{ .ant-popover{
z-index:1000 !important; z-index:1000 !important;
@ -900,9 +900,9 @@ class TPMBanner extends Component {
} }
</p> </p>
<div className="clearfix mt30"> <div className="clearfix mt10">
<ul className="fl color-grey-c pathInfo"> <ul className="fl color-grey-c pathInfo mt20">
{shixunsDetails&&shixunsDetails.stu_num===0?"":<li> {shixunsDetails&&shixunsDetails.stu_num===0?"":<li>
<span>学习人数</span> <span>学习人数</span>
<span className="mt3">{shixunsDetails.stu_num}</span> <span className="mt3">{shixunsDetails.stu_num}</span>
@ -973,7 +973,7 @@ class TPMBanner extends Component {
</div> </div>
</div> </div>
}> }>
<div className="pr fl" id="commentsStar"> <div className="pr fl mt15" id="commentsStar">
<div className={"color-grey-c ml15"} style={{color: "#fff", textAlign: "center"}}>学员评分</div> <div className={"color-grey-c ml15"} style={{color: "#fff", textAlign: "center"}}>学员评分</div>
<div className="rateYo"> <div className="rateYo">
<MyRate allowHalf defaultValue={star_info[0]} disabled/> <MyRate allowHalf defaultValue={star_info[0]} disabled/>

8
public/react/src/modules/tpm/TPMsettings/Configuration.js
Unescape View File

@ -295,6 +295,8 @@ export default class Shixuninformation extends Component {
const dateFormat = 'YYYY-MM-DD HH:mm'; const dateFormat = 'YYYY-MM-DD HH:mm';
// console.log()
console.log(this.props&&this.props.identity<8)
return ( return (
<div> <div>
<div className="educontent mb200 edu-back-white padding10-20 pdb30 mb50"> <div className="educontent mb200 edu-back-white padding10-20 pdb30 mb50">
@ -308,8 +310,8 @@ export default class Shixuninformation extends Component {
</span> </span>
</div>} </div>}
<div className="edu-back-white mb10 ml30 mt20"> <div className="edu-back-white mb10 ml30 mt20">
<div> {this.props&&this.props.status>1&&this.state.use_scope===0&&this.props&&this.props.identity>7||this.props&&this.props.public===2&&this.state.use_scope===0&&this.props&&this.props.identity>7?"":<div>
<span className="color-grey-6 mt5 fl font-16" style={{minWidth: '45px'}}>公开程度:</span> <span className="color-grey-6 mt5 fl font-16" style={{minWidth: '45px'}}>公开程度:</span>
<span className="fl mt8 ml20"> <span className="fl mt8 ml20">
<RadioGroup onChange={this.SelectOpenpublic} value={this.state.use_scope}> <RadioGroup onChange={this.SelectOpenpublic} value={this.state.use_scope}>
@ -387,7 +389,7 @@ export default class Shixuninformation extends Component {
</span> </span>
</div> </div>}
<div className="clearfix mt20"> <div className="clearfix mt20">
<span className="color-grey-6 mt5 fl font-16" style={{minWidth: '45px'}}>开启时间:</span> <span className="color-grey-6 mt5 fl font-16" style={{minWidth: '45px'}}>开启时间:</span>

6
public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
Unescape View File

@ -1185,7 +1185,11 @@ class Shixuninformation extends Component {
closable={false} closable={false}
footer={null} footer={null}
> >
<div className="task-popup-content"><p className="task-popup-text-center font-16">评测脚本生成成功！</p></div> <div className="task-popup-content">
{/*<p className="task-popup-text-center font-16">已根据您的选择，生成新的评测脚本！</p>*/}
{/*<p className="task-popup-text-center font-16 mt10">您之前使用的脚本已复制到剪贴板，可通过Ctrl+C贴贴</p>*/}
<p className="task-popup-text-center font-16">评测脚本生成成功！</p>
</div>
<div className="task-popup-sure clearfix"> <div className="task-popup-sure clearfix">
<a className="task-btn task-btn-orange" onClick={() => this.hidestandard_scriptsModal()}>确定</a> <a className="task-btn task-btn-orange" onClick={() => this.hidestandard_scriptsModal()}>确定</a>
</div> </div>

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

@ -82,18 +82,18 @@ class TPMRightSection extends Component {
<div className="flex1"> <div className="flex1">
<div className="creatorname sortinxdirection space-between"> <div className="creatorname sortinxdirection space-between">
<div className={"creatornamelist"}> <div className={"creatornamelist color-grey-3"}>
{TPMRightSectionData === undefined ? "" : TPMRightSectionData.creator === undefined ? "" : TPMRightSectionData.creator.name} {TPMRightSectionData === undefined ? "" : TPMRightSectionData.creator === undefined ? "" : TPMRightSectionData.creator.name}
</div> </div>
<div className={"creatornamelist width80center"}> <div className={"creatornamelist width80center"}>
{TPMRightSectionData.user_shixuns_count} <span className={"color888hezuo"}>共发布实训</span> <span className={"color-grey-3"}>{TPMRightSectionData.user_shixuns_count}</span> <span className={"color888hezuo"}>个</span>
</div> </div>
</div> </div>
<div className="clearfix"> {/*<div className="clearfix">*/}
<span className={"fr color888hezuo"}>发布实训项目</span> {/* <span className={"fr color888hezuo"}>发布实训项目</span>*/}
{/*<span className="ml20">粉丝 <span id="user_h_fan_count">{TPMRightSectionData.fans_count}</span></span>*/} {/* /!*<span className="ml20">粉丝 <span id="user_h_fan_count">{TPMRightSectionData.fans_count}</span></span>*!/*/}
{/* <a href="/watchers/unwatch?className=fr+user_watch_btn+edu-default-btn+edu-focus-btn&amp;object_id=3039&amp;object_type=user&amp;shixun_id=61&amp;target_id=3039" className="fr edu-default-btn user_watch_btn edu-focus-btn" data-method="post" data-remote="true" id="cancel_watch" rel="nofollow">取消关注</a> */} {/* /!* <a href="/watchers/unwatch?className=fr+user_watch_btn+edu-default-btn+edu-focus-btn&amp;object_id=3039&amp;object_type=user&amp;shixun_id=61&amp;target_id=3039" className="fr edu-default-btn user_watch_btn edu-focus-btn" data-method="post" data-remote="true" id="cancel_watch" rel="nofollow">取消关注</a> *!/*/}
</div> {/*</div>*/}
</div> </div>
</div> </div>

7
public/react/src/modules/tpm/component/TPMright.css
Unescape View File

@ -98,14 +98,15 @@
} }
.creatornamelist { .creatornamelist {
-o-text-overflow: ellipsis; cursor: default;
overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
cursor: default; width: 139px;
} }
.width80center { .width80center {
width: 80px; font-size:12px;
text-align: center; text-align: center;
} }

12
public/react/src/modules/tpm/jupyter/index.js
Unescape View File

@ -326,12 +326,12 @@ function JupyterTPI (props) {
</p> </p>
<p className="jupyter_btn"> <p className="jupyter_btn">
{/*sync | poweroff */} {/*sync | poweroff */}
{/*<Button*/} <Button
{/* className="btn_common"*/} className="btn_common"
{/* type="link"*/} type="link"
{/* icon="history"*/} icon="history"
{/* onClick={handleClickResetTpi}*/} onClick={handleClickResetTpi}
{/*>重置实训</Button>*/} >重置实训</Button>
<Button <Button
className="btn_common" className="btn_common"

14
public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.css
Unescape View File

@ -122,7 +122,7 @@
} }
.fabushixunwidth{ .fabushixunwidth{
color: #000000; color: #000000;
font-size: 16px; font-size: 12px;
} }
.fabushixunwidthcolor{ .fabushixunwidthcolor{
color: #4CACFF; color: #4CACFF;
@ -143,11 +143,11 @@
height:34px; height:34px;
line-height: 34px; line-height: 34px;
} }
.hezuozhe630{ .hezuozhe655{
width: 630px; width: 655px;
} }
.hezuozhe634{ .hezuozhe655{
width: 634px; width: 655px;
} }
.color333hezuo{ .color333hezuo{
color:#333333; color:#333333;
@ -194,3 +194,7 @@
white-space: nowrap; white-space: nowrap;
cursor: default; cursor: default;
} }
.centertop20{
text-align: center;
padding-top: 20%;
}

20
public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
Unescape View File

@ -118,6 +118,7 @@ class Collaborators extends Component {
if (type === "cooperation") { if (type === "cooperation") {
this.setState({ this.setState({
Collaboratorsvisibleadmin: true, Collaboratorsvisibleadmin: true,
Collaboratorsvisible: false,
}); });
} else if ("admin") { } else if ("admin") {
let id = this.props.match.params.shixunId; let id = this.props.match.params.shixunId;
@ -132,6 +133,7 @@ class Collaborators extends Component {
} else { } else {
this.setState({ this.setState({
Collaboratorsvisible: true, Collaboratorsvisible: true,
Collaboratorsvisibleadmin: false,
Collaboratorslist: response.data Collaboratorslist: response.data
}) })
} }
@ -517,17 +519,16 @@ class Collaborators extends Component {
closable={false} closable={false}
footer={null} footer={null}
> >
<div className="mb15 font-14 edu-txt-center color-orange-tip"> <div className="mb15 font-14 edu-txt-center color-orange-tip">
选择的成员将会成为新的管理员<br/> 您将不再拥有管理员的权限，但您仍是合作团队的一员 选择的成员将会成为新的管理员<br/> 您将不再拥有管理员的权限，但您仍是合作团队的一员
</div> </div>
<div className="clearfix mb15 edu-bg-light-blue edu-max-h200"> <div className="clearfix mb15 edu-bg-light-blue edu-max-h200">
<ul className=""> <ul className="">
<li className="clearfix"> <li className={Collaboratorslist&&Collaboratorslist.length===0?"centertop20 clearfix":"clearfix"}>
<span>
请先将新的管理员通过 <a className={"color-blue"} onClick={() => this.showCollaboratorsvisible("cooperation")}>"添加合作者"</a> 加入合作者列表
</span>
<RadioGroup onChange={this.onChange} value={this.state.value}> <RadioGroup onChange={this.onChange} value={this.state.value}>
{ {
Collaboratorslist.length === 0 ? "" : Collaboratorslist.map((item, key) => { Collaboratorslist.length === 0 ? "" : Collaboratorslist.map((item, key) => {
return ( return (
@ -536,7 +537,6 @@ class Collaborators extends Component {
) )
}) })
} }
</RadioGroup> </RadioGroup>
</li> </li>
</ul> </ul>
@ -642,7 +642,7 @@ class Collaborators extends Component {
<style> <style>
{ {
` `
.collaborators-item-middles{width: 100% !important; margin-left: 20px;} .collaborators-item-middles{width: 100% !important;}
.ysltithead{ .ysltithead{
padding-bottom: 20px; padding-bottom: 20px;
} }
@ -665,7 +665,7 @@ class Collaborators extends Component {
<div className="fl collaborators-item-middles"> <div className="fl collaborators-item-middles">
<p className="mb10 sortinxdirection space-between hezuozhe634"> <p className="mb10 sortinxdirection space-between hezuozhe655">
<a href={item.user.user_url} target="_blank" className="yslusername">{item.user.name}</a> <a href={item.user.user_url} target="_blank" className="yslusername">{item.user.name}</a>
{item.user.shixun_manager === true ? "" : <span> {item.user.shixun_manager === true ? "" : <span>
<i className={this.state.hovertype===true&&key===this.state.hoverkey?"fontnewreds iconfont icon-shanchu_Hover":"fontneweees iconfont icon-shanchu_moren"} <i className={this.state.hovertype===true&&key===this.state.hoverkey?"fontnewreds iconfont icon-shanchu_Hover":"fontneweees iconfont icon-shanchu_moren"}
@ -681,10 +681,10 @@ class Collaborators extends Component {
</p> </p>
<p className="color-grey-B2 font-12 mb10 sortinxdirection mt14"> <p className="color-grey-B2 font-12 mb10 sortinxdirection mt14">
<p className="hezuozhe630 sortinxdirection space-between"> <p className="hezuozhe655 sortinxdirection space-between">
{/*<p className={item.user.identity===null||item.user.identity===undefined||item.user.identity===""?" font-16 ":"mr20 font-16 w70"}>{item.user.identity}</p>*/} {/*<p className={item.user.identity===null||item.user.identity===undefined||item.user.identity===""?" font-16 ":"mr20 font-16 w70"}>{item.user.identity}</p>*/}
<p <p
className={item.user.school_name === null || item.user.school_name === "" ? "" : " font-16 color888hezuo maxfont450"}>{item.user.school_name}</p> className={item.user.school_name === null || item.user.school_name === "" ? "" : " font-12 color888hezuo maxfont450"}>{item.user.school_name}</p>
<p className="fabushixunwidth color888hezuo">发布实训项目&nbsp;&nbsp;<span <p className="fabushixunwidth color888hezuo">发布实训项目&nbsp;&nbsp;<span
className="ml2">{item.user.user_shixuns_count}</span></p> className="ml2">{item.user.user_shixuns_count}</span></p>
</p> </p>

2
public/react/src/modules/tpm/shixunchild/Ranking_list/Ranking_list.js
Unescape View File

@ -129,7 +129,7 @@ class Ranking_list extends Component {
{/*<li className="fl with13 edu-txt-center color-grey-74">*/} {/*<li className="fl with13 edu-txt-center color-grey-74">*/}
{/*/!*{item.accuracy} %准确率*!/*/} {/*/!*{item.accuracy} %准确率*!/*/}
{/*</li>*/} {/*</li>*/}
<li className="fl with25 edu-txt-center">{this.formatSeconds(item.use_time)}</li> <li className="fl with25 edu-txt-center">{item.use_time===null?"":this.formatSeconds(item.use_time)}</li>
<li className="fl with14 edu-txt-center color-yellow">+{item.gold}金币 </li> <li className="fl with14 edu-txt-center color-yellow">+{item.gold}金币 </li>
</div> </div>
) )

Write Preview
Loading…
Cancel
Save