From 94c36b0bb5f47eb399b79c433ce42784739c077f 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, 24 Mar 2020 20:16:48 +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 --- public/react/src/modules/courses/coursesDetail/CoursesBanner.js | 2 +- .../src/modules/courses/shixunHomework/ShixunhomeWorkItem.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js index 5ef7173ee..f6c707d94 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js @@ -620,7 +620,7 @@ class CoursesBanner extends Component {
-
+
{coursedata.teacher_users.length===0?'': 协作老师： diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js index 771c0dda8..45c9e8963 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js @@ -378,7 +378,7 @@ class ShixunhomeWorkItem extends Component{ } - {this.props.isAdmin()?this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"ml20 btn colorblue font-16 fontweight400 "}>重命名:""} + {this.props.isAdmin?this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"ml20 btn colorblue font-16 fontweight400 "}>重命名:""} {/* 设置*/} 设置 :""} From 25f56e5aa0d8c87ea7d910b8b7cb6109110eae05 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, 24 Mar 2020 20:22:51 +0800 Subject: [PATCH 2/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 --- .../exercise/Studentshavecompletedthelist.js | 69 ++++++++++--------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js index b3f126e9f..ab4efaf9b 100644 --- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js +++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js @@ -297,16 +297,15 @@ class Studentshavecompletedthelist extends Component { } : {color: '#747A7F', textAlign: "center", width: '99px'}}>{record.levelscore} { //主观题老师没有评分是 - parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ? + parseInt(record.levelscore) === 0 && myssubjective === 1 &&record.review_status===false? (待批阅) - : - "" - + + :"" } } @@ -371,7 +370,7 @@ class Studentshavecompletedthelist extends Component { 主观题得分：{record.subjective_score}分}
{ - parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ? + parseInt(record.efficiencyscore) === 0 && myssubjective === 0 &&record.review_status===false?
待批阅
@@ -397,15 +396,15 @@ class Studentshavecompletedthelist extends Component { textAlign: "center" }}>{record.efficiencyscore} {//只有一个主观题的时候 - parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ? - (待批阅) : - "" + "" } } @@ -644,16 +643,14 @@ class Studentshavecompletedthelist extends Component { } : {color: '#747A7F', textAlign: "center", width: '99px'}}>{record.levelscore} { //主观题老师没有评分是 - parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ? + parseInt(record.levelscore) === 0 && myssubjective === 1 &&record.review_status===false? (待批阅) - : - "" - + :"" } } @@ -720,7 +717,7 @@ class Studentshavecompletedthelist extends Component { 主观题得分：{record.subjective_score}分}
{ - parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ? + parseInt(record.efficiencyscore) === 0 && myssubjective === 0 &&record.review_status===false?
待批阅
@@ -750,15 +747,15 @@ class Studentshavecompletedthelist extends Component { width: "199px" }}>{record.efficiencyscore} {//只有一个主观题的时候 - parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ? - (待批阅) : - "" + "" } } @@ -980,7 +977,7 @@ class Studentshavecompletedthelist extends Component { } : {color: '#747A7F', textAlign: "center"}}>{record.levelscore} { //主观题老师没有评分是 - parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ? + parseInt(record.levelscore) === 0 && myssubjective === 1 &&record.review_status===false? : "" - } } @@ -1051,7 +1047,7 @@ class Studentshavecompletedthelist extends Component { 主观题得分：{record.subjective_score}分}
{ - parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ? + parseInt(record.efficiencyscore) === 0 && myssubjective === 0 &&record.review_status===false?
待批阅
@@ -1077,8 +1073,8 @@ class Studentshavecompletedthelist extends Component { textAlign: "center", }}>{record.efficiencyscore} {//只有一个主观题的时候 - parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ? - {record.levelscore} { //主观题老师没有评分是 - parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ? - : "" - } @@ -1361,8 +1356,8 @@ class Studentshavecompletedthelist extends Component { 主观题得分：{record.subjective_score}分}
{ - parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ? -
+ parseInt(record.efficiencyscore) === 0 && myssubjective === 0&& record.review_status===false? +
待批阅
: @@ -1392,7 +1387,7 @@ class Studentshavecompletedthelist extends Component { textAlign: "center", }}>{parseInt(record.efficiencyscore) === 0 ? 0 : record.efficiencyscore} {//只有一个主观题的时候 - parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ? + parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && record.review_status===false?