Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/assets/javascripts/admins/shixun_settings/index.js

@@ -1,16 +1,15 @@
 $(document).on('turbolinks:load', function() {
   if ($('body.admins-shixun-settings-index-page').length > 0) {
-    $(".shixun-settings-list-form").on("change", '.shixun-settings-select', function () {
-      var s_value = $(this).val();
-      var s_name = $(this).attr("name");
-      var json = {};
-      json[s_name] = s_value;
-      $.ajax({
-        url: "/admins/shixun_settings",
-        type: "GET",
-        dataType:'script',
-        data: json
-      })
+    let searchContainer = $(".shixun-settings-list-form");
+    let searchForm = $("form.search-form",searchContainer);
+
+    searchContainer.on('change', '.shixun-settings-select', function(){
+      searchForm.find('input[type="submit"]').trigger('click');
+    });
+
+    //导出
+    searchContainer.on('click',"#shixun-settings-export",function () {
+      window.location.href = "/admins/shixun_settings.xls?" + searchForm.serialize();
     });
 
    $(".shixun-settings-list-container").on("change", '.shixun-setting-form', function () {
@@ -27,7 +26,12 @@ $(document).on('turbolinks:load', function() {
        dataType:'script',
        data: json
      })
-   })
+   });
+
+   $("select#settings-tag-choosed").select2({
+     placeholder: "请选择分类",
+     allowClear: true
+   });
 
     $('.modal.admin-upload-file-modal').on('upload:success', function(e, data){
       var $imageElement = $('.shixun-image-' + data.source_id);

app/assets/javascripts/admins/shixuns/index.js

@@ -4,5 +4,10 @@ $(document).on('turbolinks:load', function() {
       placeholder: "请选择分类",
       allowClear: true
     });
+
+    $(".shixuns-list-form").on("click","#shixuns-export",function () {
+      let search_form = $(".search-form");
+      window.location.href = "/admins/shixuns.xls?" + search_form.serialize();
+    })
   }
 });

app/controllers/admins/shixun_settings_controller.rb

@@ -9,6 +9,16 @@ class Admins::ShixunSettingsController < Admins::BaseController
     @pending_shixuns = shixun_settings.where(status:1).size
     @processed_shixuns = shixun_settings.where(status:2).size
     @closed_shixuns = shixun_settings.where(status:3).size
+
+    @sort_json = {
+      can_copy: params[:can_copy].present? ? params[:can_copy] : false,
+      webssh: params[:webssh].present? ? params[:webssh] : "0",
+      hidden: params[:hidden].present? ? params[:hidden] : false,
+      homepage_show: params[:homepage_show].present? ? params[:homepage_show] : false,
+      task_pass: params[:task_pass].present? ? params[:task_pass] : false,
+      code_hidden: params[:code_hidden].present? ? params[:code_hidden] : false
+    }
+
     @shixuns_type_check = MirrorRepository.pluck(:type_name,:id)
     @shixun_tags = TagRepertoire.order("name asc").pluck(:name,:id)
     @params_page = params[:page] || 1
@@ -22,6 +32,7 @@ class Admins::ShixunSettingsController < Admins::BaseController
         send_data(shixun_list_xls(shixun_settings), :type => 'application/octet-stream', :filename => filename_for_content_disposition(filename))
       }
     end
+
   end
 
   def update

app/views/admins/departments/index.html.erb

@@ -5,15 +5,15 @@
 <div class="box search-form-container department-list-form">
   <%= form_tag(admins_departments_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
     <div class="form-check mr-3">
-      <%= hidden_field_tag(:with_member, false) %>
+      <%= hidden_field_tag(:with_member, false,id:'') %>
       <%= check_box_tag(:with_member, true, params[:with_member].to_s == 'true', class: 'form-check-input') %>
       <label class="form-check-label" for="with_member">有部门管理员</label>
     </div>
 
     <div class="form-check mr-3">
-      <%= hidden_field_tag(:with_identifier, false) %>
+      <%= hidden_field_tag(:with_identifier, false,id:'') %>
       <%= check_box_tag(:with_identifier, true, params[:with_identifier].to_s == 'true', class: 'form-check-input') %>
-      <label class="form-check-label" for="with_member">有统计链接</label>
+      <label class="form-check-label" for="with_identifier">有统计链接</label>
     </div>
 
     <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: '部门/单位名称检索') %>

app/views/admins/shixun_settings/index.html.erb

@@ -13,7 +13,7 @@
         </div>
         <div class="form-group mr-2">
           <label for="tag-choosed">技术平台：</label>
-          <%= select_tag(:tag, options_for_select(@shixuns_type_check.unshift(["",nil])), class: 'form-control',id:"tag-choosed") %>
+          <%= select_tag(:tag, options_for_select(@shixuns_type_check.unshift(["",nil])), class: 'form-control',id:"settings-tag-choosed") %>
         </div>
         <div class="form-group mr-2">
           <label>搜索类型：</label>
@@ -21,47 +21,47 @@
           <%= select_tag(:search_type, options_for_select(auto_trial_options), class: 'form-control') %>
         </div>
         <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: '输入关键字搜索') %>
-        <%= submit_tag('搜索', class: 'btn btn-primary ml-3') %>
+        <%= submit_tag('搜索', class: 'btn btn-primary ml-3','data-disable-with': '搜索中...') %>
         <%= link_to "清除",admins_shixun_settings_path(status:nil,tag:nil,search_type:nil,keyword:nil),class: "btn btn-default" %>
 
         <div class="">
-          <a href="<%= admins_shixun_settings_path( :format => "xls") %>" class="btn btn-primary export-absolute" id="shixun_xls">导出</a>
+          <a href="javascript:void(0)" class="btn btn-primary export-absolute" id="shixun-settings-export" data-disable-with = '导出中...'>导出</a>
         </div>
       </div>
       <div class="d-flex mt-3">
         <div class="mr-5">
           <label for="can_copy">
-            <%= check_box_tag :can_copy,true,false,remote:true,class:"shixun-settings-select" %>
+            <%= check_box_tag :can_copy,!@sort_json[:can_copy],@sort_json[:can_copy],class:"shixun-settings-select" %>
             <span class="only_view">只看可复制</span>
           </label>
         </div>
         <div class="mr-5">
           <label for="webssh">
-            <%= check_box_tag :webssh,1,false,remote:true, class:"shixun-settings-select" %>
+            <%= check_box_tag :webssh,(@sort_json[:webssh] == "0" ? "1" : "0"),(@sort_json[:webssh] == "1"), class:"shixun-settings-select" %>
             <span class="only_view">只看可ssh</span>
           </label>
         </div>
         <div class="mr-5">
           <label for="hidden">
-            <%= check_box_tag :hidden,true,false,remote:true, class:"shixun-settings-select" %>
+            <%= check_box_tag :hidden,!@sort_json[:hidden],@sort_json[:hidden], class:"shixun-settings-select" %>
             <span class="only_view">只看已隐藏</span>
           </label>
         </div>
         <div class="mr-5">
           <label for="homepage_show">
-            <%= check_box_tag :homepage_show,true,false,remote:true, class:"shixun-settings-select" %>
+            <%= check_box_tag :homepage_show,!@sort_json[:homepage_show],@sort_json[:homepage_show], class:"shixun-settings-select" %>
             <span class="only_view">只看首页显示</span>
           </label>
         </div>
         <div class="mr-5">
           <label for="task_pass">
-            <%= check_box_tag :task_pass, true, false, remote:true, class:"shixun-settings-select" %>
+            <%= check_box_tag :task_pass, !@sort_json[:task_pass],@sort_json[:task_pass], class:"shixun-settings-select" %>
             <span class="only_view">只看可跳关</span>
           </label>
         </div>
         <div class="mr-5">
           <label for="code_hidden">
-            <%= check_box_tag :code_hidden, true, false, remote:true, class:"shixun-settings-select" %>
+            <%= check_box_tag :code_hidden, !@sort_json[:code_hidden],@sort_json[:code_hidden], class:"shixun-settings-select" %>
             <span class="only_view">只看已隐藏文件目录</span>
           </label>
         </div>

app/views/admins/shixuns/index.html.erb

@@ -3,7 +3,7 @@
 <% end %>
 
 <div class="box search-form-container shixuns-list-form">
-  <%= form_tag(admins_shixuns_path, method: :get, class: 'form-inline search-form', remote: true) do %>
+  <%= form_tag(admins_shixuns_path, method: :get, class: 'form-inline search-form',remote:true) do %>
     <div class="form-group mr-2">
       <label for="status">状态：</label>
       <% status_options = [['全部', ''], ["编辑中(#{@editing_shixuns})", "editing"], ["待审核(#{@pending_shixuns})", 'pending'], ["已发布(#{@processed_shixuns})", 'processed'],["已关闭(#{@closed_shixuns})",'closed']] %>
@@ -21,11 +21,10 @@
       <%= select_tag(:search_type, options_for_select(auto_trial_options), class: 'form-control') %>
     </div>
     <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: '输入关键字搜索') %>
-    <%= submit_tag('搜索', class: 'btn btn-primary ml-3') %>
+    <%= submit_tag('搜索', class: 'btn btn-primary ml-3','data-disable-with': '搜索中...') %>
     <%= link_to "清除",admins_shixuns_path(status:nil,tag:nil,search_type:nil,keyword:nil),class: "btn btn-default" %>
-  <% end %>
-  <a href="<%= admins_shixuns_path( :format => "xls") %>" class="btn btn-primary" id="shixun_xls">导出</a>
-
+<% end %>
+  <a href="javascript:void(0)" class="btn btn-primary" id="shixuns-export" data-disable-with = '导出中...'>导出</a>
 </div>
 
 <div class="box shixuns-list-container">

public/assets/admin-3a3e1471cc8a140e713ce6d929c848a42c505e52003b091f568ae53493d04b9e.js

@@ -38424,17 +38424,16 @@ $(document).on('turbolinks:load', function() {
 ;
 $(document).on('turbolinks:load', function() {
   if ($('body.admins-shixun-settings-index-page').length > 0) {
-    $(".shixun-settings-list-form").on("change", '.shixun-settings-select', function () {
-      var s_value = $(this).val();
-      var s_name = $(this).attr("name");
-      var json = {};
-      json[s_name] = s_value;
-      $.ajax({
-        url: "/admins/shixun_settings",
-        type: "GET",
-        dataType:'script',
-        data: json
-      })
+    let searchContainer = $(".shixun-settings-list-form");
+    let searchForm = $("form.search-form",searchContainer);
+
+    searchContainer.on('change', '.shixun-settings-select', function(){
+      searchForm.find('input[type="submit"]').trigger('click');
+    });
+
+    //导出
+    searchContainer.on('click',"#shixun-settings-export",function () {
+      window.location.href = "/admins/shixun_settings.xls?" + searchForm.serialize();
     });
 
    $(".shixun-settings-list-container").on("change", '.shixun-setting-form', function () {
@@ -38451,7 +38450,12 @@ $(document).on('turbolinks:load', function() {
        dataType:'script',
        data: json
      })
-   })
+   });
+
+   $("select#settings-tag-choosed").select2({
+     placeholder: "请选择分类",
+     allowClear: true
+   });
 
     $('.modal.admin-upload-file-modal').on('upload:success', function(e, data){
       var $imageElement = $('.shixun-image-' + data.source_id);
@@ -38468,6 +38472,11 @@ $(document).on('turbolinks:load', function() {
       placeholder: "请选择分类",
       allowClear: true
     });
+
+    $(".shixuns-list-form").on("click","#shixuns-export",function () {
+      let search_form = $(".search-form");
+      window.location.href = "/admins/shixuns.xls?" + search_form.serialize();
+    })
   }
 });
 $(document).on('turbolinks:load', function(){

public/assets/application-1f92c3535b5c467017248fb418af706cd6b50e16e9384c9631ed79281bcb5abc.js

@@ -38424,17 +38424,16 @@ $(document).on('turbolinks:load', function() {
 ;
 $(document).on('turbolinks:load', function() {
   if ($('body.admins-shixun-settings-index-page').length > 0) {
-    $(".shixun-settings-list-form").on("change", '.shixun-settings-select', function () {
-      var s_value = $(this).val();
-      var s_name = $(this).attr("name");
-      var json = {};
-      json[s_name] = s_value;
-      $.ajax({
-        url: "/admins/shixun_settings",
-        type: "GET",
-        dataType:'script',
-        data: json
-      })
+    let searchContainer = $(".shixun-settings-list-form");
+    let searchForm = $("form.search-form",searchContainer);
+
+    searchContainer.on('change', '.shixun-settings-select', function(){
+      searchForm.find('input[type="submit"]').trigger('click');
+    });
+
+    //导出
+    searchContainer.on('click',"#shixun-settings-export",function () {
+      window.location.href = "/admins/shixun_settings.xls?" + searchForm.serialize();
     });
 
    $(".shixun-settings-list-container").on("change", '.shixun-setting-form', function () {
@@ -38451,7 +38450,12 @@ $(document).on('turbolinks:load', function() {
        dataType:'script',
        data: json
      })
-   })
+   });
+
+   $("select#settings-tag-choosed").select2({
+     placeholder: "请选择分类",
+     allowClear: true
+   });
 
     $('.modal.admin-upload-file-modal').on('upload:success', function(e, data){
       var $imageElement = $('.shixun-image-' + data.source_id);
@@ -38468,6 +38472,11 @@ $(document).on('turbolinks:load', function() {
       placeholder: "请选择分类",
       allowClear: true
     });
+
+    $(".shixuns-list-form").on("click","#shixuns-export",function () {
+      let search_form = $(".search-form");
+      window.location.href = "/admins/shixuns.xls?" + search_form.serialize();
+    })
   }
 });
 $(document).on('turbolinks:load', function(){