Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

This commit is contained in:
duandongmei
2018-09-18 15:51:03 +08:00
86 changed files with 67 additions and 158 deletions

View File

@@ -1,10 +1,4 @@
$(function(){
var height=document.documentElement.clientHeight;
if($('.table-responsive')){
$('.table-responsive').css({'height':height-105+'px'});
}
//扩展jquery增加全局函数
$.ipcommon=function(){
return {};
}
@@ -1805,8 +1799,14 @@ var initCommIpVal=function(){
}
window.onresize=function (){
var height=document.documentElement.clientHeight;
if($('.table-responsive')){
$('.table-responsive').css({'height':height-105+'px'});
var hei=document.documentElement.clientHeight;
hei=hei-71;
var rowheigth=0;
if($('.row')){
rowheigth=$('.row').height();
hei=hei-rowheigth;
}
}
if($('.table-responsive')){
$('.table-responsive').css({'height':hei+'px'});
}
}