From 4d69cecf44639a5f5e74f32b2bbfbc56ea2479fa Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 8 Nov 2019 16:28:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= 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 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/student_works_controller.rb b/app/controllers/student_works_controller.rb index ad684952d..cd742a178 100644 --- a/app/controllers/student_works_controller.rb +++ b/app/controllers/student_works_controller.rb @@ -476,7 +476,7 @@ class StudentWorksController < ApplicationController end # 图形效率图的数据 - @echart_data = student_efficiency(@homework, @work) + @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 cda78d93c..40b0e28c2 100644 --- a/app/views/student_works/shixun_work_report.json.jbuilder +++ b/app/views/student_works/shixun_work_report.json.jbuilder @@ -3,6 +3,7 @@ json.category @homework.category_info json.course_name @course.name json.work_id @work.id json.work_efficiency @homework.work_efficiency +json.has_commit @work.myshixun.present? if @shixun json.shixun_name @shixun.name # 总体评价 From aae49d19f479d97aeffc08ce4d726b851c9064a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 8 Nov 2019 16:41:58 +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 --- .../shixunreport/Shixunechart.js | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js b/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js index 603a67474..d560a6f1d 100644 --- a/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js +++ b/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js @@ -87,7 +87,7 @@ function startechart(data){ { name:'', type:'scatter', - data:data.echart_data===undefined?"":data.echart_data.efficiency_list, + data: data.echart_data === undefined || data.echart_data === null ? "" : data.echart_data.efficiency_list, itemStyle:{ normal:{color:'#2e65ad'} }, @@ -113,9 +113,9 @@ function startechart(data){ data : [ { 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], + xAxis: data.echart_data === undefined || data.echart_data === null ? "" : data.echart_data.myself_eff[0], + yAxis: data.echart_data === undefined || data.echart_data === null ? "" : data.echart_data.myself_eff[1], + value: data.echart_data === undefined || data.echart_data === null ? "" : data.echart_data.myself_eff[1], } ], itemStyle: { @@ -148,7 +148,7 @@ function startechart(data){ var ablChart = echarts.init(document.getElementById('shixun_overall_ablility_chart')); - var dataBJ = data.echart_data===undefined?"":data.echart_data.consume_list; + var dataBJ = data.echart_data === undefined || data.echart_data === null ? "" : data.echart_data.consume_list; var itemStyle = { @@ -196,7 +196,7 @@ function startechart(data){ formatter: function (obj) { var value = obj.value; if(obj.name ===data.username){ - return "姓名："+data.username + "
"+'学号： '+data.user_id + "
"+'得分：'+ data.echart_data===undefined?"":data.echart_data.myself_object[1]; + return "姓名：" + data.username + "
" + '学号： ' + data.user_id + "
" + '得分：' + data.echart_data === undefined || data.echart_data === null ? "" : data.echart_data.myself_object[1]; } } @@ -249,9 +249,9 @@ function startechart(data){ data : [ { 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] + xAxis: data.echart_data === undefined || data.echart_data === null ? "" : data.echart_data.myself_object[0], + yAxis: data.echart_data === undefined || data.echart_data === null ? "" : data.echart_data.myself_object[1], + value: data.echart_data === undefined || data.echart_data === null ? "" : data.echart_data.myself_object[1] } ], itemStyle: { @@ -375,8 +375,12 @@ class Shixunechart extends Component {
  • {data&&data.username}
  • {data===undefined?"--":data.student_id===undefined?"--":data.student_id===null?"--":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]}
    • +
  • {data && data.echart_data === undefined || data.echart_data === null ? "" : data && data.echart_data.myself_eff[1]} +
    • +
  • {data && data.echart_data === undefined || data.echart_data === null ? "" : data && data.echart_data.myself_eff[0]} +
    • @@ -401,7 +405,9 @@ class Shixunechart extends Component {
  • {data&&data.username}
  • {data===undefined?"--":data.student_id===undefined?"--":data.student_id===null?"--":data.student_id}
    • -
  • {data&&data.echart_data===undefined?"":data&&data.echart_data.myself_object[1]}
    • +
  • {data && data.echart_data === undefined || data.echart_data === null ? "" : data && data.echart_data.myself_object[1]} +