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

调整

Browse Source
dev_forum
杨树明 6 years ago
parent 0ea35bb571
commit 683161b1ec
12 changed files with 374 additions and 344 deletions
Show Stats Download Patch File Download Diff File

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

@ -8,6 +8,7 @@ import '../css/members.css'
import { WordsBtn } from 'educoder'
import '../css/busyWork.css'
import _ from 'lodash';
import moment from 'moment'
import UseBank from "../busyWork/UseBank";
import ImmediatelyPublish from "../poll/pollPublicBtn/ImmediatelyPublish";
import ImmediatelyEnd from "../poll/pollPublicBtn/ImmediatelyEnd";
@ -187,7 +188,7 @@ class Exercise extends Component{
}
// 题库选用成功后刷新页面
useBankSuccess=(checkValue,value)=>{
debugger
let{type,StudentList_value,page,limit}=this.state;
let coursesId=this.props.match.params.coursesId;
let url=`/courses/${coursesId}/exercises/publish_modal.json`;
@ -210,9 +211,9 @@ class Exercise extends Component{
modalname:"立即发布",
modaltype:response.data.un_publish > 0 ? 1 : 2,
visible:true,
Topval:"本操作只对“未发布”的对象生效",
Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布",
Topval:"学生将立即收到试卷",
// Botvalleft:"暂不发布",
Botval:`本操作只对"未发布"的分班有效`,
starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:this.props.getNowFormatDates(1),
endtime:"截止时间："+this.props.getNowFormatDates(2),

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

@ -412,9 +412,9 @@ class GraduationTaskssettingapp extends Component{
this.setState({
modalname:"立即发布",
visibles:true,
Topval:"发布设置均可修改",
Botvalleft:"点击修改",
Botval:"此设置将对所有分班生效",
Topval:"学生将立即收到毕设任务",
// Botvalleft:"点击修改",
Botval:`本操作只对"未发布"的分班有效`,
starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm") ,
starttimes:this.props.getNowFormatDates(1),
typs:"start",
@ -787,9 +787,9 @@ class GraduationTaskssettingapp extends Component{
this.setState({
modalname:"立即截止",
visibles:true,
Topval:"本操作只对“提交中”的对象生效",
Botvalleft:"暂不截止",
Botval:"则将根据已设置的截止时间，定时截止",
Topval:"学生将不能再提交作品",
// Botvalleft:"暂不截止",
Botval:`本操作只对"提交中"的分班有效`,
Cancelname:"暂不截止",
Savesname:"立即截止",
Cancel:this.cancelmodel,

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

@ -100,7 +100,7 @@ class GraduationTaskssettinglist extends Component{
grouping: result.data.have_grouping === true ? worklists[i].grouping_name : null,
submitstate: worklists[i].status === 0 ? "未提交" : worklists[i].status === 1 ? "按时提交" : worklists[i].status === 2 ? "延时提交" : "",
turnovertime:worklists[i].update_time,
associationitems: {name:worklists[i].project_info === undefined ?"--": worklists[i].project_info.name,id:worklists[i].project_info.id},
associationitems:result.data.have_grouping==false?"": {name:worklists[i].project_info === undefined ?"--": worklists[i].project_info.name,id:worklists[i].project_info.id},
teacherrating: worklists[i].teacher_comment_score,
crossrating: worklists[i].cross_comment_score,
finalscore: worklists[i].final_score.work_score === null ? "--" : worklists[i].final_score.work_score,
@ -309,9 +309,9 @@ class GraduationTaskssettinglist extends Component{
this.setState({
modalname:"立即截止",
visible:true,
Topval:"本操作只对“提交中”的对象生效",
Botvalleft:"暂不截止",
Botval:"则将根据已设置的截止时间，定时截止",
Topval:"学生将不能再提交作品",
// Botvalleft:"暂不截止",
Botval:`本操作只对"提交中"的分班有效`,
Cancelname:"暂不截止",
Savesname:"立即截止",
Cancel:this.cancelmodel,
@ -328,9 +328,9 @@ class GraduationTaskssettinglist extends Component{
this.setState({
modalname:"立即发布",
visible:true,
Topval:"发布设置均可修改",
Botvalleft:"点击修改",
Botval:"此设置将对所有分班生效",
Topval:"学生将立即收到毕设任务",
// Botvalleft:"点击修改",
Botval:`本操作只对"未发布"的分班有效`,
starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm") ,
starttimes:this.props.getNowFormatDates(1),
typs:"start",
@ -742,8 +742,9 @@ class GraduationTaskssettinglist extends Component{
</a>
:
<a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
onClick={tag.name==="调分"?()=>this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""}
>{tag.status===0?"":tag.name}</a>
onClick={tag.name==="调分"?()=>this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""}>
{tag.status===0?"":tag.name}
</a>
}
</Tooltip>
@ -874,10 +875,8 @@ class GraduationTaskssettinglist extends Component{
{this.props.isAdmin()?operation.map((tag,key) => {
return(
<div key={key}>
<Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
其它历史评分将全部失效</pre>:""}>
{tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
{tag.name}
</a>
@ -1045,7 +1044,6 @@ class GraduationTaskssettinglist extends Component{
>{tag.status===0?"":tag.name}</a>
}
</Tooltip>
}
</div>
)
}):""}
@ -1192,7 +1190,6 @@ class GraduationTaskssettinglist extends Component{
>{tag.status===0?"":tag.name}</a>
}
</Tooltip>
}
</div>
)
}):""}
@ -1223,13 +1220,44 @@ class GraduationTaskssettinglist extends Component{
let task_Id = this.props.match.params.task_Id;
if(taskslistdata&&taskslistdata.cross_comment===false){
columns.map((item,key)=>{
if(item.title==="交叉评分"){
columns.splice(key,1)
}
})
if(taskslistdata&&taskslistdata.have_grouping===false){
columns.map((item,key)=>{
if(item.title==="关联项目"){
columns.splice(key,1)
}
})
columns.map((item,key)=>{
if(item.title==="分组"){
columns.splice(key,1)
}
})
}
}else{
if(taskslistdata&&taskslistdata.have_grouping===false){
columns.map((item,key)=>{
if(item.title==="关联项目"){
columns.splice(key,1)
}
})
columns.map((item,key)=>{
if(item.title==="分组"){
columns.splice(key,1)
}
})
}
}
console.log(columns)
return(
<React.Fragment>

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

@ -59,9 +59,9 @@ class GraduationTasksquestions extends Component{
this.setState({
modalname:"立即截止",
visible:true,
Topval:"本操作只对“提交中”的对象生效",
Botvalleft:"暂不截止",
Botval:"则将根据已设置的截止时间，定时截止",
Topval:"学生将不能再提交作品",
// Botvalleft:"暂不截止",
Botval:`本操作只对"提交中"的分班有效`,
Cancelname:"暂不截止",
Savesname:"立即截止",
Cancel:this.cancelmodel,
@ -78,9 +78,9 @@ class GraduationTasksquestions extends Component{
this.setState({
modalname:"立即发布",
visible:true,
Topval:"发布设置均可修改",
Botvalleft:"点击修改",
Botval:"此设置将对所有分班生效",
Topval:"学生将立即收到毕设任务",
// Botvalleft:"点击修改",
Botval:`本操作只对"未发布"的分班有效`,
starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm") ,
starttimes:this.props.getNowFormatDates(1),
typs:"start",

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

@ -33,6 +33,7 @@ class GraduationTasks extends Component{
isSpin:false,
typs:undefined,
starttimes:undefined,
}
}
fetchAll = (search,page,order,count) => {
@ -410,9 +411,9 @@ class GraduationTasks extends Component{
this.setState({
modalname:"立即发布",
visible:true,
Topval:"本操作只对“未发布”的对象生效",
Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布",
Topval:"学生将立即收到毕设任务",
// Botvalleft:"暂不发布",
Botval:`本操作只对"未发布"的分班有效`,
starttime:"发布时间："+moment(new Date()).format("YYYY-MM-DD HH:mm"),
starttimes:this.props.getNowFormatDates(1),
typs:"start",
@ -476,9 +477,9 @@ class GraduationTasks extends Component{
this.setState({
modalname:"立即截止",
visible:true,
Topval:"本操作只对“提交中”的对象生效",
Botvalleft:"暂不截止",
Botval:"则将根据已设置的截止时间，定时截止",
Topval:"学生将不能再提交作品",
// Botvalleft:"暂不截止",
Botval:`本操作只对"提交中"的分班有效`,
Cancelname:"暂不截止",
Savesname:"立即截止",
Cancel:this.publishcanner,
@ -603,7 +604,6 @@ class GraduationTasks extends Component{
{/*立即发布*/}
<HomeworkModal
modaltype={modaltype}
modalname={modalname}
visible={visible}
Topval={Topval}
@ -621,6 +621,7 @@ class GraduationTasks extends Component{
course_groups={this.state.course_groups}
modaltype={this.state.modaltype}
getcourse_groupslist={(id) => this.getcourse_groupslist(id)}
/>

12
public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyEnd.js
Unescape View File

@ -70,9 +70,9 @@ class ImmediatelyEnd extends Component{
modalname:"立即截止",
modaltype:response.data.on_commiting > 0 ? 1 : 2,
visible:true,
Topval:"本操作只对“提交中”的对象生效",
Botvalleft:"暂不截止",
Botval:"则将根据已设置的截止时间，定时截止",
Topval:"学生将不能再提交试卷",
// Botvalleft:"暂不截止",
Botval:`本操作只对"提交中"的分班有效`,
// starttime:"发布时间："+getNowFormatDate(1),
// endtime:"截止时间："+getNowFormatDate(2),
Cancelname:"暂不截止",
@ -112,9 +112,9 @@ class ImmediatelyEnd extends Component{
modalname:"立即截止",
modaltype:response.data.on_commiting > 0 ? 1 : 2,
visible:true,
Topval:"本操作只对“提交中”的对象生效",
Botvalleft:"暂不截止",
Botval:"则将根据已设置的截止时间，定时截止",
Topval:"学生将不能再提交问卷",
// Botvalleft:"暂不截止",
Botval:`本操作只对"提交中"的分班有效`,
// starttime:"发布时间："+getNowFormatDate(1),
// endtime:"截止时间："+getNowFormatDate(2),
Cancelname:"暂不截止",

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

@ -78,9 +78,9 @@ class Immediatelypublish extends Component{
modalname:"立即发布",
modaltype:response.data.un_publish > 0 ? 1 : 2,
visible:true,
Topval:"本操作只对“未发布”的对象生效",
Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布",
Topval:"学生将立即收到试卷",
// Botvalleft:"暂不发布",
Botval:`本操作只对"未发布"的分班有效`,
starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:this.props.getNowFormatDates(1),
endtime:"截止时间："+this.props.getNowFormatDates(2),
@ -117,9 +117,9 @@ class Immediatelypublish extends Component{
modalname:"立即发布",
modaltype:response.data.un_publish > 0 ? 1 : 2,
visible:true,
Topval:"本操作只对“未发布”的对象生效",
Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布",
Topval:"学生将立即收到问卷",
// Botvalleft:"暂不发布",
Botval:`本操作只对"未发布"的分班有效`,
starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:this.props.getNowFormatDates(1),
endtime:"截止时间："+this.props.getNowFormatDates(2),

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

@ -818,9 +818,9 @@ class Listofworks extends Component {
modalname: "立即发布",
modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1,
svisible: true,
Topval: "本操作只对“未发布”的对象生效",
Botvalleft: "暂不发布",
Botval: "则通过后续手动设置，定时发布",
Topval:"学生将立即收到作业",
// Botvalleft:"暂不发布",
Botval:`本操作只对"未发布"的分班有效`,
starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
endtime: "截止时间：" + endtime,
starttimes:starttime,
@ -850,9 +850,9 @@ class Listofworks extends Component {
modalname: "立即截止",
modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1,
svisible: true,
Topval: "本操作只对“提交中”的对象生效",
Botvalleft: "暂不截止",
Botval: "则将根据已设置的截止时间，定时截止",
Topval:"学生将不能再提交作业",
// Botvalleft:"暂不截止",
Botval:`本操作只对"提交中"的分班有效`,
Cancelname: "暂不截止",
Savesname: "立即截止",
Cancel: this.homeworkhide,

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

@ -301,9 +301,9 @@ class ShixunStudentWork extends Component {
modalname:"立即发布",
modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1,
visible:true,
Topval:"本操作只对“未发布”的对象生效",
Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布",
Topval:"学生将立即收到作业",
// Botvalleft:"暂不发布",
Botval:`本操作只对"未发布"的分班有效`,
starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
endtime:"截止时间："+endtime,
Cancelname:"暂不发布",
@ -335,9 +335,9 @@ class ShixunStudentWork extends Component {
modalname:"立即截止",
modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1,
visible:true,
Topval:"本操作只对“提交中”的对象生效",
Botvalleft:"暂不截止",
Botval:"则将根据已设置的截止时间，定时截止",
Topval:"学生将不能再提交作业",
// Botvalleft:"暂不截止",
Botval:`本操作只对"提交中"的分班有效`,
Cancelname:"暂不截止",
Savesname:"立即截止",
Cancel:this.homeworkhide,

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

@ -1237,9 +1237,9 @@ class Trainingjobsetting extends Component {
modalname: "立即发布",
modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1,
visible: true,
Topval: "本操作只对“未发布”的对象生效",
Botvalleft: "暂不发布",
Botval: "则通过后续手动设置，定时发布",
Topval:"学生将立即收到作业",
// Botvalleft:"暂不发布",
Botval:`本操作只对"未发布"的分班有效`,
starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:starttime,
typs:"start",
@ -1269,9 +1269,9 @@ class Trainingjobsetting extends Component {
modalname: "立即截止",
modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1,
visible: true,
Topval: "本操作只对“提交中”的对象生效",
Botvalleft: "暂不截止",
Botval: "则将根据已设置的截止时间，定时截止",
Topval:"学生将不能再提交作业",
// Botvalleft:"暂不截止",
Botval:`本操作只对"提交中"的分班有效`,
Cancelname: "暂不截止",
Savesname: "立即截止",
Cancel: this.homeworkhide,

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

@ -145,9 +145,9 @@ class Workquestionandanswer extends Component {
modalname: "立即发布",
modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1,
visible: true,
Topval: "本操作只对“未发布”的对象生效",
Botvalleft: "暂不发布",
Botval: "则通过后续手动设置，定时发布",
Topval:"学生将立即收到作业",
// Botvalleft:"暂不发布",
Botval:`本操作只对"未发布"的分班有效`,
starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
endtime: "截止时间：" + endtime,
Cancelname: "暂不发布",
@ -177,9 +177,9 @@ class Workquestionandanswer extends Component {
modalname: "立即截止",
modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1,
visible: true,
Topval: "本操作只对“提交中”的对象生效",
Botvalleft: "暂不截止",
Botval: "则将根据已设置的截止时间，定时截止",
Topval:"学生将不能再提交作业",
// Botvalleft:"暂不截止",
Botval:`本操作只对"提交中"的分班有效`,
Cancelname: "暂不截止",
Savesname: "立即截止",
Cancel: this.homeworkhide,

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

@ -8,7 +8,7 @@ import ShixunModal from "../coursesPublic/ShixunModal";
import PathModal from "../coursesPublic/PathModal";
import AddcoursesNav from "../coursesPublic/AddcoursesNav";
import Modals from '../../modals/Modals';
import moment from 'moment';
import '../css/members.css';
import '../css/busyWork.css'
import ShixunhomeWorkItem from "./ShixunhomeWorkItem";
@ -206,9 +206,9 @@ class ShixunHomework extends Component{
modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1,
visible:true,
typs:"start",
Topval:"本操作只对“未发布”的对象生效",
Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布",
Topval:"学生将立即收到作业",
// Botvalleft:"暂不发布",
Botval:`本操作只对"未发布"的分班有效`,
starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:starttime,
endtime:"截止时间："+endtime,
@ -301,9 +301,9 @@ class ShixunHomework extends Component{
modalname:"立即截止",
modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1,
visible:true,
Topval:"本操作只对“提交中”的对象生效",
Botvalleft:"暂不截止",
Botval:"则将根据已设置的截止时间，定时截止",
Topval:"学生将不能再提交作业",
// Botvalleft:"暂不截止",
Botval:`本操作只对"提交中"的分班有效`,
Cancelname:"暂不截止",
Savesname:"立即截止",
Cancel:this.homeworkhide,
@ -400,9 +400,9 @@ class ShixunHomework extends Component{
course_groups:response.data.course_groups,
modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1,
visible:true,
Topval:"本操作只对“未发布”的对象生效",
Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布",
Topval:"学生将立即收到作业",
// Botvalleft:"暂不发布",
Botval:`本操作只对"未发布"的分班有效`,
starttime:"发布时间："+ moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:starttime,
typs:"start",

Write Preview
Loading…
Cancel
Save