From c90d2e7cc27f800f6989a0c63b5412545c4c4344 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@nismail.iie.ac.cn>
Date: Thu, 15 Nov 2018 16:19:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BB=E8=B7=83ip=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=A0=B7=E5=BC=8F=EF=BC=8C=E5=AF=BC=E5=87=BA=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E6=94=B9=E4=B8=BAjs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp     | 6 +++---
 .../WEB-INF/views/dashboard/trafficIpActiveList.jsp       | 8 ++++----
 .../WEB-INF/views/dashboard/trafficUserBehavior.jsp       | 7 +++++--
 src/main/webapp/static/pages/css/data_text.css            | 2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
index b8507b7ab..da48d31cf 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
@@ -706,7 +706,7 @@ function systemList(){
 	
 				   $(rs).each(function(i, itemObj) {
 					   var os="";
-					   if(itemObj.osType!=null){
+					   if(typeof(itemObj.osType)!="undefined"&&itemObj.osType!=null){
 						   os=(itemObj.osType).toString();
 						   if(os.length>18){
 							   os=os.substring(0,18);
@@ -822,7 +822,7 @@ function browserList() {
 			   if(n>0){
 				   $(rs).each(function(i, itemObj) {
 					   var bs="";
-					   if(itemObj.bsType!=null){
+					   if(typeof(itemObj.bsType)!="undefined"&&itemObj.bsType!=null){
 						   bs=(itemObj.bsType).toString();
 						   if(bs.length>18){
 							   bs=bs.substring(0,18);
@@ -890,7 +890,7 @@ function websiteList() {
 			   if(n>0){
 				   $(rs).each(function(i, itemObj) {
 					   var web="";
-					   if(itemObj.websiteService!=null){
+					   if(typeof(itemObj.websiteService)!="undefined"&&itemObj.websiteService!=null){
 							   web=(itemObj.websiteService).toString();
 						   if(web.length>18){
 							   web=web.substring(0,18);
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
index 8cae16ef3..4b1f137c2 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
@@ -11,8 +11,8 @@
 
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-	<button type="button" class="btn btn-default" onClick="javascript:window.location='${ctx}/dashboard/ipActiveList'"><spring:message code="refresh"/></button>
-	<button type="button" class="btn btn-default" onClick="javascript:window.location='${ctx}/dashboard/logChart'"><spring:message code="back"/></button>
+	<button type="button" class="btn btn-default" onClick="javascript:window.location='${ctx}/dashboard/ipActiveList'"><i class="fa fa-refresh"></i></button>
+	<button type="button" class="btn btn-default" onClick="javascript:window.location='${ctx}/dashboard/logChart'"><i class="fa fa-history"></i></button>
 	</div>
 	<h3 class="page-title">
 		<spring:message code="traffic_ipactive_hour_trend"></spring:message>
@@ -71,6 +71,8 @@
 </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/offline-exporting.js"></script>
 <%-- <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/themes/grid.js"></script> --%>
 <script type="text/javascript">
 $(document).ready(function(){
@@ -92,8 +94,6 @@ function showIpActiveChart(rs){
 	var chart = Highcharts.chart('chart', {
 		exporting: {
 			allowHTML:true,
-			url:'saveAsImage',
-			filename:'Active-IP',
 			chartOptions: {
 				plotOptions: {
 					series: {
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp
index 960f7e098..9c7973912 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp
@@ -10,6 +10,9 @@
 	td:hover{
 		cursor: pointer;
 	}
+	.Wdate {
+   		width: 200px !important;
+	}
 </style>
 <script>
 	$(document).ready(function() {
@@ -238,7 +241,7 @@
 	                                 <div class="input-group-btn">
 										<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
 	                             	</div>
-	                                 	<input id="searchFoundStartTime" name="searchFoundStartTime" type="text" readonly="readonly" class="form-control input-medium Wdate "
+	                                 	<input id="searchFoundStartTime" name="searchFoundStartTime" type="text" readonly="readonly" class="form-control Wdate "
 											value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
                         		</div>
@@ -247,7 +250,7 @@
 	                                 <div class="input-group-btn">
 										<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
 	                             	</div>
-	                                 	<input id="searchFoundEndTime" name="searchFoundEndTime" type="text" readonly="readonly" class="form-control input-medium Wdate "
+	                                 	<input id="searchFoundEndTime" name="searchFoundEndTime" type="text" readonly="readonly" class="form-control Wdate "
 											value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
                         		</div>
diff --git a/src/main/webapp/static/pages/css/data_text.css b/src/main/webapp/static/pages/css/data_text.css
index 9bfdcf4f6..61be4ed55 100644
--- a/src/main/webapp/static/pages/css/data_text.css
+++ b/src/main/webapp/static/pages/css/data_text.css
@@ -218,7 +218,7 @@ p{
     margin-bottom: 5px;
 }
 .data_content .data_main .main_left div .main_title{
-    width: 230px;
+    width: 260px;
     height: 35px;
     line-height: 33px;
     background-color: #3D3D3D;