diff --git a/public/react/src/modules/courses/exercise/Exercise.js b/public/react/src/modules/courses/exercise/Exercise.js index a6791fb54..6f9470260 100644 --- a/public/react/src/modules/courses/exercise/Exercise.js +++ b/public/react/src/modules/courses/exercise/Exercise.js @@ -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), diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js index dfa6879f5..d1ce04697 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js @@ -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, diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js index 517629479..c842d02f2 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js @@ -92,7 +92,6 @@ class GraduationTaskssettinglist extends Component{ if (worklists.length != 0) { for (var i = 0; i < worklists.length; i++) { - datalist.push({ name: worklists[i].name, number: (parseInt(page)-1)*parseInt(limit)+(i+1), @@ -101,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: worklists[i].project_info === undefined ?"--": worklists[i].project_info.name , + 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, @@ -310,9 +309,9 @@ class GraduationTaskssettinglist extends Component{ this.setState({ modalname:"立即截止", visible:true, - Topval:"本操作只对“提交中”的对象生效", - Botvalleft:"暂不截止", - Botval:"则将根据已设置的截止时间，定时截止", + Topval:"学生将不能再提交作品", + // Botvalleft:"暂不截止", + Botval:`本操作只对"提交中"的分班有效`, Cancelname:"暂不截止", Savesname:"立即截止", Cancel:this.cancelmodel, @@ -329,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", @@ -611,7 +610,7 @@ class GraduationTaskssettinglist extends Component{ course_groups } =this.state; - let columns; + let columns; // console.log("taskslistdata.course_group_count"); // console.log(taskslistdata); @@ -662,9 +661,11 @@ class GraduationTaskssettinglist extends Component{ key: 'associationitems', render: (text, record) => ( - - {record.associationitems} - +
+ +
{record.associationitems.name}
+ +
), },{ title: '提交状态', @@ -694,9 +695,11 @@ class GraduationTaskssettinglist extends Component{ dataIndex: 'teacherrating', render: (text, record) => ( - - 90?'#DD1717':parseInt(record.teacherrating)>60&&parseInt(record.teacherrating)<90?"#FF6800":'#747A7F'}}>{parseInt(record.teacherrating==="--"||record.crossrating==="未批阅"?0:record.teacherrating)} - + + + 90?'#DD1717':parseInt(record.teacherrating)>60&&parseInt(record.teacherrating)<90?"#FF6800":'#747A7F'}}>{record.teacherrating==="--"||record.teacherrating==="未批阅"?"--":parseInt(record.teacherrating)} + + ), }, { title: '交叉评分', @@ -705,8 +708,10 @@ class GraduationTaskssettinglist extends Component{ render: (text, record) => ( - 90?'#DD1717':parseInt(record.crossrating)>60&&parseInt(record.crossrating)<90?"#FF6800":'#747A7F'}}>{parseInt(record.crossrating==="--"||record.crossrating==="未批阅"?0:record.crossrating)} - + + 90?'#DD1717':parseInt(record.crossrating)>60&&parseInt(record.crossrating)<90?"#FF6800":'#747A7F'}}>{record.crossrating==="--"||record.crossrating==="未批阅"?"--":parseInt(record.crossrating)} + + ), }, { title: '最终成绩', @@ -715,8 +720,10 @@ class GraduationTaskssettinglist extends Component{ render: (text, record) => ( - 90?'#DD1717':parseInt(record.finalscore)>60&&parseInt(record.finalscore)<90?"#FF6800":'#747A7F'}}>{parseInt(record.finalscore==="--"?0:record.finalscore)} - + + 90?'#DD1717':parseInt(record.finalscore)>60&&parseInt(record.finalscore)<90?"#FF6800":'#747A7F'}}>{record.finalscore==="--"?"--":parseInt(record.finalscore)} + + ), }, { title: '操作', @@ -735,8 +742,9 @@ class GraduationTaskssettinglist extends Component{ : this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""} - >{tag.status===0?"":tag.name} + onClick={tag.name==="调分"?()=>this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""}> + {tag.status===0?"":tag.name} + } @@ -794,9 +802,11 @@ class GraduationTaskssettinglist extends Component{ key: 'associationitems', render: (text, record) => ( - - {record.associationitems} - +
+ +
{record.associationitems.name}
+ +
), },{ title: '提交状态', @@ -827,18 +837,22 @@ class GraduationTaskssettinglist extends Component{ render: (text, record) => ( - 90?'#DD1717':parseInt(record.teacherrating)>60&&parseInt(record.teacherrating)<90?"#FF6800":'#747A7F'}}>{parseInt(record.teacherrating==="--"||record.crossrating==="未批阅"?0:record.teacherrating)} - + + 90?'#DD1717':parseInt(record.teacherrating)>60&&parseInt(record.teacherrating)<90?"#FF6800":'#747A7F'}}>{record.teacherrating==="--"||record.teacherrating==="未批阅"?"--":parseInt(record.teacherrating)} + + ), }, { title: '交叉评分', key: 'crossrating', dataIndex: 'crossrating', - + className:'none', render: (text, record) => ( - 90?'#DD1717':parseInt(record.crossrating)>60&&parseInt(record.crossrating)<90?"#FF6800":'#747A7F'}}>{parseInt(record.crossrating==="--"||record.crossrating==="未批阅"?0:record.crossrating)} - + + 90?'#DD1717':parseInt(record.crossrating)>60&&parseInt(record.crossrating)<90?"#FF6800":'#747A7F'}}>{record.crossrating==="--"||record.crossrating==="未批阅"?"--":parseInt(record.crossrating)} + + ), }, { title: '最终成绩', @@ -847,8 +861,10 @@ class GraduationTaskssettinglist extends Component{ render: (text, record) => ( - 90?'#DD1717':parseInt(record.finalscore)>60&&parseInt(record.finalscore)<90?"#FF6800":'#747A7F'}}>{parseInt(record.finalscore==="--"?0:record.finalscore)} - + + 90?'#DD1717':parseInt(record.finalscore)>60&&parseInt(record.finalscore)<90?"#FF6800":'#747A7F'}}>{record.finalscore==="--"?"--":parseInt(record.finalscore)} + + ), }, { title: '操作', @@ -859,10 +875,8 @@ class GraduationTaskssettinglist extends Component{ {this.props.isAdmin()?operation.map((tag,key) => { return(
- 调整学生最终成绩
其它历史评分将全部失效:""}> - {tag.name==="评阅"?tag.status===0?"--": {tag.name} @@ -944,9 +958,12 @@ class GraduationTaskssettinglist extends Component{ key: 'associationitems', render: (text, record) => ( - - {record.associationitems} - +
+ +
{record.associationitems.name} +
+ +
), },{ title: '提交状态', @@ -977,8 +994,10 @@ class GraduationTaskssettinglist extends Component{ render: (text, record) => ( - 90?'#DD1717':parseInt(record.teacherrating)>60&&parseInt(record.teacherrating)<90?"#FF6800":'#747A7F'}}>{parseInt(record.teacherrating==="--"||record.crossrating==="未批阅"?0:record.teacherrating)} - + + 90?'#DD1717':parseInt(record.teacherrating)>60&&parseInt(record.teacherrating)<90?"#FF6800":'#747A7F'}}>{record.teacherrating==="--"||record.teacherrating==="未批阅"?"--":parseInt(record.teacherrating)} + + ), }, { title: '交叉评分', @@ -987,8 +1006,10 @@ class GraduationTaskssettinglist extends Component{ render: (text, record) => ( - 90?'#DD1717':parseInt(record.crossrating)>60&&parseInt(record.crossrating)<90?"#FF6800":'#747A7F'}}>{parseInt(record.crossrating==="--"||record.crossrating==="未批阅"?0:record.crossrating)} - + + 90?'#DD1717':parseInt(record.crossrating)>60&&parseInt(record.crossrating)<90?"#FF6800":'#747A7F'}}>{record.crossrating==="--"||record.crossrating==="未批阅"?"--":parseInt(record.crossrating)} + + ), }, { title: '最终成绩', @@ -997,8 +1018,10 @@ class GraduationTaskssettinglist extends Component{ render: (text, record) => ( - 90?'#DD1717':parseInt(record.finalscore)>60&&parseInt(record.finalscore)<90?"#FF6800":'#747A7F'}}>{parseInt(record.finalscore==="--"?0:record.finalscore)} - + + 90?'#DD1717':parseInt(record.finalscore)>60&&parseInt(record.finalscore)<90?"#FF6800":'#747A7F'}}>{record.finalscore==="--"?"--":parseInt(record.finalscore)} + + ), }, { title: '操作', @@ -1021,7 +1044,6 @@ class GraduationTaskssettinglist extends Component{ >{tag.status===0?"":tag.name} } - }
) }):""} @@ -1078,9 +1100,13 @@ class GraduationTaskssettinglist extends Component{ key: 'associationitems', render: (text, record) => ( - - {record.associationitems} - +
+ +
+ {record.associationitems.name} +
+ +
), },{ title: '提交状态', @@ -1111,8 +1137,10 @@ class GraduationTaskssettinglist extends Component{ render: (text, record) => ( - 90?'#DD1717':parseInt(record.teacherrating)>60&&parseInt(record.teacherrating)<90?"#FF6800":'#747A7F'}}>{parseInt(record.teacherrating==="--"||record.crossrating==="未批阅"?0:record.teacherrating)} - + + 90?'#DD1717':parseInt(record.teacherrating)>60&&parseInt(record.teacherrating)<90?"#FF6800":'#747A7F'}}>{record.teacherrating==="--"||record.teacherrating==="未批阅"?"--":parseInt(record.teacherrating)} + + ), }, { title: '交叉评分', @@ -1121,8 +1149,10 @@ class GraduationTaskssettinglist extends Component{ render: (text, record) => ( - 90?'#DD1717':parseInt(record.crossrating)>60&&parseInt(record.crossrating)<90?"#FF6800":'#747A7F'}}>{parseInt(record.crossrating==="--"||record.crossrating==="未批阅"?0:record.crossrating)} - + + 90?'#DD1717':parseInt(record.crossrating)>60&&parseInt(record.crossrating)<90?"#FF6800":'#747A7F'}}>{record.crossrating==="--"||record.crossrating==="未批阅"?"--":parseInt(record.crossrating)} + + ), }, { title: '最终成绩', @@ -1131,8 +1161,10 @@ class GraduationTaskssettinglist extends Component{ render: (text, record) => ( - 90?'#DD1717':parseInt(record.finalscore)>60&&parseInt(record.finalscore)<90?"#FF6800":'#747A7F'}}>{parseInt(record.finalscore==="--"?0:record.finalscore)} - + + 90?'#DD1717':parseInt(record.finalscore)>60&&parseInt(record.finalscore)<90?"#FF6800":'#747A7F'}}>{record.finalscore==="--"?"--":parseInt(record.finalscore)} + + ), }, { title: '操作', @@ -1141,6 +1173,9 @@ class GraduationTaskssettinglist extends Component{ render: operation => (
{this.props.isAdmin()?operation.map((tag,key) => { + console.log("1179"); + console.log(key); + console.log(tag); return(
@@ -1155,7 +1190,6 @@ class GraduationTaskssettinglist extends Component{ >{tag.status===0?"":tag.name} } - }
) }):""} @@ -1184,12 +1218,63 @@ class GraduationTaskssettinglist extends Component{ let position=this.props.match.params.position; let category_id=this.props.match.params.category_id; let task_Id = this.props.match.params.task_Id; - // console.log("task_statustask_statustask_status"); - // console.log(task_status); + + 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(
+ + {/*提示*/}
- {taskslistdata&&taskslistdata.work_count}个检索结果（{taskslistdata&&taskslistdata.work_count} 学生） -
-

- {order==="updated_at"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}排序

+ {this.props.isAdmin()?{taskslistdata&&taskslistdata.work_count}个检索结果（{taskslistdata&&taskslistdata.work_count} 学生） :""} + {this.props.isAdmin()?
+

+ + {order==="updated_at"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}排序 +

  • this.funorder("updated_at")}>更新时间
    • @@ -1466,7 +1552,7 @@ class GraduationTaskssettinglist extends Component{
  • this.funorder("student_id" )}>学生学号
-
+
:""}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js index 997085d13..99c0d21c1 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js @@ -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", diff --git a/public/react/src/modules/courses/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js index acb8508b2..29610eb93 100644 --- a/public/react/src/modules/courses/graduation/tasks/index.js +++ b/public/react/src/modules/courses/graduation/tasks/index.js @@ -6,14 +6,13 @@ import Titlesearchsection from '../../common/titleSearch/TitleSearchSection'; import HomeworkModal from "../../coursesPublic/HomeworkModal"; import { WordsBtn } from 'educoder'; import axios from 'axios'; -import _ from 'lodash' +import moment from 'moment'; import GraduateTaskItem from './GraduateTaskItem'; import TaskPublishModal from "./TaskPublishModal"; import Modals from '../../../modals/Modals'; import UseBank from "../../busyWork/UseBank"; import '../../css/members.css'; import '../style.css'; -import moment from 'moment' class GraduationTasks extends Component{ @@ -34,6 +33,7 @@ class GraduationTasks extends Component{ isSpin:false, typs:undefined, starttimes:undefined, + } } fetchAll = (search,page,order,count) => { @@ -411,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", @@ -477,9 +477,9 @@ class GraduationTasks extends Component{ this.setState({ modalname:"立即截止", visible:true, - Topval:"本操作只对“提交中”的对象生效", - Botvalleft:"暂不截止", - Botval:"则将根据已设置的截止时间，定时截止", + Topval:"学生将不能再提交作品", + // Botvalleft:"暂不截止", + Botval:`本操作只对"提交中"的分班有效`, Cancelname:"暂不截止", Savesname:"立即截止", Cancel:this.publishcanner, @@ -604,7 +604,6 @@ class GraduationTasks extends Component{ {/*立即发布*/} this.getcourse_groupslist(id)} + /> diff --git a/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyEnd.js b/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyEnd.js index bfc316ae8..e74fe8204 100644 --- a/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyEnd.js +++ b/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyEnd.js @@ -1,269 +1,269 @@ -import React,{ Component } from "react"; - - -import Modals from '../../../modals/Modals' -import { WordsBtn } from 'educoder' -import HomeworkModal from "../../coursesPublic/HomeworkModal"; - -import axios from 'axios' -import moment from 'moment'; - - -class ImmediatelyEnd extends Component{ - constructor(props){ - super(props) - this.state={ - modalname:undefined, - modaltype:undefined, - visible:false, - Topval:undefined, - Topvalright:undefined, - Botvalleft:undefined, - Botval:undefined, - starttime:undefined, - endtime:undefined, - Cancelname:undefined, - Savesname:undefined, - Cancel:undefined, - Saves:undefined, - course_groups:undefined, - - modalsType:false, - modalsTopval:"", - loadtype:false, - chooseId:undefined - } - } - //立即截止 - homeworkstart=()=>{ - let {checkBoxValues}=this.props - if(checkBoxValues.length==0){ - this.props.showNotification("请先在列表中选择数据"); - // this.setState({ - // modalsType:true, - // modalsTopval:"请先在列表中选择数据", - // loadtype:true - // }) - }else{ - let coursesId=this.props.match.params.coursesId; - if(this.props.Exercisetype==="exercise"){ - let url=`/courses/${coursesId}/exercises/end_modal.json`; - axios.get(url,{ - params:{ - check_ids:checkBoxValues - } - }).then((response) => { - if(response.status===200){ - let list=[]; - if(response.data.course_info){ - for(var i=0;i 0 ? 1 : 2, - visible:true, - Topval:"本操作只对“提交中”的对象生效", - Botvalleft:"暂不截止", - Botval:"则将根据已设置的截止时间，定时截止", - // starttime:"发布时间："+getNowFormatDate(1), - // endtime:"截止时间："+getNowFormatDate(2), - Cancelname:"暂不截止", - Savesname:"立即截止", - Cancel:this.homeworkhide, - Saves:this.homeworkstartend, - }) - } - }).catch((error) => { - console.log(error) - }); - - - - }else{ - let url=`/courses/${coursesId}/polls/end_poll_modal.json`; - - axios.get(url,{ - params:{ - check_ids:checkBoxValues - } - }).then((response) => { - if(response.status===200){ - let list=[]; - if(response.data.course_info){ - for(var i=0;i 0 ? 1 : 2, - visible:true, - Topval:"本操作只对“提交中”的对象生效", - Botvalleft:"暂不截止", - Botval:"则将根据已设置的截止时间，定时截止", - // starttime:"发布时间："+getNowFormatDate(1), - // endtime:"截止时间："+getNowFormatDate(2), - Cancelname:"暂不截止", - Savesname:"立即截止", - Cancel:this.homeworkhide, - Saves:this.homeworkstartend, - }) - } - }).catch((error) => { - console.log(error) - }); - } - - - } - } - - //取消提示弹框 - modalCancel=()=>{ - this.setState({ - modalsType:false, - modalsTopval:"", - loadtype:false - }) - } - //暂不发布 - homeworkhide=()=>{ - this.setState({ - modalname:undefined, - modaltype:undefined, - visible:false, - Topval:undefined, - Topvalright:undefined, - Botvalleft:undefined, - Botval:undefined, - starttime:undefined, - endtime:undefined, - Cancelname:undefined, - Savesname:undefined, - Cancel:undefined, - Saves:undefined, - StudentList_value:undefined, - addname:undefined, - addnametype:false, - addnametab:undefined - }) - } - // 确定立即截止 - homeworkstartend=()=>{ - - let {checkBoxValues}=this.props - let {chooseId}=this.state; - let coursesId=this.props.match.params.coursesId; - if(this.props.Exercisetype==="exercise"){ - let url=`/courses/${coursesId}/exercises/end_exercise.json` - axios.post(url,{ - check_ids:checkBoxValues, - group_ids:chooseId - }).then((result)=>{ - if(result){ - this.props.showNotification(result.data.message); - this.homeworkhide(); - // 调用父级公共头部的接口刷新 - this.props.action() - } - }).catch((error)=>{ - console.log(error); - }) - }else{ - let url=`/courses/${coursesId}/polls/end_poll.json` - axios.post(url,{ - check_ids:checkBoxValues, - group_ids:chooseId - }).then((result)=>{ - if(result){ - this.props.showNotification(result.data.message); - this.homeworkhide(); - // 调用父级公共头部的接口刷新 - this.props.action() - } - }).catch((error)=>{ - console.log(error); - }) - } - - - - } - - getcourse_groupslist=(id)=>{ - this.setState({ - chooseId:id - }) - } - - render(){ - let{ - modalname, - modaltype, - visible, - Topval, - Topvalright, - Botvalleft, - Botval, - starttime, - endtime, - Cancelname, - Savesname, - Cancel, - Saves, - course_groups, - - modalsType, - modalsTopval, - loadtype, - }=this.state - return( - - this.getcourse_groupslist(id)} - /> - {/* 公用的提示弹框 */} - - - 立即截止 - - ) - } -} +import React,{ Component } from "react"; + + +import Modals from '../../../modals/Modals' +import { WordsBtn } from 'educoder' +import HomeworkModal from "../../coursesPublic/HomeworkModal"; + +import axios from 'axios' +import moment from 'moment'; + + +class ImmediatelyEnd extends Component{ + constructor(props){ + super(props) + this.state={ + modalname:undefined, + modaltype:undefined, + visible:false, + Topval:undefined, + Topvalright:undefined, + Botvalleft:undefined, + Botval:undefined, + starttime:undefined, + endtime:undefined, + Cancelname:undefined, + Savesname:undefined, + Cancel:undefined, + Saves:undefined, + course_groups:undefined, + + modalsType:false, + modalsTopval:"", + loadtype:false, + chooseId:undefined + } + } + //立即截止 + homeworkstart=()=>{ + let {checkBoxValues}=this.props + if(checkBoxValues.length==0){ + this.props.showNotification("请先在列表中选择数据"); + // this.setState({ + // modalsType:true, + // modalsTopval:"请先在列表中选择数据", + // loadtype:true + // }) + }else{ + let coursesId=this.props.match.params.coursesId; + if(this.props.Exercisetype==="exercise"){ + let url=`/courses/${coursesId}/exercises/end_modal.json`; + axios.get(url,{ + params:{ + check_ids:checkBoxValues + } + }).then((response) => { + if(response.status===200){ + let list=[]; + if(response.data.course_info){ + for(var i=0;i 0 ? 1 : 2, + visible:true, + Topval:"学生将不能再提交试卷", + // Botvalleft:"暂不截止", + Botval:`本操作只对"提交中"的分班有效`, + // starttime:"发布时间："+getNowFormatDate(1), + // endtime:"截止时间："+getNowFormatDate(2), + Cancelname:"暂不截止", + Savesname:"立即截止", + Cancel:this.homeworkhide, + Saves:this.homeworkstartend, + }) + } + }).catch((error) => { + console.log(error) + }); + + + + }else{ + let url=`/courses/${coursesId}/polls/end_poll_modal.json`; + + axios.get(url,{ + params:{ + check_ids:checkBoxValues + } + }).then((response) => { + if(response.status===200){ + let list=[]; + if(response.data.course_info){ + for(var i=0;i 0 ? 1 : 2, + visible:true, + Topval:"学生将不能再提交问卷", + // Botvalleft:"暂不截止", + Botval:`本操作只对"提交中"的分班有效`, + // starttime:"发布时间："+getNowFormatDate(1), + // endtime:"截止时间："+getNowFormatDate(2), + Cancelname:"暂不截止", + Savesname:"立即截止", + Cancel:this.homeworkhide, + Saves:this.homeworkstartend, + }) + } + }).catch((error) => { + console.log(error) + }); + } + + + } + } + + //取消提示弹框 + modalCancel=()=>{ + this.setState({ + modalsType:false, + modalsTopval:"", + loadtype:false + }) + } + //暂不发布 + homeworkhide=()=>{ + this.setState({ + modalname:undefined, + modaltype:undefined, + visible:false, + Topval:undefined, + Topvalright:undefined, + Botvalleft:undefined, + Botval:undefined, + starttime:undefined, + endtime:undefined, + Cancelname:undefined, + Savesname:undefined, + Cancel:undefined, + Saves:undefined, + StudentList_value:undefined, + addname:undefined, + addnametype:false, + addnametab:undefined + }) + } + // 确定立即截止 + homeworkstartend=()=>{ + + let {checkBoxValues}=this.props + let {chooseId}=this.state; + let coursesId=this.props.match.params.coursesId; + if(this.props.Exercisetype==="exercise"){ + let url=`/courses/${coursesId}/exercises/end_exercise.json` + axios.post(url,{ + check_ids:checkBoxValues, + group_ids:chooseId + }).then((result)=>{ + if(result){ + this.props.showNotification(result.data.message); + this.homeworkhide(); + // 调用父级公共头部的接口刷新 + this.props.action() + } + }).catch((error)=>{ + console.log(error); + }) + }else{ + let url=`/courses/${coursesId}/polls/end_poll.json` + axios.post(url,{ + check_ids:checkBoxValues, + group_ids:chooseId + }).then((result)=>{ + if(result){ + this.props.showNotification(result.data.message); + this.homeworkhide(); + // 调用父级公共头部的接口刷新 + this.props.action() + } + }).catch((error)=>{ + console.log(error); + }) + } + + + + } + + getcourse_groupslist=(id)=>{ + this.setState({ + chooseId:id + }) + } + + render(){ + let{ + modalname, + modaltype, + visible, + Topval, + Topvalright, + Botvalleft, + Botval, + starttime, + endtime, + Cancelname, + Savesname, + Cancel, + Saves, + course_groups, + + modalsType, + modalsTopval, + loadtype, + }=this.state + return( + + this.getcourse_groupslist(id)} + /> + {/* 公用的提示弹框 */} + + + 立即截止 + + ) + } +} export default ImmediatelyEnd \ No newline at end of file diff --git a/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js b/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js index 95e5ba2ad..8c472b417 100644 --- a/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js +++ b/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js @@ -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), diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js index ba3c34c51..3e3bf95c4 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworks.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js @@ -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, diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js index a62e815ef..ea368d478 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js @@ -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, diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index 108ab58f0..a15fd16b1 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -637,11 +637,14 @@ class Trainingjobsetting extends Component { //允许补交 onChanges = (e) => { + // debugger if(e.target.value ==="允许补交"){ if(this.state.end_time !== null && this.state.end_time!== undefined){ + // console.log(this.state.end_time); + var times = this.state.end_time.format('YYYY-MM-DD HH:mm'); this.setState({ - late_time:moment(handleDateString(this.state.end_time)).add(1, 'months'), - late_times:moment(handleDateString(this.state.end_time)).add(1, 'months').format('YYYY-MM-DD HH:mm'), + late_time:moment(handleDateString(times)).add(1, 'months'), + late_times:moment(handleDateString(times)).add(1, 'months').format('YYYY-MM-DD HH:mm'), }) } @@ -1080,7 +1083,7 @@ class Trainingjobsetting extends Component { } // console.log(value); - // console.log(dateString); + console.log(dateString); // console.log(handleDateString(dateString)); this.onChangedata('publish_time', value, dateString); if(this.state.allowreplenishment === "允许补交") { @@ -1234,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", @@ -1266,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, diff --git a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js index 7808355e8..02107b912 100644 --- a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js +++ b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js @@ -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, diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js index 5970a8907..1933f1ad7 100644 --- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js +++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js @@ -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", diff --git a/public/react/src/modules/login/Trialapplication.js b/public/react/src/modules/login/Trialapplication.js index d98228856..d2b942ce7 100644 --- a/public/react/src/modules/login/Trialapplication.js +++ b/public/react/src/modules/login/Trialapplication.js @@ -79,10 +79,10 @@ class Trialapplication extends Component { }); console.log("89"); try { - if (this.state.props.user !== undefined) { - console.log(this.state.props.user && this.state.props.user.user_phone_binded); + if (this.state.props.user_phone_binded !== undefined) { + console.log(this.state.props.user_phone_binded); this.setState({ - user_phone_binded: this.state.props.user.user_phone_binded, + user_phone_binded: this.state.props.user_phone_binded, }) } diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index e22b2ab17..ecbc8570b 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -171,7 +171,6 @@ class NewHeader extends Component { isRender:false, isRenders:false, showTrial:false, - user:undefined, } console.log("176") console.log(props); @@ -583,7 +582,6 @@ submittojoinclass=(value)=>{ /> {/* :""*/} {/*}*/} - {/*{*/} {/* isRenders&&isRenders===true?*/} diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js index c808a4808..7723af4fc 100644 --- a/public/react/src/modules/tpm/TPMIndexHOC.js +++ b/public/react/src/modules/tpm/TPMIndexHOC.js @@ -9,6 +9,7 @@ import { getUrl } from 'educoder' import axios from 'axios'; import './TPMIndex.css' +import Trialapplication from "../login/Trialapplication"; // import "antd/dist/antd.css"; // import '../../css/educoder/edu-common.css' // import '../../css/educoder/edu-all.css' @@ -246,10 +247,10 @@ export function TPMIndexHOC(WrappedComponent) { } */ if (response.data) { - this.initCommonState(response.data) - this.setState({ - tpmLoading: false, + this.setState({ + user_phone_binded:response.data.user_phone_binded, + tpmLoading: false, coursedata: { course_identity: response.data.course_identity >= 0 ? response.data.course_identity : undefined, course_public: response.data.course_public, @@ -266,7 +267,7 @@ export function TPMIndexHOC(WrappedComponent) { }) } render() { - let{Headertop,Footerdown}=this.state; + let{Headertop,Footerdown,user_phone_binded}=this.state; const common = { isSuperAdmin:this.isSuperAdmin, isAdminOrCreator:this.isAdminOrCreator, @@ -278,11 +279,17 @@ export function TPMIndexHOC(WrappedComponent) { isNotMember: this.isNotMember, isUserid:this.state.coursedata&&this.state.coursedata.userid } - - return (
- + + } + +