From 683161b1ec1e233b16e0f4a5d7476d305466c9a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 22 Jun 2019 00:34:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/modules/courses/exercise/Exercise.js | 9 +-
.../tasks/GraduationTaskssetting.js | 12 +-
.../tasks/GraduationTaskssettinglist.js | 54 +-
.../tasks/GraduationTaskssettingquestions.js | 12 +-
.../modules/courses/graduation/tasks/index.js | 15 +-
.../poll/pollPublicBtn/ImmediatelyEnd.js | 536 +++++++++---------
.../poll/pollPublicBtn/ImmediatelyPublish.js | 12 +-
.../courses/shixunHomework/Listofworks.js | 12 +-
.../shixunHomework/ShixunStudentWork.js | 12 +-
.../shixunHomework/Trainingjobsetting.js | 12 +-
.../shixunHomework/Workquestionandanswer.js | 12 +-
.../courses/shixunHomework/shixunHomework.js | 20 +-
12 files changed, 374 insertions(+), 344 deletions(-)
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 fd3eac922..c842d02f2 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -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{
:
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}
+
}
@@ -874,10 +875,8 @@ class GraduationTaskssettinglist extends Component{
{this.props.isAdmin()?operation.map((tag,key) => {
return(
-
调整学生最终成绩
其它历史评分将全部失效:""}>
-
{tag.name==="评阅"?tag.status===0?"--":
{tag.name}
@@ -1045,7 +1044,6 @@ class GraduationTaskssettinglist extends Component{
>{tag.status===0?"":tag.name}
}
- }