修复打印字体不显示问题以及格式化时间展示

2019-01-03 18:11:00 +08:00
parent 3c28bb7514
commit f7795f7172
10 changed files with 188 additions and 26 deletions
--- a/src/main/webapp/WEB-INF/views/dashboard/ntcTotalReportDetailList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/ntcTotalReportDetailList.jsp
@@ -190,6 +190,18 @@
 									},
 									min:0
 								},
+								tooltip: {
+									dateTimeLabelFormats: {
+										millisecond: '%Y-%m-%d %H:%M:%S',
+										second: '%Y-%m-%d %H:%M:%S',
+										minute: '%Y-%m-%d %H:%M:%S',
+										hour: '%Y-%m-%d %H:%M:%S',
+										day: '%Y-%m-%d %H:%M:%S',
+										week: '%Y-%m-%d %H:%M:%S',
+										month: '%Y-%m-%d %H:%M:%S',
+										year: '%Y-%m-%d %H:%M:%S'
+									}
+								},
 								credits : {//是否有highcharts水印
 									enabled : false
 								},
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp
@@ -162,6 +162,18 @@ function showActionTransChart(xData,series){
 	        },
 	        min:0
 	    },
+	    tooltip: {
+			dateTimeLabelFormats: {
+				millisecond: '%Y-%m-%d %H:%M:%S',
+				second: '%Y-%m-%d %H:%M:%S',
+				minute: '%Y-%m-%d %H:%M:%S',
+				hour: '%Y-%m-%d %H:%M:%S',
+				day: '%Y-%m-%d %H:%M:%S',
+				week: '%Y-%m-%d %H:%M:%S',
+				month: '%Y-%m-%d %H:%M:%S',
+				year: '%Y-%m-%d %H:%M:%S'
+			}
+		},
 	    credits:{//是否有highcharts水印
 	        enabled:false
 	    },
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
@@ -449,7 +449,17 @@ function protocolTypeChart(rs){
 			    },
 			    tooltip: {
 					headerFormat: '{series.name}<br>',
-					pointFormat: '{point.name}: <b>{point.percentage:.2f}%</b>'
+					pointFormat: '{point.name}: <b>{point.percentage:.2f}%</b>',
+					dateTimeLabelFormats: {
+						millisecond: '%Y-%m-%d %H:%M:%S',
+						second: '%Y-%m-%d %H:%M:%S',
+						minute: '%Y-%m-%d %H:%M:%S',
+						hour: '%Y-%m-%d %H:%M:%S',
+						day: '%Y-%m-%d %H:%M:%S',
+						week: '%Y-%m-%d %H:%M:%S',
+						month: '%Y-%m-%d %H:%M:%S',
+						year: '%Y-%m-%d %H:%M:%S'
+					}
 				},
 				series: [{
 						name: "App",
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp
@@ -158,6 +158,18 @@ function showDomainTrans(xData,series){
 	    legend: {
 	    	enabled:false
 	    },
+	    tooltip: {
+			dateTimeLabelFormats: {
+				millisecond: '%Y-%m-%d %H:%M:%S',
+				second: '%Y-%m-%d %H:%M:%S',
+				minute: '%Y-%m-%d %H:%M:%S',
+				hour: '%Y-%m-%d %H:%M:%S',
+				day: '%Y-%m-%d %H:%M:%S',
+				week: '%Y-%m-%d %H:%M:%S',
+				month: '%Y-%m-%d %H:%M:%S',
+				year: '%Y-%m-%d %H:%M:%S'
+			}
+		},
 	    plotOptions: {
 	        series: {
 	        	lineWidth:1,
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
@@ -250,8 +250,19 @@ function showIpActiveChart(xData,series){
 		        }
 		    },
 		tooltip: {
-	        pointFormat: '<b><spring:message code="ip"/>:</b>{series.name}  <b><spring:message code="count"/>:</b>{point.y}<br/>'
-	    },
+	        pointFormat: '<b><spring:message code="ip"/>:</b>{series.name}  <b><spring:message code="count"/>:</b>{point.y}<br/>',
+   			dateTimeLabelFormats: {
+   				millisecond: '%Y-%m-%d %H:%M:%S',
+   				second: '%Y-%m-%d %H:%M:%S',
+   				minute: '%Y-%m-%d %H:%M:%S',
+   				hour: '%Y-%m-%d %H:%M:%S',
+   				day: '%Y-%m-%d %H:%M:%S',
+   				week: '%Y-%m-%d %H:%M:%S',
+   				month: '%Y-%m-%d %H:%M:%S',
+   				year: '%Y-%m-%d %H:%M:%S'
+   			}
+	    		
+		},
 	    yAxis: {
 	        title: {
 	            text: 'bytes'
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficPortActiveList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficPortActiveList.jsp
@@ -188,6 +188,18 @@ function showPortActiveChart(xData,series){
 	            text: 'bytes'
 	        }
 	    },
+	    tooltip: {
+			dateTimeLabelFormats: {
+				millisecond: '%Y-%m-%d %H:%M:%S',
+				second: '%Y-%m-%d %H:%M:%S',
+				minute: '%Y-%m-%d %H:%M:%S',
+				hour: '%Y-%m-%d %H:%M:%S',
+				day: '%Y-%m-%d %H:%M:%S',
+				week: '%Y-%m-%d %H:%M:%S',
+				month: '%Y-%m-%d %H:%M:%S',
+				year: '%Y-%m-%d %H:%M:%S'
+			}
+		},
 	    credits:{//是否有highcharts水印
 	        enabled:false
 	    },
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp
@@ -442,8 +442,18 @@ function protocolTypeChart(rs){
 			    },
 			    tooltip: {
 					headerFormat: '{series.name}<br>',
-					pointFormat: '{point.name}: <b>{point.percentage:.2f}%</b>'
-				},
+					pointFormat: '{point.name}: <b>{point.percentage:.2f}%</b>',
+					dateTimeLabelFormats: {
+						millisecond: '%Y-%m-%d %H:%M:%S',
+						second: '%Y-%m-%d %H:%M:%S',
+						minute: '%Y-%m-%d %H:%M:%S',
+						hour: '%Y-%m-%d %H:%M:%S',
+						day: '%Y-%m-%d %H:%M:%S',
+						week: '%Y-%m-%d %H:%M:%S',
+						month: '%Y-%m-%d %H:%M:%S',
+						year: '%Y-%m-%d %H:%M:%S'
+					}
+			    },
 				series: [{
 						name: "Protocol",
 						colorByPoint: true,
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
@@ -535,7 +535,17 @@ function webTypeChart(rs){
 			    },
 			    tooltip: {
 					headerFormat: '{series.name}<br>',
-					pointFormat: '{point.name}: <b>{point.percentage:.2f}%</b>'
+					pointFormat: '{point.name}: <b>{point.percentage:.2f}%</b>',
+					dateTimeLabelFormats: {
+						millisecond: '%Y-%m-%d %H:%M:%S',
+						second: '%Y-%m-%d %H:%M:%S',
+						minute: '%Y-%m-%d %H:%M:%S',
+						hour: '%Y-%m-%d %H:%M:%S',
+						day: '%Y-%m-%d %H:%M:%S',
+						week: '%Y-%m-%d %H:%M:%S',
+						month: '%Y-%m-%d %H:%M:%S',
+						year: '%Y-%m-%d %H:%M:%S'
+					}
 				},
 				series: [{
 						name: "Domain",