From e79aee341823a5d490d19efd8f4f230c47846e96 Mon Sep 17 00:00:00 2001
From: tanghao <default@DESKTOP-7FEGRP2>
Date: Sat, 22 Dec 2018 21:15:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=88=B6traffic=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=97=B6=E9=97=B4=E6=AE=B5=E5=9C=A824?=
 =?UTF-8?q?=E5=B0=8F=E6=97=B6=E5=86=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/dashboard/trafficBandwidthList.jsp  | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
index 815ba280f..3be456d0e 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
@@ -32,7 +32,7 @@
 						<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
                           	</div>
                               	<input id="beginDate" name="beginDate" type="text" readonly="readonly" class="form-control Wdate input-medium"
-							value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'endDate\')}'});"/>
+							value="" onclick="WdatePicker({onpicked:function(){console.log(endDate);console.log(this);$(endDate).val('')},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'endDate\')}'});"/>
 						</div>
                     		</div>
 				<div class="pull-left">
@@ -41,7 +41,7 @@
 						<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
                           	</div>
                               	<input id="endDate" name="endDate" type="text" readonly="readonly" class="form-control Wdate input-medium" 
-							value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'${endDate}'});"/>
+							value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'#F{$dp.$D(\'beginDate\',{H:24})}'});"/>
 						</div>
                     		</div>
                     		
@@ -86,6 +86,7 @@
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting-data.js"></script>
 <script type="text/javascript">
 $(document).ready(function(){
+	loading();
 	var starth=$("#beginDateh").val();
 	var endh=$("#endDateh").val();
 	$("#beginDate").val(starth);
@@ -94,6 +95,7 @@ $(document).ready(function(){
 	changeBandwidth(unitType,starth,endh);
 	//changeBandwidth2(unitType,starth,endh);
 	$("#unitType").on("change",function(){
+		loading();
 		changeBandwidth($("#unitType").val(),$("#beginDate").val(),$("#endDate").val());
 	//	changeBandwidth2($("#unitType").val(),$("#beginDate").val(),$("#endDate").val());
 	});
@@ -222,13 +224,12 @@ function changeBandwidth(unitType,beginDate,endDate){
 	var udpdata2=null;
 	if(data!=null&&Object.keys(data).length>0){
 		if(data.ipv4Type1!=undefined&&data.ipv4Type1!=null){
-			console.log(2222)
-			xdata=data.ipv4Type1[0].statTime;
+			xdata=data.ipv4Type1.statTime;
 			if(unitType=="Gbps"){
-				ipv4data=data.ipv4Type1[0].gbps;
-				ipv6data=data.ipv6Type1[0].gbps;
-				tcpdata=data.trans6Type1[0].gbps;
-				udpdata=data.trans17Type1[0].gbps;
+				ipv4data=data.ipv4Type1.gbps;
+				ipv6data=data.ipv6Type1.gbps;
+				tcpdata=data.trans6Type1.gbps;
+				udpdata=data.trans17Type1.gbps;
 			}
 			if(unitType=="pps"){
 				ipv4data=data.ipv4Type1.pps;
@@ -263,13 +264,12 @@ function changeBandwidth(unitType,beginDate,endDate){
 	
 	if(data!=null&&Object.keys(data).length>0){
 		if(data.ipv4Type2!=undefined&&data.ipv4Type2!=null){
-			console.log(3333)
-			xdata=data.ipv4Type2[0].statTime;
+			xdata=data.ipv4Type2.statTime;
 			if(unitType=="Gbps"){
-				ipv4data2=data.ipv4Type2[0].gbps;
-				ipv6data2=data.ipv6Type2[0].gbps;
-				tcpdata2=data.trans6Type2[0].gbps;
-				udpdata2=data.trans17Type2[0].gbps;
+				ipv4data2=data.ipv4Type2.gbps;
+				ipv6data2=data.ipv6Type2.gbps;
+				tcpdata2=data.trans6Type2.gbps;
+				udpdata2=data.trans17Type2.gbps;
 			}
 			if(unitType=="pps"){
 				ipv4data2=data.ipv4Type2.pps;