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

试卷截止时间和学院统计url调整

Browse Source
chromesetting
杨树明 5 years ago
parent 26b98b449e
commit 19c9d2d510
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

12
public/react/src/modules/courses/exercise/Exercisesetting.js
Unescape View File

@ -608,9 +608,9 @@ class Exercisesetting extends Component{
}; };
// console.log(flagPageEdit===true?polls&&polls.exercise_status===1?3:2:1) // console.log(flagPageEdit===true?polls&&polls.exercise_status===1?3:2:1)
console.log("asdasdasda"); // console.log("asdasdasda");
console.log(this.props); // console.log(this.props);
console.log(this.props.Commonheadofthetestpaper); // console.log(this.props.Commonheadofthetestpaper);
return( return(
<div> <div>
<Modals <Modals
@ -654,7 +654,7 @@ class Exercisesetting extends Component{
<div className="clearfix" id={"publishtimeid"}> <div className="clearfix" id={"publishtimeid"}>
<span className="font-16 mr15 fl mt6">发布时间：</span> <span className="font-16 mr15 fl mt6">发布时间：</span>
<div className="fl"> <div className="fl">
<Tooltip placement="bottom" title={publish_timetype===true?this.props.isAdmin()? "":"发布时间已过，不能再修改":""}> <Tooltip placement="bottom" title={publish_timetype===true?this.props.isAdmin()? "发布时间已过，不能再修改":"":""}>
<DatePicker <DatePicker
dropdownClassName="hideDisable" dropdownClassName="hideDisable"
placeholder="请选择发布时间" placeholder="请选择发布时间"
@ -667,7 +667,7 @@ class Exercisesetting extends Component{
disabledDate={disabledDate} disabledDate={disabledDate}
onChange={this.onChangeTimepublish} onChange={this.onChangeTimepublish}
value={publish_time && moment(publish_time,"YYYY-MM-DD HH:mm")} value={publish_time && moment(publish_time,"YYYY-MM-DD HH:mm")}
disabled={ publish_timetype===true?this.props.isAdmin()?!flagPageEdit:true:!flagPageEdit } disabled={ publish_timetype===true?true:!flagPageEdit }
></DatePicker> ></DatePicker>
</Tooltip> </Tooltip>
<p className="color-red lineh-25 clearfix" style={{height:"25px"}}> <p className="color-red lineh-25 clearfix" style={{height:"25px"}}>
@ -694,7 +694,7 @@ class Exercisesetting extends Component{
disabledDate={disabledDate} disabledDate={disabledDate}
onChange={this.onChangeTimeEnd} onChange={this.onChangeTimeEnd}
value={end_time && moment(end_time,"YYYY-MM-DD HH:mm")} value={end_time && moment(end_time,"YYYY-MM-DD HH:mm")}
disabled={ end_timetype===true?true:!flagPageEdit} disabled={ end_timetype===true?this.props.isAdmin()?!flagPageEdit:true:!flagPageEdit}
> >
</DatePicker> </DatePicker>
<p className="color-red lineh-25 clearfix" style={{height:"25px"}}> <p className="color-red lineh-25 clearfix" style={{height:"25px"}}>

2
public/react/src/modules/courses/poll/PollDetailTabForthRules.js
Unescape View File

@ -461,7 +461,7 @@ class PollDetailTabForthRules extends Component{
format="YYYY-MM-DD HH:mm" format="YYYY-MM-DD HH:mm"
disabledTime={disabledDateTime} disabledTime={disabledDateTime}
disabledDate={disabledDate} disabledDate={disabledDate}
disabled={rule.e_timeflag === undefined ? rule.publish_time === null ? false : moment(rule.end_time, dataformat) <= moment() ? true : !flagPageEdit : rule.e_timeflag == true ? true : !flagPageEdit} disabled={rule.e_timeflag === undefined ? rule.publish_time === null ? false : moment(rule.end_time, dataformat) <= moment() ?this.props.isAdmin()?!flagPageEdit: true : !flagPageEdit : rule.e_timeflag == true ? this.props.isAdmin()?!flagPageEdit :true : !flagPageEdit}
style={{"height":"42px"}} style={{"height":"42px"}}
></DatePicker> ></DatePicker>
</span> </span>

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

@ -1214,7 +1214,7 @@ submittojoinclass=(value)=>{
</li> </li>
{ {
this.props.Headertop && this.props.Headertop.college_identifier && this.props.Headertop && this.props.Headertop.college_identifier &&
<li><a href={`${this.props.Headertop.old_url}/colleges/${this.props.Headertop.college_identifier}/statistics`}>学院统计</a></li> <li><a href={`/colleges/${this.props.Headertop.college_identifier}/statistics`}>学院统计</a></li>
} }
{ {
this.props.Headertop && this.props.Headertop.laboratory_user && this.props.Headertop && this.props.Headertop.laboratory_user &&

Write Preview
Loading…
Cancel
Save