diff --git a/app/views/managements/schools/_contrast_search_form.html.erb b/app/views/managements/schools/_contrast_search_form.html.erb
index 4d24a810..9597a9c7 100644
--- a/app/views/managements/schools/_contrast_search_form.html.erb
+++ b/app/views/managements/schools/_contrast_search_form.html.erb
@@ -26,13 +26,10 @@
<%= hidden_field_tag :data_type, params[:data_type] || 'grow' %>
- <% if params[:data_type] == 'contrast' %>
-
时间对比
-
新增数据
- <% else %>
-
时间对比
-
新增数据
- <% end %>
+
时段对比
+
数据变化
<%= text_field_tag :keyword, params[:keyword], placeholder: '请输入单位名称或者ID关键字进行搜索',
diff --git a/app/views/managements/schools/_data_contrast_list.html.erb b/app/views/managements/schools/_data_contrast_list.html.erb
index d77d4b70..83f7a11b 100644
--- a/app/views/managements/schools/_data_contrast_list.html.erb
+++ b/app/views/managements/schools/_data_contrast_list.html.erb
@@ -21,8 +21,8 @@
序号 |
ID |
单位名称 |
- 时段一 <%= "(#{params[:begin_date]}至#{params[:end_date]})" %> |
- 时段二 <%= "(#{params[:other_begin_date]}至#{params[:other_end_date]})" %> |
+ 时段一 <%= "(#{params[:begin_date]} 05:00至#{params[:end_date]} 05:00)" %> |
+ 时段二 <%= "(#{params[:other_begin_date]} 05:00至#{params[:other_end_date]} 05:00)" %> |
<%= sort_tag('变化情况', name: 'percentage', path: school_data_contrast_managements_path) %>
( 新 增 数 | 新增百分比)
diff --git a/app/views/managements/schools/_data_grow_list.html.erb b/app/views/managements/schools/_data_grow_list.html.erb
index 27a1ccf3..8f502979 100644
--- a/app/views/managements/schools/_data_grow_list.html.erb
+++ b/app/views/managements/schools/_data_grow_list.html.erb
@@ -9,7 +9,7 @@
新增教师<%= @grow_summary.teacher_increase_count || 0 %>人,
新增学生<%= @grow_summary.student_increase_count || 0 %>人,
新增课堂<%= @grow_summary.course_increase_count || 0 %>个,
- 新增实训<%= @grow_summary.shixun_increase_count || 0 %>个,
+ 新增实训作业<%= @grow_summary.shixun_increase_count || 0 %>个,
活跃用户<%= @grow_summary.active_user_count || 0 %>个
@@ -22,7 +22,7 @@
<%= sort_tag('新增教师', name: 'teacher_increase_count', path: school_data_grow_managements_path) %> |
<%= sort_tag('新增学生', name: 'student_increase_count', path: school_data_grow_managements_path) %> |
<%= sort_tag('新增课堂', name: 'course_increase_count', path: school_data_grow_managements_path) %> |
- <%= sort_tag('新增实训', name: 'shixun_increase_count', path: school_data_grow_managements_path) %> |
+ <%= sort_tag('新增实训作业', name: 'shixun_increase_count', path: school_data_grow_managements_path) %> |
<%= sort_tag('活跃用户', name: 'active_user_count', path: school_data_grow_managements_path) %> |
diff --git a/config/locales/school_daily_reports/zh.yml b/config/locales/school_daily_reports/zh.yml
index 57caf343..2db8a429 100644
--- a/config/locales/school_daily_reports/zh.yml
+++ b/config/locales/school_daily_reports/zh.yml
@@ -3,5 +3,5 @@ zh:
teacher_increase_count: 新增教师
student_increase_count: 新增学生
course_increase_count: 新增课堂
- shixun_increase_count: 新增实训
+ shixun_increase_count: 新增实训作业
active_user_count: 活跃用户
\ No newline at end of file
|