From 6567718badd6b2844113d6ddda4e1badf739ade6 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@nismail.iie.ac.cn>
Date: Wed, 14 Nov 2018 19:28:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=BA=E7=BB=9F=E8=AE=A1=E6=97=A0=E6=95=B0=E6=8D=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E6=B5=81=E9=87=8F=E7=BB=9F=E8=AE=A1=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/dashboard/dashBoardIndex.jsp        | 45 +++++++++++--------
 .../views/dashboard/trafficUserBehavior.jsp   | 20 +++++----
 2 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
index 1aa753886..f71f15426 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
@@ -556,13 +556,13 @@ function protocolList(){
 			}else{
 				echart_1(rs);
 			}
-				closeTip();
+				
 		}, 
 		complete:function(XMLHttpRequest,status){//超时设置
 			closeTip();
 		}
 	});
-	 
+	closeTip(); 
   }
 //活跃IP统计
 function ipActiveList(){
@@ -579,13 +579,13 @@ function ipActiveList(){
 				}else{
 					echart_main(rs);
 				}
-					closeTip();
+					
 		}, 
 		complete:function(XMLHttpRequest,status){//超时设置
 			closeTip();
 		}
 	});
-	 
+	closeTip();
   }
 //活跃端口统计
 function portActiveList(){
@@ -597,7 +597,7 @@ function portActiveList(){
 		cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
 		beforeSend: function () {
 			
-			var msg = "Reloading...";
+			var msg = "OnLoading...";
 			var trLen = $("#tbodyDataPort tr").length;
 			if(trLen<=0) {
 				msg = "OnLoading...";
@@ -638,12 +638,13 @@ function portActiveList(){
 						 $("#tbodyDataPort").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'>No Data</td><td></td></tr>");
 					}
 				}
-				closeTip();
+			
 		},
 		complete:function(XMLHttpRequest,status){//超时设置
 			closeTip();
 		}
 	});
+	closeTip();
   }
 
 //app应用类型统计
@@ -661,13 +662,13 @@ function appTypeList(){
 				}else{
 				echart_3(rs);
 			}
-				closeTip();
+				
 		},
 		complete:function(XMLHttpRequest,status){//超时设置
 			closeTip();
 		}
 	});
-	 
+	closeTip();
   }
 //获取终端用户-操作系统列表 左下
 function systemList(){
@@ -679,7 +680,7 @@ function systemList(){
 		cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
 		beforeSend: function () {
 			
-			var msg = "Reloading...";
+			var msg = "OnLoading...";
 			var trLen = $("#tbodyData1 tr").length;
 			if(trLen<=0) {
 				msg = "OnLoading...";
@@ -723,12 +724,13 @@ function systemList(){
 				//终端图-操作系统
 				echart_2(rs.reverse());
 			}
-				closeTip();
+				
 		}, 
 		complete:function(XMLHttpRequest,status){//超时设置
 			closeTip();
 		}
 	});
+	closeTip();
   }
 // 点击操作系统列表右侧显示 浏览器图
 function osClick(osType,obj){
@@ -745,12 +747,13 @@ function osClick(osType,obj){
 		cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
 		success:function (rs) {
 			echart_5(rs.reverse());
-			closeTip();
+			
 		},
 		complete:function(XMLHttpRequest,status){//超时设置
 			closeTip();
 		}
 	});
+	closeTip();
 }
 //点击浏览器列表右侧显示 操作系统图
 function bsClick(bsType,obj){
@@ -765,12 +768,13 @@ function bsClick(bsType,obj){
 		cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
 		success:function (rs) {
 			echart_2(rs.reverse());
-			closeTip();
+			
 		},
 		complete:function(XMLHttpRequest,status){//超时设置
 			closeTip();
 		}
 	});
+	closeTip();
 }
 
 
@@ -784,7 +788,7 @@ function browserList() {
 		cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
 		beforeSend: function () {
 			
-			var msg = "Reloading...";
+			var msg = "OnLoading...";
 			var trLen = $("#tbodyData1 tr").length;
 			if(trLen<=0) {
 				msg = "OnLoading...";
@@ -828,13 +832,13 @@ function browserList() {
 		 		//终端图-浏览器
 				echart_5(rs.reverse());
 			}
-				closeTip();
+				
 		},
 		complete:function(XMLHttpRequest,status){//超时设置
 			closeTip();
 		}
 	});
-	 
+	closeTip();
   }
 //获取http网站table列表
 function websiteList() {
@@ -845,7 +849,7 @@ function websiteList() {
 		dataType:"json",
 		cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
 		beforeSend: function () {
-			var msg = "ReLoading...";
+			var msg = "OnLoading...";
 			var trLen = $("#tbodyData2 tr").length;
 			if(trLen<=0) {
 				msg = "OnLoading...";
@@ -887,12 +891,13 @@ function websiteList() {
 		 	//网站统计图
 			echart_4(rs.reverse());
 			}
-			closeTip();
+			
 		},
 		complete:function(XMLHttpRequest,status){//超时设置
 			closeTip();
 		}
 	});
+	closeTip();
   }
 //点击http网站列表-显示域名图
 function webClick(websiteServiceId,obj){
@@ -909,12 +914,13 @@ function webClick(websiteServiceId,obj){
 		cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
 		success:function (rs) {
 			echart_6(rs);
-			closeTip();
+			
 		},
 		complete:function(XMLHttpRequest,status){//超时设置
 			closeTip();
 		}
 	});
+	closeTip();
 }
 //网站主题
 function topicAndDomainList(){
@@ -927,12 +933,13 @@ function topicAndDomainList(){
 		success:function (rs) {
 			//主题域名流量统计图
 			echart_topic_domain(rs);
-			closeTip();
+			
 		},
 		complete:function(XMLHttpRequest,status){//超时设置
 			closeTip();
 		}
 	});
+	closeTip();
 }
 
 </script>
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp
index f74dc83dd..960f7e098 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp
@@ -281,6 +281,7 @@
 					
 					<div class="httpReqCfg">
 						<div class="row">
+						<c:if test="${!empty accountList}">
 				  			<div class="col-md-1">
 				            <div class=" " style="height: 500px;">
 				                <div class="panel-body" style="max-height:460px;overflow-y:auto;overflow-x:hidden;">
@@ -322,9 +323,7 @@
 				
 										</tbody>
 									</table>
-									<c:if test="${empty accountList}">
-										<div class="none-data"><i class="fa fa-warning font-red-flamingo"></i>&nbsp;&nbsp;<spring:message code="noneData"/></div>
-									</c:if>
+									
 				<!-- 					</div> -->
 				                </div>
 				            </div>
@@ -376,12 +375,16 @@
 				                	</div>
 				            	</div>
 				       	 	</div>
-						</div>
+						</div></c:if>
+						<c:if test="${empty accountList}">
+										<div class="none-data"><i class="fa fa-warning font-red-flamingo"></i>&nbsp;&nbsp;<spring:message code="noneData"/></div>
+						</c:if>
 					</div>
 					</div>
 					<!-- IP -->
 					<div class="httpResCfg">
 						<div class="row">
+						<c:if test="${!empty nasIpList}">
 				  			<div class="col-md-1">
 				           <div class=" " style="height: 500px;">
 				                <div class="panel-body" style="max-height:460px;overflow-y:auto;overflow-x:auto;">
@@ -425,9 +428,7 @@
 				
 										</tbody>
 									</table>
-									<c:if test="${empty nasIpList}">
-										<div class="none-data"><i class="fa fa-warning font-red-flamingo"></i>&nbsp;&nbsp;<spring:message code="noneData"/></div>
-									</c:if>	
+									
 				<!-- 					</div> -->
 				                    </div>
 				                </div>
@@ -481,7 +482,10 @@
 					                    </div>
 				                	</div>
 				            	</div>
-				       	 	</div>
+				       	 	</div></c:if>	
+				       	 	<c:if test="${empty nasIpList}">
+										<div class="none-data"><i class="fa fa-warning font-red-flamingo"></i>&nbsp;&nbsp;<spring:message code="noneData"/></div>
+							</c:if>	
 						</div>
 					</div>
 					</div>