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

Merge branches 'dev_aliyun' and 'onigin/ysl_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

Browse Source
dev_newshixunModel
杨树明 6 years ago
parent 8c3668adc8 b369d36a3b
commit 08c05eb333
6 changed files with 81 additions and 40 deletions
Show Stats Download Patch File Download Diff File

2
public/react/src/modules/courses/graduation/tasks/index.js
Unescape View File

@ -744,6 +744,8 @@ class GraduationTasks extends Component{
<div className="mt20 edu-back-white pt10 pl30 pr30" key={index}> <div className="mt20 edu-back-white pt10 pl30 pr30" key={index}>
<div className="clearfix"> <div className="clearfix">
<GraduateTaskItem <GraduateTaskItem
{...this.state}
{...this.props}
discussMessage={item} discussMessage={item}
isAdmin={this.props.isAdmin()} isAdmin={this.props.isAdmin()}
isStudent={this.props.isStudent()} isStudent={this.props.isStudent()}

2
public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
Unescape View File

@ -17,7 +17,7 @@ class GraduateTopicItem extends Component{
toDetailPage=(topicId)=>{ toDetailPage=(topicId)=>{
if(this.props.checkIfLogin()===false){ if(this.props.checkIfLogin()===false){
this.props.showLoginDialog() this.props.showLoginDialog("iscancel")
return return
} }

30
public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
Unescape View File

@ -181,9 +181,7 @@ class ShixunHomeworkPage extends Component {
const isAdmin = this.props.isAdmin(); const isAdmin = this.props.isAdmin();
// console.log(119) // console.log(119)
console.log(jobsettingsdatapage); // console.log(jobsettingsdatapage);
return ( return (
<div className="newMain clearfix "> <div className="newMain clearfix ">
<Modals <Modals
@ -197,17 +195,21 @@ class ShixunHomeworkPage extends Component {
</Modals> </Modals>
<div className={"educontent mt10 mb20"} style={{width: "1200px"}}> <div className={"educontent mt10 mb20"} style={{width: "1200px"}}>
<Spin size="large" spinning={this.state.mylistisSpin}> <Spin size="large" spinning={this.state.mylistisSpin}>
<div className="educontent mb20"> {
<p className="clearfix mb20 mt10"> jobsettingsdatapage === undefined?"":
<a className="btn colorgrey fl hovercolorblue " href={this.props.current_user&&this.props.current_user.first_category_url}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name}</a> <div className="educontent mb20">
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <p className="clearfix mb20 mt10">
<a <a className="btn colorgrey fl hovercolorblue " href={this.props.current_user&&this.props.current_user.first_category_url}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name}</a>
className=" btn colorgrey fl hovercolorblue " <span className="color-grey-9 fl ml3 mr3">&gt;</span>
href={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main === 1 ? "shixun_homeworks" :"shixun_homework"}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_name}</a> <a
<span className="color-grey-9 fl ml3 mr3">&gt;</span> className=" btn colorgrey fl hovercolorblue "
<WordsBtn className="fl">作业详情</WordsBtn> href={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main === 1 ? "shixun_homeworks" :"shixun_homework"}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_name}</a>
</p> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
</div> <WordsBtn className="fl">作业详情</WordsBtn>
</p>
</div>
}
<div className="educontent mb20"> <div className="educontent mb20">
<p className=" fl color-black summaryname" style={{heigth: "33px"}}> <p className=" fl color-black summaryname" style={{heigth: "33px"}}>
{teacherdatapage === undefined ? "" : teacherdatapage.homework_name} {teacherdatapage === undefined ? "" : teacherdatapage.homework_name}

73
public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
Unescape View File

@ -241,26 +241,26 @@ class Trainingjobsetting extends Component {
} }
} }
} }
console.log("220"); // console.log("220");
var publish_timebools=false; var publish_timebools=false;
if(result.data.publish_time){ if(result.data.publish_time){
publish_timebools= moment(result.data.publish_time,"YYYY-MM-DD HH:mm")<=moment(); publish_timebools= moment(result.data.publish_time,"YYYY-MM-DD HH:mm")<=moment();
} }
console.log("228"); // console.log("228");
console.log(publish_timebools); // console.log(publish_timebools);
var end_timebools =false; var end_timebools =false;
if(result.data.end_time){ if(result.data.end_time){
end_timebools == moment(result.data.end_time,"YYYY-MM-DD HH:mm")<=moment(); end_timebools == moment(result.data.end_time,"YYYY-MM-DD HH:mm")<=moment();
} }
console.log("233"); // console.log("233");
console.log(end_timebools); // console.log(end_timebools);
var late_timess=false; var late_timess=false;
if(result.data.late_time){ if(result.data.late_time){
late_timess== moment(result.data.end_time,"YYYY-MM-DD HH:mm")<=moment(); late_timess== moment(result.data.end_time,"YYYY-MM-DD HH:mm")<=moment();
} }
console.log("240"); // console.log("240");
console.log(late_timess); // console.log(late_timess);
this.setState({ this.setState({
@ -1805,6 +1805,7 @@ class Trainingjobsetting extends Component {
modalSave: this.cancelBox modalSave: this.cancelBox
}) })
} else { } else {
// debugger
var releasetime =true; var releasetime =true;
var deadline = true; var deadline = true;
var endtime =true; var endtime =true;
@ -1851,6 +1852,9 @@ class Trainingjobsetting extends Component {
} }
}catch (e) { }catch (e) {
console.log(1);
console.log(e);
} }
@ -1875,6 +1879,8 @@ class Trainingjobsetting extends Component {
} }
} }
}catch (e) { }catch (e) {
console.log(2);
console.log(e);
this.setState({ this.setState({
flagPageEditsbox:true, flagPageEditsbox:true,
flagPageEdit: true, flagPageEdit: true,
@ -1905,9 +1911,10 @@ class Trainingjobsetting extends Component {
} }
} catch (e) { } catch (e) {
console.log(3);
console.log(e);
} }
} };
//取消编辑 //取消编辑
cancelEdit = () => { cancelEdit = () => {
this.setState({ this.setState({
@ -2117,7 +2124,24 @@ class Trainingjobsetting extends Component {
loadtype={loadtype} loadtype={loadtype}
modalSave={modalSave} modalSave={modalSave}
></Modals> ></Modals>
<div className={"educontent "}>
<div className={"educontent"}>
{
!flagPageEdit && this.props.isAdmin() === true ?
""
:
<style>
{
`
.yskspickers
.ant-input, .ant-input .ant-input-suffix{
background-color: #fff !important;
}
`
}
</style>
}
<div className="edu-back-white" style={{paddingTop: "20px"}}> <div className="edu-back-white" style={{paddingTop: "20px"}}>
{/*发布设置*/} {/*发布设置*/}
<div className="stud-class-set bor-bottom-greyE edu-back-white"> <div className="stud-class-set bor-bottom-greyE edu-back-white">
@ -2155,7 +2179,7 @@ class Trainingjobsetting extends Component {
<div className="clearfix mb5 ml15"> <div className="clearfix mb5 ml15">
<span className="font-16 fl mt3" style={{"color":"#999999"}}>发布时间：</span> <span className="font-16 fl mt3" style={{"color":"#999999"}}>发布时间：</span>
<Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditstwo === true && publish_timebool === true?"发布时间已过，则不能修改": ""}> <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditstwo === true && publish_timebool === true?"发布时间已过，则不能修改": ""}>
<div className="fl"> <div className="fl yskspickers">
<DatePicker <DatePicker
showToday={false} showToday={false}
id={"publishtimeid"} id={"publishtimeid"}
@ -2188,7 +2212,7 @@ class Trainingjobsetting extends Component {
<div className="clearfix ml15 mb5"> <div className="clearfix ml15 mb5">
<span className=" fl mt3 font-16" style={{"color":"#999999"}}>截止时间：</span> <span className=" fl mt3 font-16" style={{"color":"#999999"}}>截止时间：</span>
<Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditsthrees === true&&end_timebool===true?"截止时间已过，则不能修改": ""}> <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditsthrees === true&&end_timebool===true?"截止时间已过，则不能修改": ""}>
<div className="fl"> <div className="fl yskspickers">
<DatePicker <DatePicker
showToday={false} showToday={false}
id={"end_timeid"} id={"end_timeid"}
@ -2261,7 +2285,7 @@ class Trainingjobsetting extends Component {
` `
} }
</style> </style>
<InputNumber disabled={!flagPageEditsfor || !whethertopay} min={0} max={1000} className="mr10 h40 color-grey-9" <InputNumber disabled={!whethertopay} min={0} max={1000} className="mr10 h40 color-grey-9"
onChange={this.changeTopicName} onChange={this.changeTopicName}
style={{"color":"#999999","height": "40px"}} style={{"color":"#999999","height": "40px"}}
value={this.state.latededuction}/> value={this.state.latededuction}/>
@ -2269,8 +2293,21 @@ class Trainingjobsetting extends Component {
<span className="ml15 color-grey-c" style={{"text-align":"left","font-size":"14px"}}>(延时提交作品时，学生成绩将被扣减的分值)</span> <span className="ml15 color-grey-c" style={{"text-align":"left","font-size":"14px"}}>(延时提交作品时，学生成绩将被扣减的分值)</span>
{/*{latepenaltytype===true?<div className={"color-red ml40"}></div>:""}*/} {/*{latepenaltytype===true?<div className={"color-red ml40"}></div>:""}*/}
</div> </div>
{
<div className={"h20 mb20 "}> whethertopay&& whethertopay === true ?
<style>
{
`
.yskspickerss
.ant-input, .ant-input .ant-input-suffix{
background-color: #fff !important;
}
`
}
</style>
:""
}
<div className={"h20 mb20 yskspickerss"}>
<span style={{"width": "100px","color":"#999999"}}>结束时间：</span> <span style={{"width": "100px","color":"#999999"}}>结束时间：</span>
<DatePicker <DatePicker
showToday={false} showToday={false}
@ -2286,7 +2323,7 @@ class Trainingjobsetting extends Component {
onOk={this.ontimeonokthree} onOk={this.ontimeonokthree}
showTime={{ format: 'HH:mm' }} showTime={{ format: 'HH:mm' }}
width={"210px"} width={"210px"}
disabled={!flagPageEditsfor || !whethertopay} disabled={ !whethertopay}
dropdownClassName="hideDisable" dropdownClassName="hideDisable"
className={handclass} className={handclass}
/> />
@ -2403,7 +2440,7 @@ class Trainingjobsetting extends Component {
</span> </span>
</div> </div>
<p className="ml20 mt15 c_grey font-13 " style={{"color":"#666666"}}> 关卡名称<span <p className="ml20 mt15 c_grey font-13 " style={{"color":"#666666"}}> 关卡名称<span
className="color-grey-c font-10 ml10">(需要学生完成的任务请选中)</span></p> className="color-grey-c font-12 ml10">(需要学生完成的任务请选中)</span></p>
<div className="ml40 mt15" > <div className="ml40 mt15" >
{this.state.challenge_settings === undefined ? "" : this.state.challenge_settings.map((object, index) => { {this.state.challenge_settings === undefined ? "" : this.state.challenge_settings.map((object, index) => {
return ( return (
@ -2433,7 +2470,7 @@ class Trainingjobsetting extends Component {
<RadioGroup className="ml40 mt20" onChange={this.onChangeslevel} value={this.state.level}> <RadioGroup className="ml40 mt20" onChange={this.onChangeslevel} value={this.state.level}>
<Radio style={radioStyle} disabled={!flagPageEdit} className="c_grey" value={"扣分"}>按查看答案级别扣分<span <Radio style={radioStyle} disabled={!flagPageEdit} className="c_grey" value={"扣分"}>按查看答案级别扣分<span
className="color-grey-c font-14 ml15" style={{"text-align":"left"}}>根据学员选择查看的实训答案级别(解题思路、完整答案)，扣减相应的分值</span></Radio> className="color-grey-c font-14 ml15" style={{"text-align":"left"}}>(根据学员选择查看的实训答案级别(解题思路、完整答案)，扣减相应的分值)</span></Radio>
<Radio style={radioStyle} disabled={!flagPageEdit} className="c_grey mt15" <Radio style={radioStyle} disabled={!flagPageEdit} className="c_grey mt15"
value={"满分"}>不扣分 </Radio> value={"满分"}>不扣分 </Radio>
</RadioGroup> </RadioGroup>

6
public/react/src/modules/login/LoginDialog.js
Unescape View File

@ -398,11 +398,9 @@ class LoginDialog extends Component {
}); });
} }
handleDialogClose = () => { handleDialogClose = () => {
if(this.props.isloginCancel===undefined){
console.log(this.props.match)
debugger
if(this.props.match===undefined){
window.location.href="/"; window.location.href="/";
this.props.Modifyloginvalue();
// this.setState({ // this.setState({
// isRender: false // isRender: false
// }) // })

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

@ -83,6 +83,7 @@ export function TPMIndexHOC(WrappedComponent) {
globalLoading: false, globalLoading: false,
dataquerys:{}, dataquerys:{},
isloginCancel:undefined
} }
} }
@ -429,15 +430,16 @@ export function TPMIndexHOC(WrappedComponent) {
}; };
hideLoginDialog = () => { hideLoginDialog = () => {
this.setState({ this.setState({
isRender: false isRender: false,
isloginCancel:undefined
}) })
} }
showLoginDialog = () => { showLoginDialog = () => {
this.setState({ this.setState({
isRender: true isRender: true,
isloginCancel:"iscancel"
}) })
} }
checkIfLogin = () => { checkIfLogin = () => {
return this.state.current_user && this.state.current_user.login != '' return this.state.current_user && this.state.current_user.login != ''
} }

Write Preview
Loading…
Cancel
Save