Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
This commit is contained in:
commit
b649882a23
|
@ -20,6 +20,11 @@
|
|||
// text: 'Source: WorldClimate.com'
|
||||
},
|
||||
xAxis: {
|
||||
title: {
|
||||
text: '作者',
|
||||
x: -23, //center设置标题的位置
|
||||
y: 6
|
||||
},
|
||||
// categories: ["Jan", "Jan", "Jan", 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
|
||||
categories: <%= raw(@a_uname_code) %>
|
||||
},
|
||||
|
@ -70,7 +75,7 @@
|
|||
lineWidth: 1.5
|
||||
},
|
||||
{
|
||||
name: '<b style="font-weight:normal ">改动或增加</b>',
|
||||
name: '<b style="font-weight:normal;text-align: center ">改动或增加</b>',
|
||||
color: '#5b6b76',
|
||||
data: <%= @a_commits_add %>,
|
||||
dataLabels: {
|
||||
|
@ -122,6 +127,11 @@
|
|||
// text: 'Source: WorldClimate.com'
|
||||
},
|
||||
xAxis: {
|
||||
title: {
|
||||
text: '作者',
|
||||
x: -20, //center设置标题的位置
|
||||
y: 6
|
||||
},
|
||||
// categories: ["Jan", "Jan", "Jan", 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
|
||||
categories: <%= raw(@a_uname) %>
|
||||
},
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
</div>
|
||||
</td>
|
||||
<td class="tree-age c_grey">
|
||||
<div class="hidden" title="<%= distance_of_time_in_words(latest_changes.time, Time.now + 8.hours) if latest_changes && latest_changes.time %>">
|
||||
<div class="hidden" title="<%= format_time(latest_changes.time) %>">
|
||||
<%# 为了转换UTC时间,时差8小时 %>
|
||||
<%= distance_of_time_in_words(latest_changes.time, Time.now + 8.hours) if latest_changes && latest_changes.time %>
|
||||
<%#= latest_changes.time if latest_changes && latest_changes.time %>
|
||||
|
|
Loading…
Reference in New Issue