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

chromesetting
daiao 5 years ago
commit 32a698d18c

@ -178,16 +178,9 @@ class Exercisesetting extends Component{
} }
if(result.data.exercise.unified_setting == true && moment(result.data.exercise.end_time) <= moment()){ if(result.data.exercise.unified_setting == true && moment(result.data.exercise.end_time) <= moment()){
// if(this.props.isSuperAdmin()===true){
// this.setState({
// end_timetype:false
// })
// }else{
this.setState({ this.setState({
end_timetype:true end_timetype:true
}) })
// }
} }
let group=result.data.published_course_groups; let group=result.data.published_course_groups;
@ -236,10 +229,10 @@ class Exercisesetting extends Component{
//提交form表单 //提交form表单
handleSubmit = (e) => { handleSubmit = (e) => {
e.preventDefault(); e.preventDefault();
if(this.props&&this.props.Commonheadofthetestpaper.exercise_status){ // if(this.props&&this.props.Commonheadofthetestpaper.exercise_status){
console.log("190"); // console.log("190");
console.log(this.props.Commonheadofthetestpaper.exercise_status); // console.log(this.props.Commonheadofthetestpaper.exercise_status);
} // }
this.props.form.validateFieldsAndScroll((err, values) => { this.props.form.validateFieldsAndScroll((err, values) => {
if(!err){ if(!err){
@ -327,7 +320,7 @@ class Exercisesetting extends Component{
} }
} }
if(this.state.end_timetype === false){ if(this.state.end_timetype === false||this.props.isAdmin()==true){
if(moment(end_time,dataformat) <= moment(publish_time,dataformat)){ if(moment(end_time,dataformat) <= moment(publish_time,dataformat)){
this.setState({ this.setState({
unit_e_tip:"截止时间不能小于发布时间" unit_e_tip:"截止时间不能小于发布时间"
@ -525,7 +518,7 @@ class Exercisesetting extends Component{
end_time:null end_time:null
}) })
}else{ }else{
if(dateString<moment().format('YYYY-MM-DD HH:mm')){ if(dateString<=moment().format('YYYY-MM-DD HH:mm')){
this.setState({ this.setState({
unit_e_tip:"截止时间不能早于当前时间", unit_e_tip:"截止时间不能早于当前时间",
e_flag:true e_flag:true

@ -666,7 +666,7 @@ class GraduationTasks extends Component{
<React.Fragment> <React.Fragment>
{/*{this.props.isAdmin() ?<WordsBtn style="blue" className="mr30" onClick={() => this.addDir()}>题库选用</WordsBtn>:""}*/} {/*{this.props.isAdmin() ?<WordsBtn style="blue" className="mr30" onClick={() => this.addDir()}>题库选用</WordsBtn>:""}*/}
{/*{this.props.isAdmin() ?<a href={"/api/graduation_tasks/"+category_id+"/tasks_list.xls"} className={"fr color-blue font-16"}>导出成绩</a> :""}*/} {/*{this.props.isAdmin() ?<a href={"/api/graduation_tasks/"+category_id+"/tasks_list.xls"} className={"fr color-blue font-16"}>导出成绩</a> :""}*/}
{this.props.isAdmin() ? <WordsBtn style="blue" className="mr10 fr font-16"> {this.props.isAdmin() ? <WordsBtn style="blue" className=" fr font-16">
<Link to={"/courses/" + coursesId + "/graduation_tasks/"+category_id+"/new"}> <Link to={"/courses/" + coursesId + "/graduation_tasks/"+category_id+"/new"}>
<span className={"color-blue font-16"}>新建</span> <span className={"color-blue font-16"}>新建</span>
</Link> </Link>

@ -589,7 +589,7 @@ class PollDetailTabForth extends Component{
<div className="clearfix"> <div className="clearfix">
<span className="mr15 fl mt10 font-16">截止时间</span> <span className="mr15 fl mt10 font-16">截止时间</span>
<div className="fl"> <div className="fl">
<Tooltip placement="bottom" title={un_change_end ? this.props.isAdmin()?"":"截止时间已过,不能再修改":""}> <Tooltip placement="bottom" title={un_change_end ? this.props.isAdmin()?"截止时间已过,不能再修改":"":""}>
<span> <span>
<DatePicker <DatePicker
showToday={false} showToday={false}
@ -605,7 +605,7 @@ class PollDetailTabForth extends Component{
disabledDate={disabledDate} disabledDate={disabledDate}
onChange={this.onChangeTimeEnd} onChange={this.onChangeTimeEnd}
value={ end_time && moment(end_time,dataformat) } value={ end_time && moment(end_time,dataformat) }
disabled={un_change_end == true ? this.props.isAdmin()?!flagPageEdit:true : !flagPageEdit } disabled={un_change_end == true ?true : !flagPageEdit }
> >
</DatePicker> </DatePicker>
</span> </span>

@ -462,7 +462,7 @@ class PollDetailTabForthRules extends Component{
disabledTime={disabledDateTime} disabledTime={disabledDateTime}
disabledDate={disabledDate} disabledDate={disabledDate}
disabled={ disabled={
this.props.type==="polls"||this.props.type==="Exercise"? this.props.type==="Exercise"?
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: 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:
rule.e_timeflag === undefined ? rule.publish_time === null ? false : moment(rule.end_time, dataformat) <= moment() ? true : !flagPageEdit : rule.e_timeflag == true ? true : !flagPageEdit rule.e_timeflag === undefined ? rule.publish_time === null ? false : moment(rule.end_time, dataformat) <= moment() ? true : !flagPageEdit : rule.e_timeflag == true ? true : !flagPageEdit
} }

@ -1,11 +1,12 @@
.float_button { .float_button {
background-image: url(./images/float_switch.jpg); background-image: url(images/float_switch.jpg);
height: 112px; height: 141px;
width: 38px; width: 38px;
position: absolute; position: absolute;
left: -38px; left: -38px;
top: 32%; top: 32%;
cursor: pointer; cursor: pointer;
padding-top: 15px;
} }
.float_button .text { .float_button .text {
position: relative; position: relative;
@ -17,8 +18,8 @@
} }
.jupyter_float_button { .jupyter_float_button {
background-image: url(./images/float_switch.jpg); background-image: url(images/float_switch.jpg);
height: 112px; height: 141px;
width: 38px; width: 38px;
position: absolute; position: absolute;
right: 0px; right: 0px;
@ -26,6 +27,7 @@
cursor: pointer; cursor: pointer;
left:auto; left:auto;
z-index: 99999999; z-index: 99999999;
padding-top: 15px;
} }
.jupyter_float_button .text { .jupyter_float_button .text {
@ -37,6 +39,16 @@
user-select: none; user-select: none;
} }
@keyframes mymove
{
from {right:0px;}
to {right:330px;}
}
.newjupyter_float_button{ .newjupyter_float_button{
right: 330px; /*right: 330px;*/
/*animation-duration:2s;*/
/*infinite*/
animation:mymove 0.35s;
animation-fill-mode:forwards;
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1003 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

@ -114,7 +114,7 @@
.ant-drawer-content-wrapper{ .ant-drawer-content-wrapper{
width:330px !important; width:330px !important;
box-shadow: -2px 0 8px #070F1A !important; //box-shadow: -2px 0 8px #070F1A !important;
} }
.ant-drawer-body{ .ant-drawer-body{
padding: 0px; padding: 0px;

Loading…
Cancel
Save