From c3555785050f42903342d15193b2b9c5c502ac8c Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Thu, 6 Sep 2018 14:52:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=8A=A5=E8=A1=A8=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA--=E5=90=88=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/report/list.jsp | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp
index 7a8d35b9a..9dc31f1ad 100644
--- a/src/main/webapp/WEB-INF/views/report/list.jsp
+++ b/src/main/webapp/WEB-INF/views/report/list.jsp
@@ -8,6 +8,8 @@
 <title><spring:message code="${bean.cfgName}"></spring:message></title>
 <%@ include file="/WEB-INF/include/form/pageGroup.jsp"%>
 <script>
+var pato=1;
+var size=30;
 $(document).ready(function() {
 		//筛选功能初始化
 		filterActionInit();
@@ -68,6 +70,7 @@ $(document).ready(function() {
 		});
 		ajaxServiceLogTotal();
 		$("#export-btn").click(function(){
+			totaltb(1,-1);
 			var te = $(".in table").tableExport({
 				headings:true,
 				footers:true,
@@ -77,6 +80,7 @@ $(document).ready(function() {
 			});
 			$("#myexport").click();
 			$("caption").remove();
+			totaltb(pato,size); 
 		});
 	});
 	function getXlsxFileName() {
@@ -198,22 +202,17 @@ var ajaxReport=function(url,target){
 };
 //自定义列设置事件
 function customColumnClick(){
-
-	
 	var submit = function(v,h,f) {
 		var abVisCols = [true];
 		top.$(".customColumnList input[type='checkbox']").each(function(){
 			abVisCols[$(this).val()] = $(this).prop("checked");
 		});
-
 		var key = getLocationPathName()+"_visCols";
 		Cookies.set(key,JSON.stringify(abVisCols),{expires:7});
 		customColumnInit();
 		
 		return true;	
 	}
-	
-	
 	var html = "<div class='customColumnList'>";
 	$(".active .table tr th").each(function(colIndex,obj){	
 		
@@ -231,13 +230,15 @@ function customColumnClick(){
 		html+="<div class='col-md-6'><label>"+ckbox_html+" "+$(this).html()+"</label></div>";
 	})
 	html +="</div>";
-	
 	top.$.jBox(html,{title:"<i class='fa fa-wrench'></i> Custom Columns",showIcon:false,opacity:0.3,submit:submit});
-	
 }
 
 //合计table中某一段数据
- function totaltb(pageNo,pageSize){
+ function totaltb(paNo,paSize){
+	if(paSize>0){
+		size=paSize;
+		pato=paNo;
+	}
 	 $('#total').remove();
 	 var reportBusinessType=$("#reportBusinessType").val()
 	 var tableId="tagTable";
@@ -266,8 +267,8 @@ function customColumnClick(){
  		s=2;
  	}
  	
- 	if(pageNo > 1){
- 	   row=(pageNo-1)*pageSize+1;	
+ 	if(paNo > 1){
+ 	   row=(paNo-1)*paSize+1;	
  	}
  	for (var i = row; i < rows.length; i++) {
 		for (var j = s; j <rows[i].cells.length ; j++) {
@@ -278,10 +279,10 @@ function customColumnClick(){
 		   }
 		}
 		num++;
-		if(num == pageSize){
+		if(num == paSize){
 			break;
-		}
-	} 
+			}
+    	 }
  	   if(rows.length  > 1){
  		 var trtotal="";
  		if(reportBusinessType=="src_ip_report"){