From 7ee7f0feb49ebb6d58b310ff83311332e8b82b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 22 Oct 2019 16:18:52 +0800 Subject: [PATCH 01/10] tz --- .../shixunreport/OfficialAcademicTranscript.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js b/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js index d115eef45..d869cc130 100644 --- a/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js +++ b/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js @@ -94,6 +94,7 @@ class OfficialAcademicTranscript extends Component { challenge_id: {id: item.challenge_id}, challenge_comment: item.challenge_comment, challenge_comment_hidden: item.challenge_comment_hidden, + view_answer: item.view_answer, // adjustmentminute:asdasd }) }) @@ -172,15 +173,18 @@ class OfficialAcademicTranscript extends Component { className: "edu-txt-center", render: (text, record) => { return ( - {record.view_answer === true ? + {record.view_answer === true ? 学生在完成任务评测之前查是否看了参考答案 - }>已查看 : 已查看 + : 学生在完成任务评测之前查是否看了参考答案 - - }>未查看 } + + }>未查看 } + ) } }, From 6dde2ef6d5bfd17149138d0adb39fb4b12aa6e31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Tue, 22 Oct 2019 16:25:10 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/busyWork/PublishRightnow.js | 4 ++-- .../modules/courses/graduation/tasks/GraduationTaskDetail.js | 4 ++-- .../modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js | 4 ++-- .../modules/courses/shixunHomework/Listofworksstudentone.js | 4 ++-- .../src/modules/courses/shixunHomework/ShixunStudentWork.js | 4 ++-- .../src/modules/courses/shixunHomework/Trainingjobsetting.js | 4 ++-- .../modules/courses/shixunHomework/Workquestionandanswer.js | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/PublishRightnow.js b/public/react/src/modules/courses/busyWork/PublishRightnow.js index 5b31986ee..42701babf 100644 --- a/public/react/src/modules/courses/busyWork/PublishRightnow.js +++ b/public/react/src/modules/courses/busyWork/PublishRightnow.js @@ -231,7 +231,7 @@ class PublishRightnow extends Component{ typs={this.state.typs} />:""} {/*立即发布*/} - + />:""} { showActionButton && { showdatatypes ? "立即发布" : "立即截止" } } ) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js index fdd10db6a..118b92607 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js @@ -353,7 +353,7 @@ class GraduationTaskDetail extends Component{ modaltype={this.state.modaltype} getcourse_groupslist={(id) => this.getcourse_groupslist(id)} /> - + />:""} diff --git a/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js b/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js index b35b500ac..068fd8c24 100644 --- a/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js +++ b/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js @@ -367,7 +367,7 @@ class Immediatelypublish extends Component{ /> {/*立即发布*/} - + />:""} {/* 公用的提示弹框 */} {/*立即发布*/} - + />:""} { homework_status&&homework_status.length===0?
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js index 559cafd78..1fdc4303a 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js @@ -793,7 +793,7 @@ class ShixunStudentWork extends Component { /> {/*立即发布*/} - + />:""}
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index c040b7d99..92d263888 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -2163,7 +2163,7 @@ class Trainingjobsetting extends Component { {/*立即发布*/} - + />:""} {/*立即发布*/} - + />:""}
From a14ece2093d06306543caa171a5e1af3bdaa61ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Tue, 22 Oct 2019 17:06:10 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/busyWork/PublishRightnow.js | 8 ++++---- .../modules/courses/coursesPublic/HomeworkModal.js | 8 ++++++-- .../courses/coursesPublic/OneSelfOrderModal.js | 14 ++++++++------ .../courses/shixunHomework/ShixunhomeWorkItem.js | 2 +- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/PublishRightnow.js b/public/react/src/modules/courses/busyWork/PublishRightnow.js index 42701babf..ff0a1bbd3 100644 --- a/public/react/src/modules/courses/busyWork/PublishRightnow.js +++ b/public/react/src/modules/courses/busyWork/PublishRightnow.js @@ -46,17 +46,17 @@ class PublishRightnow extends Component{ } - showDialog = () => { + showDialog = (course_groups) => { const isPublish = this.props.isPublish; const isPublishtype = this.props.isPublishtype; const dateFormat = 'YYYY-MM-DD HH:mm'; - let showdatatype=isPublish===false||isPublishtype===undefined; + let showdatatype=isPublish===true&&isPublishtype===undefined; let showdatatypes=isPublish===true||isPublishtype===1; // getNextHalfHourOfMoment const startMoment = (moment()); this.setState({ modalname: showdatatypes ? "立即发布" : "立即截止", - modaltype:1, + modaltype:course_groups.length> 0 ? 1 : 2, visible:showdatatype?false:true, OneSelftype:showdatatype?true:false, Topval:showdatatypes ? "学生将立即收到作业" : "学生将不能再提交作品", @@ -172,7 +172,7 @@ class PublishRightnow extends Component{ this.setState({ visible : false }) return; } - this.showDialog() + this.showDialog(response.data.course_groups) this.setState({ course_groups: response.data.course_groups, starttimesend:response.data.end_time===undefined||response.data.end_time===null||response.data.end_time===""?undefined:response.data.end_time, diff --git a/public/react/src/modules/courses/coursesPublic/HomeworkModal.js b/public/react/src/modules/courses/coursesPublic/HomeworkModal.js index ee19745c9..69eb937ff 100644 --- a/public/react/src/modules/courses/coursesPublic/HomeworkModal.js +++ b/public/react/src/modules/courses/coursesPublic/HomeworkModal.js @@ -235,10 +235,14 @@ class HomeworkModal extends Component{ @@ -251,7 +255,7 @@ class HomeworkModal extends Component{
  • + :

    {/**/} {/*发布时间:*/} {/*{this.props.starttime}*/} @@ -366,16 +366,17 @@ class OneSelfOrderModal extends Component{ onChange={this.onChangeTimeend} className={ this.state.endtimetype===true?"noticeTip":""} /> - {this.state.endtimetype===true?

    {this.state.endtimetypevalue}
    :""} + {/*
    (仅支持半点和整点)
    */} :""} +

    } {/* usingCheckBeforePost 为true的时候 全选所有分班 */}