流量统计带表格的导出excel，csv, 第一行标题，时间，最后一行统计，修改活跃IP的详情的标题

src/main/resources/messages/message_en.properties

@@ -1154,8 +1154,8 @@ area_group_manage=Grouping Area Manage
 stream_media_protocol=Stream Media Protocol
 new_link=New Link
 active_link=Close Link
-traffic_ipactive_hour_trend=Active IP TOP10 Trend In Nearly One Hour
+traffic_ipactive_hour_trend=Active IP TOP10 Trend
-traffic_ipactive_hour_max=Active IP TOP10 Maximum In Nearly One Hour
+traffic_ipactive_hour_max=Active IP TOP10 Maximum
 ip_addr=IP
 area_id=Area
 link_num=Link Times

src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp

@@ -84,7 +84,7 @@
     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <spring:message code="export"/>
         <span class="caret"></span>
     </button>
-	    <ul class="dropdown-menu" role="menu" style="min-width: 81px;right: -9px;">
+	    <ul class="dropdown-menu" role="menu" style="min-width: 81px;right: -16px;">
 	     <li><a class="btn export-btn" data-type="xlsx" id="export-btn"><i class="fa fa-download"> </i> excel </a><li>
 		 <li><a class="btn export-btn" data-type="csv" id="export-btn"><i class="fa fa-download"> </i> csv &nbsp;&nbsp;&nbsp;</a><li>
 	    </ul>
@@ -95,7 +95,7 @@
        <table id="contentTable" class="table table-active table-striped table-bordered table-condensed text-nowrap">
          <thead>
            <tr>
-             <th class="tl"><spring:message code="app"/></th>
+             <th class="tl"><spring:message code="App"/></th>
              <th class="tl"><spring:message code="link_num"/></th>
              <th class="tl"><spring:message code="percentage"/> (<spring:message code="link_num"/>)</th>
              <th class="tl"><spring:message code="packets"/></th>
@@ -116,6 +116,7 @@
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
 <script type="text/javascript">
 $(document).ready(function(){
+	loading();
 	var starth=$("#beginDateh").val();
 	var endh=$("#endDateh").val();
 	$("#beginDate").val(starth);
@@ -185,6 +186,14 @@ function ajaxAppList(start,end){
 $(".export-btn").click(function(){
 	var dataType = $(this).attr("data-type");
 	getPageData(1,999999);// 设置导出页条数
+	var start=$("#beginDate").val();
+	var end=$("#endDate").val();
+	var	htmlTitle="";
+	htmlTitle+="<tr class='tr-title'>";
+	htmlTitle+= "<th class='tc' colspan='1'>"+"<spring:message code='App'/>"+"</th>";
+	htmlTitle+= "<th class='tc' colspan='2'>"+start+"--"+ end +"</th>";
+	htmlTitle+="</tr>"
+   	$("#contentTable thead").prepend(htmlTitle);
 	var te = $("#contentTable").tableExport({
 		headings:true,
 		footers:true,
@@ -194,6 +203,7 @@ $(".export-btn").click(function(){
 	});
 	$("#myexport").click();
 	$("caption").remove();
+	$(".tr-title").remove();
 	getPageData(1,10); 
 });
 /**
@@ -231,8 +241,7 @@ function htmlData(fileDataS){
     }else{
         $('.none-data').hide();
         $('.M-box').show();
-        var start=$("#beginDate").val();
+    	
-    	var end=$("#endDate").val();
         $.each(fileDataS,function (index,data){
         	if(data!=null){
         	var totalLink = data.totalLink;
@@ -267,7 +276,7 @@ function htmlData(fileDataS){
                	html+= "<td class='tc'>"+Math.round(totalPackets*100)/100+"</td>";
                	html+= "<td class='tc'>"+"100%"+"</td>";
                	html+= "<td class='tc'>"+Math.round(totalGByte*100)/100+"</td>";
-               	html+= "<td class='tc'>"+start+"--"+ end +"</td>";
+               	html+= "<td class='tc'>"+"100%"+"</td>";
            		html+="</tr>"
            	}
         	}

src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp

@@ -44,11 +44,11 @@ $(document).ready(function(){
 });
 	//活跃IP一小时间隔五分钟统计
 	function domainTrans(){
+		loading();
 		var beginDate=$("#beginDate").val();
 		var endDate=$("#endDate").val();
 		var entranceId=$("#entranceId").val();
 		var domain=$("#domain").val();
-		loading();
 		$.ajax({
 			url: '${ctx}/dashboard/traffic/ajaxDomainTrans',
 			type : "get" ,
@@ -80,8 +80,6 @@ function showDomainTrans(rs){
 	var xData=new Array();
 		xData=rs[0].statTime;
 	var series=new Array();
-	console.log(rs[0].statTime)
-	console.log(rs[0].count)
 // 	$(rs).each(function(i, d) {
 	series.push({
 		name: ' ',

src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp

@@ -61,7 +61,7 @@
     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <spring:message code="export"/>
         <span class="caret"></span>
     </button>
-	    <ul class="dropdown-menu" role="menu" style="min-width: 81px;right: -9px;">
+	    <ul class="dropdown-menu" role="menu" style="min-width: 81px;right: -16px;">
 	     <li><a class="btn export-btn" data-type="xlsx" id="export-btn"><i class="fa fa-download"> </i> excel </a><li>
 		 <li><a class="btn export-btn" data-type="csv" id="export-btn"><i class="fa fa-download"> </i> csv &nbsp;&nbsp;&nbsp;</a><li>
 	    </ul>
@@ -93,6 +93,7 @@
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
 <script type="text/javascript">
 $(document).ready(function(){
+	loading();
 	var starth=$("#beginDateh").val();
 	var endh=$("#endDateh").val();
 	$("#beginDate").val(starth);
@@ -166,6 +167,14 @@ function ajaxProtocolList(start,end){
 $(".export-btn").click(function(){
 	var dataType = $(this).attr("data-type");
 	getPageData(1,999999);// 设置导出页条数
+	var start=$("#beginDate").val();
+	var end=$("#endDate").val();
+	var	htmlTitle="";
+	htmlTitle+="<tr class='tr-title'>";
+	htmlTitle+= "<th class='tc' colspan='1'>"+"<spring:message code='service'/>"+"</th>";
+	htmlTitle+= "<th class='tc' colspan='2'>"+start+"--"+ end +"</th>";
+	htmlTitle+="</tr>"
+   	$("#contentTable thead").prepend(htmlTitle);
 	var te = $("#contentTable").tableExport({
 		headings:true,
 		footers:true,
@@ -175,6 +184,7 @@ $(".export-btn").click(function(){
 	});
 	$("#myexport").click();
 	$("caption").remove();
+	$(".tr-title").remove();
 	getPageData(1,10); 
 });
 /**
@@ -233,7 +243,6 @@ function htmlData(fileDataS){
                	html+= "<td class='tc'>"+"100%"+"</td>";
                	html+= "<td class='tc'>"+(data.allGByte/1073741824).toFixed(2)+"</td>";
                	html+= "<td class='tc'>"+"100%"+"</td>";
-               	html+= "<td class='tc'>"+start+"--"+ end +"</td>";
            		html+="</tr>"
            	}  
         	}

src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp

@@ -64,7 +64,7 @@
 			    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <spring:message code="export"/>
 			        <span class="caret"></span>
 			    </button>
-				    <ul class="dropdown-menu" role="menu" style="min-width: 81px;right: -9px;">
+				    <ul class="dropdown-menu" role="menu" style="min-width: 81px;right: -16px;">
 				     <li><a class="btn export-btn" data-type="xlsx" id="export-btn"><i class="fa fa-download"> </i> excel </a><li>
 					 <li><a class="btn export-btn" data-type="csv" id="export-btn"><i class="fa fa-download"> </i> csv &nbsp;&nbsp;&nbsp;</a><li>
 				    </ul>
@@ -108,6 +108,7 @@
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting-data.js"></script>
 <script type="text/javascript">
 $(document).ready(function(){
+	loading();
 	var starth=$("#beginDateh").val();
 	var endh=$("#endDateh").val();
 	$("#beginDate").val(starth);
@@ -128,6 +129,14 @@ $(document).ready(function(){
 //导出列表
 $(".export-btn").click(function(){
 	var dataType = $(this).attr("data-type");
+	var start=$("#beginDate").val();
+	var end=$("#endDate").val();
+	var	htmlTitle="";
+	htmlTitle+="<tr class='tr-title'>";
+	htmlTitle+= "<th class='tc' colspan='1'>"+"<spring:message code='traffic_ipactive_hour_max'/>"+"</th>";
+	htmlTitle+= "<th class='tc' colspan='2'>"+start+"--"+ end +"</th>";
+	htmlTitle+="</tr>"
+   	$("#contentTable thead").prepend(htmlTitle);
 	var te = $("#contentTable").tableExport({
 		headings:true,
 		footers:true,
@@ -137,6 +146,7 @@ $(".export-btn").click(function(){
 	});
 	$("#myexport").click();
 	$("caption").remove();
+	$(".tr-title").remove();
 });
 function searchList(){
 	var start=$("#beginDate").val();
@@ -228,13 +238,11 @@ function showIpActiveChart(rs){
 			},  
 			error: function(data, textStatus, errorThrown){
 				closeTip();
-//	 			warning_prompt("获取实时列表数据失败！",1500);
 			},
 			complete:function(XMLHttpRequest,status){//超时设置
 				closeTip();
 			}
 		});
-		 
 	  }
 	//活跃IP一小时统计
 	function ipActiveOneHourList(beginDate,endDate){
@@ -292,7 +300,7 @@ function showIpActiveChart(rs){
                     	html+= "<td class='tc'>"+totalc2sPkt+"</td>";
                     	html+= "<td class='tc'>"+totals2cPkt+"</td>";
                     	html+= "<td class='tc'>"+totalpacket+"</td>";
-                    	html+= "<td class='tc'>"+beginDate+"--"+ endDate +"</td>";
+                		html+= "<td class='tc'>"+"--"+"</td>";
                 		html+="</tr>"
                 	}
 		                $("#tbodyData").append(html);
@@ -304,7 +312,6 @@ function showIpActiveChart(rs){
 			},  
 			error: function(data, textStatus, errorThrown){
 				closeTip();
-//	 			warning_prompt("获取实时列表数据失败！",1500);
 			},
 			complete:function(XMLHttpRequest,status){//超时设置
 				closeTip();

src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp

@@ -45,6 +45,19 @@
 								value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'${endDate}'});"/>
 							</div>
 	                </div>
+		          <%--  <div class="pull-left">	
+		 				  <div class="input-group">
+		                     <div class="input-group-btn">
+								<span class="selectpicker form-control" ><spring:message code="protocol_type"/></span>
+                          	</div>
+                              	<select id="protoType" name="protoType" class="selectpicker form-control" data-max-options="10" data-selected-text-format="count > 2" multiple max-width="100px" data-live-search="true" data-live-search-placeholder="search">
+                              		<option value=""><spring:message code="select"/></option>
+									<c:forEach items="${fns:getCodeList('protocolCode')}" var="dict" >
+										<option value="${dict.code}"><spring:message code="${dict.item}"></spring:message></option>
+									</c:forEach>
+								</select>
+						 </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>
@@ -61,7 +74,7 @@
     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <spring:message code="export"/>
         <span class="caret"></span>
     </button>
-	    <ul class="dropdown-menu" role="menu" style="min-width: 81px;right: -9px;">
+	    <ul class="dropdown-menu" role="menu" style="min-width: 81px;right: -16px;">
 	     <li><a class="btn export-btn" data-type="xlsx" id="export-btn"><i class="fa fa-download"> </i> excel </a><li>
 		 <li><a class="btn export-btn" data-type="csv" id="export-btn"><i class="fa fa-download"> </i> csv &nbsp;&nbsp;&nbsp;</a><li>
 	    </ul>
@@ -93,6 +106,7 @@
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
 <script type="text/javascript">
 $(document).ready(function(){
+	loading();
 	var starth=$("#beginDateh").val();
 	var endh=$("#endDateh").val();
 	$("#beginDate").val(starth);
@@ -114,7 +128,7 @@ $(document).ready(function(){
 	},500000);// 五分钟调用一次
 });
 function searchList(){
-// 	loading();
+	loading();
 	var start=$("#beginDate").val();
 	var end=$("#endDate").val();
 	if(start==''||end==''||end==null||start==null){
@@ -124,14 +138,16 @@ function searchList(){
 	}
 }
 function ajaxProtocolList(start,end){
-// 	loading();
+// 	var protoType=$("#protoType").val();
+	loading();
 	$.ajax({
         url: '${ctx}/dashboard/traffic/protocolList',
         type: 'get',
         dataType: "json",
         data:{"beginDate":start,"endDate":end},
         async:false,
-		timeout:10000,
+		timeout:40000,
+// 		traditional:true,
 		beforeSend:function(){
 			loading();
 		},
@@ -165,6 +181,14 @@ function ajaxProtocolList(start,end){
 $(".export-btn").click(function(){
 	var dataType = $(this).attr("data-type");
 	getPageData(1,999999);// 设置导出页条数
+	var start=$("#beginDate").val();
+	var end=$("#endDate").val();
+	var	htmlTitle="";
+	htmlTitle+="<tr class='tr-title'>";
+	htmlTitle+= "<th class='tc' colspan='1'>"+"<spring:message code='protocol_type'/>"+"</th>";
+	htmlTitle+= "<th class='tc' colspan='2'>"+start+"--"+ end +"</th>";
+	htmlTitle+="</tr>"
+   	$("#contentTable thead").prepend(htmlTitle);
 	var te = $("#contentTable").tableExport({
 		headings:true,
 		footers:true,
@@ -174,6 +198,7 @@ $(".export-btn").click(function(){
 	});
 	$("#myexport").click();
 	$("caption").remove();
+	$(".tr-title").remove();
 	getPageData(1,10); 
 });
 /**
@@ -246,7 +271,7 @@ function htmlData(fileDataS){
             	html+= "<td class='tc'>"+Math.round(totalPackets*100)/100+"</td>";
             	html+= "<td class='tc'>"+"100%"+"</td>";
             	html+= "<td class='tc'>"+Math.round(totalGByte*100)/100+"</td>";
-            	html+= "<td class='tc'>"+start+"--"+ end +"</td>";
+            	html+= "<td class='tc'>"+"100%"+"</td>";
         		html+="</tr>"
         	}
         	}

src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp

@@ -69,7 +69,7 @@
 		                     <div class="input-group-btn">
 								<span class="selectpicker form-control" ><spring:message code="domain_name"/></span>
                           	</div>
-                              	<select id="domain" name="domain" class="selectpicker form-control" data-max-options="50" data-selected-text-format="count > 2" multiple max-width="100px" data-live-search="true" data-live-search-placeholder="search">
+                              	<select id="domain" name="domain" class="selectpicker form-control" data-max-options="10" data-selected-text-format="count > 2" multiple max-width="100px" data-live-search="true" data-live-search-placeholder="search">
                               		<option value=""><spring:message code="select"/></option>
 									<c:forEach items="${domainList}" var="dict" >
 										<option value="${dict.id}"><spring:message code="${dict.domain}"></spring:message></option>
@@ -124,7 +124,7 @@
 					    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <spring:message code="export"/>
 					        <span class="caret"></span>
 					    </button>
-						    <ul class="dropdown-menu" role="menu" style="min-width: 81px;right: -9px;">
+						    <ul class="dropdown-menu" role="menu" style="min-width: 81px;right: -16px;">
 						     <li><a class="btn export-btn" data-type="xlsx" id="export-btn"><i class="fa fa-download"> </i> excel </a><li>
 							 <li><a class="btn export-btn" data-type="csv" id="export-btn"><i class="fa fa-download"> </i> csv &nbsp;&nbsp;&nbsp;</a><li>
 						    </ul>
@@ -168,6 +168,7 @@
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
 	<script type="text/javascript">
 	$(document).ready(function(){
+		loading();
 			var starth = $("#beginDateh").val();
 			var endh = $("#endDateh").val();
 			$("#beginDate").val(starth);
@@ -200,9 +201,9 @@
 			}
 		}
 		function ajaxWebTypeList(start, end) {
+			loading();
 			var domain = $("#domain").val();
 			var entranceId = $("#entranceId").val();
-			loading();
 			$.ajax({
 						url : '${ctx}/dashboard/traffic/websiteList',
 						type : 'get',
@@ -250,6 +251,14 @@
 		$(".export-btn").click(function(){
 			var dataType = $(this).attr("data-type");
 			getPageData(1,999999);// 设置导出页条数
+			var start=$("#beginDate").val();
+			var end=$("#endDate").val();
+			var	htmlTitle="";
+			htmlTitle+="<tr class='tr-title'>";
+			htmlTitle+= "<th class='tc' colspan='1'>"+"<spring:message code='domain_name'/>"+"</th>";
+			htmlTitle+= "<th class='tc' colspan='2'>"+start+"--"+ end +"</th>";
+			htmlTitle+="</tr>"
+		   	$("#contentTable thead").prepend(htmlTitle);
 			var te = $("#contentTable").tableExport({
 				headings:true,
 				footers:true,
@@ -259,6 +268,7 @@
 			});
 			$("#myexport").click();
 			$("caption").remove();
+			$(".tr-title").remove();
 			getPageData(1, 10);
 		});
 		$("#print-btn").click(function() {
@@ -334,7 +344,6 @@
 		            	html+= "<td class='tc'>"+"100%"+"</td>";
 		            	html+= "<td class='tc'>"+totalGbyte+"</td>";
 		            	html+= "<td class='tc'>"+"100%"+"</td>";
-		            	html+= "<td class='tc'>"+start+"--"+ end +"</td>";
 		        		html+="</tr>"
 		        	}
 					}

src/main/webapp/static/pages/css/data_text.css

@@ -4,7 +4,7 @@
     /*overflow-x: hidden;*/
     /* min-width: 1366px; */
 /*     background-color: #303030; */
-    padding-top: 15px;
+    padding-top: 18px;
 /*     padding-bottom: 10px; */
     background: url("../img/dashboard-back.jpg")no-repeat;
     width:100%;