From 3158dd9e1673f6336d817da350289b427fed91b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 11 Nov 2019 14:28:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CompetitionCommonChild/CompetitionContentsChart.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js
index 235cfbb43..76a65581d 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js
@@ -146,8 +146,8 @@ class CompetitionContents extends Component{
}
})}
- console.log(this.props&&this.props.mode)
- console.log(columns)
+ // console.log(this.props&&this.props.mode)
+ // console.log(columns)
return (
From d21517b570ed874b0945c0b0b9b4df1a2507a371 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Mon, 11 Nov 2019 14:28:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A?=
=?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E5=8A=A0=E6=9F=A5=E7=9C=8B?=
=?UTF-8?q?=E7=AD=94=E6=A1=88=E6=98=AF=E5=90=A6=E6=89=A3=E5=88=86=E7=9A=84?=
=?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/homework_commons/works_list.json.jbuilder | 1 +
1 file changed, 1 insertion(+)
diff --git a/app/views/homework_commons/works_list.json.jbuilder b/app/views/homework_commons/works_list.json.jbuilder
index 3807d5b99..34123e829 100644
--- a/app/views/homework_commons/works_list.json.jbuilder
+++ b/app/views/homework_commons/works_list.json.jbuilder
@@ -19,6 +19,7 @@ json.allow_late @homework.allow_late
if @user_course_identity < Course::STUDENT
json.calculation_time @homework.calculation_time if @homework.homework_type == "practice"
+ json.answer_open_evaluation @homework_detail_manual.answer_open_evaluation if @homework.homework_type == "practice"
# 教师身份的评阅、提交状态、分班过滤
if @homework.homework_type != "practice"
json.teacher_comment teacher_comment @homework, @current_user.id