diff --git a/app/controllers/admins/issues_rank_controller.rb b/app/controllers/admins/issues_rank_controller.rb
index 530678ad5..79450fbfb 100644
--- a/app/controllers/admins/issues_rank_controller.rb
+++ b/app/controllers/admins/issues_rank_controller.rb
@@ -11,11 +11,11 @@ class Admins::IssuesRankController < Admins::BaseController
private
def begin_date
- params.fetch(:begin_date, (Date.today-7.days).to_s)
+ params.fetch(:begin_date, (Date.yesterday-7.days).to_s)
end
def end_date
- params.fetch(:end_date, Date.today.to_s)
+ params.fetch(:end_date, Date.yesterday.to_s)
end
def sort_by
diff --git a/app/controllers/admins/projects_rank_controller.rb b/app/controllers/admins/projects_rank_controller.rb
index e4d8046e0..8db0961b7 100644
--- a/app/controllers/admins/projects_rank_controller.rb
+++ b/app/controllers/admins/projects_rank_controller.rb
@@ -17,11 +17,11 @@ class Admins::ProjectsRankController < Admins::BaseController
private
def begin_date
- params.fetch(:begin_date, (Date.today-7.days).to_s)
+ params.fetch(:begin_date, (Date.yesterday-7.days).to_s)
end
def end_date
- params.fetch(:end_date, Date.today.to_s)
+ params.fetch(:end_date, Date.yesterday.to_s)
end
def sort_by
diff --git a/app/views/admins/issues_rank/index.html.erb b/app/views/admins/issues_rank/index.html.erb
index b52076966..4fc56ada9 100644
--- a/app/views/admins/issues_rank/index.html.erb
+++ b/app/views/admins/issues_rank/index.html.erb
@@ -7,11 +7,11 @@
<%= form_tag(admins_issues_rank_index_path, method: :get, class: 'form-inline search-form flex-1', id: 'issue-rank-date-form') do %>
开始日期
-
+
截止日期
-
+
<% end %>
diff --git a/app/views/admins/issues_rank/shared/_data_list.html.erb b/app/views/admins/issues_rank/shared/_data_list.html.erb
index 8e9068345..9512028c3 100644
--- a/app/views/admins/issues_rank/shared/_data_list.html.erb
+++ b/app/views/admins/issues_rank/shared/_data_list.html.erb
@@ -19,7 +19,7 @@
<%= item&.issues %> |
<%= item&.closed_issues %> |
- <%= item&.issues_count %> |
+ <%= item&.project&.issues&.issue_issue.count %> |
<% end %>
diff --git a/app/views/admins/projects_rank/index.html.erb b/app/views/admins/projects_rank/index.html.erb
index e8f334f05..2e33a5335 100644
--- a/app/views/admins/projects_rank/index.html.erb
+++ b/app/views/admins/projects_rank/index.html.erb
@@ -7,11 +7,11 @@
<%= form_tag(admins_projects_rank_index_path, method: :get, class: 'form-inline search-form flex-1', id: 'project-rank-date-form') do %>
开始日期
-
+
截止日期
-
+
<% end %>
<%= link_to '导出', "/项目活跃度排行.xls", class: 'btn btn-primary mr-3' %>
diff --git a/app/views/admins/shared/_sidebar.html.erb b/app/views/admins/shared/_sidebar.html.erb
index ac09e3732..f9bf9ae48 100644
--- a/app/views/admins/shared/_sidebar.html.erb
+++ b/app/views/admins/shared/_sidebar.html.erb
@@ -81,7 +81,7 @@
<%= sidebar_item_group('#rank-submenu', '活跃度排行', icon: 'calendar') do %>
<%= sidebar_item(admins_users_rank_index_path, '用户活跃度排行', icon: 'user', controller: 'admins-users_rank') %>
<%= sidebar_item(admins_projects_rank_index_path, '项目活跃度排行', icon: 'database', controller: 'admins-projects_rank') %>
- <%= sidebar_item(admins_issues_rank_index_path, '疑修活跃度排行', icon: 'database', controller: 'admins-issues_rank') %>
+ <%= sidebar_item(admins_issues_rank_index_path, '疑修活跃度排行', icon: 'calendar', controller: 'admins-issues_rank') %>
<% end %>