From 3fb9b5b159a090c035fc3ffc5dc32da4d5b18ada Mon Sep 17 00:00:00 2001
From: tanghao <default@DESKTOP-7FEGRP2>
Date: Thu, 3 Jan 2019 14:43:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/dashboard/trafficBandwidthList.jsp  | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
index c2c1a9a07..3c3c9de09 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
@@ -32,8 +32,10 @@
                               <div class="input-group-btn">
 						<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({onpicked:setTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'endDate\')}'});"/>
+                              	<!-- <input id="beginDate" name="beginDate" type="text" readonly="readonly" class="form-control Wdate input-medium"
+							value="" onclick="WdatePicker({onpicked:setTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'endDate\')}'});"/> -->
+							<input id="beginDate" name="beginDate" type="text" readonly="readonly" class="form-control Wdate input-medium"
+							value="" onclick="WdatePicker({el:'beginDate',onpicked:setTime(1),dateFmt:'yyyy-MM-dd HH:mm:ss',maxDate:'#F{$dp.$D(\'endDate\')||currentTime()}' })" />
 						</div>
                     		</div>
 				<div class="pull-left">
@@ -41,15 +43,17 @@
                               <div class="input-group-btn">
 						<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:'#F{$dp.$D(\'beginDate\',{H:24})}'});"/>
+                              	<!-- <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:'#F{$dp.$D(\'beginDate\',{H:24})}'});"/> -->
+							<input id="endDate" name="endDate" type="text" readonly="readonly" class="form-control Wdate input-medium" 
+							value="" onclick="WdatePicker({el:'endDate',dateFmt:'yyyy-MM-dd HH:mm:ss',minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:getMaxDate(1) })"/>
 						</div>
                     		</div>
                     		
 				<div class="pull-left">
 					 <button type="button" class="btn blue" onClick="return searchList()"> <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> 
 			</div>
 			<!-- 搜索内容与操作按钮栏 -->
 		</form:form>
@@ -260,6 +264,7 @@ function changeBandwidth(unitType,beginDate,endDate){
 /* 网络带宽时间维度趋势图 */
 function showBandwidthChart(id,unitType,xdata,ydata,title){
 	var nowDate=new Date();
+	Highcharts.setOptions({ global: { useUTC: false } }); 
 	var chart = Highcharts.chart(id, {
 		chart:{
  			type: 'area',
@@ -382,7 +387,6 @@ function showBandwidthChart(id,unitType,xdata,ydata,title){
 		}, */
 	    series:ydata
 	});
-	Highcharts.setOptions({ global: { useUTC: false } }); 
 }
 (function(H) {
 	  H.Chart.prototype.downloadXLS = function() {
@@ -446,12 +450,12 @@ function showBandwidthChart(id,unitType,xdata,ydata,title){
 	  };
 	}(Highcharts));
 	
-	function setTime(){
+	/* function setTime(){
 		var chooseDate=new Date($('#beginDate').val());
 		chooseDate=chooseDate.setDate(chooseDate.getDate()+1);
 		var modifyTime=new Date(chooseDate);
 		$('#endDate').val(modifyTime.getFullYear()+"-"+((modifyTime.getMonth()+1)>=10?(modifyTime.getMonth()+1):"0"+(modifyTime.getMonth()+1))+"-"+(modifyTime.getDate()>=10?modifyTime.getDate():'0'+modifyTime.getDate())+' '+(modifyTime.getHours()>=10?modifyTime.getHours():'0'+modifyTime.getHours())+':'+(modifyTime.getMinutes()>=10?modifyTime.getMinutes():'0'+modifyTime.getMinutes())+':'+(modifyTime.getSeconds()>=10?modifyTime.getSeconds():'0'+modifyTime.getSeconds()));
-	}
+	} */
 (function(H) {
 		H.Chart.prototype.downloadCSV = function() {
 			var rows = this.getDataRows(true);