From fa8a8a4f4cce7ebd2e82426bc39d32c3f76472f3 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, 17 Mar 2020 17:55:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/shixunHomework/ShixunWorkReport.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js index 959ba9244..8834df1af 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js @@ -315,7 +315,8 @@ class ShixunWorkReport extends Component { const antIcon = ; // let showAppraiseModals=this.props&&this.props.isAdminOrTeacher()===true?work_comment===null||work_comment===undefined?false:true:work_comment===null||work_comment===undefined?false:true; - let showAppraiseModals=work_comment===null||work_comment===undefined?false:true; + // let showAppraiseModals=work_comment===null||work_comment===undefined?false:true; + // console.log(this.props.isAdmin()) document.title=data&&data.course_name; return ( @@ -460,13 +461,13 @@ class ShixunWorkReport extends Component {
总体评价
{ - shixun_detail&&shixun_detail.map((item,key)=>{ + this.props&&this.props.isAdmin()===true?shixun_detail&&shixun_detail.map((item,key)=>{ if(key===0){ return( 查看学员实训 ) } - }) + }):"" }
From 20e86d67297acc20f59f0dc616297777007b710a Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 17 Mar 2020 18:43:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=AD=A6=E9=99=A2?= =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E7=9A=84=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_works_controller.rb | 2 ++ app/views/student_works/shixun_work_report.json.jbuilder | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/controllers/student_works_controller.rb b/app/controllers/student_works_controller.rb index 6c9de071d..8770a6519 100644 --- a/app/controllers/student_works_controller.rb +++ b/app/controllers/student_works_controller.rb @@ -477,6 +477,8 @@ class StudentWorksController < ApplicationController @user_evaluate_count = 0 end + @view_tpi = ((@user_course_identity < Course::STUDENT && current_user.is_certification_teacher) || current_user.admin_or_business?) && @work.myshixun.present? + # 图形效率图的数据 @echart_data = student_efficiency(@homework, @work) if @work.myshixun end diff --git a/app/views/student_works/shixun_work_report.json.jbuilder b/app/views/student_works/shixun_work_report.json.jbuilder index bd618c2d4..adf0a2ea5 100644 --- a/app/views/student_works/shixun_work_report.json.jbuilder +++ b/app/views/student_works/shixun_work_report.json.jbuilder @@ -87,4 +87,6 @@ if @shixun end end +json.view_tpi @view_tpi +