diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp index 35d94be39..309f35684 100644 --- a/src/main/webapp/WEB-INF/views/report/list.jsp +++ b/src/main/webapp/WEB-INF/views/report/list.jsp @@ -69,15 +69,19 @@ $(document).ready(function() { } }); //ajaxServiceLogTotal(); - $("#export-btn").click(function(){ + $(".export-btn").click(function(){ + var suffix = $(this).data("export-type"); + totaltb(1,-1); + getExportHead(); var te = $(".in table").tableExport({ headings:true, footers:true, - formats:["xlsx"], - fileName: getXlsxFileName(), + formats:[suffix], + fileName: getFileName(), bootstrap:false }); + $(".exportFirst").remove(); $("#myexport").click(); $("caption").remove(); //totaltb(pato,size); @@ -93,8 +97,20 @@ $(document).ready(function() { var li=document.getElementById("liwhite").offsetWidth; var lipx=Number(li/6); $(".lireport").css({'width':lipx+'px','text-overflow':'ellipsis','overflow':'hidden'}); + }); - function getXlsxFileName() { + function getExportHead(){ + // 报表导出 文件增加表头 + var timeType = $("#reportType").find("option:selected").text(); + var time = $("#intype").val(); + var tabName = $("#liwhite").find("li[class='active'] a").attr("title"); + + var addTr = " "+timeType+":"+time+" "+tabName+""; + $(".table-responsive").find("table > thead").prepend(addTr); + + } + + function getFileName() { var cfgName = $("[name=cfgName2]").val() + "_"; if ("${bean.serviceId}") { var action = $("[name=serviceId]").find('[value=' + "${bean.serviceId}" + ']').text() + "_"; @@ -467,7 +483,18 @@ white-space:nowrap;
- + <%-- --%> +
+ + +
+ <%-- --%>
diff --git a/src/main/webapp/static/global/plugins/tableExport-3.3.13/tableexport.js b/src/main/webapp/static/global/plugins/tableExport-3.3.13/tableexport.js index a86601f50..3611a38e0 100644 --- a/src/main/webapp/static/global/plugins/tableExport-3.3.13/tableexport.js +++ b/src/main/webapp/static/global/plugins/tableExport-3.3.13/tableexport.js @@ -247,6 +247,7 @@ if ($(val).is(emptyCSS)) { return " " } + titleText=$cols.is("th")?"\t"+titleText:titleText; return '"' + TableExport.prototype.formatValue(isTrimWhitespace, titleText.replace(/"/g, '""')) + '"'; }).get().join(colD); }).get().join(rdel),