Hjqreturn
/
pgfqe6ch8
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_partners' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_partners

Browse Source
dev_local
jasder 6 years ago
parent 9f417e17cd f5746f0839
commit 85d8355541
6 changed files with 93 additions and 36 deletions
Show Stats Download Patch File Download Diff File

8
app/controllers/managements_controller.rb
Unescape View File

@ -1200,7 +1200,6 @@ end
@province = params[:province]
@schools = School.where("partner_id IS NULL").all
if params[:search]
@schools = @schools.where("name like ?", "%#{@search}%")
end
@ -1209,12 +1208,11 @@ end
@schools = @schools.where("province like ?", "%#{@province}%")
end
@page = (params['page'] || 1).to_i
@limit = 10
@page = params[:page] || 1
@schools_count = @schools.count
@total_pages = (@schools_count / 10.0).ceil
@limit = 10
@is_remote = true
@schools_pages = Paginator.new @schools_count, @limit, @page
@schools = paginateHelper @schools, @limit
respond_to do |format|
format.js

88
app/views/managements/_partner_addUnit.html.erb
Unescape View File

@ -2,15 +2,8 @@
<div class="task-popup-title clearfix">添加合作伙伴</div>
<div class="task_popup_con">
<div class="clearfix mb5 df">
<div class="flex1">
<div class="df">
<span class="fl lineh-35">地区：</span>
<select placeholder="请选择地区" id="province" class="flex1"></select>
</div>
<div class="df mt15">
<span class="fl lineh-35">单位：</span>
<input placeholder="请输入单位关键字" class="input-flex-35"/>
</div>
<div class="flex1" id="partners_search_form">
<%= render partial: "managements/partner_search_form" %>
</div>
<a href="javascript:void(0);" onclick="submit_search_user()" class="white-btn mt6 edu-blueback-btn fl ml15 mt55">搜索</a>
</div>
@ -19,7 +12,7 @@
<span class="fl ml25">单位</span>
<span class="fr with30">地区</span>
</p>
<div class="edu-back-skyblue clearfix pl10 over280" id="serch_user_list">
<div class="edu-back-skyblue clearfix pl10 over280" id="search_user_list">
</div>
<p class="clearfix" style="height: 20px;"><span class="fl lineh-20 none color-red" id="checkNotice"></span></p>
@ -35,27 +28,60 @@
$(function() {
unitDownOption();
showprovince("province");
submit_add_partner();
get_schools()
var i = 1; //设置当前页数
var msg_list_loading = false;
$(function() {
var totalpage = <%= @total_pages.to_i %>; //总页数，防止超过总页数继续滚动
var winH = $(window).height(); //页面可视区域高度
get_schools(1)
$("#search_user_list").scroll(function() {
if (i < totalpage) { // 当滚动的页数小于总页数的时候，继续加载
var pageH = $(document.body).height();
});
function get_schools() {
$.getJSON("/managements/all_partners",function(schools){
let s_html = "";
$.each(schools,function (index,array) {
s_html =s_html+ "<p class='clearfix mt5'>" +
" <span class='fl with70'>" +
" <span>" +
" <input type='checkbox' name='school[id]' value='"+array["school"]["id"]+"' id='school_'"+array["school"]["id"]+"'class='magic-checkbox'>" +
" <label for='school_'"+array["school"]["id"]+">"+array["school"]["name"]+"</label>" +
" </span>\n" +
" </span>\n" +
" <span class='fl with30'>"+array["school"]["province"]+"</span>" +
" </p>"
})
$("#serch_user_list").html(s_html)
})
}
var scrollT = $(window).scrollTop(); //滚动条top
var aa = (pageH - winH - scrollT) / winH;
console.log(aa)
if ( !msg_list_loading ){
if (aa < 0.01 ) {
get_schools(i+1)
}
}
}
});
});
function get_schools(page) {
var msg_list = $('#search_user_list');
var limit_page = 1
if (page > 1){
limit_page = page
}else{
limit_page = 1
}
if (msg_list.height() + msg_list[0].scrollTop >= msg_list[0].scrollHeight - 60) {
msg_list_loading = true;
$.getJSON("<%= all_path %>?page="+limit_page, function(schools) {
if (schools) {
msg_list_loading = false;
let s_html = "";
$.each(schools,function (index,array) {
s_html =s_html+ "<p class='clearfix mt5'>" +
" <span class='fl with70'>" +
" <span>" +
" <input type='checkbox' name='school[id]' value='"+array["school"]["id"]+"' id='school_'"+array["school"]["id"]+"'class='magic-checkbox'>" +
" <label for='school_'"+array["school"]["id"]+">"+array["school"]["name"]+"</label>" +
" </span>\n" +
" </span>\n" +
" <span class='fl with30'>"+array["school"]["province"]+"</span>" +
" </p>"
});
$("#search_user_list").html(s_html);
i ++;
}
});
}
}
function submit_add_partner(){
if($("input[name='school[id]']:checked").length==0){
$("#checkNotice").html("请选择需要添加的内容").removeClass("none");
@ -77,4 +103,8 @@
})
}
}
});
</script>

19
app/views/managements/_partner_search_form.html.erb
Unescape View File

@ -0,0 +1,19 @@
<%= labelled_form_for @schools, :url =>{:controller=> 'managements', :action => 'add_partners', :type => @type}, :html => {:id => 'partners_search_form'}, :method => "get", :remote => true do |f| %>
<div class="df">
<span class="fl lineh-35">地区：</span>
<select placeholder="请选择地区" id="province" class="flex1"></select>
</div>
<div class="df mt15">
<span class="fl lineh-35">单位：</span>
<input type="text" class="input-flex-35" name="search" placeholder="请输入单位关键字" value="<%= @search %>" id="partner_name_search"/>
</div>
<% end %>
<script>
$(function () {
unitDownOption();
showprovince("province");
})
</script>

7
app/views/managements/all_partners.js.erb
Unescape View File

@ -0,0 +1,7 @@
var html="<%= escape_javascript(render :partial => "managements/partner_addUnit",locals: {all_path: all_partners_managements_path}) %>";
pop_box_new(html,572,500);

7
app/views/managements/partners.html.erb
Unescape View File

@ -6,7 +6,7 @@
</div>
<div class="clearfix mt20">
<div class="with25 fl edu-back-white">
<a href="javascript:void(0)" class="color-blue addOperation">+添加</a>
<%= link_to "+添加",all_partners_managements_path,remote:true,class:"color-blue addOperation" %>
<ul class="partnerList">
<% @partners.each_with_index do |partner,index| %>
<li>
@ -77,11 +77,14 @@
$(this).parents("li").remove();
})
$(".manageList").on("click",".addManage",function(){
var html="<%= escape_javascript(render :partial => "managements/partner_addManage") %>";
pop_box_new(html,572,500);
})
$(".addOperation").on("click",function(){
var html="<%= escape_javascript(render :partial => "managements/partner_addUnit") %>";
pop_box_new(html,572,500);
})
})
</script>

0
db/migrate/20180920093851_create_graduation_group.rb → db/migrate/20180920093851_create_graduation_groups.rb
Unescape View File

Write Preview
Loading…
Cancel
Save