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

Merge remote-tracking branch 'origin/master'

Browse Source
dev_forum
杨树明 6 years ago
parent 45b6fa412c 1212d6329a
commit 41cc5b6c67
6 changed files with 42 additions and 45 deletions
Show Stats Download Patch File Download Diff File

2
public/react/src/modules/courses/busyWork/CommonWorkPost.js
Unescape View File

@ -664,7 +664,7 @@ render(){
> >
{getFieldDecorator('description', { {getFieldDecorator('description', {
rules: [{ rules: [{
required: true, message: '请输入帖子内容', required: true, message: '请输入作品内容',
}, { }, {
max: 5000, message: '最大限制为5000个字符', max: 5000, message: '最大限制为5000个字符',
}], }],

19
public/react/src/modules/courses/busyWork/CommonWorkSetting.js
Unescape View File

@ -49,6 +49,8 @@ class CommonWorkSetting extends Component{
super(props) super(props)
this.publishModal = React.createRef(); this.publishModal = React.createRef();
this.endModal = React.createRef(); this.endModal = React.createRef();
this.fetchMoment = moment()
this.state={ this.state={
unified_setting: true, unified_setting: true,
rules: [], rules: [],
@ -123,6 +125,7 @@ class CommonWorkSetting extends Component{
} else if (result.data.publish_time && moment(result.data.publish_time) < moment()) { } else if (result.data.publish_time && moment(result.data.publish_time) < moment()) {
disable_unified_setting = true disable_unified_setting = true
} }
this.fetchMoment = moment()
this.setState({ this.setState({
// starttimetype:starttype, // starttimetype:starttype,
// endtimetype:endtype, // endtimetype:endtype,
@ -1042,7 +1045,7 @@ class CommonWorkSetting extends Component{
{/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":publish_time_type===true?"发布时间已过，则不能修改":""}> {/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":publish_time_type===true?"发布时间已过，则不能修改":""}>
</Tooltip> */} </Tooltip> */}
<ConditionToolTip condition={moment(this.state.init_publish_time) < moment()} title={"时间已过，不能再修改"}> <ConditionToolTip condition={moment(this.state.init_publish_time) < this.fetchMoment} title={"时间已过，不能再修改"}>
<span> <span>
<DatePicker <DatePicker
@ -1074,7 +1077,7 @@ class CommonWorkSetting extends Component{
<span>截止时间：</span> <span>截止时间：</span>
{/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":end_time_type===true?"截止时间已过，则不能修改":""}> {/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":end_time_type===true?"截止时间已过，则不能修改":""}>
</Tooltip> */} </Tooltip> */}
<ConditionToolTip condition={moment(this.state.init_end_time) < moment()} title={"时间已过，不能再修改"}> <ConditionToolTip condition={moment(this.state.init_end_time) < this.fetchMoment} title={"时间已过，不能再修改"}>
<span> <span>
<DatePicker <DatePicker
dropdownClassName="hideDisable" dropdownClassName="hideDisable"
@ -1133,7 +1136,7 @@ class CommonWorkSetting extends Component{
<RadioGroup onChange={this.allow_late_change} value={allow_late}> <RadioGroup onChange={this.allow_late_change} value={allow_late}>
<Radio style={radioStyle} value={true} disabled={noAuth}>允许补交</Radio> <Radio style={radioStyle} value={true} disabled={noAuth || moment(init_late_time) < this.fetchMoment}>允许补交</Radio>
<div className={"h21 mb10 ml30 mt20"}> <div className={"h21 mb10 ml30 mt20"}>
<span>迟交扣分：</span> <span>迟交扣分：</span>
@ -1146,7 +1149,7 @@ class CommonWorkSetting extends Component{
<div className={" mb10 ml30"}> <div className={" mb10 ml30"}>
<span>结束时间：</span> <span>结束时间：</span>
<ConditionToolTip condition={moment(init_late_time) < moment()} title={"时间已过，不能再修改"}> <ConditionToolTip condition={moment(init_late_time) < this.fetchMoment} title={"时间已过，不能再修改"}>
<span> <span>
<DatePicker <DatePicker
showToday={false} showToday={false}
@ -1175,7 +1178,7 @@ class CommonWorkSetting extends Component{
</div> </div>
<Radio style={radioStyle} value={false} disabled={noAuth}>禁止补交</Radio> <Radio style={radioStyle} value={false} disabled={noAuth || moment(init_late_time) < this.fetchMoment}>禁止补交</Radio>
</RadioGroup> </RadioGroup>
@ -1194,7 +1197,7 @@ class CommonWorkSetting extends Component{
<div className={"h20 mb30 ml60"}> <div className={"h20 mb30 ml60"}>
<span>开启时间：</span> <span>开启时间：</span>
<Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}> <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}>
<ConditionToolTip condition={moment(init_evaluation_start) < moment()} title={"时间已过，不能再修改"}> <ConditionToolTip condition={moment(init_evaluation_start) < this.fetchMoment} title={"时间已过，不能再修改"}>
<span> <span>
<DatePicker <DatePicker
dropdownClassName="hideDisable" dropdownClassName="hideDisable"
@ -1227,7 +1230,7 @@ class CommonWorkSetting extends Component{
{/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}> {/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}>
</Tooltip> */} </Tooltip> */}
<ConditionToolTip condition={moment(init_evaluation_end) < moment()} title={"时间已过，不能再修改"}> <ConditionToolTip condition={moment(init_evaluation_end) < this.fetchMoment} title={"时间已过，不能再修改"}>
<span> <span>
<DatePicker <DatePicker
dropdownClassName="hideDisable" dropdownClassName="hideDisable"
@ -1324,7 +1327,7 @@ class CommonWorkSetting extends Component{
<span>结束时间：</span> <span>结束时间：</span>
{/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}> {/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}>
</Tooltip> */} </Tooltip> */}
<ConditionToolTip condition={moment(init_appeal_time) < moment()} title={"时间已过，不能再修改"}> <ConditionToolTip condition={moment(init_appeal_time) < this.fetchMoment} title={"时间已过，不能再修改"}>
<span> <span>
<DatePicker <DatePicker
dropdownClassName="hideDisable" dropdownClassName="hideDisable"

4
public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js
Unescape View File

@ -81,7 +81,7 @@ class GraduationTasksappraiseReplyChild extends Component{
></GraduationTasksappraiseMainEditor> } ></GraduationTasksappraiseMainEditor> }
</div> </div>
<div className={"stud-class-set edu-back-white mb10"} style={{height:"100%"}}> {!!comment_scores.length && <div className={"stud-class-set edu-back-white mb10"} style={{height:"100%"}}>
<div className="padding20 memoReplies commentsDelegateParent course-message" <div className="padding20 memoReplies commentsDelegateParent course-message"
style={{ paddingTop: '0px', paddingBottom: '0px' }} style={{ paddingTop: '0px', paddingBottom: '0px' }}
@ -96,7 +96,7 @@ class GraduationTasksappraiseReplyChild extends Component{
}) } }) }
</div> </div>
</div> </div>
</div> </div> }
</React.Fragment> </React.Fragment>
) )
} }

50
public/react/src/modules/courses/shixunHomework/Listofworks.js
Unescape View File

@ -1336,23 +1336,19 @@ class Listofworks extends Component {
} }
// 导出实习报告批量 // 导出实习报告批量
internshipreport = ()=>{ internshipreport = (url)=>{
console.log("internshipreport"); console.log("internshipreport");
let url = "/zip/shixun_report"; // params: {
let homeworkid = this.props.match.params.homeworkid; // homework_common_id: homeworkid,
axios.get((url),{ // work_status: this.state.course_groupyslstwo,
params: { // course_group: this.state.checkedValuesineinfo,
homework_common_id: homeworkid, // search: this.state.searchtext,
work_status: this.state.course_groupyslstwo, // }
course_group: this.state.checkedValuesineinfo, // let url = "/zip/shixun_report";
search: this.state.searchtext, // let homeworkid = this.props.match.params.homeworkid;
} axios.get(url).then((response) => {
},{responseType: 'blob'}).then((response) => {
console.log("1342");
console.log(response);
if(response.status === 200){ if(response.status === 200){
window.open(url, '_blank'); window.open(url, '_blank');
}else{
} }
}).catch((error) => { }).catch((error) => {
@ -1361,21 +1357,19 @@ class Listofworks extends Component {
} }
// 课堂学生成绩的导出下载 // 课堂学生成绩的导出下载
Classstudentachievement=()=>{ Classstudentachievement=(url)=>{
console.log("Classstudentachievement"); console.log("Classstudentachievement");
const course_id = this.props.match.params.coursesId; // const course_id = this.props.match.params.coursesId;
let url = "/courses/"+course_id+"/export_member_scores_excel.xlsx"; // let url = "/courses/"+course_id+"/export_member_scores_excel.xlsx";
axios.get((url),{ // ,{
params: { // params: {
group_id: this.state.checkedValuesineinfo, // group_id: this.state.checkedValuesineinfo,
search: this.state.searchtext, // search: this.state.searchtext,
} // }
},{responseType: 'blob'}).then((response) => { // },{responseType: 'blob'})
console.log("1306"); axios.get(url).then((response) => {
console.log(response);
if(response.status === 200){ if(response.status === 200){
window.open(url, '_blank'); window.open(url, '_blank');
}else{
} }
}).catch((error) => { }).catch((error) => {
@ -1531,8 +1525,8 @@ class Listofworks extends Component {
{this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding":"0 20px"}}> {this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding":"0 20px"}}>
导出<i className="iconfont icon-xiajiantou font-12 ml2"></i> 导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
<ul className="drop_down_menu" style={{"right":"-0px","left":"unset","height":"auto"}}> <ul className="drop_down_menu" style={{"right":"-0px","left":"unset","height":"auto"}}>
<li><a onClick={()=>this.internshipreport()}>实训报告</a></li> <li><a onClick={()=>this.internshipreport(`/api/zip/shixun_report?homework_common_id=${this.props.match.params.homeworkid}&work_status=${this.state.course_groupyslstwo}&course_group=${this.state.checkedValuesineinfo}&search=${this.state.searchtext}`)}>实训报告</a></li>
<li><a onClick={()=>this.Classstudentachievement()} >学生成绩</a></li> <li><a onClick={()=>this.Classstudentachievement(`/api/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx?group_id=${this.state.checkedValuesineinfo}&search=${this.state.searchtext}`)} >学生成绩</a></li>
</ul> </ul>
</li>:""} </li>:""}
{this.props.isAdmin() ? {this.props.isAdmin() ?

2
public/react/src/modules/user/FindPasswordComponent.js
Unescape View File

@ -402,7 +402,7 @@ class LoginRegisterComponent extends Component {
: <div style={{height: "25px"}}></div> : <div style={{height: "25px"}}></div>
} }
<DragValidator <DragValidator
height={38} successGreenColor="#b0e811" height={38} successGreenColor="#29bd8b"
style={{height: "38px", width: "100%"}} style={{height: "38px", width: "100%"}}
dragOkCallback={this.dragOkCallback} dragOkCallback={this.dragOkCallback}
></DragValidator> ></DragValidator>

2
public/react/src/modules/user/LoginRegisterComponent.js
Unescape View File

@ -713,7 +713,7 @@ class LoginRegisterComponent extends Component {
} }
<DragValidator <DragValidator
height={38} className="loginInput" successGreenColor="#b0e811" height={38} className="loginInput" successGreenColor="#29bd8b"
style={{ height: '38px'}} style={{ height: '38px'}}
dragOkCallback={this.dragOkCallback} dragOkCallback={this.dragOkCallback}
></DragValidator> ></DragValidator>

Write Preview
Loading…
Cancel
Save