From 74e6504ac2e05e85e6c4c6999520e5085c75f0a7 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, 9 Sep 2019 14:53:59 +0800 Subject: [PATCH 1/4] =?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/Ecerciseallbackagain.js | 5 +++-- public/react/src/modules/paths/PathDetail/PathDetailIndex.js | 4 ++-- public/react/src/modules/tpm/component/TPMRightSection.js | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js b/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js index 0deddfacf..11c0fd07b 100644 --- a/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js +++ b/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js @@ -159,6 +159,7 @@ class Ecerciseallbackagain extends Component{
{datalist===undefined?"": -
-
+
取消 确认
diff --git a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js index f1b0a3bbb..3866f3f16 100644 --- a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js +++ b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js @@ -459,8 +459,8 @@ class PathDetailIndex extends Component{ this.props.checkIfLogin()===false?"":progress === undefined ? "" : progress === null ? "" :

- 我的进展 - + 关卡数 + {progress.my_score} / {progress.all_score}

diff --git a/public/react/src/modules/tpm/component/TPMRightSection.js b/public/react/src/modules/tpm/component/TPMRightSection.js index fd96454c4..f824e7d83 100644 --- a/public/react/src/modules/tpm/component/TPMRightSection.js +++ b/public/react/src/modules/tpm/component/TPMRightSection.js @@ -121,7 +121,7 @@ class TPMRightSection extends Component {
-

相关实践课程

+

所属课程

{ TPMRightSectionData===undefined?"":TPMRightSectionData.paths===undefined?"":TPMRightSectionData.paths.map((i,k)=>{ @@ -164,7 +164,7 @@ class TPMRightSection extends Component {

推荐实训

From 3df9ee5bed5394c2042c9448d4344db3c0c97b2a 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, 9 Sep 2019 15:35:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/exercise/Ecerciseallbackagain.js | 60 +++++++++++++++---- .../Shixunworkdetails/ShixunWorkModal.js | 6 +- .../paths/PathDetail/DetailCardsEditAndAdd.js | 2 +- .../PathDetail/DetailCardsEditAndEdit.js | 2 +- 4 files changed, 55 insertions(+), 15 deletions(-) diff --git a/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js b/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js index 11c0fd07b..35556da54 100644 --- a/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js +++ b/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js @@ -157,9 +157,44 @@ class Ecerciseallbackagain extends Component{ console.log() return(
+ + .greybackHead{ + padding:0px 30px; + } + .fontlefts{text-align: left;} + `} +
学生将得到一次重新答题的机会，现有的答题情况将被清空
  • 姓名
    • @@ -183,7 +219,7 @@ class Ecerciseallbackagain extends Component{
{datalist===undefined?"": -
    @@ -191,7 +227,7 @@ class Ecerciseallbackagain extends Component{ { datalist.map((item,key)=>{ return( -
    +
  • - + {item.user_name}
  • diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js index ec245c29b..22a97ed21 100644 --- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js +++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js @@ -273,7 +273,7 @@ class ShixunWorkModal extends Component{
    • : -
      @@ -286,7 +286,7 @@ class ShixunWorkModal extends Component{ group_list&&group_list.length===0?"":group_list.map((item,key)=>{ return(
      -
    • +
    • + className="task-hide color-grey-name" title={item===undefined?"":item.name}>{item===undefined?"":item.name}
    • diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js index f3c9d514b..10c78dddf 100644 --- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js +++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js @@ -518,7 +518,7 @@ class DetailCardsEditAndAdd extends Component{ style={{"width":"298px"}} name="shixun_homework[]" > - +
    • {item.school_users}
      • diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js index b4b8cb536..30859d962 100644 --- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js +++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js @@ -554,7 +554,7 @@ class DetailCardsEditAndEdit extends Component{ style={{"width":"298px"}} name="shixun_homework[]" > - +
    • {item.school_users}
      • From 51e9767ac85bd13445150d9871894c052a4048b7 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, 9 Sep 2019 15:55:18 +0800 Subject: [PATCH 3/4] b --- public/react/src/modules/paths/PathDetail/PathDetailIndex.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js index 3866f3f16..f432c18b2 100644 --- a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js +++ b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js @@ -460,7 +460,7 @@ class PathDetailIndex extends Component{

      关卡数 - + {progress.my_score} / {progress.all_score}

      From 5794d7a6a16fd6c7a25b20571eda9073180b63ca 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, 9 Sep 2019 16:19:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=84=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/coursesPublic/AppraiseModal.js | 20 ++++++++++------ .../shixunHomework/ShixunWorkReport.js | 1 + .../OfficialAcademicTranscript.js | 23 +++++++++++++++++++ .../src/modules/modals/WordNumberTextarea.css | 8 ++----- 4 files changed, 39 insertions(+), 13 deletions(-) diff --git a/public/react/src/modules/courses/coursesPublic/AppraiseModal.js b/public/react/src/modules/courses/coursesPublic/AppraiseModal.js index ab67dddc6..4c1453c2a 100644 --- a/public/react/src/modules/courses/coursesPublic/AppraiseModal.js +++ b/public/react/src/modules/courses/coursesPublic/AppraiseModal.js @@ -91,7 +91,7 @@ class AppraiseModal extends Component{ padding: 0px 15px 15px 15px; } .font{ - width: 48px; + height: 16px; font-size: 16px; font-weight: 400; @@ -111,15 +111,21 @@ class AppraiseModal extends Component{

      - 权限： + 可见:(学生可查看老师的评阅内容）

      - - 可见 (学生查看老师的评阅内容） - 不可见 (仅对课堂老师可见） - + {/**/} + {/*可见 (学生查看老师的评阅内容）*/} + {/*不可见 (仅对课堂老师可见）*/} + {/**/} + this.settextarea(e)} + value={textareaval} + maxlength={500} + />

      - 内容： + 不可见:(仅对课堂老师可见）

      this.getdatalist()} setupdalist={(challenge_score,overall_appraisal,work_score)=>this.setupdalist(challenge_score,overall_appraisal,work_score)} + showAppraiseModal={(sum)=>this.showAppraiseModal(sum)} />
      diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js b/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js index 2a79ce829..5e12bda06 100644 --- a/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js +++ b/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js @@ -196,6 +196,19 @@ class OfficialAcademicTranscript extends Component { // min={0} max={record.game_scores.game_score_full} /> {/*查看*/} + + ), + },{ + title: '操作', + key: 'operation', + dataIndex: 'operation', + + render: (text, record) => ( + + this.props.showAppraiseModal(1)} + >评阅 ), }]; @@ -210,6 +223,13 @@ class OfficialAcademicTranscript extends Component { } } ) + columns.some((item,key)=> { + if (item.title === "操作") { + columns.splice(key, 1) + return true + } + } + ) } return (
      @@ -276,6 +296,9 @@ class OfficialAcademicTranscript extends Component { .linhe15{ line-height: 15px; } + .mr22{ + margin-right: 22px; + } `} {datas===undefined?"":