diff --git a/app/helpers/quality_analysis_helper.rb b/app/helpers/quality_analysis_helper.rb index f2a1effba..62993ea1b 100644 --- a/app/helpers/quality_analysis_helper.rb +++ b/app/helpers/quality_analysis_helper.rb @@ -1,2 +1,45 @@ module QualityAnalysisHelper + + def sqale_rating_status val + if val.to_i > 0 && val.to_i < 5 + "henhao" + elsif val.to_i > 5 && val.to_i < 10 + + elsif val.to_i > 10 && val.to_i < 20 + elsif val.to_i > 20 && val.to_i < 50 + "yiban" + elsif val.to_i > 20 + "cha" + end + end + + def complexity_status val + if val.to_i < 10 + "zhengchang" + elsif val.to_i > 10 && val.to_i < 15 + "yiban" + elsif val.to_i > 15 + "cha" + end + end + + def duplicated_lines_density_status val + if val.to_i < 30 + "zhengchang" + elsif val.to_i > 30 && val.to_i < 50 + "jiaogao" + elsif val.to_i > 50 + "gao" + end + end + + def comment_lines_density_status val + if val.to_i < 20 + "paindi" + elsif val.to_i > 20 && val.to_i < 50 + "jiaohao" + elsif val.to_i > 50 + "hao" + end + end end diff --git a/app/views/quality_analysis/_hightchars.html.erb b/app/views/quality_analysis/_hightchars.html.erb index cea38f691..620e2d4fb 100644 --- a/app/views/quality_analysis/_hightchars.html.erb +++ b/app/views/quality_analysis/_hightchars.html.erb @@ -44,12 +44,6 @@ }] }, - xAxis: { - style:{ - fontSize: '18px' - } - }, - // the value axis yAxis: { min: 0, @@ -100,7 +94,7 @@ }, series: [{ name: '代码质量', - data: [<%= @complexity["msr"][9]["frmt_val"] %>] + data: [<%= @complexity["msr"][9]["val"] %>] // tooltip: { // valueSuffix: ' km/h' // } @@ -127,6 +121,7 @@ }); }); + // function_complexity $(function () { $('#container_function_complexity').highcharts({ @@ -175,7 +170,7 @@ // the value axis yAxis: { min: 0, - max: 100, + max: 30, minorTickInterval: 'auto', minorTickWidth: 1, minorTickLength: 10, @@ -214,7 +209,7 @@ }, series: [{ name: '复杂度', - data: [<%= @complexity["msr"][5]["frmt_val"] %>] + data: [<%= @complexity["msr"][5]["val"] %>] // tooltip: { // valueSuffix: ' km/h' // } @@ -334,7 +329,7 @@ }, series: [{ name: '重复率', - data: [<%= @complexity["msr"][7]["frmt_val"] %>] + data: [<%= @complexity["msr"][7]["val"] %>] // tooltip: { // valueSuffix: ' km/h' // } @@ -459,7 +454,7 @@ }, series: [{ name: '质量等级', - data: [<%= @complexity["msr"][5]["frmt_val"] %>] + data: [<%= @complexity["msr"][5]["val"] %>] // tooltip: { // valueSuffix: ' km/h' // } diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb index 24fd990df..4265a6e6c 100644 --- a/app/views/quality_analysis/_show.html.erb +++ b/app/views/quality_analysis/_show.html.erb @@ -8,12 +8,13 @@

duplicated_lines_density: <%= @complexity["msr"][7]["frmt_val"] %>

sqale_index: <%= @complexity["msr"][8]["frmt_val"] %>

sqale_rating: <%= @complexity["msr"][9]["frmt_val"] %>

- -<%dd %> +<%# DD %> <%= javascript_include_tag 'highcharts','highcharts-more' %> <%= render :partial => "hightchars" %> + +

SonarQube质量分析

@@ -26,24 +27,24 @@

质量等级

-

A正常

+

<%= @complexity["msr"][9]["frmt_val"] %><%= sqale_rating_status(@complexity["msr"][9]["val"]) %>

复杂度

-

44正常

+

<%= @complexity["msr"][6]["val"] %><%= complexity_status(@complexity["msr"][6]["val"]) %>

重复

-

44%正常

+

<%= @complexity["msr"][7]["frmt_val"] %><%= duplicated_lines_density_status(@complexity["msr"][7]["val"]) %>

注释率

-

12%偏低

+

<%= @complexity["msr"][5]["frmt_val"] %><%=comment_lines_density_status(@complexity["msr"][5]["val"]) %>