From aaf64fc5271eef6debdd9e9225411280745b7638 Mon Sep 17 00:00:00 2001
From: shangguanyanfei <shangguan@zdjizhi.com>
Date: Thu, 13 Jun 2019 15:08:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E9=87=8F=E7=BB=9F=E8=AE=A1-=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/dashboard/commonNew.jsp     | 31 +++++--------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp b/src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp
index b14d8407a..20f95e880 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp
@@ -162,27 +162,13 @@
 						</select>
 		            </div>
 				</div>
-				<div id="chart_detail" class="pull-left" style="display: none;">
-					<div class="input-group">
-						<div class="input-group-btn">
-							<span class="selectpicker form-control" ><spring:message code="chart_type"/></span>
-		                </div>
-		                <select id="chartType" name="chartType" class="selectpicker select2 input-small">
-							<option value ="line"><spring:message code="line_chart"/></option>
-							<option value ="column"><spring:message code="column_chart"/></option>
-							<c:if test="${concent ne '3'}">
-								<option value ="pie"><spring:message code="pie_chart"/></option>
-							</c:if>
-						</select>
-	                </div>
-				</div>
 			</div>
 			<div class="col-md-12" style="padding-top: 3px;">
 			<div class="form-group">
                	<div class="control-label col-md-3 form-control" style="width: max-content;">
 					<spring:message code="time_granularity" />
 				</div>
-               	<div class="col-md-4" style="padding-left: 10px;">
+               	<div class="pull-left" style="margin-left: 10px;">
 					<div class="mt-radio-inline" style="height: 34px">
 						 <label class="mt-radio">
 					 	 	<input type="radio" class="timeSize" name="time" value="1" checked/> 
@@ -212,7 +198,7 @@
 					</div> 
 					
 				</div>
-				<div class="pull-left">
+				<div class="pull-left" style="padding-left: 10px;">
 					<div class="input-group beginDate">
 						<div class="input-group-btn">
 							<span class="selectpicker form-control"><spring:message code="begin_date" /></span>
@@ -222,8 +208,8 @@
 							  <input name="beginDate" id="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
 										value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')"/> 
 					</div>
-					</div>
-					<div class="pull-left">
+				</div>
+				<div class="pull-left">
 					<div class="input-group endDate">
 						<div class="input-group-btn">
 							<span class="selectpicker form-control"><spring:message code="end_date" /></span>
@@ -233,7 +219,7 @@
 							  <input name="endDate" id="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
 										value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')"/> 
 					</div>
-					</div>
+				</div>
 					
 				
 			</div>
@@ -296,7 +282,7 @@
 	   </div> --%>
 		
 		<div class="col-md-12" style="padding-top: 3px;">
-			<%-- <div id="chart_detail" class="pull-left" style="display: none;">
+			 <div id="chart_detail" class="pull-left" style="display: none;">
 					<div class="input-group">
 						<div class="input-group-btn">
 							<span class="selectpicker form-control" ><spring:message code="chart_type"/></span>
@@ -309,7 +295,7 @@
 							</c:if>
 						</select>
 	                </div>
-			</div> --%>
+			</div> 
 			<c:if test="${empty concent or concent eq '1' }">
 				<div class="pull-left">
 					<button id="search" type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
@@ -927,10 +913,9 @@ function  concentOnChange(){
 			$("#search").attr("onclick","return searchListBandWidth()");
 		}else if(concent == 4){ // 
 			$("#statis_detail").hide();
-			$("#statis_detail_2").hide();
 			$("#statis_detail_1").show();
+			$("#statis_detail_2").hide();
 			$("#statis_detail_3").hide();
-	//		createSelect('detail_select','protocols', detailNation2);
 			createSelect('dimension_select','bps', dimensionNation4);
 			$("#search").removeAttr("onclick");
 			$("#search").attr("onclick","return searchListProtocol()");