From 55edab464dec652860b4be153177fbf5e6e89438 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@zdjizhi.com>
Date: Thu, 10 Jan 2019 19:47:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E9=87=8F=E7=BB=9F=E8=AE=A1app?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=B6=8B=E5=8A=BF=E5=9B=BE=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/dashboard/trafficAppTrendList.jsp   | 127 +++++++++++++-----
 1 file changed, 90 insertions(+), 37 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp
index 23ed14fc0..8c88be957 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp
@@ -174,8 +174,8 @@
 				$(".searchQuota").removeClass("active");
 				$(this).addClass("active");
 			})
-			$(".chart-realTime").removeClass("hidden");
 			$(".chart-history").addClass("hidden");
+			$(".chart-realTime").removeClass("hidden");
 			$(".changeData").on("click",function(){
 				$(".changeData").removeClass("active");
 				$(this).addClass("active");
@@ -546,7 +546,7 @@
 										year: '%Y'
 									},
 									title: {
-											text: 'time',
+											text: 'Real Time',
 											align:'high',
 									},
 									labels: { 
@@ -755,7 +755,7 @@
 										year: '%Y'
 									},
 									title: {
-											text: 'time',
+											text: 'History Time',
 											align:'high',
 									},
 									labels: { 
@@ -821,21 +821,41 @@
 				var nowDate=new Date();
 				var start=$("#beginDateh").val();
 				var end=$("#endDateh").val();
-				 var rows = [];
-				 var heard = [];
-				/* 调用后台接口导出 */
-				var total = JSON.parse($("#total").val());
-				var timeData = JSON.parse($("#timeData").val());
-				var sipData = JSON.parse($("#sipData").val());
-				var dipData = JSON.parse($("#dipData").val());
+				var rows = this.getDataRows(true);
+				var heard = rows.shift(); // 删除一个重复行
+				rows.shift(); // 删除一个重复行
+				var total=[];
 				var map={};
-				heard.push("time","server","client");
-				for(var i=0;i<sipData.length;i++){
-					var colData=[];
-					var time=new Date(timeData[i]); // 
-					var ftime=dateFtt("yyyy-MM-dd hh:mm:ss",time);
-					colData.push(ftime,sipData[i],dipData[i])
-					rows.push(colData)
+				 if(heard[0].indexOf("History") != -1){
+					rows = [];
+					/* 调用后台接口导出 */
+					total = JSON.parse($("#total").val());
+					var timeData = JSON.parse($("#timeData").val());
+					var sipData = JSON.parse($("#sipData").val());
+					var dipData = JSON.parse($("#dipData").val());
+					for(var i=0;i<sipData.length;i++){
+						var colData=[];
+						var time=new Date(timeData[i]); // 
+						var ftime=dateFtt("yyyy-MM-dd hh:mm:ss",time);
+						colData.push(ftime,sipData[i],dipData[i])
+						rows.push(colData)
+					}
+				 }else{
+					var siptotal=0;
+					var diptotal=0;
+					 $(rows).each(function (i,d){
+						if(d!=null){
+								if(i==0){
+									start=d[0];
+								}
+								if(i==rows.length-1){
+									end=d[0];
+								}
+								siptotal=siptotal+Number(d[1]);	
+								diptotal=diptotal+Number(d[2]);	
+						}
+					})
+					total.push(siptotal,diptotal);
 				}
 				 total.unshift('<spring:message code="report_total"/>');
 				 rows.push(total)
@@ -850,28 +870,61 @@
 
 		(function(H) {
 			H.Chart.prototype.downloadCSV = function() {
-				var total = JSON.parse($("#total").val());
-				var timeData = JSON.parse($("#timeData").val());
-				var sipData = JSON.parse($("#sipData").val());
-				var dipData = JSON.parse($("#dipData").val());
+				
+				var rows = this.getDataRows(true);
 				var data=[];
-				for(var i=0;i<sipData.length;i++){
-					var colData=[];
-					var time=new Date(timeData[i]); // 
-					var ftime=dateFtt("yyyy-MM-dd hh:mm:ss",time);
-					colData.push(ftime,sipData[i],dipData[i])
-					data.push({
-			                      num1:ftime,
-			                      num2:sipData[i],
-			                      num3:dipData[i],
+				var heard = rows.shift(); // 删除一个重复行
+				var total=[];
+				var start = "";
+				var end = "";
+				if(heard[0].indexOf("History") != -1){
+					start = $("#beginDateh").val();
+					end = $("#endDateh").val();
+					total = JSON.parse($("#total").val());
+					var timeData = JSON.parse($("#timeData").val());
+					var sipData = JSON.parse($("#sipData").val());
+					var dipData = JSON.parse($("#dipData").val());
+					for(var i=0;i<sipData.length;i++){
+						var colData=[];
+						var time=new Date(timeData[i]); // 
+						var ftime=dateFtt("yyyy-MM-dd hh:mm:ss",time);
+						colData.push(ftime,sipData[i],dipData[i])
+						data.push({
+				                      num1:ftime,
+				                      num2:sipData[i],
+				                      num3:dipData[i],
+							})
+					}
+					}else{
+						var siptotal=0;
+						var diptotal=0;
+						$(rows).each(function (i,d){
+							if(d!=null){
+								data.push({
+					                      num1:d[0],
+					                      num2:d[1],
+					                      num3:d[2],
+								});
+								if(i>0){
+									if(i==1){
+										start=d[0];
+										}
+									if(i==rows.length-1){
+										end=d[0];
+										}
+										siptotal=siptotal+Number(d[1]);	
+										diptotal=diptotal+Number(d[2]);	
+									}
+							}
 						})
-				}
-				data.push({
-					num1:"<spring:message code='report_total'/>",
-	                num2:total
-				})
-				var start = $("#beginDateh").val();
-				var end = $("#endDateh").val();
+						total.push(siptotal,diptotal);
+					}
+					data.push({
+						num1:"<spring:message code='report_total'/>",
+		                num2:total
+					})
+				
+				
 				exportCsv({
 	                  title:["<spring:message code='${appName}'/>",start+"--"+end],
 	                  titleForKey:["num1","num2","num3"],