From e55357125c4db998e0fee4ae2f5c5726311507db Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@zdjizhi.com>
Date: Fri, 11 Jan 2019 18:15:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3app=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E8=B6=8B=E5=8A=BF=E6=90=9C=E7=B4=A2=E6=A1=86=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=AE=9E=E6=97=B6?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/dashboard/trafficAppTrendList.jsp   | 52 ++++++++++++++++---
 1 file changed, 44 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp
index 8c88be957..6ebe6b805 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp
@@ -34,8 +34,40 @@
 				<li class="changeData" value="2"><a href="javascript:void(0);"><spring:message code="history"/></a></li>
 		</ul>
 		<br>
-		<div class="row">
-			<form:form id="searchForm" method="get" class="form-search">
+		<div class="row chart-realTime">
+			<form:form id="searchForm1" method="get" class="form-search">
+				<!-- 搜索内容与操作按钮栏 -->
+				<div class="col-md-12">
+					<div class="pull-left">
+		 				  <div class="input-group">
+		                     <div class="input-group-btn">
+								<span class="selectpicker form-control" ><spring:message code="entrance_id"/></span>
+                          	</div>
+                              	<select id="entranceId" name="entranceId" class="selectpicker form-control" width="100px" data-live-search="true" data-live-search-placeholder="search">
+									<option value=""><spring:message code="select"/></option>
+									<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict" >
+										<option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"></spring:message></option>
+									</c:forEach>
+								</select>
+						</div>
+                  	</div>
+					<div class="pull-left">
+						<button type="button" class="btn blue"
+							onClick="return searchList1()">
+							<i class="fa fa-search"></i>
+							<spring:message code="search" />
+						</button>
+						<%-- <button type="button" class="btn btn-default" id="resetBtn">
+							<i class="fa fa-refresh"></i>
+							<spring:message code="reset" />
+						</button> --%>
+					</div>
+				</div>
+				<!-- 搜索内容与操作按钮栏 -->
+			</form:form>
+		</div>
+		<div class="row chart-history hidden">
+			<form:form id="searchForm2" method="get" class="form-search">
 				<!-- 搜索内容与操作按钮栏 -->
 				<div class="col-md-12">
 					<div class="pull-left chart-history">
@@ -73,7 +105,7 @@
                   	</div>
 					<div class="pull-left">
 						<button type="button" class="btn blue"
-							onClick="return searchList()">
+							onClick="return searchList2()">
 							<i class="fa fa-search"></i>
 							<spring:message code="search" />
 						</button>
@@ -99,12 +131,12 @@
 		<div class="row chart-history hidden">
 			<div id="chart-history" style="width: 97%; height: 430px; margin-top: 20px"></div>
 		</div>
-			<ul class="nav nav-tabs">
+			<ul class="nav nav-tabs chart-history hidden">
 				<li class="searchQuota active" value="1" onclick="changeOrderby(1)"><a href="javascript:void(0);"><spring:message code="link_num"/></a></li>
 				<li class="searchQuota" value="2" onclick="changeOrderby(2)"><a href="javascript:void(0);"><spring:message code="packet"/></a></li>
 				<li class="searchQuota" value="3" onclick="changeOrderby(3)"><a href="javascript:void(0);"><spring:message code="byte"/></a></li>
 			</ul>
-			<div class="btn-group pull-right" style="padding-top: 5px">
+			<div class="btn-group pull-right chart-history hidden" style="padding-top: 5px">
 			    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-wrench"></i>  <spring:message code="export"/>
 			        <span class="caret"></span>
 			    </button>
@@ -117,7 +149,7 @@
 		            </div>
 			</div>
 			<br>
-		<div class="row" style="padding-top: 5px">
+		<div class="row chart-history hidden" style="padding-top: 5px">
 					<div class="table-responsive">
 						<table id="contentTable" style="width: 100%;"
 							class="table table-striped table-bordered table-condensed text-nowrap">
@@ -193,7 +225,12 @@
 		function changeOrderby(searchQuota) {
 			appTop100List($("#beginDate").val(),$("#endDate").val(),$("#appType").val(),$("#entranceId").val(),searchQuota);
 		}
-		function searchList() {
+		function searchList1() {
+				var appType=$("#appType").val();
+				var entranceId=$("#entranceId").val();
+				showRealTimeTransChart(appType,entranceId);// 折线
+		}
+		function searchList2() {
 			var start = $("#beginDate").val();
 			var end = $("#endDate").val();
 			$("#beginDateh").val(start);
@@ -205,7 +242,6 @@
 				var entranceId=$("#entranceId").val();
 				var searchQuota=$(".searchQuota[class~='active']").val();
 				appTransAjax(start,end,appType,entranceId);// 折线
-				showRealTimeTransChart(appType,entranceId);// 折线
 				appTop100List(start,end,appType,entranceId,searchQuota);// 列表
 			}
 		}