1.增加了导出日志时日志的检索条件

This commit is contained in:
lihaochen
2018-12-17 17:10:21 +08:00
parent e793aca0e1
commit fd5da887d6
6 changed files with 77 additions and 24 deletions

View File

@@ -418,15 +418,22 @@ function cancelPassOpt(url){
//导出检索条件下所有数据
}else{
var totalCount = $("#showTotalCount").html() == undefined ? '' : $("#showTotalCount").html().trim();
if(totalCount > maxRow){
top.$.jBox.confirm("<spring:message code='export_confirm_message'/>"+maxRow+"!","<spring:message code='info'/>",function(v,h,f){
if(v=="ok"){
if (!confirmEnding(url,"excel")&&!confirmEnding(url,"csv")) {
if(totalCount > maxRow){
top.$.jBox.confirm("<spring:message code='export_confirm_message'/>"+maxRow+"!","<spring:message code='info'/>",function(v,h,f){
if(v=="ok"){
$("#searchForm").attr("action",url);
$("#searchForm").submit();
closeTip();
}
},{buttonsFocus:1});
top.$('.jbox-body .jbox-icon').css('top','55px');
}else{
$("#searchForm").attr("action",url);
$("#searchForm").submit();
closeTip();
}
},{buttonsFocus:1});
top.$('.jbox-body .jbox-icon').css('top','55px');
$("#searchForm").attr("action",searchUrl);
}
}else{
$("#searchForm").attr("action",url);
$("#searchForm").submit();
@@ -435,4 +442,13 @@ function cancelPassOpt(url){
}
}
}
function confirmEnding(str, target) {
var result=true;
var num=str.indexOf(target);
if (-1==num) {
result=false;
}
return result;
}
</script>