From 23a29ad457afd37a00800727dcdaacc336e20f9f Mon Sep 17 00:00:00 2001
From: tanghao <default@DESKTOP-7FEGRP2>
Date: Fri, 4 Jan 2019 19:09:31 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=B5=81=E9=87=8F=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20=E8=B7=9F=E6=97=A5=E5=BF=97=E7=AD=89=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=97=B6=E9=97=B4=E6=96=B9=E6=B3=95=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=202.=E4=BF=AE=E5=A4=8D2=E7=BA=A7=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=90=8E=20=E5=AD=97=E4=BD=93=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E5=8F=98=E7=99=BD=203.=E4=BC=98=E5=8C=96=E9=9D=A2?=
 =?UTF-8?q?=E7=A7=AF=E5=9B=BE=E9=A2=9C=E8=89=B2=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/ntcTotalReportDetailList.jsp    | 19 +++++---------
 .../dashboard/trafficActionTransList.jsp      | 15 +++++------
 .../views/dashboard/trafficBandwidthList.jsp  | 13 ++++------
 .../dashboard/trafficHttpStatisticList.jsp    | 14 +++++-----
 .../views/dashboard/trafficIpActiveList.jsp   | 26 +++++++++----------
 .../views/dashboard/trafficPortActiveList.jsp | 21 ++++++---------
 .../dashboard/trafficProtocolTypeList.jsp     | 13 +++++-----
 .../views/dashboard/trafficWebTypeList.jsp    | 22 +++++-----------
 .../highcharts/js/offline-exporting-modify.js |  8 ------
 9 files changed, 58 insertions(+), 93 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/dashboard/ntcTotalReportDetailList.jsp b/src/main/webapp/WEB-INF/views/dashboard/ntcTotalReportDetailList.jsp
index b9282bb93..57abbd3bf 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/ntcTotalReportDetailList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/ntcTotalReportDetailList.jsp
@@ -33,11 +33,9 @@
 								<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(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">
@@ -45,13 +43,9 @@
 								<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\',{d:7})}'});" /> -->
-							<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">
@@ -152,6 +146,7 @@
 										}
 									}
 								},
+								colors:['#e5e3cd','#f1e5cd','#f3ebdf','#f3f7f1','#F6DDD0','#FAF0D5','#F1CFC7','#F8DCE8','#CEEBF1','#CED3F8'],
 								title : {
 									text : null
 								},
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp
index d60e57312..0fb40306f 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp
@@ -27,10 +27,8 @@
                               <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({el:'beginDate',onpicked:setTime(7),dateFmt:'yyyy-MM-dd HH:mm:ss',maxDate:'#F{$dp.$D(\'endDate\')||currentTime()}' })" />
+                              <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">
@@ -38,10 +36,8 @@
                               <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\',{d:7})}'});"/> -->
-							<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) })"/>
+                              	<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>
                     		
@@ -70,6 +66,7 @@
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/no-data-to-display.js"></script>
 
 <script type="text/javascript">
+var lineColors=['#a9d4cf','#eecf8d','#f1aa76','#88b876','#E2875C','#EDC86B','#DF8F7E','#F0AEC9','#59BACE','#8E97EE'];
 $(document).ready(function(){
 	var starth=$("#beginDateh").val();
 	var endh=$("#endDateh").val();
@@ -139,6 +136,7 @@ function showActionTransChart(xData,series){
 	    title: {
 	        text: null
 	    },
+	    colors:['#e5e3cd','#f1e5cd','#f3ebdf','#f3f7f1','#F6DDD0','#FAF0D5','#F1CFC7','#F8DCE8','#CEEBF1','#CED3F8'],
 		xAxis: {
 			type:'datetime',
 			dateTimeLabelFormats: {
@@ -226,6 +224,7 @@ function showActionTransChart(xData,series){
 						series.push({
 								name: entrance,
 								data: d.result,
+								lineColor:lineColors[i],
 								marker: {
 						            enabled: false
 						        }
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
index 6474f1ff5..442e0edca 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
@@ -34,20 +34,17 @@
                           	</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({el:'beginDate',onpicked:setTime(1),dateFmt:'yyyy-MM-dd HH:mm:ss',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',1,'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({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>
+                           		<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',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
+							</div>
                     		</div>
                     		
 				<div class="pull-left">
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp
index 9524e375d..4cda0d06a 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp
@@ -32,20 +32,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=""
-								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">
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
index b7a5ea356..c73301ce9 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
@@ -29,26 +29,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="" 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({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'#F{$dp.$D(\'beginDate\',{d:7})}'});" />
-						 -->
-						 	<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">
@@ -124,6 +116,8 @@
 <script src="${ctxStatic }/pages/scripts/jQuery.print.js"></script>
 
 <script type="text/javascript">
+//var lineColors=['#FFD700','#EE7600','#63BFF','#EE9572','#CD6090','#CDCD00','#CD950C','#FFBBFF','#8FBC8F','#79CDCD'];
+var lineColors=['#a9d4cf','#eecf8d','#f1aa76','#88b876','#E2875C','#EDC86B','#DF8F7E','#F0AEC9','#59BACE','#8E97EE'];
 $(document).ready(function(){
 	loading();
 	var starth=$("#beginDateh").val();
@@ -283,6 +277,8 @@ function showIpActiveChart(xData,series){
 		            }
 		        }
 		    },
+		    		colors:['#e5e3cd','#f1e5cd','#f3ebdf','#f3f7f1','#F6DDD0','#FAF0D5','#F1CFC7','#F8DCE8','#CEEBF1','#CED3F8'],
+		    		//	colors:['#FFF8DC','#FFEFDB','#E0FFFF','#FFEBCD','#E6E6FA','#FAFAD2','#FAF0E6','#FFF0F5','#E0EEE0','#E0EEEE'],
 		tooltip: {
 	        pointFormat: '<b><spring:message code="ip"/>:</b>{series.name}  <b><spring:message code="count"/>:</b>{point.y}<br/>',
    			dateTimeLabelFormats: {
@@ -333,6 +329,8 @@ function showIpActiveChart(xData,series){
 						series.push({
 							name: d.ipAddr,
 							data: d.result,
+							lineColor:lineColors[i],
+							lineWidth:1,
 							marker: {
 					            enabled: false
 					        }
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficPortActiveList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficPortActiveList.jsp
index 20aad6b29..aa6566711 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficPortActiveList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficPortActiveList.jsp
@@ -28,25 +28,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="" 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({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'#F{$dp.$D(\'beginDate\',{d:7})}'});"/> -->
-							<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">
@@ -72,6 +65,7 @@
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/standalone.js"></script>
 
 <script type="text/javascript">
+var lineColors=['#a9d4cf','#eecf8d','#f1aa76','#88b876','#E2875C','#EDC86B','#DF8F7E','#F0AEC9','#59BACE','#8E97EE'];
 $(document).ready(function(){
 	var starth=$("#beginDateh").val();
 	var endh=$("#endDateh").val();
@@ -150,6 +144,7 @@ function showPortActiveChart(xData,series){
 				fontWeight:"unset",
 			},
 		},
+		colors:['#e5e3cd','#f1e5cd','#f3ebdf','#f3f7f1','#F6DDD0','#FAF0D5','#F1CFC7','#F8DCE8','#CEEBF1','#CED3F8'],
 		plotOptions: {
 	        line: {
 				 marker: {
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp
index 6d62ecac5..483c2e788 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp
@@ -32,19 +32,17 @@
                               <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(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) })"/>
+	                          	<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">	
@@ -421,6 +419,7 @@ function protocolTypeChart(rs){
 // 	    	    		color:'#61D2F7',
 // 	    	    	},
 // 	    	    },
+				colors:['#EBB093','#f1e5cd','#8F99EF','#DF917E','#CA8099','#8B84B2','#F0AFCA','#E19696','#F3DCA0','#8ED2DE'],
 	    	    legend: {
 // 	    			layout: 'vertical',
 	    			align: 'right',
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
index 4d5c3d830..41ada073d 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
@@ -46,15 +46,9 @@
 							<span class="selectpicker form-control"><spring:message
 									code="begin_date" /></span>
 						</div>
-						<!-- <input id="beginDate" name="beginDate" type="text"
-							readonly="readonly" class="form-control" style="width:166px"
-							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(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">
@@ -62,12 +56,9 @@
 							<span class="selectpicker form-control"><spring:message
 									code="end_date" /></span>
 						</div>
-						<!-- <input id="endDate" name="endDate" type="text" readonly="readonly"
-							class="form-control" value="" style="width:166px"
-							onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'#F{$dp.$D(\'beginDate\',{d:7})}'});"/> -->
-						<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">	
@@ -498,6 +489,7 @@ function webTypeChart(rs){
     	                }
     	            }
 	    		},
+	    		colors:['#EBB093','#f1e5cd','#8F99EF','#DF917E','#CA8099','#8B84B2','#F0AFCA','#E19696','#F3DCA0','#8ED2DE'],
 	    		noData:{
 	    			style: {//设置字体颜色
 						color: '#413333',
diff --git a/src/main/webapp/static/global/plugins/highcharts/js/offline-exporting-modify.js b/src/main/webapp/static/global/plugins/highcharts/js/offline-exporting-modify.js
index ffec23b35..01abfaf54 100644
--- a/src/main/webapp/static/global/plugins/highcharts/js/offline-exporting-modify.js
+++ b/src/main/webapp/static/global/plugins/highcharts/js/offline-exporting-modify.js
@@ -1,11 +1,3 @@
-/*
-Highcharts JS v6.1.0 (2018-04-13)
-Client side exporting module
-
-(c) 2015 Torstein Honsi / Oystein Moseng
-
-License: www.highcharts.com/license
- */
 (function (n) {
 	"object" === typeof module && module.exports ? module.exports = n : n(Highcharts)
 })(function (n) {