From e402a476008102263679a2469f3aeead01f232d4 Mon Sep 17 00:00:00 2001
From: tanghao <default@DESKTOP-7FEGRP2>
Date: Thu, 3 Jan 2019 15:25:46 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B5=81=E9=87=8F=E6=89=80=E6=9C=89=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E8=AE=BE=E7=BD=AE=E6=97=B6=E5=8C=BA=202.=E6=B5=81?=
 =?UTF-8?q?=E9=87=8F=E6=89=80=E6=9C=89=E7=95=8C=E9=9D=A2=E6=8A=98=E7=BA=BF?=
 =?UTF-8?q?=E5=9B=BE=E6=94=B9=E4=B8=BA=E9=9D=A2=E7=A7=AF=E5=9B=BE=203.?=
 =?UTF-8?q?=E6=B5=81=E9=87=8F=E6=89=80=E6=9C=89=E7=95=8C=E9=9D=A2=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E9=80=89=E6=8B=A9=E4=BC=98=E5=8C=96=E4=B8=8D=E4=BC=9A?=
 =?UTF-8?q?=E8=B6=85=E8=BF=87=E6=9C=80=E6=96=B0=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/dashboard/trafficDomainTrans.jsp    | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp
index 900278a3a..1e5fae4a9 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp
@@ -65,15 +65,17 @@ $(document).ready(function(){
 				var xData=new Array();
 				var series=new Array();
 				var total = 0;
+				console.log(rs)
 				if(rs!=null&&rs.length>0){
-					xData=rs[0].statTime;
+					/* xData=rs[0].statTime;
 					$(rs[0].count).each(function(i,d) {
 						total+=d
-					})
+					})*/
+					total=rs[0].sum;
 					series.push({
 						name: 'unique',
-						data: rs[0].count
-					});
+						data: rs[0].result
+					}); 
 				}else{
 					series.push({
 						name: 'unique',
@@ -98,7 +100,7 @@ function showDomainTrans(xData,series){
 	var domainName= $("#domainName").val();
 	var chart = Highcharts.chart('chart', {
 		 chart:{
-// 			type: 'area',
+ 			type: 'area',
 			 zoomType: 'x'
 		},
 		exporting: {
@@ -129,8 +131,16 @@ function showDomainTrans(xData,series){
 	        text: domainName
 	    },
 		xAxis: {
-			type:'category',
-			categories: xData,
+			type:'datetime',
+			dateTimeLabelFormats: {
+				second: '%H:%M:%S',
+				minute: '%H:%M',
+				hour: '%H:%M',
+				day: '%m-%d',
+				week: '%m-%d',
+				month: '%Y-%m',
+				year: '%Y'
+			},
 			title: {
 					text: 'time',
 					align:'high',