diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index e2a438faf..0f536433d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -438,7 +438,7 @@ module ApplicationHelper content_tag(:span, text, opts) end - def sort_tag(content, opts) + def sort_tag(content = '', **opts) options = {} options[:sort_by] = opts.delete(:name) is_current_sort = params[:sort_by].to_s == options[:sort_by] @@ -450,10 +450,13 @@ module ApplicationHelper when 'asc' then 'fa-sort-amount-asc' else '' end + opts[:style] = "#{opts[:style]} ;position: relative;" content_tag(:span, opts) do link_to path, remote: true do - content += content_tag(:i, '', class: "fa color-light-green ml-1 #{arrow_class}") if is_current_sort + content = content_tag(:span) { yield } if block_given? + + content += content_tag(:i, '', class: "fa color-light-green ml-1 #{arrow_class}", style: 'position: absolute;top:0;') if is_current_sort raw content end end diff --git a/app/views/admins/daily_school_statistics/shared/_list.html.erb b/app/views/admins/daily_school_statistics/shared/_list.html.erb index af23e09f6..611acdd2a 100644 --- a/app/views/admins/daily_school_statistics/shared/_list.html.erb +++ b/app/views/admins/daily_school_statistics/shared/_list.html.erb @@ -1,19 +1,21 @@ - + - - - + +
单位名称单位名称 <%= sort_tag('教师总数', name: 'teacher_count', path: admins_daily_school_statistics_path) %> <%= sort_tag('学生总数', name: 'student_count', path: admins_daily_school_statistics_path) %> <%= sort_tag('课堂总数', name: 'course_count', path: admins_daily_school_statistics_path) %> <%= sort_tag('正在进行课堂数', name: 'active_course_count', path: admins_daily_school_statistics_path) %> <%= sort_tag('实训总数', name: 'shixun_count', path: admins_daily_school_statistics_path) %> - <%= sort_tag('实训评测总数', name: 'shixun_evaluate_count', path: admins_daily_school_statistics_path) %> - + + <%= sort_tag(name: 'shixun_evaluate_count', path: admins_daily_school_statistics_path) do %> + 实训评测总数 + + <% end %> <%= sort_tag('实训作业总数', name: 'homework_count', path: admins_daily_school_statistics_path) %><%= sort_tag('其它作业总数', name: 'other_homework_count', path: admins_daily_school_statistics_path) %><%= sort_tag('实训作业总数', name: 'homework_count', path: admins_daily_school_statistics_path) %><%= sort_tag('其它作业总数', name: 'other_homework_count', path: admins_daily_school_statistics_path) %> <%= sort_tag('动态时间', name: 'nearly_course_time', path: admins_daily_school_statistics_path) %>