m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

Browse Source
dev_oauth
hjm 6 years ago
parent 6022e88b1d e2e8421f14
commit 3206625ea8
5 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File

1
app/controllers/subjects_controller.rb
Unescape View File

@ -81,6 +81,7 @@ class SubjectsController < ApplicationController
def show def show
@user = current_user @user = current_user
@is_creator = current_user.creator_of_subject?(@subject) @is_creator = current_user.creator_of_subject?(@subject)
@is_manager = @user.manager_of_subject?(@subject)
# 合作团队 # 合作团队
@members = @subject.subject_members.includes(:user) @members = @subject.subject_members.includes(:user)
@shixuns = @subject.shixuns.published.pluck(:id) @shixuns = @subject.shixuns.published.pluck(:id)

4
app/models/user.rb
Unescape View File

@ -263,9 +263,9 @@ class User < ApplicationRecord
course&.course_members.exists?(user_id: id) course&.course_members.exists?(user_id: id)
end end
# 实训路径管理员：创建者或admin # 实训路径管理员
def creator_of_subject?(subject) def creator_of_subject?(subject)
subject.user_id == id || admin? subject.user_id == id
end end
# 实训路径：合作者、admin # 实训路径：合作者、admin

8
app/views/subjects/show.json.jbuilder
Unescape View File

@ -5,12 +5,12 @@ json.challenges_count @subject.subject_challenge_count
json.subject_score @subject.all_score json.subject_score @subject.all_score
json.member_count @subject.member_count 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.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_send @user.logged?
json.allow_visit @user.manager_of_subject?(@subject) || @user.admin? || @subject.status > 1 json.allow_visit @subject.status > 1 || @is_manager
json.allow_add_member @user.manager_of_subject?(@subject) json.allow_add_member @is_manager
json.members @members do |member| json.members @members do |member|
json.partial! 'subject_member', locals: { user: member.user } json.partial! 'subject_member', locals: { user: member.user }

22
public/react/src/modules/courses/ListPageIndex.js
Unescape View File

@ -119,17 +119,17 @@ class ListPageIndex extends Component{
{/*头部banner*/} {/*头部banner*/}
<CoursesBanner {...this.props}></CoursesBanner> <CoursesBanner {...this.props}></CoursesBanner>
{mysearch!==undefined? {/*{mysearch!==undefined?*/}
( {/*(*/}
mysearch===true? {/* mysearch===true?*/}
<Guide {/* <Guide*/}
setwindowlocal={(b)=>this.setwindowlocal(b)} {/* setwindowlocal={(b)=>this.setwindowlocal(b)}*/}
> {/* >*/}
</Guide> {/* </Guide>*/}
:"" {/* :""*/}
) {/* )*/}
:"" {/* :""*/}
} {/*}*/}
<div className="educontent clearfix" style={{flex: "1 0 auto"}}> <div className="educontent clearfix" style={{flex: "1 0 auto"}}>
<div className="stud-class-set"> <div className="stud-class-set">

46
public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js
Unescape View File

@ -24,7 +24,8 @@ function startechart(data){
// trigger: 'axis', // trigger: 'axis',
showDelay : 0, showDelay : 0,
formatter : function (params) { formatter : function (params) {
if(params.name == data.username){
if(params.name === data.username){
return "姓名："+data.username + "<br/>"+'学号： '+data.user_id + "<br/>"+'效率：'+ data.echart_data.myself_eff[1]; return "姓名："+data.username + "<br/>"+'学号： '+data.user_id + "<br/>"+'效率：'+ data.echart_data.myself_eff[1];
}else if (params.value.length > 1) { }else if (params.value.length > 1) {
/* return '学生ID: ' + params.value[2] + '<br/>' /* return '学生ID: ' + params.value[2] + '<br/>'
@ -34,6 +35,7 @@ function startechart(data){
return params.name + ":" + params.value +" "; return params.name + ":" + params.value +" ";
} }
}, },
axisPointer:{ axisPointer:{
show: true, show: true,
type : 'cross', type : 'cross',
@ -106,7 +108,7 @@ function startechart(data){
markPoint : { markPoint : {
data : [ data : [
{ {
name: data.username, name: data===undefined?"":data.username,
xAxis:data.echart_data===undefined?"":data.echart_data.myself_eff[0], xAxis:data.echart_data===undefined?"":data.echart_data.myself_eff[0],
yAxis:data.echart_data===undefined?"":data.echart_data.myself_eff[1], yAxis:data.echart_data===undefined?"":data.echart_data.myself_eff[1],
value: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:'二班', // name:'二班',
type:'scatter', // type:'scatter',
data: data.echart_data===undefined?"":data.echart_data.myself_eff, // data: data.echart_data===undefined?"":data.echart_data.myself_eff,
itemStyle:{ // itemStyle:{
color:'#c23531' // color:'#c23531'
}} // }}
]}; ]};
effChart.setOption(option); effChart.setOption(option);
@ -189,7 +191,7 @@ function startechart(data){
borderWidth: 1, borderWidth: 1,
formatter: function (obj) { formatter: function (obj) {
var value = obj.value; var value = obj.value;
if(obj.name ==data.username){ if(obj.name ===data.username){
return "姓名："+data.username + "<br/>"+'学号： '+data.user_id + "<br/>"+'得分：'+ data.echart_data===undefined?"":data.echart_data.myself_object[1]; return "姓名："+data.username + "<br/>"+'学号： '+data.user_id + "<br/>"+'得分：'+ data.echart_data===undefined?"":data.echart_data.myself_object[1];
} }
@ -242,7 +244,7 @@ function startechart(data){
markPoint : { markPoint : {
data : [ data : [
{ {
name: data.username, name: data===undefined?"":data.username,
xAxis: data.echart_data===undefined?"":data.echart_data.myself_object[0], xAxis: data.echart_data===undefined?"":data.echart_data.myself_object[0],
yAxis:data.echart_data===undefined?"":data.echart_data.myself_object[1], yAxis:data.echart_data===undefined?"":data.echart_data.myself_object[1],
value: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', // name: '能力1',
type: 'scatter', // type: 'scatter',
data: data.echart_data===undefined?"":data.echart_data.myself_object, // data: data.echart_data===undefined?"":data.echart_data.myself_object,
itemStyle:itemStyle1, // itemStyle:itemStyle1,
symbolSize: function (val){ // symbolSize: function (val){
return Math.round(val[2]); // return Math.round(val[2]);
} // }
} // }
] ]
}; };
// 使用刚指定的配置项和数据显示图表。 // 使用刚指定的配置项和数据显示图表。
@ -368,7 +370,7 @@ class Shixunechart extends Component {
</div> </div>
<div className="fl with65" style={{paddingLeft: "5%"}}> <div className="fl with65" style={{paddingLeft: "5%"}}>
<li className="mt5 mb5">{data&&data.username}</li> <li className="mt5 mb5">{data&&data.username}</li>
<li className="mt5 mb5">{data&&data.user_id}</li> <li className="mt5 mb5">{data&&data.student_id}</li>
<li className="mt5 mb5 color-orange03"><span className="color-orange03">{data&&data.echart_data===undefined?"":data&&data.echart_data.myself_eff[1]}</span></li> <li className="mt5 mb5 color-orange03"><span className="color-orange03">{data&&data.echart_data===undefined?"":data&&data.echart_data.myself_eff[1]}</span></li>
<li className="mt5 mb5 color-orange03"><span className="color-orange03">{data&&data.echart_data===undefined?"":data&&data.echart_data.myself_eff[0]}</span></li> <li className="mt5 mb5 color-orange03"><span className="color-orange03">{data&&data.echart_data===undefined?"":data&&data.echart_data.myself_eff[0]}</span></li>
</div> </div>
@ -394,7 +396,7 @@ class Shixunechart extends Component {
</div> </div>
<div className="fl with65" style={{paddingLeft: "5%"}}> <div className="fl with65" style={{paddingLeft: "5%"}}>
<li className="mt5 mb5">{data&&data.username}</li> <li className="mt5 mb5">{data&&data.username}</li>
<li className="mt5 mb5">{data&&data.user_id}</li> <li className="mt5 mb5">{data&&data.student_id}</li>
<li className="mt5 mb5 color-orange03"><span className="color-orange03">{data&&data.echart_data===undefined?"":data&&data.echart_data.myself_object[1]}</span></li> <li className="mt5 mb5 color-orange03"><span className="color-orange03">{data&&data.echart_data===undefined?"":data&&data.echart_data.myself_object[1]}</span></li>
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save