Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop
This commit is contained in:
@@ -98,6 +98,7 @@ $(document).ready(function() {
|
|||||||
|
|
||||||
var li=document.getElementById("liwhite").offsetWidth;
|
var li=document.getElementById("liwhite").offsetWidth;
|
||||||
var lipx=Number(li/6);
|
var lipx=Number(li/6);
|
||||||
|
lipx=lipx-3;
|
||||||
$(".lireport").css({'width':lipx+'px','text-overflow':'ellipsis','overflow':'hidden'});
|
$(".lireport").css({'width':lipx+'px','text-overflow':'ellipsis','overflow':'hidden'});
|
||||||
|
|
||||||
});
|
});
|
||||||
@@ -236,6 +237,8 @@ var ajaxReport=function(url,target){
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
var tb_column="<spring:message code='cfg_custom'/>";
|
||||||
//自定义列设置事件
|
//自定义列设置事件
|
||||||
function customColumnClick(){
|
function customColumnClick(){
|
||||||
var submit = function(v,h,f) {
|
var submit = function(v,h,f) {
|
||||||
@@ -266,7 +269,7 @@ function customColumnClick(){
|
|||||||
html+="<div class='col-md-6'><label>"+ckbox_html+" "+$(this).html()+"</label></div>";
|
html+="<div class='col-md-6'><label>"+ckbox_html+" "+$(this).html()+"</label></div>";
|
||||||
})
|
})
|
||||||
html +="</div>";
|
html +="</div>";
|
||||||
top.$.jBox(html,{title:"<i class='fa fa-wrench'></i> Custom Columns",showIcon:false,opacity:0.3,submit:submit});
|
top.$.jBox(html,{title:"<i class='fa fa-wrench'></i> "+tb_column ,showIcon:false,opacity:0.3,submit:submit});
|
||||||
}
|
}
|
||||||
|
|
||||||
//合计table中某一段数据
|
//合计table中某一段数据
|
||||||
|
|||||||
Reference in New Issue
Block a user