From a3eefdfd2f2babcefc30940948ba7d6630768066 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@nismail.iie.ac.cn>
Date: Wed, 12 Dec 2018 17:11:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=20=E6=B5=81=E9=87=8F?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=20?=
 =?UTF-8?q?=EF=BC=8C=E5=8C=BA=E5=9F=9F=E5=9B=BE=E6=94=B9=E6=88=90=E6=8A=98?=
 =?UTF-8?q?=E7=BA=BF=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/dashboard/trafficActionTransList.jsp       |  8 ++++----
 .../WEB-INF/views/dashboard/trafficBandwidthList.jsp | 12 ++++++------
 .../WEB-INF/views/dashboard/trafficIpActiveList.jsp  |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp
index 981e793c2..96c7dce94 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp
@@ -52,9 +52,9 @@ function showActionTransChart(rs){
 	});
 	})
 	var chart = Highcharts.chart('chart', {
-		chart:{
+		/* chart:{
 			type: 'area',
-		},
+		}, */
 		exporting: {
 			filename:'Action-Trans',
 			scale:1,
@@ -80,7 +80,7 @@ function showActionTransChart(rs){
 	    credits:{//是否有highcharts水印
 	        enabled:false
 	    },
-	    plotOptions: {
+	   /*  plotOptions: {
 	    	area: {
 	    		stacking: 'normal',
 				lineColor: '#666666',
@@ -90,7 +90,7 @@ function showActionTransChart(rs){
 					lineColor: '#666666'
 				}
 			}
-		},
+		}, */
 // 	    legend: {
 // 	        layout: 'vertical',
 // 	        align: 'right',
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
index d1619d5f7..58dd5dae8 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
@@ -112,6 +112,7 @@ $(document).ready(function(){
 });
 
 function searchList(){
+	loading();
 	var start=$("#beginDate").val();
 	var end=$("#endDate").val();
 	changeBandwidth($("#unitType").val(),start,end);
@@ -259,7 +260,7 @@ function showBandwidthChart(id,unitType,xdata,ydata,title){
 
 	var chart = Highcharts.chart(id, {
 		chart:{
-			type: 'area',
+// 			type: 'area',
 			zoomType: 'x'
 		},
 	    title: {
@@ -281,7 +282,6 @@ function showBandwidthChart(id,unitType,xdata,ydata,title){
 	        title: {
 	            text: unitType
 	        },
-	        tickmarkPlacement: 'on',
 	        min:0
 	    },
 	    legend: {
@@ -289,10 +289,10 @@ function showBandwidthChart(id,unitType,xdata,ydata,title){
 	    },
 		xAxis:{
 			type: 'datetime',
-			tickmarkPlacement: 'on',
+// 			tickmarkPlacement: 'on',
 			dateTimeLabelFormats: {
 				millisecond: '%H:%M:%S.%L',
-				second: '%H:%M:%S',
+				second: '%H:%M',
 				minute: '%H:%M',
 				hour: '%H:%M',
 				day: '%m-%d',
@@ -309,7 +309,7 @@ function showBandwidthChart(id,unitType,xdata,ydata,title){
 	  	credits:{//是否有highcharts水印
 	        enabled:false
 	    },
-	    plotOptions: {
+	   /*  plotOptions: {
 	    	area: {
 	    		stacking: 'normal',
 				lineColor: '#666666',
@@ -319,7 +319,7 @@ function showBandwidthChart(id,unitType,xdata,ydata,title){
 					lineColor: '#666666'
 				}
 			}
-		},
+		}, */
 	    series: ydata,
 
 	});
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
index 904dee4c7..659469627 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
@@ -105,9 +105,9 @@ function showIpActiveChart(rs){
 	});
 	})
 	var chart = Highcharts.chart('chart', {
-		chart:{
+		/* chart:{
 			type: 'area',
-		},
+		}, */
 		exporting: {
 			filename:'IP-Active',
 			scale:1,
@@ -124,7 +124,7 @@ function showIpActiveChart(rs){
 					text: 'time',
 					align:'high',
 			},
-		plotOptions: {
+		/* plotOptions: {
 	    	area: {
 	    		stacking: 'normal',
 				lineColor: '#666666',
@@ -134,7 +134,7 @@ function showIpActiveChart(rs){
 					lineColor: '#666666'
 				}
 			}
-		},
+		}, */
 // 		labels:{
 // 			formatter:function(){
 // 				if(this.value.length>15){