Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git

into develop Conflicts: src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
2019-01-03 15:01:46 +08:00
parent 3fb9b5b159 2312b41035
commit 1e0fc76160
34 changed files with 1851 additions and 381 deletions
--- a/src/main/webapp/WEB-INF/views/dashboard/ntcTotalReportDetailList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/ntcTotalReportDetailList.jsp
@@ -36,7 +36,7 @@
 							<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\')}'});"/>
+								onclick="WdatePicker({onpicked:setTime(7),dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'endDate\')||currentTime()}'});"/>
 						</div>
 					</div>
 					<div class="pull-left">
@@ -45,10 +45,12 @@
 								<span class="selectpicker form-control"><spring:message
 										code="end_date" /></span>
 							</div>
-							<input id="endDate" name="endDate" type="text"
+							<!-- <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})}'});" />
+								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>
 					</div>

@@ -76,7 +78,7 @@
 	</div>
 	<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script>
 	<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting.js"></script>
-	<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script>
+<%-- 	<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script> --%>
 	<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
 	<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting-data.js"></script>
 	<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/standalone.js"></script>
@@ -118,10 +120,11 @@
 		// 局点信息
 		function showActionTransChart(xData,series) {
 			var nowDate=new Date();
+			Highcharts.setOptions({ global: { useUTC: false } }); 
 			var chart = Highcharts.chart('chart',
 							{
 								chart : {
-									// type: 'area',
+									type: 'area',
 									zoomType : 'x'
 								},
 								noData:{
@@ -163,8 +166,16 @@
 								     },
 								}, */
 								xAxis: {
-									type:'category',
-									categories: xData,
+									type:'datetime',
+									dateTimeLabelFormats: {
+										second: '%H:%M:%S',
+										minute: '%H:%M',
+										hour: '%H:%M',
+										day: '%m-%d',
+										week: '%m-%d',
+										month: '%Y-%m',
+										year: '%Y'
+									},
 									title: {
 											text: 'time',
 											align:'high',
@@ -216,16 +227,19 @@
 						var series = new Array();
 						var total = 0;
 						if(rs!=null){
-							$(rs.sum).each(function(i,d) {
+							/* $(rs.sum).each(function(i,d) {
 								total+=d
 							})
-							xData = rs.statTime;
-							data  =rs.sum;
+							xData = rs.statTime; */
+							data  =rs.result;
 						}
-						$("#total").val(JSON.stringify(total));
+						$("#total").val(JSON.stringify(rs.sum));
 						series.push({
 							name: 'sum',
-							data: data
+							data: data,
+							marker: {
+					            enabled: false
+					        }
 						});
 							showActionTransChart(xData,series);
 							closeTip();
@@ -291,9 +305,9 @@
 			H.Chart.prototype.downloadCSV = function() {
 				var rows = this.getDataRows(true);
 				var data=new Array();
-				var total = total = JSON.parse($("#total").val());
+				var total = JSON.parse($("#total").val());
 				$(rows).each(function (i,d){
-					if(d!=null){
+					if(d!=null&&i>0){
 						data.push({
 			                      num1:d[0],
 			                      num2:d[1]
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp
@@ -27,8 +27,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(7),dateFmt:'yyyy-MM-dd HH:mm:ss',maxDate:'#F{$dp.$D(\'endDate\')||currentTime()}' })" />
 						</div>
                    		</div>
 				<div class="pull-left">
@@ -36,8 +38,10 @@
                              <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({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>
                    		</div>
                    		
@@ -58,7 +62,7 @@
 </div>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting.js"></script>
-<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script>
+<%-- <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script>--%>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
 <%-- <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/themes/grid.js"></script> --%>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting-data.js"></script>
@@ -100,9 +104,10 @@ function searchList(){
 // 局点信息
 function showActionTransChart(xData,series){
 	var nowDate=new Date();
+	Highcharts.setOptions({ global: { useUTC: false } }); 
 	var chart = Highcharts.chart('chart', {
 		chart:{
-// 			type: 'area',
+ 			type: 'area',
 			zoomType: 'x'
 		}, 
 		exporting: {
@@ -133,15 +138,23 @@ function showActionTransChart(xData,series){
 	        text: null
 	    },
 		xAxis: {
-			type:'category',
-			categories: xData,
+			type:'datetime',
+			dateTimeLabelFormats: {
+				second: '%H:%M:%S',
+				minute: '%H:%M',
+				hour: '%H:%M',
+				day: '%m-%d',
+				week: '%m-%d',
+				month: '%Y-%m',
+				year: '%Y'
+			},
 			title: {
 					text: 'time',
 					align:'high',
 			},
 			labels: { 
 	             rotation: -45, //倾斜的角度
-	         },
+	        }
 		},
 	    yAxis: {
 	        title: {
@@ -185,10 +198,9 @@ function showActionTransChart(xData,series){
 				var series=new Array();
 				var total=[];
 				if(rs!=null&&rs.length>0){
-					xData=rs[0].statTime;
 					$(rs).each(function(i, d) {
 						total.push(
-								sum(d.count)
+								d.sum
 							)
 						var entrance="";
 						if(d!=null&&d.entranceId==1){
@@ -199,7 +211,10 @@ function showActionTransChart(xData,series){
 						}
 						series.push({
 								name: entrance,
-								data: d.count
+								data: d.result,
+								marker: {
+						            enabled: false
+						        }
 						});
 					})
 				}else{
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
@@ -42,8 +42,12 @@
                              <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="${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>
                    		</div>
 						<div class="pull-left">	
@@ -52,7 +56,7 @@
 								<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="${endDate}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'#F{$dp.$D(\'beginDate\',{d:7})}'});"/>
+							value="" onclick="WdatePicker({el:'endDate',dateFmt:'yyyy-MM-dd HH:mm:ss',minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:getMaxDate(7) })"/>
 						</div>
                    		</div>
 						<div class="pull-left">	
@@ -115,7 +119,7 @@
 </div>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting.js"></script>
-<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script>
+<%-- <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script>--%>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/no-data-to-display.js"></script>
 <script src="${ctxStatic }/pages/scripts/jQuery.print.js"></script>
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
@@ -263,8 +263,8 @@ function changeBandwidth(unitType,beginDate,endDate){

 /* 网络带宽时间维度趋势图 */
 function showBandwidthChart(id,unitType,xdata,ydata,title){
-	var nowDate=new Date();
-	Highcharts.setOptions({ global: { useUTC: false } }); 
+	var nowDate=new Date();
+	Highcharts.setOptions({ global: { useUTC: false } });
 	var chart = Highcharts.chart(id, {
 		chart:{
 			type: 'area',
@@ -386,7 +386,7 @@ function showBandwidthChart(id,unitType,xdata,ydata,title){
 			}
 		}, */
 	    series:ydata
-	});
+	});
 }
 (function(H) {
 	  H.Chart.prototype.downloadXLS = function() {
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.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(7),dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'endDate\')||currentTime()}'});"/>
 						</div>
                    		</div>
 				<div class="pull-left">
@@ -42,7 +44,7 @@
 						<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})}'});"/>
+							value="" onclick="WdatePicker({el:'endDate',dateFmt:'yyyy-MM-dd HH:mm:ss',minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:getMaxDate(7) })"/>
 						</div>
                    		</div>
                    		
@@ -92,7 +94,7 @@
 </div>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting.js"></script>
-<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script>
+<%-- <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script>--%>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
 <script src="${ctxStatic }/pages/scripts/jQuery.print.js"></script>
 <script type="text/javascript">
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
@@ -29,18 +29,26 @@
                              <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"
+                              	<!-- <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\')}'});" />
-						</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>
                    		</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" 
+                              <!-- 	<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})}'});" />
-						</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>
                    		</div>
                    		
 				<div class="pull-left">
@@ -107,7 +115,7 @@
 <script src="${ctxStatic }/global/plugins/tableExport-3.3.13/tableexport.js"></script>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting.js"></script>
-<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script>
+<%-- <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script>--%>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
 <%-- <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/themes/grid.js"></script> --%>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting-data.js"></script>
@@ -179,9 +187,10 @@ function searchList(){

 function showIpActiveChart(xData,series){
 	var nowDate=new Date();
+	Highcharts.setOptions({ global: { useUTC: false } }); 
 	var chart = Highcharts.chart('chart', {
 		chart:{
-			//type: 'area',
+			type: 'area',
 			zoomType: 'x'
 		},
 		exporting: {
@@ -206,12 +215,20 @@ function showIpActiveChart(xData,series){
 	    },
 		xAxis: {
 			//tickInterval:tickInterval,
-			type:'category',
-			categories: xData,
+			type:'datetime',
+			dateTimeLabelFormats: {
+				second: '%H:%M:%S',
+				minute: '%H:%M',
+				hour: '%H:%M',
+				day: '%m-%d',
+				week: '%m-%d',
+				month: '%Y-%m',
+				year: '%Y'
+			},
 			title: {
 					text: 'time',
 					align:'high',
-			},
+			}
 		},
 		noData:{
 			style: {//设置字体颜色
@@ -266,16 +283,17 @@ function showIpActiveChart(xData,series){
 				var xData=new Array();
 				var series=new Array();
 				if(rs!=null&&rs.length>0){
-					xData=rs[0].statTime;
 					$(rs).each(function(i, d) {
-						total.push(
-							sum(d.linkNum)
-						)
-					series.push({
-						name: d.ipAddr,
-						data: d.linkNum
-					});
-					})
+						total.push(d.sum)
+						series.push({
+							name: d.ipAddr,
+							data: d.result,
+							marker: {
+					            enabled: false
+					        }
+						});
+					}) 
+					console.log(rs)
 				}else{
 					series.push({
 						name: " ",
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficPortActiveList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficPortActiveList.jsp
@@ -28,18 +28,25 @@
                              <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"
+                              	<!-- <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\')}'});"/>
-						</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>
                    		</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})}'});"/>
-						</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>
                    		</div>
                    		
 				<div class="pull-left">
@@ -57,7 +64,7 @@
 <script src="${ctxStatic }/global/plugins/tableExport-3.3.13/tableexport.js"></script>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting.js"></script>
-<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script>
+<%-- <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script>--%>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
 <%-- <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/themes/grid.js"></script> --%>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting-data.js"></script>
@@ -111,9 +118,10 @@ function searchList(){

 function showPortActiveChart(xData,series){
 	var nowDate=new Date();
+	Highcharts.setOptions({ global: { useUTC: false } }); 
 	var chart = Highcharts.chart('chart', {
 		chart:{
-// 			type: 'area',
+ 			type: 'area',
 			zoomType: 'x'
 		}, 
 		exporting: {
@@ -160,8 +168,16 @@ function showPortActiveChart(xData,series){
 	        text: null
 	    },
 		xAxis: {
-			type:'category',
-			categories: xData,
+			type:'datetime',
+			dateTimeLabelFormats: {
+				second: '%H:%M:%S',
+				minute: '%H:%M',
+				hour: '%H:%M',
+				day: '%m-%d',
+				week: '%m-%d',
+				month: '%Y-%m',
+				year: '%Y'
+			},
 			title: {
 					text: 'time',
 					align:'high',
@@ -199,14 +215,16 @@ function showPortActiveChart(xData,series){
 					var series=new Array();
 					var total = [];
 				if(rs!=null&&rs.length>0){
-					xData=rs[0].statTime;
 					$(rs).each(function(i, d) {
 						total.push(
-								sum(d.sum)
+								d.sum
 							)
 						series.push({
 							name: d.port,
-							data: d.sum
+							data: d.result,
+							marker: {
+					            enabled: false
+					        }
 						});
 					})
 				}else{
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.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(7),dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'endDate\')||currentTime()}'});"/>
 					</div>
                  </div>
 					<div class="pull-left">
@@ -42,7 +44,7 @@
 							<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})}'});"/>
+							value="" onclick="WdatePicker({el:'endDate',dateFmt:'yyyy-MM-dd HH:mm:ss',minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:getMaxDate(7) })"/>
 							</div>
 	                </div>
 		           <div class="pull-left">	
@@ -105,7 +107,7 @@
 </div>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting.js"></script>
-<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script>
+<%-- <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script>--%>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/no-data-to-display.js"></script>
 <script src="${ctxStatic }/pages/scripts/jQuery.print.js"></script>
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
@@ -46,10 +46,14 @@
 							<span class="selectpicker form-control"><spring:message
 									code="begin_date" /></span>
 						</div>
-						<input id="beginDate" name="beginDate" type="text"
+						<!-- <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\')}'});"/>
+							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>
 				</div>
 				<div class="pull-left">
@@ -58,9 +62,11 @@
 							<span class="selectpicker form-control"><spring:message
 									code="end_date" /></span>
 						</div>
-						<input id="endDate" name="endDate" type="text" readonly="readonly"
+						<!-- <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})}'});"/>
+							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>
 				</div>

@@ -162,7 +168,7 @@
 	</div>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting.js"></script>
-<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script>
+<%-- <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script>--%>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/no-data-to-display.js"></script>
 <script src="${ctxStatic }/pages/scripts/jQuery.print.js"></script>