From 26721de90d7a6f5c7bbd916493d2943c8b4b0f22 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, 10 Mar 2020 23:03:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=99=AE=E9=80=9A=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E3=80=81=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A=E5=AD=A6?= =?UTF-8?q?=E7=94=9F=E8=BA=AB=E4=BB=BD=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/scripts/build.js | 3 ++- public/react/src/modules/courses/busyWork/CommonWorkList.js | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/public/react/scripts/build.js b/public/react/scripts/build.js index f8cec6702..560e1082b 100644 --- a/public/react/scripts/build.js +++ b/public/react/scripts/build.js @@ -191,7 +191,8 @@ function generateNewIndexJsp() { if (err) { return console.log(err); } - const newVersion = '1.1.1' + const newVersion = Date.parse(new Date()); + let cdnHost = 'https://shixun.educoder.net' cdnHost = 'https://ali-cdn.educoder.net' cdnHost = '' diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js index e020031fb..58156beea 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkList.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js @@ -692,7 +692,7 @@ class CommonWorkList extends Component{ id, user_name, user_login, student_id, group_name, work_status, update_time, teacher_score, teaching_asistant_score, student_score, ultimate_score, work_score, student_comment_count, appeal_all_count, appeal_deal_count, - late_penalty, absence_penalty, appeal_penalty + late_penalty, absence_penalty, appeal_penalty,user_comment_count , end_immediately, publish_immediately , homework_id, visible, work_group, project_info, is_leader @@ -742,7 +742,7 @@ class CommonWorkList extends Component{ }else{ StudentData=isStudent ? [{ id, user_name, user_login, student_id, group_name, work_status, update_time, teacher_score, teaching_asistant_score, student_score, ultimate_score, work_score, student_comment_count, appeal_all_count, appeal_deal_count, - late_penalty, absence_penalty, appeal_penalty, project_info, is_leader, + late_penalty, absence_penalty, appeal_penalty, project_info, is_leader,user_comment_count, work_group, isMine: true }] : [] } const columns = buildColumns(this, student_works, StudentData) @@ -775,7 +775,7 @@ class CommonWorkList extends Component{ const hasData = this.state.homework_status && this.state.homework_status.indexOf("未发布") == -1 // student_works && !!student_works.length && page == 1 && - // console.log(StudentData) + console.log(StudentData) // console.log(student_works) return(