From d534d8016bf75052f58698c4930c9a00c06959f5 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 13 Aug 2019 16:30:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=90=E5=91=98?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/subjects_controller.rb | 1 + app/models/user.rb | 4 ++-- app/views/subjects/show.json.jbuilder | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb index 825040528..864c2c426 100644 --- a/app/controllers/subjects_controller.rb +++ b/app/controllers/subjects_controller.rb @@ -81,6 +81,7 @@ class SubjectsController < ApplicationController def show @user = current_user @is_creator = current_user.creator_of_subject?(@subject) + @is_manager = @user.manager_of_subject?(@subject) # 合作团队 @members = @subject.subject_members.includes(:user) @shixuns = @subject.shixuns.published.pluck(:id) diff --git a/app/models/user.rb b/app/models/user.rb index 7f724d081..9c3d1af39 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -263,9 +263,9 @@ class User < ApplicationRecord course&.course_members.exists?(user_id: id) end - # 实训路径管理员：创建者或admin + # 实训路径管理员 def creator_of_subject?(subject) - subject.user_id == id || admin? + subject.user_id == id end # 实训路径：合作者、admin diff --git a/app/views/subjects/show.json.jbuilder b/app/views/subjects/show.json.jbuilder index d93ee62f9..af524f5b3 100644 --- a/app/views/subjects/show.json.jbuilder +++ b/app/views/subjects/show.json.jbuilder @@ -5,12 +5,12 @@ json.challenges_count @subject.subject_challenge_count json.subject_score @subject.all_score json.member_count @subject.member_count -json.allow_delete @is_creator && (@subject.status != 2 || @user.admin?) +json.allow_delete (@subject.status != 2 && @is_creator) || @user.admin? json.publish_status publish_status(@subject, @is_creator, @user, @shixuns) -json.allow_statistics @user.manager_of_subject?(@subject) +json.allow_statistics @is_manager json.allow_send @user.logged? -json.allow_visit @user.manager_of_subject?(@subject) || @user.admin? || @subject.status > 1 -json.allow_add_member @user.manager_of_subject?(@subject) +json.allow_visit @subject.status > 1 || @is_manager +json.allow_add_member @is_manager json.members @members do |member| json.partial! 'subject_member', locals: { user: member.user } From e7081f9ee70b10917207c921ba74b5bfa147467f 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, 13 Aug 2019 16:34:44 +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 --- .../src/modules/courses/ListPageIndex.js | 22 ++++----- .../shixunreport/Shixunechart.js | 46 ++++++++++--------- 2 files changed, 35 insertions(+), 33 deletions(-) diff --git a/public/react/src/modules/courses/ListPageIndex.js b/public/react/src/modules/courses/ListPageIndex.js index 9c1923452..20718c903 100644 --- a/public/react/src/modules/courses/ListPageIndex.js +++ b/public/react/src/modules/courses/ListPageIndex.js @@ -119,17 +119,17 @@ class ListPageIndex extends Component{ {/*头部banner*/} - {mysearch!==undefined? - ( - mysearch===true? - this.setwindowlocal(b)} - > - - :"" - ) - :"" - } + {/*{mysearch!==undefined?*/} + {/*(*/} + {/* mysearch===true?*/} + {/* this.setwindowlocal(b)}*/} + {/* >*/} + {/* */} + {/* :""*/} + {/* )*/} + {/* :""*/} + {/*}*/}
diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js b/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js index c12ec13d5..9842aa026 100644 --- a/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js +++ b/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js @@ -24,7 +24,8 @@ function startechart(data){ // trigger: 'axis', showDelay : 0, formatter : function (params) { - if(params.name == data.username){ + + if(params.name === data.username){ return "姓名："+data.username + "
"+'学号： '+data.user_id + "
"+'效率：'+ data.echart_data.myself_eff[1]; }else if (params.value.length > 1) { /* return '学生ID: ' + params.value[2] + '
' @@ -34,6 +35,7 @@ function startechart(data){ return params.name + ":" + params.value +" "; } }, + axisPointer:{ show: true, type : 'cross', @@ -106,7 +108,7 @@ function startechart(data){ markPoint : { data : [ { - name: data.username, + name: data===undefined?"":data.username, xAxis:data.echart_data===undefined?"":data.echart_data.myself_eff[0], yAxis:data.echart_data===undefined?"":data.echart_data.myself_eff[1], value:data.echart_data===undefined?"":data.echart_data.myself_eff[1], @@ -130,13 +132,13 @@ function startechart(data){ ] } }, - { - name:'二班', - type:'scatter', - data: data.echart_data===undefined?"":data.echart_data.myself_eff, - itemStyle:{ - color:'#c23531' - }} + // { + // name:'二班', + // type:'scatter', + // data: data.echart_data===undefined?"":data.echart_data.myself_eff, + // itemStyle:{ + // color:'#c23531' + // }} ]}; effChart.setOption(option); @@ -189,7 +191,7 @@ function startechart(data){ borderWidth: 1, formatter: function (obj) { var value = obj.value; - if(obj.name ==data.username){ + if(obj.name ===data.username){ return "姓名："+data.username + "
"+'学号： '+data.user_id + "
"+'得分：'+ data.echart_data===undefined?"":data.echart_data.myself_object[1]; } @@ -242,7 +244,7 @@ function startechart(data){ markPoint : { data : [ { - name: data.username, + name: data===undefined?"":data.username, xAxis: data.echart_data===undefined?"":data.echart_data.myself_object[0], yAxis:data.echart_data===undefined?"":data.echart_data.myself_object[1], value:data.echart_data===undefined?"":data.echart_data.myself_object[1] @@ -255,15 +257,15 @@ function startechart(data){ } } }, - { - name: '能力1', - type: 'scatter', - data: data.echart_data===undefined?"":data.echart_data.myself_object, - itemStyle:itemStyle1, - symbolSize: function (val){ - return Math.round(val[2]); - } - } + // { + // name: '能力1', + // type: 'scatter', + // data: data.echart_data===undefined?"":data.echart_data.myself_object, + // itemStyle:itemStyle1, + // symbolSize: function (val){ + // return Math.round(val[2]); + // } + // } ] }; // 使用刚指定的配置项和数据显示图表。 @@ -368,7 +370,7 @@ class Shixunechart extends Component {
  • {data&&data.username}
    • -
  • {data&&data.user_id}
    • +
  • {data&&data.student_id}
  • {data&&data.echart_data===undefined?"":data&&data.echart_data.myself_eff[1]}
  • {data&&data.echart_data===undefined?"":data&&data.echart_data.myself_eff[0]}
    • @@ -394,7 +396,7 @@ class Shixunechart extends Component {
  • {data&&data.username}
    • -
  • {data&&data.user_id}
    • +
  • {data&&data.student_id}
  • {data&&data.echart_data===undefined?"":data&&data.echart_data.myself_object[1]}