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

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

Browse Source
dev_forum
杨树林 5 years ago
parent af9d68d0a6 ffa647be48
commit b9812c7f8d
4 changed files with 54 additions and 33 deletions
Show Stats Download Patch File Download Diff File

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

@ -1297,23 +1297,26 @@ export default class TPMsettings extends Component {
<p id="e_tips_shixundescriptionQuestion" className="edu-txt-right color-grey-cd font-12"></p> <p id="e_tips_shixundescriptionQuestion" className="edu-txt-right color-grey-cd font-12"></p>
</div> </div>
<div className="edu-back-white mb10 padding40-20 clearfix"> <div className="edu-back-white mb10 padding40-20 clearfix" >
<div className="clearfix"> <div className="clearfix">
<p className="color-grey-6 font-16 mb30">技术平台</p> <p className="color-grey-6 font-16 mb30">技术平台</p>
<div className="clearfix mb20"> <div className="clearfix mb20">
<span className="color-orange fl mr20">*</span> <span className="color-orange fl mr20">*</span>
<div className="width15 fl mr20" onMouseLeave={operateauthority?this.bigopens:""}> <div className="width15 fl mr20"
// onMouseLeave={operateauthority?this.bigopens:""}
>
<Select placeholder="请更新主类别" value={choice_main_type === "" ? undefined : choice_main_type} <Select placeholder="请更新主类别" value={choice_main_type === "" ? undefined : choice_main_type}
style={{width: 180}} style={{width: 180}}
onChange={operateauthority?this.bigClass:""} onChange={operateauthority?this.bigClass:""}
// onMouseEnter={this.bigopen} // onMouseEnter={this.bigopen}
// onMouseLeave={this.bigopens} // onMouseLeave={this.bigopens}
disabled={operateauthority?false:true} disabled={operateauthority?false:true}
onMouseEnter={operateauthority?this.bigopen:""} // onMouseEnter={operateauthority?this.bigopen:""}
onSelect={operateauthority?this.bigopens:""} onSelect={operateauthority?this.bigopens:""}
open={opers}> // open={opers}
>
{ {
settingsData === undefined ? "" : settingsData.shixun.main_type.map((item, key) => { settingsData === undefined ? "" : settingsData.shixun.main_type.map((item, key) => {
@ -1379,17 +1382,19 @@ export default class TPMsettings extends Component {
</Modal> </Modal>
</div> </div>
<div className="width15 fl pr mr20" onMouseLeave={operateauthority?this.bigopens:""}> <div className="width15 fl pr mr20"
// onMouseLeave={operateauthority?this.bigopens:""}
>
<Select mode="multiple" placeholder="请选择小类别" <Select mode="multiple" placeholder="请选择小类别"
value={choice_small_type.length===0||choice_small_type[0]===""||choice_small_type===[]?undefined:choice_small_type} value={choice_small_type.length===0||choice_small_type[0]===""||choice_small_type===[]?undefined:choice_small_type}
style={{width: 180,height:30}} style={{width: 180,height:30}}
disabled={operateauthority?false:true} disabled={operateauthority?false:true}
// onChange={operateauthority?this.littleClass:""} // onChange={operateauthority?this.littleClass:""}
onDeselect={operateauthority?this.Deselectlittle:""} onDeselect={operateauthority?this.Deselectlittle:""}
onMouseEnter={operateauthority?this.bigopensmal:""} // onMouseEnter={operateauthority?this.bigopensmal:""}
onSelect={operateauthority?this.littleClass:""} onSelect={operateauthority?this.littleClass:""}
defaultOpen={false} defaultOpen={false}
open={opensmail} // open={opensmail}
> >
{ {
settingsData === undefined ? "" : settingsData.shixun.small_type.map((item, key) => { settingsData === undefined ? "" : settingsData.shixun.small_type.map((item, key) => {
@ -1409,18 +1414,20 @@ export default class TPMsettings extends Component {
</div> </div>
</div> </div>
</div> {/*</div>*/}
<div className="edu-back-white mb10 padding40-20 clearfix" onMouseLeave={operateauthority?this.bigopens:""}> {/*<div className="edu-back-white mb10 padding40-20 clearfix" >*/}
<div className="clearfix"> <div className="clearfix"
// onMouseLeave={operateauthority?this.bigopens:""}
>
<p className="color-grey-6 font-16 mb30">评测脚本</p> <p className="color-grey-6 font-16 mb30">评测脚本</p>
<div className="pl35"> <div className="pl35">
<Select placeholder="请选择选择脚本" <Select placeholder="请选择选择脚本"
style={{width: 180}} style={{width: 180}}
className="fl" className="fl"
disabled={operateauthority?false:true} disabled={operateauthority?false:true}
onMouseEnter={operateauthority?this.sbigopen:""} // onMouseEnter={operateauthority?this.sbigopen:""}
onSelect={operateauthority?this.bigopens:""} onSelect={operateauthority?this.bigopens:""}
open={operss} // open={operss}
value={choice_standard_scripts === undefined||choice_standard_scripts === null ? undefined :choice_standard_scripts.id===undefined?choice_standard_scripts:choice_standard_scripts.id} value={choice_standard_scripts === undefined||choice_standard_scripts === null ? undefined :choice_standard_scripts.id===undefined?choice_standard_scripts:choice_standard_scripts.id}
onChange={operateauthority?this.SelectScput:""}> onChange={operateauthority?this.SelectScput:""}>
{ {
@ -1725,7 +1732,9 @@ export default class TPMsettings extends Component {
<div className="edu-back-white mb10 padding40-20 clearfix"> <div className="edu-back-white mb10 padding40-20 clearfix">
<p className="color-grey-6 font-16 mb30">发布信息</p> <p className="color-grey-6 font-16 mb30">发布信息</p>
<div className="clearfix" onMouseLeave={this.bigopens}> <div className="clearfix"
// onMouseLeave={this.bigopens}
>
<span className="color-orange fl mr20">*</span> <span className="color-orange fl mr20">*</span>
<span className="color-grey-6 fl" style={{minWidth: '95px'}}>面向学员：</span> <span className="color-grey-6 fl" style={{minWidth: '95px'}}>面向学员：</span>
@ -1734,9 +1743,9 @@ export default class TPMsettings extends Component {
style={{width: 180}} style={{width: 180}}
value={trainee} value={trainee}
onChange={this.Selecttrainee} onChange={this.Selecttrainee}
onMouseEnter={this.sbigopenss} // onMouseEnter={this.sbigopenss}
onSelect={this.sbigopensss} onSelect={this.sbigopensss}
open={opersss} // open={opersss}
> >
<Option value={1}>初级学员</Option> <Option value={1}>初级学员</Option>
<Option value={2}>中级学员</Option> <Option value={2}>中级学员</Option>

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

@ -655,7 +655,9 @@ export default class TPMchallengesnew extends Component {
</div> </div>
<p className="color-grey-6 font-16 mb30">奖励经验值</p> <p className="color-grey-6 font-16 mb30">奖励经验值</p>
<div className="clearfix" onMouseLeave={this.props.status===2?"":this.onshixunsmarkss}> <div className="clearfix"
// onMouseLeave={this.props.status===2?"":this.onshixunsmarkss}
>
<span className="fl mr30 color-orange pt10">*</span> <span className="fl mr30 color-orange pt10">*</span>
<style> <style>
@ -668,9 +670,9 @@ export default class TPMchallengesnew extends Component {
<Select style={{width: 120}} className="winput-240-40 fl" <Select style={{width: 120}} className="winput-240-40 fl"
id="challenge_score" id="challenge_score"
onChange={this.props.status===2?"":this.onshixunsmark} onChange={this.props.status===2?"":this.onshixunsmark}
onMouseEnter={this.props.status===2?"":this.onshixunsmarks} // onMouseEnter={this.props.status===2?"":this.onshixunsmarks}
disabled={this.props.status===2?true:false} disabled={this.props.status===2?true:false}
open={marktype} // open={marktype}
value={onshixunsmarkvalue} value={onshixunsmarkvalue}
getPopupContainer={triggerNode => triggerNode.parentNode} getPopupContainer={triggerNode => triggerNode.parentNode}
> >

16
public/react/src/modules/tpm/challengesnew/TPMquestion.js
Unescape View File

@ -1473,7 +1473,9 @@ editanswersMD=(initValue, id)=> {
</div> </div>
<p className="color-grey-6 font-16 mb30">奖励经验值</p> <p className="color-grey-6 font-16 mb30">奖励经验值</p>
<div className="clearfix" onMouseLeave={this.onshixunsmarkss}> <div className="clearfix"
// onMouseLeave={this.onshixunsmarkss}
>
<span className="fl mr30 color-orange pt10">*</span> <span className="fl mr30 color-orange pt10">*</span>
<style> <style>
{` {`
@ -1485,8 +1487,8 @@ editanswersMD=(initValue, id)=> {
<Select style={{width: 120}} className="winput-240-40 fl" <Select style={{width: 120}} className="winput-240-40 fl"
id="challenge_score" id="challenge_score"
onChange={this.onshixunsansweSelect} onChange={this.onshixunsansweSelect}
onMouseEnter={this.onshixunsmarks} // onMouseEnter={this.onshixunsmarks}
open={marktype} // open={marktype}
value={answeonshixunsmark} value={answeonshixunsmark}
> >
{options} {options}
@ -1662,7 +1664,9 @@ editanswersMD=(initValue, id)=> {
</div> </div>
<p className="color-grey-6 font-16 mb30">奖励经验值</p> <p className="color-grey-6 font-16 mb30">奖励经验值</p>
<div className="clearfix" onMouseLeave={this.onshixunsmarkss}> <div className="clearfix"
// onMouseLeave={this.onshixunsmarkss}
>
<span className="fl mr30 color-orange pt10">*</span> <span className="fl mr30 color-orange pt10">*</span>
<style> <style>
{` {`
@ -1675,9 +1679,9 @@ editanswersMD=(initValue, id)=> {
id="challenge_score" id="challenge_score"
disabled={this.props.status===2?true:false} disabled={this.props.status===2?true:false}
onChange={this.props.status===2?"":this.onshixunsansweSelect} onChange={this.props.status===2?"":this.onshixunsansweSelect}
onMouseEnter={this.onshixunsmarks} // onMouseEnter={this.onshixunsmarks}
value={answeonshixunsmark} value={answeonshixunsmark}
open={marktype} // open={marktype}
> >
{options} {options}

24
public/react/src/modules/tpm/newshixuns/Newshixuns.js
Unescape View File

@ -889,14 +889,16 @@ class Newshixuns extends Component {
<p className="color-grey-6 font-16 mb15">技术平台</p> <p className="color-grey-6 font-16 mb15">技术平台</p>
<div className="clearfix mb20"> <div className="clearfix mb20">
<span className="mr30 color-orange pt5 fl">*</span> <span className="mr30 color-orange pt5 fl">*</span>
<div className="width15 fl mr20" onMouseLeave={this.bigopens}> <div className="width15 fl mr20"
// onMouseLeave={this.bigopens}
>
<Select placeholder="请更新主类别" <Select placeholder="请更新主类别"
style={{width: 180}} style={{width: 180}}
onChange={this.bigClass} onChange={this.bigClass}
onMouseEnter={this.bigopen} // onMouseEnter={this.bigopen}
onSelect={this.bigopens} onSelect={this.bigopens}
defaultOpen={false} defaultOpen={false}
open={opers} // open={opers}
> >
{ {
newshixunlist === undefined ? "" : newshixunlist.main_type.map((item, key) => { newshixunlist === undefined ? "" : newshixunlist.main_type.map((item, key) => {
@ -1026,14 +1028,16 @@ class Newshixuns extends Component {
</div> </div>
</Modal> </Modal>
</div> </div>
<div className=" fl pr mr20" onMouseLeave={this.bigopens}> <div className=" fl pr mr20"
// onMouseLeave={this.bigopens}
>
<Select mode="multiple" placeholder="请选择小类别" <Select mode="multiple" placeholder="请选择小类别"
style={{minWidth: 180}} style={{minWidth: 180}}
onChange={this.littleClass} onChange={this.littleClass}
onMouseEnter={this.bigopensmal} // onMouseEnter={this.bigopensmal}
onSelect={this.bigopens} onSelect={this.bigopens}
defaultOpen={false} defaultOpen={false}
open={opensmail} // open={opensmail}
> >
{ {
newshixunlist === undefined ? "" : newshixunlist.small_type.map((item, key) => { newshixunlist === undefined ? "" : newshixunlist.small_type.map((item, key) => {
@ -1156,7 +1160,9 @@ class Newshixuns extends Component {
<div className="mb10 edu-back-white padding30-20"> <div className="mb10 edu-back-white padding30-20">
<p className="color-grey-6 font-16 mb20">发布信息</p> <p className="color-grey-6 font-16 mb20">发布信息</p>
<div className="clearfix" onMouseLeave={this.bigopens}> <div className="clearfix"
// onMouseLeave={this.bigopens}
>
<div className="clearfix mb20 pl25"> <div className="clearfix mb20 pl25">
<span className="fl color-grey-6 lineh-30 mr20"><span <span className="fl color-grey-6 lineh-30 mr20"><span
className="mr10 color-orange mt2 fl">*</span>面向学员：</span> className="mr10 color-orange mt2 fl">*</span>面向学员：</span>
@ -1164,9 +1170,9 @@ class Newshixuns extends Component {
<Select placeholder="请选择学员类别" <Select placeholder="请选择学员类别"
style={{width: 180}} style={{width: 180}}
onChange={this.Selectthestudent} onChange={this.Selectthestudent}
onMouseEnter={this.sbigopen} // onMouseEnter={this.sbigopen}
onSelect={this.bigopens} onSelect={this.bigopens}
open={operss} // open={operss}
> >
<Option value={1}>初级学员</Option> <Option value={1}>初级学员</Option>
<Option value={2}>中级学员</Option> <Option value={2}>中级学员</Option>

Write Preview
Loading…
Cancel
Save