From c2a8335c41e77e1e697977995b37fc94b94e3bc5 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@zdjizhi.com>
Date: Wed, 26 Dec 2018 17:05:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E9=87=8F=E7=BB=9F=E8=AE=A1=E6=97=A0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/ntcTotalReportDetailList.jsp    | 19 +++++++++++++++----
 .../dashboard/trafficActionTransList.jsp      | 18 ++++++++++++------
 .../views/dashboard/trafficAppTypeList.jsp    | 18 +++++++++++-------
 .../views/dashboard/trafficBandwidthList.jsp  |  9 +++++++++
 .../views/dashboard/trafficDomainTrans.jsp    |  9 +++++++++
 .../views/dashboard/trafficIpActiveList.jsp   | 18 +++++++++++++++---
 .../views/dashboard/trafficPortActiveList.jsp | 11 ++++++++++-
 .../dashboard/trafficProtocolTypeList.jsp     | 16 ++++++++++------
 .../views/dashboard/trafficWebTypeList.jsp    | 16 ++++++++++------
 9 files changed, 101 insertions(+), 33 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/dashboard/ntcTotalReportDetailList.jsp b/src/main/webapp/WEB-INF/views/dashboard/ntcTotalReportDetailList.jsp
index babcb72d9..fd7c55a67 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/ntcTotalReportDetailList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/ntcTotalReportDetailList.jsp
@@ -80,6 +80,9 @@
 	<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>
+	<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/export-csv.js"></script>
+	<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/no-data-to-display.js"></script>
+	
 	<script type="text/javascript">
 		$(document).ready(function() {
 							var starth = $("#beginDateh").val();
@@ -121,8 +124,15 @@
 									// type: 'area',
 									zoomType : 'x'
 								},
+								noData:{
+					    			style: {//设置字体颜色
+										color: '#413333',
+										fontFamily:'Microsoft YaHei',
+										fontWeight:"unset",
+									},
+					    		},
 								exporting : {
-									filename : 'Action-Trans',
+									filename : '<spring:message code="${searchAction}"></spring:message>'+nowDate.getFullYear()+(nowDate.getMonth()+1)+nowDate.getDate(),
 									scale : 1,
 									sourceWidth : 1280,
 									sourceHeight : 500,
@@ -247,7 +257,7 @@
 				var b = new Array();
 				b.push({
 					type : 'string',
-					value : 'Action-Trans'
+					value : '<spring:message code="${searchAction}"></spring:message>'
 				})
 				b.push({
 					type : "string",
@@ -258,7 +268,7 @@
 				var a = new Array();
 				a.push({
 					type : 'string',
-					value : 'Total'
+					value : '<spring:message code="total"></spring:message>'
 				})
 				var total = total = JSON.parse($("#total").val());
 				a.push({
@@ -267,13 +277,14 @@
 				})
 				xlsxRows.push(a)
 				zipcelx({
-					filename : 'Action-Trans',
+					filename : '<spring:message code="${searchAction}"></spring:message>'+nowDate.getFullYear()+(nowDate.getMonth()+1)+nowDate.getDate(),
 					sheet : {
 						data : xlsxRows
 					}
 				});
 			};
 		}(Highcharts));
+
 	</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp
index 4fe7ecee0..4d967ffea 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp
@@ -63,6 +63,8 @@
 <%-- <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>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/standalone.js"></script>
+<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/no-data-to-display.js"></script>
+
 <script type="text/javascript">
 $(document).ready(function(){
 	var starth=$("#beginDateh").val();
@@ -103,7 +105,7 @@ function showActionTransChart(xData,series){
 			zoomType: 'x'
 		}, 
 		exporting: {
-			filename:'Action-Trans',
+			filename:'<spring:message code="${searchAction}"></spring:message>',
 			scale:1,
 			sourceWidth: 1280,
 			sourceHeight: 500,
@@ -118,6 +120,13 @@ function showActionTransChart(xData,series){
                 }
             }
 		},
+		noData:{
+			style: {//设置字体颜色
+				color: '#413333',
+				fontFamily:'Microsoft YaHei',
+				fontWeight:"unset",
+			},
+		},
 	    title: {
 	        text: null
 	    },
@@ -188,13 +197,10 @@ function showActionTransChart(xData,series){
 					})
 				}else{
 					series.push({
-						name: "Astana",
-						data: []
-					});
-					series.push({
-						name: "Alamty",
+						name: " ",
 						data: []
 					});
+					
 				}
 				
 				showActionTransChart(xData,series);
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
index 60d7c83de..ef254808a 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
@@ -16,7 +16,7 @@
 		cursor: pointer;
 	}
 	.Wdate {
-   		width: 220px !important;
+   		width: 200px !important;
 	}
 </style>
 <body>
@@ -114,6 +114,8 @@
 <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/offline-exporting.js"></script>
+<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/no-data-to-display.js"></script>
+
 <script type="text/javascript">
 $(document).ready(function(){
 	loading();
@@ -199,7 +201,7 @@ $(".export-btn").click(function(){
 		headings:true,
 		footers:true,
 		formats:[dataType],
-		fileName:"APP",
+		fileName:"<spring:message code='App'></spring:message>",
 		bootstrap:false
 	});
 	$("#myexport").click();
@@ -332,15 +334,17 @@ function protocolTypeChart(rs){
 	    		},
 				exporting: {
 	    			allowHTML:true,
-	    			filename:"App",
+	    			filename:"<spring:message code='App'></spring:message>",
 	    			scale:1,
 	    			sourceWidth: 1280,
 	    			sourceHeight: 500,
 	    		},
-				noData:{
-					style: {//设置字体颜色
-						color: '#000',
-					},	
+	    		noData:{
+	    			style: {//设置字体颜色
+						color: '#413333',
+						fontFamily:'Microsoft YaHei',
+						fontWeight:"unset",
+					},
 	    		},
 // 				legend:{// 底部平鋪图例
 // 					width:1280,
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
index 5b0d9601d..051842f8f 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
@@ -85,6 +85,8 @@
 <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>
+<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/no-data-to-display.js"></script>
+
 <script type="text/javascript">
 $(document).ready(function(){
 	loading();
@@ -254,6 +256,13 @@ function showBandwidthChart(id,unitType,xdata,ydata,title){
 				x: 5
 			}
 		},
+		noData:{
+			style: {//设置字体颜色
+				color: '#413333',
+				fontFamily:'Microsoft YaHei',
+				fontWeight:"unset",
+			},
+		},
 	    exporting: {
 			filename:'Bandwidth',
 			scale:1,
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp
index d908074b5..020f5627d 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp
@@ -38,6 +38,8 @@
 <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>
+<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/no-data-to-display.js"></script>
+
 <script type="text/javascript">
 $(document).ready(function(){
 	domainTrans();
@@ -107,6 +109,13 @@ function showDomainTrans(xData,series){
                 }
             }
 		},
+		noData:{
+			style: {//设置字体颜色
+				color: '#413333',
+				fontFamily:'Microsoft YaHei',
+				fontWeight:"unset",
+			},
+		},
 	    title: {
 	        text: domainName
 	    },
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
index 9f76549e5..8bc1272ee 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
@@ -93,7 +93,7 @@
 							
 						</tbody>
 					</table>
-<%-- 					<div class="page">${page}</div> --%>
+						<div class="none-data" ><i class="fa fa-warning font-red-flamingo"></i>&nbsp;&nbsp;<spring:message code="noneData"/></div>
 				</div>
 			</div>
 		</div>
@@ -109,6 +109,8 @@
 <%-- <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>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/standalone.js"></script>
+<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/no-data-to-display.js"></script>
+
 <script type="text/javascript">
 $(document).ready(function(){
 	loading();
@@ -145,7 +147,7 @@ $(".export-btn").click(function(){
 		headings:true,
 		footers:true,
 		formats:[dataType],
-		fileName:"IP-Active-2",
+		fileName:"<spring:message code='traffic_ipactive_hour_max'></spring:message>",
 		bootstrap:false
 	});
 	$("#myexport").click();
@@ -172,7 +174,7 @@ function showIpActiveChart(xData,series){
 			zoomType: 'x'
 		},
 		exporting: {
-			filename:'IP-Active',
+			filename:'<spring:message code="traffic_ipactive_hour_trend"></spring:message>',
 			scale:1,
 			sourceWidth: 1280,
 			sourceHeight: 500,
@@ -198,6 +200,13 @@ function showIpActiveChart(xData,series){
 					text: 'time',
 					align:'high',
 			},
+		},
+		noData:{
+			style: {//设置字体颜色
+				color: '#413333',
+				fontFamily:'Microsoft YaHei',
+				fontWeight:"unset",
+			},
 		},
 		 plotOptions: {
 		        series: {
@@ -286,6 +295,7 @@ function showIpActiveChart(xData,series){
 			timeout:50000,
 			success:function (data) {
 				if(data!=null&&data.length>0){
+					$('.none-data').hide();
 					var totalc2sByte= 0;
 					var totals2cByte= 0;
 					var totalByte= 0;
@@ -335,6 +345,8 @@ function showIpActiveChart(xData,series){
 						
 					   })
 					
+				}else{
+					$('.none-data').show();
 				}
 				closeTip();
 			},  
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficPortActiveList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficPortActiveList.jsp
index fcd06f4a4..ccc2af0a0 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficPortActiveList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficPortActiveList.jsp
@@ -60,6 +60,8 @@
 <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>
+<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/no-data-to-display.js"></script>
+
 <script type="text/javascript">
 $(document).ready(function(){
 	var starth=$("#beginDateh").val();
@@ -112,7 +114,7 @@ function showPortActiveChart(xData,series){
 			zoomType: 'x'
 		}, 
 		exporting: {
-			filename:'Port-Active',
+			filename:'<spring:message code="active_port"></spring:message>',
 			scale:1,
 			sourceWidth: 1280,
 			sourceHeight: 500,
@@ -127,6 +129,13 @@ function showPortActiveChart(xData,series){
                 }
             }
 		},
+		noData:{
+			style: {//设置字体颜色
+				color: '#413333',
+				fontFamily:'Microsoft YaHei',
+				fontWeight:"unset",
+			},
+		},
 		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 f85aed5b8..35bd75e93 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp
@@ -104,6 +104,8 @@
 <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/offline-exporting.js"></script>
+<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/no-data-to-display.js"></script>
+
 <script type="text/javascript">
 $(document).ready(function(){
 	loading();
@@ -193,7 +195,7 @@ $(".export-btn").click(function(){
 		headings:true,
 		footers:true,
 		formats:[dataType],
-		fileName:"Protocol",
+		fileName:"<spring:message code='protocol_type'></spring:message>",
 		bootstrap:false
 	});
 	$("#myexport").click();
@@ -327,15 +329,17 @@ function protocolTypeChart(rs){
 	    		},
 				exporting: {
 	    			allowHTML:true,
-	    			filename:"Protocol",
+	    			filename:"<spring:message code='protocol_type'></spring:message>",
 	    			scale:1,
 	    			sourceWidth: 1280,
 	    			sourceHeight: 500,
 	    		},
-				noData:{
-					style: {//设置字体颜色
-						color: '#000',
-					},	
+	    		noData:{
+	    			style: {//设置字体颜色
+						color:'#413333',
+						fontWeight:"unset",
+						fontFamily:'Microsoft YaHei',
+					},
 	    		},
 // 				legend:{// 底部平鋪图例
 // 					width:1280,
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
index 8596102fa..6e9e9c892 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
@@ -166,6 +166,8 @@
 <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/offline-exporting.js"></script>
+<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/no-data-to-display.js"></script>
+
 	<script type="text/javascript">
 	$(document).ready(function(){
 		loading();
@@ -261,7 +263,7 @@
 				headings:true,
 				footers:true,
 				formats:[dataType],
-				fileName:"Domain",
+				fileName:"<spring:message code='domain_name'></spring:message>",
 				bootstrap:false
 			});
 			$("#myexport").click();
@@ -416,15 +418,17 @@ function webTypeChart(rs){
 	    		},
 				exporting: {
 	    			allowHTML:true,
-	    			filename:"Domain",
+	    			filename:"<spring:message code='domain_name'></spring:message>",
 	    			scale:1,
 	    			sourceWidth: 1280,
 	    			sourceHeight: 500,
 	    		},
-				noData:{
-					style: {//设置字体颜色
-						color: '#000',
-					},	
+	    		noData:{
+	    			style: {//设置字体颜色
+						color: '#413333',
+						fontFamily:'Microsoft YaHei',
+						fontWeight:"unset",
+					},
 	    		},
 // 				legend:{// 底部平鋪图例
 // 					width:1280,