From 8d42cab7e2524c656f7f3b16a1d3a146dae67be8 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@zdjizhi.com>
Date: Sat, 19 Jan 2019 23:16:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E9=87=8F=E7=BB=9F=E8=AE=A1in/out?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=A4=A7=E5=86=99=EF=BC=8C=E6=B5=81=E9=87=8F?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1app=E8=B6=8B=E5=8A=BFreset=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4=E4=B8=80?=
 =?UTF-8?q?=E5=B0=8F=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp    | 2 +-
 .../WEB-INF/views/dashboard/trafficAppTrendList.jsp      | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
index ae7183090..de3a6d5f1 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
@@ -79,7 +79,7 @@ body {
                          <!-- 网络带宽 --><spring:message code="traffic"/>
                         </label>
                         </p>
-                 			<a href="${ctx}/dashboard/traffic/bandwidthList"><p class="csNum">in <span class="c2sNum">0</span> | out <span class="s2cNum">0</span> </p>
+                 			<a href="${ctx}/dashboard/traffic/bandwidthList"><p class="csNum">IN <span class="c2sNum">0</span> | OUT <span class="s2cNum">0</span> </p>
                         	<span class="numberRun4">0</span > <span class="numberRun4-unit">bps</span></a>
                     </div>
                 </div>
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp
index 1f8b906af..c05a490ba 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp
@@ -240,8 +240,14 @@
 						$(this).find("option").attr("selected",false);
 // 						$(this).find("option:first").attr("selected",true);
 					});
-						$(".Wdate").attr("value", '');
+// 						$(".Wdate").attr("value", '');
+						var deftime=(new Date().getTime())-(1000 * 60 * 60);
+			        	var defbegin=dateFtt("yyyy-MM-dd hh:mm:ss",new Date(deftime)); // 默认一小时
+						var defend=dateFtt("yyyy-MM-dd hh:mm:ss",new Date());
+						
 						$("#searchForm2")[0].reset();
+						$("#beginDate").val(defbegin);
+						$("#endDate").val(defend);
 			});
 			$(".searchQuota").on("click",function(){
 				$(".searchQuota").removeClass("active");
@@ -556,7 +562,6 @@
 			}
 		}
 		function realTimeTrendAjax(beginDate, endDate,appType,entranceId,isp){
-			console.log(isp)
 			var result={};
 			$.ajax({
 				url : "${ctx}/dashboard/traffic/ajaxAppTrend",