From 40123a15f3e77dff36ebe96437b8773c03863283 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 4 Mar 2020 22:44:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE=E8=BF=90?=
 =?UTF-8?q?=E8=90=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admins/user_schools_statistics/index.js   | 49 +------------------
 .../admins/user_schools_statistic_query.rb    |  8 +--
 .../user_schools_statistics/index.html.erb    |  8 +--
 3 files changed, 7 insertions(+), 58 deletions(-)

diff --git a/app/assets/javascripts/admins/user_schools_statistics/index.js b/app/assets/javascripts/admins/user_schools_statistics/index.js
index 47c9d1e97..b65318f83 100644
--- a/app/assets/javascripts/admins/user_schools_statistics/index.js
+++ b/app/assets/javascripts/admins/user_schools_statistics/index.js
@@ -20,22 +20,6 @@ $(document).on('turbolinks:load', function() {
       return null;
     }
 
-    // ************* 省份选择 *****************
-      var matcherProvinceFunc = function(params, data){
-          if ($.trim(params.term) === '') {
-              return data;
-          }
-          if (typeof data.text === 'undefined') {
-              return null;
-          }
-
-          if (data.province && data.province.indexOf(params.term) > -1) {
-              var modifiedData = $.extend({}, data, true);
-              return modifiedData;
-          }
-          // Return `null` if the term should not be displayed
-          return null;
-      }
 
     var defineSchoolSelect = function (schools) {
       $form.find('.school-select').select2({
@@ -57,26 +41,6 @@ $(document).on('turbolinks:load', function() {
       });
     };
 
-      var defineProvinceSelect = function (province) {
-          $form.find('.province-select').select2({
-              theme: 'bootstrap4',
-              placeholder: '选择省份',
-              minimumInputLength: 1,
-              data: province,
-              templateResult: function (item) {
-                  if(!item.province || item.province === '') return item.text;
-                  return item.province;
-              },
-              templateSelection: function(item){
-                  if (item.province) {
-                      $form.find('#province').val(item.province);
-                  }
-                  return item.province || item.text;
-              },
-              matcher: matcherProvinceFunc
-          });
-      };
-
 
     // 初始化学校选择器
     $.ajax({
@@ -88,22 +52,11 @@ $(document).on('turbolinks:load', function() {
       }
     });
 
-      // 初始化身份选择器
-      $.ajax({
-          url: '/api/schools/for_province_option.json',
-          dataType: 'json',
-          type: 'GET',
-          success: function (data) {
-              console.log(data.province);
-              defineProvinceSelect(data.province);
-          }
-      });
-
     // 清空
     $form.on('click', '.clear-btn', function(){
       $form.find('select[name="date"]').val('');
+      $form.find('select[name="province"]').val('');
       $form.find('.school-select').val('').trigger('change');
-      $form.find('.province-select').val('').trigger('change');
       $form.find('input[type="submit"]').trigger('click');
     })
 
diff --git a/app/queries/admins/user_schools_statistic_query.rb b/app/queries/admins/user_schools_statistic_query.rb
index d7b834a2d..25551fc77 100644
--- a/app/queries/admins/user_schools_statistic_query.rb
+++ b/app/queries/admins/user_schools_statistic_query.rb
@@ -11,12 +11,12 @@ class Admins::UserSchoolsStatisticQuery < ApplicationQuery
   end
 
   def call
-    schools = School.where(nil)
-    if params[:province]
+    schools = School.all
+    if params[:province].present?
       schools = schools.where("province like ?", "%#{params[:province]}%")
     end
 
-    if params[:school_id]
+    if params[:school_id].present?
       schools = schools.where(id: params[:school_id])
     end
 
@@ -56,7 +56,7 @@ class Admins::UserSchoolsStatisticQuery < ApplicationQuery
       finish_challenge = finish_challenge.where(updated_at: time_range)
       reg_teacher = reg_teacher.where(created_at: time_range)
       reg_student = reg_student.where(created_at: time_range)
-      user_e = t.joins(:user).where(users: {last_login_on: time_range})
+      user_e = user_e.joins(:user).where(users: {last_login_on: time_range})
     end
 
     #study_myshixun_map   = study_myshixun.reorder(nil).group(:school_id).count
diff --git a/app/views/admins/user_schools_statistics/index.html.erb b/app/views/admins/user_schools_statistics/index.html.erb
index be49fa16e..f7d59b414 100644
--- a/app/views/admins/user_schools_statistics/index.html.erb
+++ b/app/views/admins/user_schools_statistics/index.html.erb
@@ -11,18 +11,14 @@
       <%= select_tag(:date, options_for_select(data_arrs, params[:date]), class: 'form-control') %>
     </div>
 
-    <div class="form-group col-12 col-md-3">
-      <label for="province">所属省份：</label>
-      <%= hidden_field_tag(:province, params[:province]) %>
-      <%= select_tag :province, options_for_select([''], params[:province]), class: 'form-control province-select flex-1' %>
-    </div>
-
     <div class="form-group col-12 col-md-3">
       <label for="school_name">所属单位：</label>
       <%= hidden_field_tag(:school_id, params[:school_id]) %>
       <%= select_tag :school_name, options_for_select([''], params[:school_id]), class: 'form-control school-select flex-1' %>
     </div>
 
+    <%= text_field_tag(:province, params[:province], class: 'form-control col-sm-2 ml-3', placeholder: '所属省份') %>
+
     <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
     <input type="reset" class="btn btn-secondary clear-btn" value="清空"/>
   <% end %>