diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp index c61ea5d79..d6b7abb42 100644 --- a/src/main/webapp/WEB-INF/views/index.jsp +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -103,6 +103,7 @@ // 导出 $(".export-btn").on("click",function(){ + loading(''); var suffix = $(this).data("export-type"); // 导出文件类型 var tableMark = $(this).data("export-table"); //导出table var menuName = $("#menuName").val(); @@ -119,6 +120,7 @@ $("caption").remove(); $(".exportFirst").remove(); $("."+tableMark+" .count").empty(); + closeTip(); }); }); function setTemporaryRows(tableMark){ @@ -195,7 +197,7 @@
- @@ -258,7 +260,7 @@
- diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp index 07fb2d01f..11b3a2d51 100644 --- a/src/main/webapp/WEB-INF/views/report/list.jsp +++ b/src/main/webapp/WEB-INF/views/report/list.jsp @@ -70,6 +70,7 @@ $(document).ready(function() { }); //ajaxServiceLogTotal(); $(".export-btn").click(function(){ + loading(''); var suffix = $(this).data("export-type"); totaltb(1,-1); @@ -85,6 +86,7 @@ $(document).ready(function() { $("#myexport").click(); $("caption").remove(); //totaltb(pato,size); + closeTip(); }); 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 5e2745189..69ea324db 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 @@ -315,7 +315,7 @@ * @param myClass {String} */ function createObjButton(dataObject, myContent, myClass) { - var exportButton = ""; + var exportButton = ""; checkCaption(exportButton); } });