From d8614b83156e5da5a940160e08e159a179e63139 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@zdjizhi.com>
Date: Thu, 27 Dec 2018 14:02:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B5=81=E9=87=8F=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=97=A0=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA=E5=90=8E?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp  | 5 +++--
 .../WEB-INF/views/dashboard/trafficHttpStatisticList.jsp   | 5 +++--
 .../WEB-INF/views/dashboard/trafficProtocolTypeList.jsp    | 7 ++++---
 .../webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp  | 3 ++-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
index 5bc8a8525..b245096ed 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
@@ -208,7 +208,8 @@ $(".export-btn").click(function(){
 	$("#myexport").click();
 	$("caption").remove();
 	$(".tr-title").remove();
-	getPageData(1,10); 
+	getPageData(1,10);
+	pageJuan(10);//初始化分页
 });
 /**
  * 获取本页数据
@@ -239,7 +240,7 @@ function getPageData(currentPage,pageNumber){
 function htmlData(fileDataS){
 	
     $("#tableData").html("");
-    if(fileDataS == null){
+    if(fileDataS == null||(fileDataS!=null&&fileDataS.length<1)){
 		$(".none-data").show();
         $('.M-box').hide();
     }else{
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp
index f79884963..9bebcbf8d 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp
@@ -186,7 +186,8 @@ $(".export-btn").click(function(){
 	$("#myexport").click();
 	$("caption").remove();
 	$(".tr-title").remove();
-	getPageData(1,10); 
+	getPageData(1,10);
+	pageJuan(10);//初始化分页
 });
 /**
  * 获取本页数据
@@ -216,7 +217,7 @@ function getPageData(currentPage,pageNumber){
 // 处理接口数据
 function htmlData(fileDataS){
     $("#tableData").html("");
-    if(fileDataS == null){
+    if(fileDataS == null||(fileDataS!=null&&fileDataS.length<1)){
 		$(".none-data").show();
         $('.M-box').hide();
     }else{
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp
index b326b08d0..a01b5fbcd 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp
@@ -202,7 +202,8 @@ $(".export-btn").click(function(){
 	$("#myexport").click();
 	$("caption").remove();
 	$(".tr-title").remove();
-	getPageData(1,10); 
+	getPageData(1,10);
+	pageJuan(10);//初始化分页
 });
 /**
  * 获取本页数据
@@ -232,12 +233,12 @@ function getPageData(currentPage,pageNumber){
 // 处理接口数据
 function htmlData(fileDataS){
     $("#tableData").html("");
-    if(fileDataS == null){
+    if(fileDataS == null||(fileDataS!=null&&fileDataS.length<1)){
 		$(".none-data").show();
         $('.M-box').hide();
     }else{
         $('.none-data').hide();
-        $('.M-box').show();
+	    $('.M-box').show();
         var start=$("#beginDate").val();
     	var end=$("#endDate").val();
         $.each(fileDataS,function (index,data){
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
index 1e5e2fc8c..e7d1e0f37 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
@@ -270,7 +270,8 @@
 			$("#myexport").click();
 			$("caption").remove();
 			$(".tr-title").remove();
-			getPageData(1, 10);
+			getPageData(1,10);
+			pageJuan(10);//初始化分页
 		});
 		$("#print-btn").click(function() {
 			window.print();