From 25def0b3898d5108be8f8ba5db900c4b44a6e79d Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@nismail.iie.ac.cn>
Date: Fri, 12 Oct 2018 20:30:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E9=87=8F=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=B4=BB=E8=B7=83IP=E5=88=A4=E6=96=AD=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/dashboard/dashBoardIndex.jsp        | 22 +++++++++----------
 .../webapp/static/pages/scripts/echart.js     | 16 +++++++-------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
index 60d16ea17..6fb0fbf28 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
@@ -369,10 +369,10 @@
 <script type="text/javascript">
 $(document).ready(function(){
 	//动态显示数据
-// 	ajaxinfo();
-// 	setInterval(function(){
-// 	 ajaxinfo();
-// 	},20000);
+	ajaxinfo();
+	setInterval(function(){
+	 ajaxinfo();
+	},20000);
 	
 	protocolList();//协议统计
 	ipActiveList();//活跃IP
@@ -488,7 +488,7 @@ function protocolList(){
 		dataType:"json",
 		cache:false,async:true,
 		success:function (rs) {
-		  if(rs[0].error!=null){
+		  if(rs!=null&&rs.length>0&&rs[0].error!=null){
 			  top.$.jBox.tip("<spring:message code='request_service_failed'/>", "<spring:message code='info'/>");
 				return;
 			}else{
@@ -507,7 +507,7 @@ function ipActiveList(){
 		dataType:"json",
 		cache:false,async:true,
 		success:function (rs) {
-			if(rs[0].error!=null){
+			if(rs!=null&&rs.length>0&&rs[0].error!=null){
 				  top.$.jBox.tip("<spring:message code='request_service_failed'/>", "<spring:message code='info'/>");
 					return;
 				}else{
@@ -544,7 +544,7 @@ function portActiveList(){
 		   $("#tbodyDataPort").html("");
 			var n=rs.length;
 			var total=0;
-			if(rs[0].error!=null){
+			if(rs!=null&&rs.length>0&&rs[0].error!=null){
 				$("#tbodyDataPort").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'><spring:message code='request_service_failed'/></td><td></td></tr>");
 			}else{
 				if(n>0){
@@ -575,7 +575,7 @@ function appTypeList(){
 		dataType:"json",
 		cache:false,async:true,
 		success:function (rs) {
-			if(rs[0].error!=null){
+			if(rs!=null&&rs.length>0&&rs[0].error!=null){
 				  top.$.jBox.tip("<spring:message code='request_service_failed'/>", "<spring:message code='info'/>");
 					return;
 				}else{
@@ -612,7 +612,7 @@ function systemList(){
 		   $("#tbodyData1").html("");
 		   rs.reverse();
 			var n=rs.length;
-			if(rs[0].error!=null){
+			if(rs!=null&&rs.length>0&&rs[0].error!=null){
 				$("#tbodyData1").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'><spring:message code='request_service_failed'/></td><td></td></tr>");
 			}else{
 				if(n>0){
@@ -704,7 +704,7 @@ function browserList() {
 		   $("#tbodyData1").html("");
 		   rs.reverse();
 		   var n=rs.length;
-		   if(rs[0].error!=null){
+		   if(rs!=null&&rs.length>0&&rs[0].error!=null){
 				$("#tbodyData1").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'><spring:message code='request_service_failed'/></td><td></td></tr>");
 			}else{
 			   if(n>0){
@@ -759,7 +759,7 @@ function websiteList() {
 		success:function (rs) {  
 		   $("#tbodyData2").html("");
 		   var n=rs.length;
-		   if(rs[0].error!=null){
+		   if(rs!=null&&rs.length>0&&rs[0].error!=null){
 				$("#tbodyData2").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'><spring:message code='request_service_failed'/></td><td></td></tr>");
 			}else{
 			   if(n>0){
diff --git a/src/main/webapp/static/pages/scripts/echart.js b/src/main/webapp/static/pages/scripts/echart.js
index b6ed9fe97..d1adc1e08 100644
--- a/src/main/webapp/static/pages/scripts/echart.js
+++ b/src/main/webapp/static/pages/scripts/echart.js
@@ -156,14 +156,14 @@
     
     // echart_main中心图 活跃IP统计
     function echart_main(rs) {
-    	if(rs==null||rs.length<=0){
-    		rs=[{"ipAddr":"103.6.1.12","linkNum":532,"pktNum": 5,"byteLen": 6},
-    		    {"ipAddr":"163.5.6.43","linkNum":532,"pktNum": 5,"byteLen": 7},
-    		    {"ipAddr":"170.1.0.1","linkNum":532,"pktNum": 5,"byteLen": 8},
-    		    {"ipAddr":"10.32.33.61","linkNum":532,"pktNum": 5,"byteLen": 9},
-    		    {"ipAddr":"145.16.1.2","linkNum":532,"pktNum": 5,"byteLen": 10},
-    		    {"ipAddr":"153.5.0.36","linkNum":532,"pktNum": 5,"byteLen": 11}]	
-    	}
+//    	if(rs==null||rs.length<=0){
+//    		rs=[{"ipAddr":"103.6.1.12","linkNum":532,"pktNum": 5,"byteLen": 6},
+//    		    {"ipAddr":"163.5.6.43","linkNum":532,"pktNum": 5,"byteLen": 7},
+//    		    {"ipAddr":"170.1.0.1","linkNum":532,"pktNum": 5,"byteLen": 8},
+//    		    {"ipAddr":"10.32.33.61","linkNum":532,"pktNum": 5,"byteLen": 9},
+//    		    {"ipAddr":"145.16.1.2","linkNum":532,"pktNum": 5,"byteLen": 10},
+//    		    {"ipAddr":"153.5.0.36","linkNum":532,"pktNum": 5,"byteLen": 11}]	
+//    	}
     	var data=new Array();
     	var xData=new Array();
     	var drillData=new Array();