From 51ea4edebd91ded9f8eae3dcf1b1a2ab5d975cde Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@zdjizhi.com>
Date: Wed, 26 Dec 2018 10:23:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=B5=81=E9=87=8F=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E8=AF=A6=E6=83=85=E7=95=8C=E9=9D=A2=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E4=BB=BB=E5=8A=A1=EF=BC=8C=E9=98=B2=E6=AD=A2?=
 =?UTF-8?q?=E8=B7=9F=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=B8=8D=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=EF=BC=8C=E7=95=8C=E9=9D=A2=E7=BB=9F=E4=B8=80=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E4=B8=8B=E5=8A=A0=E4=B8=80=E6=9D=A1=E6=A8=AA=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/ntcTotalReportDetailList.jsp    | 43 +++++++++----------
 .../dashboard/trafficActionTransList.jsp      |  7 +--
 .../views/dashboard/trafficAppTypeList.jsp    |  6 +--
 .../views/dashboard/trafficBandwidthList.jsp  |  6 +--
 .../dashboard/trafficHttpStatisticList.jsp    |  6 +--
 .../views/dashboard/trafficIpActiveList.jsp   |  1 +
 .../views/dashboard/trafficPortActiveList.jsp |  1 +
 .../dashboard/trafficProtocolTypeList.jsp     |  6 +--
 .../views/dashboard/trafficWebTypeList.jsp    |  8 ++--
 9 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/dashboard/ntcTotalReportDetailList.jsp b/src/main/webapp/WEB-INF/views/dashboard/ntcTotalReportDetailList.jsp
index 73661cbb1..059341e8f 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/ntcTotalReportDetailList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/ntcTotalReportDetailList.jsp
@@ -98,9 +98,9 @@
 										$("#searchForm")[0].reset();
 								});
 
-								setInterval(function(){
-									actionTransAjax($("#searchAction").val(),starth,new Date().Format("yyyy-MM-dd HH:mm:00"));
-								},500000);// 五分钟调用一次
+// 								setInterval(function(){
+// 									actionTransAjax($("#searchAction").val(),starth,new Date().Format("yyyy-MM-dd HH:mm:00"));
+// 								},500000);// 五分钟调用一次
 						});
 		function searchList() {
 			// 	loading();
@@ -113,22 +113,8 @@
 			}
 		}
 		// 局点信息
-		function showActionTransChart(rs) {
-			var data = new Array();
-			var xData = new Array();
-			xData = rs.statTime;
-			var series = new Array();
-
-			var total = 0;
-			$(rs.sum).each(function(i,d) {
-				total+=d
-			})
+		function showActionTransChart(xData,series) {
 			
-			$("#total").val(JSON.stringify(total));
-			series.push({
-				name: 'sum',
-				data: rs.sum
-			});
 			var chart = Highcharts.chart('chart',
 							{
 								chart : {
@@ -211,10 +197,25 @@
 						url : "${ctx}/dashboard/traffic/ajaxNtcTotalReportDetail?searchAction="+searchAction+"&beginDate="+beginDate+"&endDate="+endDate,
 						type : "get",
 						dataType : "json",
-						cache : false,
 						async : false,
 						success : function(rs) {
-							showActionTransChart(rs);
+						var data = new Array();
+						var xData = new Array();
+						var series = new Array();
+						var total = 0;
+						if(rs!=null){
+							$(rs.sum).each(function(i,d) {
+								total+=d
+							})
+							xData = rs.statTime;
+							data  =rs.sum;
+						}
+						$("#total").val(JSON.stringify(total));
+						series.push({
+							name: 'sum',
+							data: data
+						});
+							showActionTransChart(xData,series);
 							closeTip();
 						},
 						error : function(data, textStatus, errorThrown) {
@@ -273,8 +274,6 @@
 				});
 			};
 		}(Highcharts));
-
-		
 	</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp
index 57d3ab0c0..fd2353a19 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp
@@ -17,6 +17,7 @@
 	<h3 class="page-title">
 		<spring:message code="${searchAction}"></spring:message>
 	</h3>
+	<h5 class="page-header"></h5>
 			<div class="row" >
 		<form:form id="searchForm" method="get" class="form-search">
 			<!-- 搜索内容与操作按钮栏 -->
@@ -80,9 +81,9 @@ $(document).ready(function(){
 			$("#searchForm")[0].reset();
 		});
 	
-	setInterval(function(){
-		actionTransAjax($("#searchAction").val(),starth,new Date().Format("yyyy-MM-dd HH:mm:00"));
-	},500000);// 五分钟调用一次
+// 	setInterval(function(){
+// 		actionTransAjax($("#searchAction").val(),starth,new Date().Format("yyyy-MM-dd HH:mm:00"));
+// 	},500000);// 五分钟调用一次
 });
 function searchList(){
 	loading();
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
index d77aa2a73..57c35301f 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
@@ -132,9 +132,9 @@ $(document).ready(function(){
 			$(".Wdate").attr("value",'');
 			$("#searchForm")[0].reset();
 		}); 
-	setInterval(function(){
-		ajaxAppList(starth,new Date().Format("yyyy-MM-dd HH:mm:00"));
-	},500000);// 五分钟调用一次
+// 	setInterval(function(){
+// 		ajaxAppList(starth,new Date().Format("yyyy-MM-dd HH:mm:00"));
+// 	},500000);// 五分钟调用一次
 });
 function searchList(){
 	loading();
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
index 3163f4928..5b0d9601d 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
@@ -99,9 +99,9 @@ $(document).ready(function(){
 		changeBandwidth($("#unitType").val(),$("#beginDate").val(),$("#endDate").val());
 	});
 	
-	setInterval(function(){
-		changeBandwidth($("#unitType").val(),$("#beginDate").val(),new Date().Format("yyyy-MM-dd HH:mm:00"));
-		},500000);// 五分钟调用一次
+// 	setInterval(function(){
+// 		changeBandwidth($("#unitType").val(),$("#beginDate").val(),new Date().Format("yyyy-MM-dd HH:mm:00"));
+// 		},500000);// 五分钟调用一次
 		
 	//筛选功能初始化
 	$("#resetBtn").on("click",function(){
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp
index 2d4692feb..c003653e2 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp
@@ -110,9 +110,9 @@ $(document).ready(function(){
 			$("#searchForm")[0].reset();
 		});
 	
-	setInterval(function(){
-		ajaxProtocolList(starth,new Date().Format("yyyy-MM-dd HH:mm:00"));
-	},500000);// 五分钟调用一次
+// 	setInterval(function(){
+// 		ajaxProtocolList(starth,new Date().Format("yyyy-MM-dd HH:mm:00"));
+// 	},500000);// 五分钟调用一次
 });
 function searchList(){
 	var start=$("#beginDate").val();
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
index 3a60db574..70598d465 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
@@ -17,6 +17,7 @@
 	<h3 class="page-title">
 		<spring:message code="traffic_ipactive_hour_trend"></spring:message>
 	</h3>
+	<h5 class="page-header"></h5>
 		<div class="row" >
 			<form:form id="searchForm" action="${ctx}/traffic/ipActiveList" method="get" class="form-search">
 			<input id="beginDateh" type="hidden" value="${beginDate}"/>
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficPortActiveList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficPortActiveList.jsp
index c6acd8e15..1b63b0750 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficPortActiveList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficPortActiveList.jsp
@@ -15,6 +15,7 @@
 	<h3 class="page-title">
 		<spring:message code="active_port"></spring:message>
 	</h3>
+	<h5 class="page-header"></h5>
 		<div class="row" >
 			<form:form id="searchForm" action="${ctx}/dashboard/portActiveList" method="get" class="form-search">
 			<input id="beginDateh" type="hidden" value="${beginDate}"/>
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp
index 22038fde1..2a0a94a0d 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp
@@ -123,9 +123,9 @@ $(document).ready(function(){
 			$("#searchForm")[0].reset();
 		});
 	
-	setInterval(function(){
-		ajaxProtocolList(starth,new Date().Format("yyyy-MM-dd HH:mm:00"));
-	},500000);// 五分钟调用一次
+// 	setInterval(function(){
+// 		ajaxProtocolList(starth,new Date().Format("yyyy-MM-dd HH:mm:00"));
+// 	},500000);// 五分钟调用一次
 });
 function searchList(){
 	loading();
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
index 8d5ad57e2..279afd571 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
@@ -186,10 +186,10 @@
 				}); 
 				ajaxWebTypeList(starth, endh);
 
-					setInterval(function() {
-						ajaxWebTypeList(starth, new Date()
-								.Format("yyyy-MM-dd HH:mm:00"));
-					}, 500000);// 五分钟调用一次
+// 					setInterval(function() {
+// 						ajaxWebTypeList(starth, new Date()
+// 								.Format("yyyy-MM-dd HH:mm:00"));
+// 					}, 500000);// 五分钟调用一次
 				});
 		function searchList() {
 			var start = $("#beginDate").val();