From 1624e9321c53e913bd10e8f1242a06295afd97af Mon Sep 17 00:00:00 2001
From: p31729568 <winse.wang@foxmail.com>
Date: Tue, 2 Jul 2019 10:00:41 +0800
Subject: [PATCH] modify school statistic page

---
 .../managements/schools/_data_contrast_list.html.erb     | 9 +++++----
 app/views/managements/schools/_data_grow_list.html.erb   | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/views/managements/schools/_data_contrast_list.html.erb b/app/views/managements/schools/_data_contrast_list.html.erb
index c25a8bc4..a4a7919b 100644
--- a/app/views/managements/schools/_data_contrast_list.html.erb
+++ b/app/views/managements/schools/_data_contrast_list.html.erb
@@ -19,8 +19,7 @@
   <thead>
   <tr>
     <th width="6%">序号</th>
-    <th width="10%">ID</th>
-    <th width="20%" class="edu-txt-left">单位名称</th>
+    <th width="30%" class="edu-txt-left">单位名称</th>
     <th width="22%">时段一<br><%= "（#{params[:begin_date]} 05:00至#{(Time.zone.parse(params[:end_date]) + 1.days).strftime('%Y-%m-%d')} 05:00）" %></th>
     <th width="22%">时段二<br><%= "（#{params[:other_begin_date]} 05:00至#{(Time.zone.parse(params[:other_end_date]) + 1.days).strftime('%Y-%m-%d')} 05:00）" %></th>
     <th width="20%" colspan="2">
@@ -33,8 +32,10 @@
   <% @reports.each_with_index do |report, index| %>
     <tr>
       <td><%= (@obj_pages.page - 1) * @obj_pages.per_page + index + 1 %></td>
-      <td><%= report.school_id %></td>
-      <td class="edu-txt-left"><%= report.school_name %></td>
+      <td class="edu-txt-left">
+        <%= link_to report.school_name, statistics_college_path(id: report.school_id),
+                    target: '_blank', data: { tip_down: '点击查看学校统计概况'} %>
+      </td>
       <td><%= report['total'] %></td>
       <td><%= report['other_total'] %></td>
       <%
diff --git a/app/views/managements/schools/_data_grow_list.html.erb b/app/views/managements/schools/_data_grow_list.html.erb
index af1fc200..708be475 100644
--- a/app/views/managements/schools/_data_grow_list.html.erb
+++ b/app/views/managements/schools/_data_grow_list.html.erb
@@ -20,9 +20,7 @@
   <thead>
   <tr>
     <th width="6%">序号</th>
-    <th width="10%">ID</th>
     <th width="24%" class="edu-txt-left">单位名称</th>
-
     <th width="12%"><%= sort_tag('新增教师', name: 'teacher_increase_count', path: school_data_grow_managements_path) %></th>
     <th width="12%"><%= sort_tag('新增学生', name: 'student_increase_count', path: school_data_grow_managements_path) %></th>
     <th width="12%"><%= sort_tag('新增课堂', name: 'course_increase_count', path: school_data_grow_managements_path) %></th>
@@ -36,8 +34,10 @@
     <% @reports.each_with_index do |report, index| %>
       <tr>
         <td><%= (@obj_pages.page - 1) * @obj_pages.per_page + index + 1 %></td>
-        <td><%= report.school_id %></td>
-        <td class="edu-txt-left"><%= report.school_name %></td>
+        <td class="edu-txt-left">
+          <%= link_to report.school_name, statistics_college_path(id: report.school_id),
+                      target: '_blank', data: { tip_down: '点击查看学校统计概况'} %>
+        </td>
         <td><%= report.teacher_increase_count.to_i %></td>
         <td><%= report.student_increase_count.to_i %></td>
         <td><%= report.course_increase_count.to_i %></td>