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
hjm 5 years ago
parent ed149ff555 06de981d65
commit f669cdbb83
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File

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

@ -160,7 +160,6 @@ class GraduationTasksappraiseReply extends Component{
<React.Fragment> <React.Fragment>
{comment_scores.length===0&&isStudent===true||comment_scores.length===0&&isNotMember===true? "": <div className="edu-back-white padding20-30" style={{marginTop: '16px'}}> {comment_scores.length===0&&isStudent===true||comment_scores.length===0&&isNotMember===true? "": <div className="edu-back-white padding20-30" style={{marginTop: '16px'}}>
{isStudent===true? {isStudent===true?
<GraduationTasksappraiseReplyChild <GraduationTasksappraiseReplyChild
{...this.props} {...this.props}
{...this.state} {...this.state}
@ -170,8 +169,7 @@ class GraduationTasksappraiseReply extends Component{
addSuccess={this.addSuccess} addSuccess={this.addSuccess}
onDelete={this.onDelete} onDelete={this.onDelete}
/> />
: : <GraduationTasksappraiseReplyChild {...this.state} {...this.props}
<GraduationTasksappraiseReplyChild {...this.state} {...this.props}
cancelmodel={this.cancelmodel} cancelmodel={this.cancelmodel}
showModulationtype={(id)=>this.showModulationtype(id)} showModulationtype={(id)=>this.showModulationtype(id)}
saveModulationModal={(value,num)=>this.saveModulationModal(value,num)} saveModulationModal={(value,num)=>this.saveModulationModal(value,num)}

3
public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
Unescape View File

@ -80,10 +80,11 @@ class GraduateTopicDetailTable extends Component{
} }
sureAgreeTopic=(count)=>{ sureAgreeTopic=(count)=>{
if(count > 0){ if(count > 0){
debugger
let{tableData}=this.props; let{tableData}=this.props;
let{operationId,classesId}=this.state let{operationId,classesId}=this.state
let courseId=this.props.match.params.course_id; let courseId=this.props.match.params.course_id;
let name=tableData.group_list.filter(item=>item.course_group_id==classesId)[0].group_name; let name=tableData.group_list.filter(item=>item.group_id==classesId)[0].group_name;
this.agreeChoose(courseId,operationId,classesId,name); this.agreeChoose(courseId,operationId,classesId,name);
}else{ }else{
this.setState({ this.setState({

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

@ -1747,7 +1747,7 @@ class Trainingjobsetting extends Component {
<div> <div>
<div className="clearfix mb5 ml15"> <div className="clearfix mb5 ml15">
<span className="font-16 mr15 fl mt6" style={{"color":"#999999"}}>发布时间：</span> <span className="font-16 mr15 fl mt6" style={{"color":"#999999"}}>发布时间：</span>
<Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : starttimetype === true ? "发布时间已过，则不能修改" : ""}></Tooltip> <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditstwo === true ? "发布时间已过，则不能修改" : ""}>
<div className="fl"> <div className="fl">
<DatePicker <DatePicker
showToday={false} showToday={false}
@ -1775,11 +1775,12 @@ class Trainingjobsetting extends Component {
} }
</p> </p>
</div> </div>
</Tooltip>
<span className="ml20 fl mt10" style={{"color":"#999999","text-align":"left","font-size":"14px"}}>(学生收到作业的时间)</span> <span className="ml20 fl mt10" style={{"color":"#999999","text-align":"left","font-size":"14px"}}>(学生收到作业的时间)</span>
</div> </div>
<div className="clearfix ml15"> <div className="clearfix ml15">
<span className="mr15 fl mt10 font-16" style={{"color":"#999999"}}>截止时间：</span> <span className="mr15 fl mt10 font-16" style={{"color":"#999999"}}>截止时间：</span>
<Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : starttimetype === true ? "截止时间已过，则不能修改" : ""}> </Tooltip> <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditsthrees === true ? "截止时间已过，则不能修改" : ""}>
<div className="fl"> <div className="fl">
<DatePicker <DatePicker
showToday={false} showToday={false}
@ -1807,6 +1808,7 @@ class Trainingjobsetting extends Component {
} }
</p> </p>
</div> </div>
</Tooltip>
<span className=" ml20 fl mt10 color-grey-9" style={{"text-align":"left","font-size":"14px"}}>(学生“按时”提交作品的时间截点)</span> <span className=" ml20 fl mt10 color-grey-9" style={{"text-align":"left","font-size":"14px"}}>(学生“按时”提交作品的时间截点)</span>
</div> </div>
</div> </div>
@ -1924,7 +1926,7 @@ class Trainingjobsetting extends Component {
checked={this.state.completionefficiencyscore} style={{"color":"#666666"}}>效率分<span checked={this.state.completionefficiencyscore} style={{"color":"#666666"}}>效率分<span
className={"font-14 color-grey-9 font-14 ml15"} style={{"text-align":"left"}}>(选中，则学生最终成绩包含效率分)</span></Checkbox> className={"font-14 color-grey-9 font-14 ml15"} style={{"text-align":"left"}}>(选中，则学生最终成绩包含效率分)</span></Checkbox>
</div> </div>
<div className="ml80 mt30"> <div className="ml85 mt30">
<span className="c_grey mr10" style={{"color":"#999999"}}>分值</span> <span className="c_grey mr10" style={{"color":"#999999"}}>分值</span>
<InputNumber min={0} disabled={!flagPageEdit} max={100} className="ml10 h40 mr10 color-grey-9" <InputNumber min={0} disabled={!flagPageEdit} max={100} className="ml10 h40 mr10 color-grey-9"
style={{width: "100px","color":"#999999"}} style={{width: "100px","color":"#999999"}}

Write Preview
Loading…
Cancel
Save