diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
index 2a0ffa8fb..e1284832c 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
@@ -459,7 +459,7 @@ render(){
{/*
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
index a76354481..374318af1 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
@@ -234,11 +234,11 @@ class GraduationTasksappraise extends Component{
- 更新
- {datalist&&datalist.update_user_name}
-
- {moment(datalist&&datalist.update_time).format('YYYY-MM-DD HH:mm:ss')==="Invalid date"?"":moment(datalist&&datalist.update_time).format('YYYY-MM-DD HH:mm:ss')}
-
+ {/*更新*/}
+ {/*{datalist&&datalist.update_user_name}*/}
+ {/**/}
+ {/*{moment(datalist&&datalist.update_time).format('YYYY-MM-DD HH:mm:ss')==="Invalid date"?"":moment(datalist&&datalist.update_time).format('YYYY-MM-DD HH:mm:ss')}*/}
+ {/**/}
提交
{datalist&&datalist.author_name}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js
index 69ab8ba79..1c733868e 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js
@@ -124,8 +124,9 @@ class GraduationTasksappraiseReply extends Component{
saveModulationModal=(value,num)=>{
console.log(value,num)
let {operationId}=this.state;
+ let category_id= this.props.match.params.category_id;
// console.log(value,num)
- let url ="/graduation_works/"+operationId+"/adjust_score.json";
+ let url ="/graduation_works/"+category_id+"/adjust_score.json";
axios.post(url,{
score:num,
comment:value
@@ -138,6 +139,7 @@ class GraduationTasksappraiseReply extends Component{
Modalstopval:result.data.message,
ModalSave:this.cancelmodel,
})
+ this.fetchAllComments()
}
}).catch((error)=>{
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
index 8bd55dea9..36c2f9d3f 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
@@ -18,7 +18,7 @@ class GraduationTasksedit extends Component{
this.state={
coursename:"",
coursesearch:"",
- title_num:20,
+ title_num:60,
title_value:"",
fileList: [],
contents: [{val:"",id:1}],
@@ -138,8 +138,11 @@ class GraduationTasksedit extends Component{
}
goback=()=>{
- let courseId=this.props.match.params.coursesId;
- window.location.href="/courses/"+courseId+"/graduation_tasks/"+this.state.data.graduation_id;
+ // let courseId=this.props.match.params.coursesId;
+ // window.location.href="/courses/"+courseId+"/graduation_tasks/"+this.state.data.graduation_id;
+ // goback = () => {
+ window.history.go(-1)
+
}
@@ -147,7 +150,7 @@ class GraduationTasksedit extends Component{
changeTitle=(e)=>{
this.setState({
- title_num:20-parseInt(e.target.value.length),
+ title_num:60-parseInt(e.target.value.length),
title_value:e.target.value
})
@@ -315,7 +318,7 @@ class GraduationTasksedit extends Component{
{getFieldDecorator('name', {
rules: [{ required: true, message: "请输入标题" }],
- })()}
+ })()}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
index 9ef3d7091..9d0b33e80 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
@@ -111,11 +111,11 @@ class GraduationTaskssettingapp extends Component{
max_nums: result.data.max_num,
task_type: result.data.task_type,
baseonproject: result.data.base_on_project,
- publish_time: result.data.publish_time,
- end_time: result.data.end_time,
+ publish_time:moment(moment(handleDateString(result.data.publish_time))).format("YYYY-MM-DD HH:mm"),
+ end_time:moment(moment(handleDateString(result.data.end_time))).format("YYYY-MM-DD HH:mm"),
allowlate: result.data.allow_late,
latepenalty: result.data.late_penalty,
- latetime: result.data.late_time,
+ latetime:moment(moment(handleDateString(result.data.late_time))).format("YYYY-MM-DD HH:mm"),
crosscomment: result.data.cross_comment,
taskid: result.data.id,
taskname: result.data.task_name,
@@ -128,7 +128,7 @@ class GraduationTaskssettingapp extends Component{
hasproject: result.data.has_project,
hascommit: result.data.has_commit,
assigngroups: assigngroups,
- commenttime: result.data.comment_time,
+ commenttime:moment(moment(handleDateString(result.data.comment_time))).format("YYYY-MM-DD HH:mm"),
task_status: result.data.task_status
})
}
@@ -142,7 +142,9 @@ class GraduationTaskssettingapp extends Component{
componentDidMount(){
this.getsettings();
-
+ if(this.props.isAdmin()===true){
+ this.editSetting()
+ }
}
@@ -210,17 +212,18 @@ class GraduationTaskssettingapp extends Component{
latetime:null
})
}else{
- endtime=moment(handleDateString(dateString)).add(1, 'months')
+
+ endtime= moment(moment(handleDateString(dateString))).add(1, 'months').format("YYYY-MM-DD HH:mm")
let {allowlate}=this.state;
if(allowlate===true||allowlate===1){
this.setState({
- publish_time:handleDateString(dateString),
+ publish_time:moment(moment(handleDateString(dateString))).format("YYYY-MM-DD HH:mm"),
end_time:endtime,
- latetime:moment(endtime).add(1, 'months'),
+ latetime:moment(moment(handleDateString(endtime))).add(1, 'months').format("YYYY-MM-DD HH:mm"),
})
}else{
this.setState({
- publish_time:handleDateString(dateString),
+ publish_time:moment(moment(handleDateString(dateString))).format("YYYY-MM-DD HH:mm"),
end_time:endtime
})
}
@@ -240,12 +243,12 @@ class GraduationTaskssettingapp extends Component{
let {allowlate}=this.state;
if(allowlate===true||allowlate===1){
this.setState({
- end_time:handleDateString(dateString),
- latetime:moment(handleDateString(dateString)).add(1, 'months'),
+ end_time:moment(moment(handleDateString(dateString))).format("YYYY-MM-DD HH:mm"),
+ latetime:moment(moment(handleDateString(dateString))).add(1, 'months').format("YYYY-MM-DD HH:mm"),
})
}else{
this.setState({
- end_time:handleDateString(dateString)
+ end_time:moment(moment(handleDateString(dateString))).format("YYYY-MM-DD HH:mm"),
})
}
@@ -288,7 +291,7 @@ class GraduationTaskssettingapp extends Component{
this.setState({
latepenalty:5,
allowlate:e.target.value,
- latetime:end_time===null?"":moment(end_time).add(1, 'months'),
+ latetime:end_time===null?"":moment(moment(handleDateString(end_time))).add(1, 'months').format("YYYY-MM-DD HH:mm"),
})
}else{
this.setState({
@@ -326,7 +329,7 @@ class GraduationTaskssettingapp extends Component{
this.setState({
crosscomment:e.target.checked,
- commenttime:newtime
+ commenttime:moment(moment(newtime)).format("YYYY-MM-DD HH:mm"),
})
}else{
@@ -410,7 +413,7 @@ class GraduationTaskssettingapp extends Component{
Topval:"发布设置均可修改",
Botvalleft:"点击修改",
Botval:"此设置将对所有分班生效",
- starttime:moment(moment(handleDateString(this.props.getNowFormatDates(1))).add(1, 'months')).format("YYYY-MM-DD HH:mm"),
+ starttime:moment(moment(handleDateString(this.props.getNowFormatDates(1)))).format("YYYY-MM-DD HH:mm") ,
starttimes:this.props.getNowFormatDates(1),
typs:"start",
endtime:endtime,
@@ -558,6 +561,7 @@ class GraduationTaskssettingapp extends Component{
commenttimetype:false
})
}
+ debugger
if(moment(this.state.commenttime)
{
- try {
- if (this.state.settingdata.is_end === true) {
+
+ if (this.state.settingdata&&this.state.settingdata.is_end === true) {
// this.setState({
// modalsType: true,
// modalsTopval: "课堂已结束不能再修改!",
@@ -886,9 +892,7 @@ class GraduationTaskssettingapp extends Component{
flagPageEdit: true,
})
}
- } catch (e) {
- }
}
@@ -1025,8 +1029,8 @@ class GraduationTaskssettingapp extends Component{