From f4f74a686be2afe72bb545f5f08161e09c340349 Mon Sep 17 00:00:00 2001
From: tanghao <default@DESKTOP-7FEGRP2>
Date: Fri, 4 Jan 2019 19:03:47 +0800
Subject: [PATCH] merge

---
 .../views/dashboard/trafficAppTypeList.jsp    | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
index 7e03dfc07..0f581eb8d 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
@@ -42,22 +42,18 @@
                               <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="${beginDate}" 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(7),dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'endDate\')||currentTime()}'});"/>
-						</div>
+                              <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="setStartTime('#beginDate','#endDate',7,'d','yyyy-MM-dd hh:mm:ss',false)"/>
+                              	</div>
                     		</div>
 						<div class="pull-left">	
 		 				  <div class="input-group">
 		                              <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({el:'endDate',dateFmt:'yyyy-MM-dd HH:mm:ss',minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:getMaxDate(7) })"/>
-						</div>
+                              	<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="setEndTime('#beginDate','#endDate',7,'d','yyyy-MM-dd hh:mm:ss',false)"/>
+							</div>
                     		</div>
 						<div class="pull-left">	
 		 				  <div class="input-group">
@@ -67,8 +63,9 @@
                               	<select id="appType" name="appType" class="selectpicker form-control input-medium" data-max-options="10" data-selected-text-format="count > 2" multiple  data-live-search="true" data-live-search-placeholder="search">
 									<option value=""><spring:message code="select"/></option>
 									<c:forEach items="${fns:getCodeList('appCode')}" var="dict" >
-										<option value="${dict.code}"><spring:message code="${dict.item}"></spring:message></option>
-									</c:forEach>
+										<c:if test="${dict.code!=0}">
+											<option value="${dict.code}"><spring:message code="${dict.item}"></spring:message></option>
+										</c:if>									</c:forEach>
 								</select>
 						</div>
                     		</div>
@@ -443,6 +440,7 @@ function protocolTypeChart(rs){
 				title: {
 						text: null,
 				},
+				colors:['#EBB093','#f1e5cd','#8F99EF','#DF917E','#CA8099','#8B84B2','#F0AFCA','#E19696','#F3DCA0','#8ED2DE'],
 				plotOptions: {
 						series: {
 							dataLabels: {