diff --git a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java
index 1d498577f..beecd4610 100644
--- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java
+++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java
@@ -94,6 +94,7 @@ public class TrafficStatisticsReportController extends BaseController {
 				userJsonList = usergson.fromJson(userString, new TypeToken<Map>(){}.getType());
 				userList = (ArrayList) userJsonList.get("data");
 				model.addAttribute("userList", userList);
+				model.addAttribute("searchAccount", account);
 			}
 			if ("3".endsWith(searchBusinessType)&&!StringUtil.isBlank(nasIp)) {
 				String ipString = HttpClientUtil.get(ipUrl+"&searchNasIp="+nasIp);
@@ -102,13 +103,14 @@ public class TrafficStatisticsReportController extends BaseController {
 				ipJsonList = ipgson.fromJson(ipString, new TypeToken<Map>(){}.getType());
 				ipList = (ArrayList) ipJsonList.get("data");
 				model.addAttribute("ipList", ipList);
+				model.addAttribute("searchNasIp", nasIp);
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
 		return "/dashboard/trafficUserBehavior";
 	}
-	public static void main(String[] args) {
+/*	public static void main(String[] args) {
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		HashMap<String, Object> m = new HashMap<String, Object>();
 		List list = new ArrayList();
@@ -128,5 +130,5 @@ public class TrafficStatisticsReportController extends BaseController {
 			e.printStackTrace();
 		}
 	}
-	
+	*/
 }
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp
index 9ccfa3329..7cb66bb00 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp
@@ -139,31 +139,14 @@
 		<div class="col-md-12">
 			<div class="portlet">
 				<div class="portlet-body">
-				
 					<sys:message content="${message}"/>
 					<!-- top -->
-					 <div class="row">
+					<%--  <div class="row">
 					 <div class="col-md-6">
 					  <h4 class="ng-binding"><spring:message code="user_behavior_data"/></h4>
 					 	 <div class="row">
 					 		<div class="col-md-12">
-							<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
-								<thead>
-										<tr>
-											<th><spring:message code="account"/></th>
-											<th><spring:message code="link_num"/></th>
-										</tr>
-								</thead>
-								<tbody>
-										<c:forEach items="${accountList}" var="data">
-											<tr>
-												<td>${data.account}</td>
-												<td><fmt:formatNumber type="number" value="${data.num}" minFractionDigits="0"></fmt:formatNumber></td>
-										 	</tr>
-										</c:forEach>
-		
-								</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>
@@ -199,7 +182,7 @@
 						</div>
 					</div>
 						</div>
-					</div>
+					</div> --%>
 					<!-- top end -->
 					
 					<div class="row">
@@ -218,22 +201,6 @@
 						<input id="searchBusinessType" name="searchBusinessType" type="hidden" value="${searchBusinessType}"/>
 							<!-- 搜索内容与操作按钮栏 -->
 							<div class="col-md-12">
-								<div class="pull-left accountSearch">
-									<form:select path="account" class="selectpicker select2 input-medium"  data-live-search="true" data-live-search-placeholder="search">
-										<form:option value=""><spring:message code="select"/> <spring:message code="user"/></form:option>
-										<c:forEach items="${accountList}" var="acc" >
-											<form:option value="${acc.account}">${acc.account}</form:option>
-										</c:forEach>
-									</form:select>
-								</div>
-								<div class="pull-left nasIpSearch">
-									<form:select path="nasIp" class="selectpicker select2 input-medium"  data-live-search="true" data-live-search-placeholder="search">
-										<form:option value=""><spring:message code="select"/> <spring:message code="ip"/></form:option>
-										<c:forEach items="${nasIpList}" var="nIp">
-											<form:option value="${nIp.nasIp}" >${nIp.nasIp}</form:option>
-										</c:forEach>
-									</form:select>
-								</div>
 								<div class="pull-left">
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
@@ -252,6 +219,22 @@
 											value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
                         		</div>
+                        		<div class="pull-left accountSearch">
+									<form:select path="account" class="selectpicker select2 input-medium"  data-live-search="true" data-live-search-placeholder="search">
+										<form:option value=""><spring:message code="select"/> <spring:message code="user"/></form:option>
+										<c:forEach items="${accountList}" var="acc" >
+											<form:option value="${acc.account}">${acc.account}</form:option>
+										</c:forEach>
+									</form:select>
+								</div>
+								<div class="pull-left nasIpSearch">
+									<form:select path="nasIp" class="selectpicker select2 input-medium"  data-live-search="true" data-live-search-placeholder="search">
+										<form:option value=""><spring:message code="select"/> <spring:message code="ip"/></form:option>
+										<c:forEach items="${nasIpList}" var="nIp">
+											<form:option value="${nIp.nasIp}" >${nIp.nasIp}</form:option>
+										</c:forEach>
+									</form:select>
+								</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>
 									 <button type="button" class="btn btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
@@ -266,14 +249,14 @@
 					
 					<div class="httpReqCfg">
 						<div class="row">
-				  			<div class="col-md-5" style="padding-right: 1px;">
+				  			<div class="col-md-4" style="padding-right: 1px;">
 				            <div class="panel panel-default" style="height: 500px;">
-				                <div class="panel-body" style="max-height:420px;overflow-y:auto;overflow-x:hidden;">
-				                    <h5 class="ng-binding"><spring:message code="account"/></h5>
+				                <div class="panel-body" style="max-height:460px;overflow-y:auto;overflow-x:hidden;">
+				                    <h5 class="ng-binding"><spring:message code="user_behavior_data"/></h5>
 				                    <div id="deviceRank" class="drank hm-scroll">
 				                   
 				<!--                    		<div class="table-responsive"> -->
-										<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
+										<%-- <table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 											<thead>
 												<tr>
 													<th><spring:message code="ip"/></th>
@@ -291,9 +274,26 @@
 												 	</tr>
 												</c:forEach>
 				
+										</tbody>
+									</table> --%>
+									<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
+										<thead>
+												<tr>
+													<th><spring:message code="account"/></th>
+													<th><spring:message code="link_num"/></th>
+												</tr>
+										</thead>
+										<tbody>
+												<c:forEach items="${accountList}" var="data">
+													<tr>
+														<td>${data.account}</td>
+														<td><fmt:formatNumber type="number" value="${data.num}" minFractionDigits="0"></fmt:formatNumber></td>
+												 	</tr>
+												</c:forEach>
+				
 										</tbody>
 									</table>
-									<c:if test="${empty userList}">
+									<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> -->
@@ -302,10 +302,10 @@
 				            </div>
 				        </div>
 				        
-						<div class="col-md-7" style="padding-left: 8px;">
+						<div class="col-md-8" style="padding-left: 8px;">
 				            <div class="panel panel-default">
 				                <div class="panel-body" style="height:500px">
-				                    <h5 class="ng-binding"><spring:message code="account"/></h5>
+				                    <h5 class="ng-binding"><spring:message code="account"/> : ${searchAccount}</h5>
 				                    <div id="trend" style="height: 400px; position: relative;" >
 					<!-- ===================1============== -->	
 											
@@ -326,7 +326,7 @@
 													<div class="process-row">
 														<div class="process-time">
 															<div class="time-con">
-																<span class="year">${us.reportTime}</span>
+																<span class="year" title="<spring:message code="link_num"/>: <fmt:formatNumber type='number' value='${us.num}' minFractionDigits='0'/>">${us.reportTime}</span>
 															</div>
 														</div>
 														<div class="process-noyear">
@@ -354,14 +354,14 @@
 					<!-- IP -->
 					<div class="httpResCfg">
 						<div class="row">
-				  			<div class="col-md-5" style="padding-right: 1px; ">
+				  			<div class="col-md-4" style="padding-right: 1px; ">
 				           <div class="panel panel-default" style="height: 500px;">
-				                <div class="panel-body" style="max-height:420px;overflow-y:auto;overflow-x:hidden;">
-				                    <h5 class="ng-binding"><spring:message code="ip"/></h5>
+				                <div class="panel-body" style="max-height:460px;overflow-y:auto;overflow-x:hidden;">
+				                    <h5 class="ng-binding"><spring:message code="ip_behavior_data"/></h5>
 				                    <div id="deviceRank" class="drank hm-scroll">
 				                   
 				<!--                    		<div class="table-responsive"> -->
-										<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
+										<%-- <table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 											<thead>
 												<tr>
 													<th><spring:message code="account"/></th>
@@ -379,9 +379,27 @@
 												 	</tr>
 												</c:forEach>
 				
+										</tbody>
+									</table> --%>
+									<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
+										<thead>
+												<tr>
+													<th><spring:message code="ip"/></th>
+													<th><spring:message code="link_num"/></th>
+												</tr>
+										</thead>
+										<tbody>
+				
+												<c:forEach items="${nasIpList}" var="data">
+													<tr>
+														<td>${data.nasIp}</td>
+														<td><fmt:formatNumber type="number" value="${data.num}" minFractionDigits="0"></fmt:formatNumber></td>
+												 	</tr>
+												</c:forEach>
+				
 										</tbody>
 									</table>
-									<c:if test="${empty ipList}">
+									<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> -->
@@ -390,10 +408,10 @@
 				            </div>
 				        </div>
 				        
-						<div class="col-md-7" style="padding-left: 8px;">
+						<div class="col-md-8" style="padding-left: 8px;">
 				            <div class="panel panel-default">
 				                <div class="panel-body" style="height: 500px">
-				                    <h5 class="ng-binding"><spring:message code="ip"/></h5>
+				                    <h5 class="ng-binding"><spring:message code="ip"/> : ${searchNasIp}</h5>
 				                    <div id="trend" style="height: 400px; position: relative;" >
 					  <!-- ===================2============== -->	
 							<div class="scrollMouse text-center">
@@ -414,7 +432,9 @@
 															<div class="process-row">
 																<div class="process-time">
 																	<div class="time-con">
-																		<span class="year">${it.reportTime}</span>
+																		<span class="year" title="<spring:message code="link_num"/>: <fmt:formatNumber type='number' value='${it.num}' minFractionDigits='0'/>">${it.reportTime}
+																		</span>
+																		
 																	</div>
 																</div>
 																<div class="process-noyear">