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

调整

Browse Source
dev_forum
杨树明 6 years ago
parent 83937f4304
commit 05a22b7e9c
15 changed files with 1165 additions and 1159 deletions
Show Stats Download Patch File Download Diff File

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

@ -421,7 +421,7 @@ class CommonWorkSetting extends Component{
Topval:"本操作只对“未发布”的对象生效", Topval:"本操作只对“未发布”的对象生效",
Botvalleft:"暂不发布", Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布", Botval:"则通过后续手动设置，定时发布",
starttime:starttime, starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
endtime:endtime, endtime:endtime,
Cancelname:"暂不发布", Cancelname:"暂不发布",
Savesname:"立即发布", Savesname:"立即发布",

2
public/react/src/modules/courses/coursesPublic/Associationmodel.js
Unescape View File

@ -86,7 +86,7 @@ class Associationmodel extends Component{
ModalSave:this.goback, ModalSave:this.goback,
loadtype:true loadtype:true
}) })
this.props.funlist()
} }
} }

2
public/react/src/modules/courses/exercise/Exercise.js
Unescape View File

@ -213,7 +213,7 @@ class Exercise extends Component{
Topval:"本操作只对“未发布”的对象生效", Topval:"本操作只对“未发布”的对象生效",
Botvalleft:"暂不发布", Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布", Botval:"则通过后续手动设置，定时发布",
starttime:"发布时间："+this.props.getNowFormatDates(1), starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:this.props.getNowFormatDates(1), starttimes:this.props.getNowFormatDates(1),
endtime:"截止时间："+this.props.getNowFormatDates(2), endtime:"截止时间："+this.props.getNowFormatDates(2),
Cancelname:"暂不发布", Cancelname:"暂不发布",

1
public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
Unescape View File

@ -65,6 +65,7 @@ class GraduateTaskItem extends Component{
cardsModalsavetype:this.cannerassocition, cardsModalsavetype:this.cannerassocition,
loadtype:true loadtype:true
}) })
this.props.funlist()
} }
}).catch((error)=>{ }).catch((error)=>{

10
public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
Unescape View File

@ -415,7 +415,7 @@ class GraduationTaskssettingapp extends Component{
Topval:"发布设置均可修改", Topval:"发布设置均可修改",
Botvalleft:"点击修改", Botvalleft:"点击修改",
Botval:"此设置将对所有分班生效", Botval:"此设置将对所有分班生效",
starttime:moment(moment(handleDateString(this.props.getNowFormatDates(1)))).format("YYYY-MM-DD HH:mm") , starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm") ,
starttimes:this.props.getNowFormatDates(1), starttimes:this.props.getNowFormatDates(1),
typs:"start", typs:"start",
endtime:endtime, endtime:endtime,
@ -1164,7 +1164,7 @@ class GraduationTaskssettingapp extends Component{
<div className={"h20 mb30 ml30"} > <div className={"h20 mb30 ml30"} >
<span>截止时间：</span> <span>截止时间：</span>
<Tooltip placement="bottom" title={this.props.isAdmin()===true?endtimetype===true?"时间已过，不能再修改":"":""}> <Tooltip placement="bottom" title={this.props.isSuperAdmin()===true?"":this.props.isAdmin()===true?endtimetype===true?"时间已过，不能再修改":"":""}>
<span> <span>
<DatePicker <DatePicker
showToday={false} showToday={false}
@ -1301,8 +1301,10 @@ class GraduationTaskssettingapp extends Component{
<RadioGroup onChange={this.funcommentstatus} disabled={this.props.isAdmin()===true?flagPageEdit===true?false:true:true} value={crosscomment===false?undefined:commentstatus===0?2:commentstatus===2?2:commentstatus===4?4:undefined}> <RadioGroup onChange={this.funcommentstatus} disabled={this.props.isAdmin()===true?flagPageEdit===true?false:true:true} value={crosscomment===false?undefined:commentstatus===0?2:commentstatus===2?2:commentstatus===4?4:undefined}>
<Radio style={radioStyle} value={2}>指导老师手动分配 <span className={"font-14 color-grey-c ml10"}>（由指导老师在作品列表中，手动选择每个作品被分配的评阅老师）</span></Radio> <Radio style={radioStyle} value={2}>指导老师手动分配 <span className={"font-14 color-grey-c ml10"}>（由指导老师在作品列表中，手动选择每个作品被分配的评阅老师）</span></Radio>
<Radio style={radioStyle} value={4}>答辩组间老师互评 <span className={"font-14 color-grey-c ml10"}>（由系统按照设置在答辩组之间自动分配:<Link to={"/courses/"+courseId+"/teachers"}> <Radio style={radioStyle} value={4}>答辩组间老师互评 <span className={"font-14 color-grey-c ml10"}>（由系统按照设置在答辩组之间自动分配:
<span className={"color-blue"}>答辩组设置</span></Link></span></Radio> <a href={"/courses/"+courseId+"/teachers"} target="_blank">
<span className={"color-blue"}>答辩组设置</span></a>
</span></Radio>
</RadioGroup> </RadioGroup>
</span> </span>

15
public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
Unescape View File

@ -332,7 +332,7 @@ class GraduationTaskssettinglist extends Component{
Topval:"发布设置均可修改", Topval:"发布设置均可修改",
Botvalleft:"点击修改", Botvalleft:"点击修改",
Botval:"此设置将对所有分班生效", Botval:"此设置将对所有分班生效",
starttime:moment(new Date()).format('YYYY-MM-DD 00:00'), starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm") ,
starttimes:this.props.getNowFormatDates(1), starttimes:this.props.getNowFormatDates(1),
typs:"start", typs:"start",
endtime:endtime, endtime:endtime,
@ -544,6 +544,7 @@ class GraduationTaskssettinglist extends Component{
axios.get(url).then((result)=>{ axios.get(url).then((result)=>{
if(result.data.status===0){ if(result.data.status===0){
this.searchValue()
this.setState({ this.setState({
Modalstype:true, Modalstype:true,
Modalstopval:result.data.message, Modalstopval:result.data.message,
@ -730,7 +731,7 @@ class GraduationTaskssettinglist extends Component{
其它历史评分将全部失效</pre>:""}> 其它历史评分将全部失效</pre>:""}>
{tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} > {tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
tag.name {tag.name}
</a> </a>
: :
<a style={{color:tag.name==="调分"?"#000":'#4CACFF'}} <a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
@ -863,7 +864,7 @@ class GraduationTaskssettinglist extends Component{
其它历史评分将全部失效</pre>:""}> 其它历史评分将全部失效</pre>:""}>
{tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} > {tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
tag.name {tag.name}
</a> </a>
: :
<a style={{color:tag.name==="调分"?"#000":'#4CACFF'}} <a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
@ -1012,7 +1013,8 @@ class GraduationTaskssettinglist extends Component{
<Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/> <Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
其它历史评分将全部失效</pre>:""}> 其它历史评分将全部失效</pre>:""}>
{tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} > {tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
tag.name</a> {tag.name}
</a>
: :
<a style={{color:tag.name==="调分"?"#000":'#4CACFF'}} <a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
onClick={tag.name==="调分"?()=>this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""} onClick={tag.name==="调分"?()=>this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""}
@ -1145,7 +1147,7 @@ class GraduationTaskssettinglist extends Component{
<Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/> <Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
其它历史评分将全部失效</pre>:""}> 其它历史评分将全部失效</pre>:""}>
{tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} > {tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
tag.name {tag.name}
</a> </a>
: :
<a style={{color:tag.name==="调分"?"#000":'#4CACFF'}} <a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
@ -1256,6 +1258,7 @@ class GraduationTaskssettinglist extends Component{
visible={visibles} visible={visibles}
Cancel={this.Cancel} Cancel={this.Cancel}
taskid={taskslistdata&&taskslistdata.task_id} taskid={taskslistdata&&taskslistdata.task_id}
funlist={this.searchValue()}
/>:""} />:""}
{taskslistdata&&taskslistdata? {taskslistdata&&taskslistdata?
@ -1551,7 +1554,7 @@ class GraduationTaskssettinglist extends Component{
to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/setting"}>设置</Link> to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/setting"}>设置</Link>
{taskslistdata.work_status===undefined?"":taskslistdata.work_status.map((item,key)=>{ {taskslistdata.work_status===undefined||taskslistdata.work_status===null||taskslistdata.work_status.length===0?"":taskslistdata.work_status.map((item,key)=>{
return( return(
<span key={key}> <span key={key}>
{item==="提交作品"?<a className={"fr color-blue font-16"} href={"/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+category_id+"/"+task_Id+"/works/new"}>提交作品</a>:""} {item==="提交作品"?<a className={"fr color-blue font-16"} href={"/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+category_id+"/"+task_Id+"/works/new"}>提交作品</a>:""}

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

@ -81,7 +81,7 @@ class GraduationTasksquestions extends Component{
Topval:"发布设置均可修改", Topval:"发布设置均可修改",
Botvalleft:"点击修改", Botvalleft:"点击修改",
Botval:"此设置将对所有分班生效", Botval:"此设置将对所有分班生效",
starttime:moment(new Date()).format('YYYY-MM-DD 00:00'), starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm") ,
starttimes:this.props.getNowFormatDates(1), starttimes:this.props.getNowFormatDates(1),
typs:"start", typs:"start",
endtime:endtime, endtime:endtime,

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

@ -413,7 +413,7 @@ class GraduationTasks extends Component{
Topval:"本操作只对“未发布”的对象生效", Topval:"本操作只对“未发布”的对象生效",
Botvalleft:"暂不发布", Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布", Botval:"则通过后续手动设置，定时发布",
starttime:"发布时间："+starttime, starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:this.props.getNowFormatDates(1), starttimes:this.props.getNowFormatDates(1),
typs:"start", typs:"start",
endtime:"截止时间："+endtime, endtime:"截止时间："+endtime,

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

@ -355,7 +355,7 @@ class Poll extends Component{
Topval:"本操作只对“未发布”的对象生效", Topval:"本操作只对“未发布”的对象生效",
Botvalleft:"暂不发布", Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布", Botval:"则通过后续手动设置，定时发布",
starttime:"发布时间："+this.props.getNowFormatDates(1), starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:this.props.getNowFormatDates(1), starttimes:this.props.getNowFormatDates(1),
endtime:"截止时间："+this.props.getNowFormatDates(2), endtime:"截止时间："+this.props.getNowFormatDates(2),
Cancelname:"暂不发布", Cancelname:"暂不发布",

4
public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js
Unescape View File

@ -81,7 +81,7 @@ class Immediatelypublish extends Component{
Topval:"本操作只对“未发布”的对象生效", Topval:"本操作只对“未发布”的对象生效",
Botvalleft:"暂不发布", Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布", Botval:"则通过后续手动设置，定时发布",
starttime:"发布时间："+this.props.getNowFormatDates(1), starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:this.props.getNowFormatDates(1), starttimes:this.props.getNowFormatDates(1),
endtime:"截止时间："+this.props.getNowFormatDates(2), endtime:"截止时间："+this.props.getNowFormatDates(2),
Cancelname:"暂不发布", Cancelname:"暂不发布",
@ -120,7 +120,7 @@ class Immediatelypublish extends Component{
Topval:"本操作只对“未发布”的对象生效", Topval:"本操作只对“未发布”的对象生效",
Botvalleft:"暂不发布", Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布", Botval:"则通过后续手动设置，定时发布",
starttime:"发布时间："+this.props.getNowFormatDates(1), starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:this.props.getNowFormatDates(1), starttimes:this.props.getNowFormatDates(1),
endtime:"截止时间："+this.props.getNowFormatDates(2), endtime:"截止时间："+this.props.getNowFormatDates(2),
Cancelname:"暂不发布", Cancelname:"暂不发布",

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

@ -821,7 +821,7 @@ class Listofworks extends Component {
Topval: "本操作只对“未发布”的对象生效", Topval: "本操作只对“未发布”的对象生效",
Botvalleft: "暂不发布", Botvalleft: "暂不发布",
Botval: "则通过后续手动设置，定时发布", Botval: "则通过后续手动设置，定时发布",
starttime: "发布时间：" + starttime, starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
endtime: "截止时间：" + endtime, endtime: "截止时间：" + endtime,
starttimes:starttime, starttimes:starttime,
typs:"start", typs:"start",

2
public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
Unescape View File

@ -304,7 +304,7 @@ class ShixunStudentWork extends Component {
Topval:"本操作只对“未发布”的对象生效", Topval:"本操作只对“未发布”的对象生效",
Botvalleft:"暂不发布", Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布", Botval:"则通过后续手动设置，定时发布",
starttime:"发布时间："+starttime, starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
endtime:"截止时间："+endtime, endtime:"截止时间："+endtime,
Cancelname:"暂不发布", Cancelname:"暂不发布",
Savesname:"立即发布", Savesname:"立即发布",

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

@ -1237,7 +1237,7 @@ class Trainingjobsetting extends Component {
Topval: "本操作只对“未发布”的对象生效", Topval: "本操作只对“未发布”的对象生效",
Botvalleft: "暂不发布", Botvalleft: "暂不发布",
Botval: "则通过后续手动设置，定时发布", Botval: "则通过后续手动设置，定时发布",
starttime: "发布时间：" + starttime, starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:starttime, starttimes:starttime,
typs:"start", typs:"start",
endtime: "截止时间：" + endtime, endtime: "截止时间：" + endtime,

2
public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
Unescape View File

@ -148,7 +148,7 @@ class Workquestionandanswer extends Component {
Topval: "本操作只对“未发布”的对象生效", Topval: "本操作只对“未发布”的对象生效",
Botvalleft: "暂不发布", Botvalleft: "暂不发布",
Botval: "则通过后续手动设置，定时发布", Botval: "则通过后续手动设置，定时发布",
starttime: "发布时间：" + starttime, starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
endtime: "截止时间：" + endtime, endtime: "截止时间：" + endtime,
Cancelname: "暂不发布", Cancelname: "暂不发布",
Savesname: "立即发布", Savesname: "立即发布",

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

@ -209,7 +209,7 @@ class ShixunHomework extends Component{
Topval:"本操作只对“未发布”的对象生效", Topval:"本操作只对“未发布”的对象生效",
Botvalleft:"暂不发布", Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布", Botval:"则通过后续手动设置，定时发布",
starttime:"发布时间："+starttime, starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:starttime, starttimes:starttime,
endtime:"截止时间："+endtime, endtime:"截止时间："+endtime,
Cancelname:"暂不发布", Cancelname:"暂不发布",
@ -403,7 +403,7 @@ class ShixunHomework extends Component{
Topval:"本操作只对“未发布”的对象生效", Topval:"本操作只对“未发布”的对象生效",
Botvalleft:"暂不发布", Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布", Botval:"则通过后续手动设置，定时发布",
starttime:"发布时间："+ starttime, starttime:"发布时间："+ moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:starttime, starttimes:starttime,
typs:"start", typs:"start",
endtime:"截止时间："+ endtime, endtime:"截止时间："+ endtime,

Write Preview
Loading…
Cancel
Save