修复报表多次点击搜索或换标签后可能卡死的问题;增加报表导出功能;

This commit is contained in:
chenjinsong
2018-07-12 19:14:26 +08:00
parent 207ac10d66
commit 65eba098e2
7 changed files with 934 additions and 8 deletions

View File

@@ -1,6 +1,5 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<%@ include file="/WEB-INF/include/form/pageGroup.jsp"%>
<table id="tagTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -2,7 +2,11 @@
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<script src="${ctxStatic }/global/plugins/tableExport-3.3.13/xlsx.core.js"></script>
<script src="${ctxStatic }/global/plugins/tableExport-3.3.13/FileSaver.js"></script>
<script src="${ctxStatic }/global/plugins/tableExport-3.3.13/tableexport.js"></script>
<title><spring:message code="${bean.cfgName}"></spring:message></title>
<%@ include file="/WEB-INF/include/form/pageGroup.jsp"%>
<script>
$(document).ready(function() {
//筛选功能初始化
@@ -43,7 +47,7 @@
if(type && type==$(this).val()){
$(this).parent(".btn").button("toggle");
}
})
});
$("a[data-toggle='tab']").on("click",function(){
$("#reportBusinessType").val($(this).data("bussiness"));
if(!$(this).parent("li").hasClass("active")){
@@ -87,8 +91,29 @@
}
});
});
$("#export-btn").click(function(){
var te = $(".in table").tableExport({
headings:true,
footers:true,
formats:["xlsx"],
fileName: getXlsxFileName(),
bootstrap:false
});
$("#myexport").click();
$("caption").remove();
});
});
function getXlsxFileName() {
var cfgName = $("[name=cfgName2]").val() + "_";
if ("${bean.action}") {
var action = $("[name=action]").find('[value=' + "${bean.action}" + ']').text() + "_";
} else {
var action = "";
}
var reportType = $("[name=reportType]").find('[value=' + "${bean.reportType}" + ']').text() + "_";
var reportTime = "${bean.reportTime}";
return cfgName + action + reportType + reportTime;
}
function changeReportType(reportType) {
$("#intype").remove();
var reportTime = "${bean.reportTime }";
@@ -179,7 +204,7 @@ function customColumnClick(){
</c:forEach>
</div>
<h3 class="page-title">
<spring:message code="${bean.cfgName}"></spring:message>
<spring:message code="${bean.cfgName}"/>
<small><spring:message code="report_list"/></small>
</h3>
<h5 class="page-header"></h5>
@@ -190,6 +215,10 @@ function customColumnClick(){
<form:form id="searchForm" modelAttribute="bean" action="${ctx}/report/list" method="post" class="form-search">
<input id="functionId" name="functionId" type="hidden" value="${bean.functionId}"/>
<input name="cfgName" type="hidden" value="${bean.cfgName}"/>
<input name="cfgName2" type="hidden" value="<spring:message code="${bean.cfgName}"/>"/>
<input name="action2" type="hidden" value="<spring:message code="${bean.action}"/>"/>
<input id="reportBusinessType" name="reportBusinessType" type="hidden" value="${bean.reportBusinessType}"/>
<!-- 筛选按钮展开状态-->
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${bean.isFilterAction }"/>
@@ -239,7 +268,7 @@ function customColumnClick(){
<div class="pull-left">
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<button type="button" class="btn btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
<sys:delRow url="${ctx}/report/export?functionId=${cfg.functionId}" id="contentTable" label="export" maxRow="${page.maxExportSize}"></sys:delRow>
<button type="button" class="btn btn-default" id="export-btn"><i class="fa fa-download"> <spring:message code="export"/></i></button>
<button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/><i class="fa fa-angle-double-down"></i></button>
</div>
<div class="pull-right">

View File

@@ -1,6 +1,5 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<%@ include file="/WEB-INF/include/form/pageGroup.jsp"%>
<table id="lwhhTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>

View File

@@ -1,7 +1,6 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<%@ include file="/WEB-INF/include/form/pageGroup.jsp"%>
<table id="contentTable1" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable1" class="table table-striped table-bordered table-condensed text-nowrap xlsx">
<thead>
<tr>
<th><spring:message code="src_province"/></th>