From fcfc7a617d703bd74aed24ba4769de1f8ec50d37 Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@zdjizhi.com>
Date: Mon, 24 Dec 2018 11:06:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DtabelExport.js=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E5=AF=BC=E5=87=BA=E6=93=8D=E4=BD=9C=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=A1=A8=E5=8D=95=E9=97=AE=E9=A2=98.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/index.jsp                     | 6 ++++--
 src/main/webapp/WEB-INF/views/report/list.jsp               | 2 ++
 .../static/global/plugins/tableExport-3.3.13/tableexport.js | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

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('<spring:message code="onloading"/>');
 				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 @@
 				<a style="color:#333333" href="javascript:page(${page.pageNo},${page.pageSize});" class="icon-refresh"> </a>
 				<div class="pull-right">
 		 			<div class="btn-group">
-	                	<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" style="margin-top: -8px;">
+	                	<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" style="margin-top: -5px;">
 	                    	<i class="fa fa-wrench"></i> <spring:message code="export"></spring:message>
 	                    	<i class="fa fa-angle-down"></i>
 	                 	</button>
@@ -258,7 +260,7 @@
 			<a style="color:#333333" href="javascript:page(${page.pageNo},${page.pageSize});" class="icon-refresh "> </a>
 			<div class="pull-right">
 		 		<div class="btn-group">
-                	<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" style="margin-top: -8px;">
+                	<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" style="margin-top: -5px;">
                     	<i class="fa fa-wrench"></i> <spring:message code="export"></spring:message>
                     	<i class="fa fa-angle-down"></i>
                  	</button>
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('<spring:message code="onloading"/>');
 			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 = "<button id='myexport' data-fileblob='" + dataObject + "' class='" + bootstrapClass + bootstrapTheme + myClass + "'>" + myContent + "</button>";
+                    var exportButton = "<button id='myexport' type='button' data-fileblob='" + dataObject + "' class='" + bootstrapClass + bootstrapTheme + myClass + "'>" + myContent + "</button>";
                     checkCaption(exportButton);
                 }
             });