From 953e00bc25646d1bf825d18303749c46302e3167 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@nismail.iie.ac.cn>
Date: Sat, 22 Dec 2018 16:44:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E9=87=8F=E7=BB=9F=E8=AE=A1traffic=20?=
 =?UTF-8?q?=E8=B7=9F=E5=8A=A8=E4=BD=9C=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?csv,excel=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/trafficActionTransList.jsp      | 11 +++++++++
 .../views/dashboard/trafficBandwidthList.jsp  | 23 ++++++++++---------
 .../views/dashboard/trafficDomainTrans.jsp    |  2 +-
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp
index 800217ec5..e6b540661 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp
@@ -60,6 +60,7 @@
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
 <%-- <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/themes/grid.js"></script> --%>
+<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting-data.js"></script>
 <script type="text/javascript">
 $(document).ready(function(){
 	var starth=$("#beginDateh").val();
@@ -121,6 +122,16 @@ function showActionTransChart(rs){
 			scale:1,
 			sourceWidth: 1280,
 			sourceHeight: 500,
+			buttons: {
+                contextButton: {
+                    menuItems: [
+                                Highcharts.getOptions().exporting.buttons.contextButton.menuItems[0],// 打印
+                                Highcharts.getOptions().exporting.buttons.contextButton.menuItems[1],// jpeg
+                                Highcharts.getOptions().exporting.buttons.contextButton.menuItems[4],// excel
+                                Highcharts.getOptions().exporting.buttons.contextButton.menuItems[3],// cvs
+                            ]
+                }
+            }
 		},
 	    title: {
 	        text: null
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
index 3cbd508de..815ba280f 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
@@ -83,6 +83,7 @@
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting.js"></script>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
+<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting-data.js"></script>
 <script type="text/javascript">
 $(document).ready(function(){
 	var starth=$("#beginDateh").val();
@@ -366,6 +367,16 @@ function showBandwidthChart(id,unitType,xdata,ydata,title){
 			scale:1,
 			sourceWidth: 1280,
 			sourceHeight: 550,
+			buttons: {
+                contextButton: {
+                    menuItems: [
+                                Highcharts.getOptions().exporting.buttons.contextButton.menuItems[0],// 打印
+                                Highcharts.getOptions().exporting.buttons.contextButton.menuItems[1],// jpeg
+                                Highcharts.getOptions().exporting.buttons.contextButton.menuItems[4],// excel
+                                Highcharts.getOptions().exporting.buttons.contextButton.menuItems[3],// cvs
+                            ]
+                }
+            }
 		},
 	    yAxis: {
 	        title: {
@@ -377,18 +388,8 @@ function showBandwidthChart(id,unitType,xdata,ydata,title){
 	    	enabled:true
 	    },
 		xAxis:{
-			type: 'datetime',
+			type:'category',
 // 			tickmarkPlacement: 'on',
-			dateTimeLabelFormats: {
-				millisecond: '%H:%M:%S.%L',
-				second: '%H:%M',
-				minute: '%H:%M',
-				hour: '%H:%M',
-				day: '%m-%d',
-				week: '%m-%d',
-				month: '%Y-%m',
-				year: '%Y'
-			},
 			labels: { 
 	             rotation: -45, //倾斜的角度
 	         },
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp
index fc2740cac..25fc51671 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp
@@ -82,7 +82,7 @@ function showDomainTrans(rs){
 	var series=new Array();
 // 	$(rs).each(function(i, d) {
 	series.push({
-		name: ' ',
+		name: 'unique',
 		data: rs[0].count
 	});
 // 	})