From ddcf13baa9ddca4f501a7add46685dc51079afbc Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Wed, 25 Jul 2018 18:49:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=B1=95=E7=A4=BA=E5=88=97.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/log/ntc/l2tpLogList.jsp     |  29 +-
 .../WEB-INF/views/log/ntc/mmPicIpList.jsp     |   8 +-
 .../WEB-INF/views/log/ntc/mmPicUrlList.jsp    |   5 +-
 .../views/log/ntc/mmSampleAudioList.jsp       | 539 ++++++++++--------
 .../WEB-INF/views/log/ntc/mmSamplePicList.jsp |   4 +
 .../views/log/ntc/mmSampleVideoList.jsp       |   4 +
 .../WEB-INF/views/log/ntc/pptpLogList.jsp     |  29 +-
 .../WEB-INF/views/log/ntc/sslLogList.jsp      |  33 +-
 8 files changed, 354 insertions(+), 297 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
index dc98ccd4a..287ac7309 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
@@ -72,19 +72,12 @@
 											</div>
 											<input id="beginDate" name="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate" data-options="buttons:buttons"
 													value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-											
 										</div>
 									</div>
 									<div class="pull-left">
-										<button type="button" class="btn blue" onClick="return page()">
-											<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>
-										<button type="button" class="btn btn-default" id="filter-btn">
-											<spring:message code="filter"></spring:message><i class="fa fa-angle-double-down"></i>
-										</button>
+	                               		 <button type="button" class="btn blue" onClick="page()"> <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>
+	                                     <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"></spring:message>  <i class="fa fa-angle-double-down"></i></button>
 									</div>
 									
 									<div class="pull-right">
@@ -174,6 +167,8 @@
 										<th><spring:message code="clientip" /></th>
 										<th><spring:message code="serverport" /></th>
 										<th><spring:message code="clientport" /></th>
+										<th><spring:message code='server_locate'/></th>
+										<th><spring:message code='client_locate'/></th>
 										<th><spring:message code="deviceid" /></th>
 										<th><spring:message code="stream_type" /></th>
 										<th><spring:message code="clj_ip" /></th>
@@ -188,11 +183,7 @@
 									<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
 										<tr>
 											<td>${log.cfgId}</td>
-											<td>
-												<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
-													<c:if test="${log.entranceId==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
-						               			</c:forEach>
-											</td>
+											<td>${log.entranceId }</td>
 											<td>
 												<c:if test="${log.action eq 1 }"><spring:message code="action_monit"/></c:if>
 												<c:if test="${log.action eq 16 }"><spring:message code="action_reject"/></c:if>
@@ -204,11 +195,7 @@
 											</td>
 											<td>${log.foundTime }</td>
 											<td>${log.recvTime }</td>
-											<td>
-												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
-													<c:if test="${log.transProto==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
-						               			</c:forEach>
-											</td>
+											<td>${log.transProto }</td>
 											<td>
 												<c:forEach items="${fns:getDictList('IP_TYPE')}" var="dict">
 													<c:if test="${log.addrType==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
@@ -218,6 +205,8 @@
 											<td>${log.sIp}</td>
 											<td>${log.dPort}</td>
 											<td>${log.sPort}</td>
+											<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
+											<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 											<td>${log.deviceId}</td>
 											<td>
 												<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dict">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
index 580af051b..088ae977b 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
@@ -170,7 +170,6 @@ $(document).ready(function(){
 									<th><spring:message code='entrance_id'/></th>
 									<th><spring:message code="action"/></th>
 									<th><spring:message code='direct'/></th>
-									
 									<th><spring:message code='pid'/></th>
 									<th><spring:message code='access_url'/></th>
 									<th><spring:message code='log_uri'/></th>
@@ -178,7 +177,6 @@ $(document).ready(function(){
 									<th><spring:message code='harm_level'/></th>
 									<th><spring:message code='fd_type'/></th>
 									<th><spring:message code='av_protocol'/></th>
-									
 									<th><spring:message code='found_time'/></th>
 									<th><spring:message code='recv_time'/></th>
 									<th><spring:message code='protocol'/></th>
@@ -187,6 +185,8 @@ $(document).ready(function(){
 									<th><spring:message code='clientip'/></th>
 									<th><spring:message code='serverport'/></th>
 									<th><spring:message code='clientport'/></th>
+									<th><spring:message code='server_locate'/></th>
+									<th><spring:message code='client_locate'/></th>
 									<th><spring:message code='deviceid'/></th>
 									<th><spring:message code='stream_type'/></th>
 									<th><spring:message code='clj_ip'/></th>
@@ -209,7 +209,6 @@ $(document).ready(function(){
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
-									
 									<td>${log.pid}</td>
 									<td>${log.url}</td>
 									<td>${log.logUri}</td>
@@ -221,7 +220,6 @@ $(document).ready(function(){
 										<c:if test="${log.fdType eq 2 }"><spring:message code="first_hit"/></c:if>
 									</td>
 									<td>${log.protocol}</td>
-									
 									<td>${log.foundTime}</td>
 									<td>${log.recvTime}</td>
 									<td>${log.transProto}</td>
@@ -234,6 +232,8 @@ $(document).ready(function(){
 									<td>${log.sIp}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
+									<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
+									<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 									<td>${log.deviceId}</td>
 									<td>
 										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
index b22f42005..a6b674148 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
@@ -185,12 +185,13 @@ $(document).ready(function(){
 									<th><spring:message code='clientip'/></th>
 									<th><spring:message code='serverport'/></th>
 									<th><spring:message code='clientport'/></th>
+									<th><spring:message code='server_locate'/></th>
+									<th><spring:message code='client_locate'/></th>
 									<th><spring:message code='deviceid'/></th>
 									<th><spring:message code='stream_type'/></th>
 									<th><spring:message code='clj_ip'/></th>
 									<th><spring:message code='nest_addr_list'/></th>
 									<th><spring:message code='user_region'/></th>
-									
 								</tr>
 							</thead>
 							<tbody>
@@ -230,6 +231,8 @@ $(document).ready(function(){
 									<td>${log.sIp}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
+									<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
+									<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 									<td>${log.deviceId}</td>
 									<td>
 										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
index cac282d84..ac932371c 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
@@ -4,251 +4,330 @@
 <head>
 
 <script type="text/javascript">
-$(document).ready(function(){
-	//筛选功能
-	filterActionInit();
-	//reset
-	$("#resetBtn").on("click",function(){
-		$("select.selectpicker").each(function(){
-			$(this).selectpicker('val',$(this).find('option:first').val());
-			$(this).find("option").attr("selected",false);
-			$(this).find("option:first").attr("selected",true);
-		});
-		$(".Wdate").attr("value",'');
-		$(':input','#searchForm')
-		.not(':button,:submit,:reset,:hidden')
-		.attr("value",'');
-		$("#searchForm")[0].reset();
-	});
-	
-});
-//查询
-	function page(n,s){
-	$("#intype").attr("name",$("#seltype").val());
-	$("#pageNo").val(n);
-	$("#pageSize").val(s);
-	$("#searchForm").attr("action","${ctx}/log/ntc/mmSampleAudioLogs");
-	$("#searchForm").submit();
-	loading();
-	return false;
-}
+	$(document).ready(
+			function() {
+				//筛选功能
+				filterActionInit();
+				//reset
+				$("#resetBtn").on(
+						"click",
+						function() {
+							$("select.selectpicker").each(
+									function() {
+										$(this).selectpicker(
+												'val',
+												$(this).find('option:first')
+														.val());
+										$(this).find("option").attr("selected",
+												false);
+										$(this).find("option:first").attr(
+												"selected", true);
+									});
+							$(".Wdate").attr("value", '');
+							$(':input', '#searchForm').not(
+									':button,:submit,:reset,:hidden').attr(
+									"value", '');
+							$("#searchForm")[0].reset();
+						});
+
+			});
+	//查询
+	function page(n, s) {
+		$("#intype").attr("name", $("#seltype").val());
+		$("#pageNo").val(n);
+		$("#pageSize").val(s);
+		$("#searchForm").attr("action", "${ctx}/log/ntc/mmSampleAudioLogs");
+		$("#searchForm").submit();
+		loading();
+		return false;
+	}
 </script>
 </head>
 <body>
 
-<div class="page-content">
-	<h3 class="page-title">
-		<spring:message code="av_sample_audio_control"/>
-		<small><spring:message code="date_list"/></small>
-	</h3>
-	
-	<h5 class="page-header"></h5>
-	<div class="row">
-		<div class="col-md-12">
-			<div class="portlet">
-				<div class="portlet-body">
-					<div class="row"  >
-						<form:form id="searchForm" modelAttribute="log" action="${ctx}/log/ntc/mmSampleAudioLogs" method="post" class="form-search">
-							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
-							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<!-- 筛选按钮展开状态-->
-							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
-							
-							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
-							
-							<!-- 搜索内容与操作按钮栏 -->
-							<div class="col-md-12">
-								<div class="pull-left">
-									<form:select path="action" class="selectpicker select2 input-small">
-										<form:option value=""><spring:message code="action"/></form:option>
-										<form:option value="16"><spring:message code="action_reject"/></form:option>
-										<form:option value="1"><spring:message code="action_monit"/></form:option>
-									</form:select>
-								</div>
-							<div class="pull-left">	
-				 				  <div class="input-group">
-	                                 <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 "
-											value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+	<div class="page-content">
+		<h3 class="page-title">
+			<spring:message code="av_sample_audio_control" />
+			<small><spring:message code="date_list" /></small>
+		</h3>
+
+		<h5 class="page-header"></h5>
+		<div class="row">
+			<div class="col-md-12">
+				<div class="portlet">
+					<div class="portlet-body">
+						<div class="row">
+							<form:form id="searchForm" modelAttribute="log"
+								action="${ctx}/log/ntc/mmSampleAudioLogs" method="post"
+								class="form-search">
+								<input id="pageNo" name="pageNo" type="hidden"
+									value="${page.pageNo}" />
+								<input id="pageSize" name="pageSize" type="hidden"
+									value="${page.pageSize}" />
+								<input id="functionId" name="functionId" type="hidden"
+									value="${log.functionId}" />
+								<!-- 筛选按钮展开状态-->
+								<input id="isFilterAction" name="isFilterAction" type="hidden"
+									value="${log.isFilterAction }" />
+
+								<sys:tableSort id="orderBy" name="orderBy"
+									value="${page.orderBy}" callback="page();" />
+
+								<!-- 搜索内容与操作按钮栏 -->
+								<div class="col-md-12">
+									<div class="pull-left">
+										<form:select path="action"
+											class="selectpicker select2 input-small">
+											<form:option value="">
+												<spring:message code="action" />
+											</form:option>
+											<form:option value="16">
+												<spring:message code="action_reject" />
+											</form:option>
+											<form:option value="1">
+												<spring:message code="action_monit" />
+											</form:option>
+										</form:select>
+									</div>
+									<div class="pull-left">
+										<div class="input-group">
+											<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 "
+												value="${log.searchFoundStartTime}"
+												onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});" />
 										</div>
-                        		</div>
-							<div class="pull-left">	
-				 				  <div class="input-group">
-	                                 <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 "
-											value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+									</div>
+									<div class="pull-left">
+										<div class="input-group">
+											<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 "
+												value="${log.searchFoundEndTime}"
+												onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});" />
 										</div>
-                        		</div>
-	                               
-	                               <div class="pull-left">
-	                               		 <button type="button" class="btn blue" onClick="page()"> <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>
-	                                     <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"></spring:message>  <i class="fa fa-angle-double-down"></i></button>
+									</div>
+
+									<div class="pull-left">
+										<button type="button" class="btn blue" onClick="page()">
+											<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>
+										<button type="button" class="btn btn-default" id="filter-btn">
+											<spring:message code="filter"></spring:message>
+											<i class="fa fa-angle-double-down"></i>
+										</button>
 									</div>
 
 									<div class="pull-right">
-                                        <a class="btn  btn-icon-only btn-default setfields tooltips" 
-                                      		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
-                                             <i class="icon-wrench"></i>
-                                     </a>
-                                    </div>
-							</div>
-							
-							<!-- 筛选搜索内容栏默认隐藏-->
-							<div class="col-md-12 filter-action-select-panle hide" >
-								<div class="row">
-									<div class="col-md-2">
-										<div class="form-group">
-										<label><spring:message code="protocol_type"/>：</label>
-										<c:set var="select"><spring:message code='select'/></c:set>
-                                            <form:select path="transProto" class="selectpicker select2 form-control" data-live-search="true" data-live-search-placeholder="search">
-												<form:option value=""><spring:message code="select"/></form:option>
-												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
-										 			<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
-							             		</c:forEach>
-											</form:select>
-										</div>
-									</div>
-									
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
-											<form:select path="direction" class="selectpicker select2 form-control">
-	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
-											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
-								             </c:forEach>
-	                                    	</form:select>
-									</div>
-									</div>
-									<div class="col-md-2">
-									<div class="form-group">
-										<label><spring:message code="entrance"/>：</label>
-										<form:select path="entranceId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
-											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('ENTRANCE')}" var="entrance" >
-												<form:option value="${entrance.itemCode}"><spring:message code="${entrance.itemValue}"></spring:message></form:option>
-											</c:forEach>
-										</form:select>
-									</div>
-									</div>
-									<div class="col-md-2">
-										<div class="form-group">
-	                                        <label><spring:message code="clj_ip"/>：</label>
-	                                        <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
-	                                    </div>
-									</div>
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="clientip"/>：</label>
-											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
-									</div>
-									</div>
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="serverip"/>：</label>
-											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
-									</div>
+										<a class="btn  btn-icon-only btn-default setfields tooltips"
+											data-container="body" data-placement="top"
+											data-original-title=<spring:message code="custom_columns"/>
+											href="javascript:;"> <i class="icon-wrench"></i>
+										</a>
 									</div>
 								</div>
-							</div>
-							<!-- /筛选搜索内容栏    结束-->
-						</form:form>
-					</div> 
 
-					<div class="table-responsive">
-					<sys:message content="${message}"/>
-						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
-							<thead>
-								<tr>
-									<th><spring:message code='cfg_id'/></th>
-									<th><spring:message code='entrance_id'/></th>
-									<th><spring:message code="action"/></th>
-									<th><spring:message code='direct'/></th>
-									<th><spring:message code='pid'/></th>
-									<th><spring:message code='access_url'/></th>
-									<th><spring:message code='log_uri'/></th>
-									<th><spring:message code='refer'/></th>
-									<th><spring:message code='harm_level'/></th>
-									<th><spring:message code='fd_type'/></th>
-									<th><spring:message code='av_protocol'/></th>
-									<th><spring:message code='found_time'/></th>
-									<th><spring:message code='recv_time'/></th>
-									<th><spring:message code='protocol'/></th>
-									<th><spring:message code='addr_type'/></th>
-									<th><spring:message code='serverip'/></th>
-									<th><spring:message code='clientip'/></th>
-									<th><spring:message code='serverport'/></th>
-									<th><spring:message code='clientport'/></th>
-									<th><spring:message code='deviceid'/></th>
-									<th><spring:message code='stream_type'/></th>
-									<th><spring:message code='clj_ip'/></th>
-									<th><spring:message code='nest_addr_list'/></th>
-									<th><spring:message code='user_region'/></th>
-									
-								</tr>
-							</thead>
-							<tbody>
-							<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
-								<tr>
-									<td>${log.cfgId}</td> 
-									<td>${log.entranceId}</td>
-									<td>
-										<c:if test="${log.action eq 16 }"><spring:message code="action_reject"/></c:if>
-										<c:if test="${log.action eq 1 }"><spring:message code="action_monit"/></c:if>
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
-											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
-				               			</c:forEach>
-									</td>
-									<td>${log.pid}</td>
-									<td>${log.url}</td>
-									<td>${log.logUri}</td>
-									<td>${log.refer}</td>
-									<td>${log.level}</td>
-									<td>
-										<c:if test="${log.fdType eq 0 }"><spring:message code="black_block_list"/></c:if>
-										<c:if test="${log.fdType eq 1 }"><spring:message code="static_cfg_block"/></c:if>
-										<c:if test="${log.fdType eq 2 }"><spring:message code="first_hit"/></c:if>
-									</td>
-									<td>${log.protocol}</td>
-									<td>${log.foundTime}</td>
-									<td>${log.recvTime}</td>
-									<td>${log.transProto}</td>
-									<td>
-										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="dic">
-											<c:if test="${log.addrType==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
-				               			</c:forEach>
-									</td>
-									<td>${log.dIp}</td>
-									<td>${log.sIp}</td>
-									<td>${log.dPort}</td>
-									<td>${log.sPort}</td>
-									<td>${log.deviceId}</td>
-									<td>
-										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
-											<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
-				               			</c:forEach>
-									</td>
-									<td>${log.capIp}</td>
-									<td>${log.addrList}</td>
-									<td>${log.userRegion}</td>
-								</tr>
-							</c:forEach>
-							</tbody>
-						</table>
-						<div class="page">${page}</div>
+								<!-- 筛选搜索内容栏默认隐藏-->
+								<div class="col-md-12 filter-action-select-panle hide">
+									<div class="row">
+										<div class="col-md-2">
+											<div class="form-group">
+												<label><spring:message code="protocol_type" />：</label>
+												<c:set var="select">
+													<spring:message code='select' />
+												</c:set>
+												<form:select path="transProto"
+													class="selectpicker select2 form-control"
+													data-live-search="true"
+													data-live-search-placeholder="search">
+													<form:option value="">
+														<spring:message code="select" />
+													</form:option>
+													<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}"
+														var="dict">
+														<form:option value="${dict.itemCode}">
+															<spring:message code="${dict.itemValue}" />
+														</form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+										</div>
+
+										<div class="col-md-2">
+											<div class="form-group">
+												<label><spring:message code="direct" />：</label>
+												<form:select path="direction"
+													class="selectpicker select2 form-control">
+													<form:option value="">
+														<spring:message code="select" />
+													</form:option>
+													<c:forEach items="${fns:getDictList('DIRECTION')}"
+														var="dict">
+														<form:option value="${dict.itemCode}">
+															<spring:message code="${dict.itemValue}" />
+														</form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+										</div>
+										<div class="col-md-2">
+											<div class="form-group">
+												<label><spring:message code="entrance" />：</label>
+												<form:select path="entranceId"
+													class="selectpicker form-control" data-live-search="true"
+													data-live-search-placeholder="search">
+													<form:option value="">
+														<spring:message code="select" />
+													</form:option>
+													<c:forEach items="${fns:getDictList('ENTRANCE')}"
+														var="entrance">
+														<form:option value="${entrance.itemCode}">
+															<spring:message code="${entrance.itemValue}"></spring:message>
+														</form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+										</div>
+										<div class="col-md-2">
+											<div class="form-group">
+												<label><spring:message code="clj_ip" />：</label> <input
+													name="capIp" type="text" class="form-control"
+													value="${log.capIp}" />
+											</div>
+										</div>
+										<div class="col-md-2">
+											<div class="form-group">
+												<label><spring:message code="clientip" />：</label> <input
+													id="sIp" name="sIp" class="form-control" type="text"
+													value="${log.sIp}" />
+											</div>
+										</div>
+										<div class="col-md-2">
+											<div class="form-group">
+												<label><spring:message code="serverip" />：</label> <input
+													id="dIp" name="dIp" class="form-control" type="text"
+													value="${log.dIp}" />
+											</div>
+										</div>
+									</div>
+								</div>
+								<!-- /筛选搜索内容栏    结束-->
+							</form:form>
+						</div>
+
+						<div class="table-responsive">
+							<sys:message content="${message}" />
+							<table id="contentTable"
+								class="table table-striped table-bordered table-condensed text-nowrap">
+								<thead>
+									<tr>
+										<th><spring:message code='cfg_id' /></th>
+										<th><spring:message code='entrance_id' /></th>
+										<th><spring:message code="action" /></th>
+										<th><spring:message code='direct' /></th>
+										<th><spring:message code='pid' /></th>
+										<th><spring:message code='access_url' /></th>
+										<th><spring:message code='log_uri' /></th>
+										<th><spring:message code='refer' /></th>
+										<th><spring:message code='harm_level' /></th>
+										<th><spring:message code='fd_type' /></th>
+										<th><spring:message code='av_protocol' /></th>
+										<th><spring:message code='found_time' /></th>
+										<th><spring:message code='recv_time' /></th>
+										<th><spring:message code='protocol' /></th>
+										<th><spring:message code='addr_type' /></th>
+										<th><spring:message code='serverip' /></th>
+										<th><spring:message code='clientip' /></th>
+										<th><spring:message code='serverport' /></th>
+										<th><spring:message code='clientport' /></th>
+										<th><spring:message code='server_locate' /></th>
+										<th><spring:message code='client_locate' /></th>
+										<th><spring:message code='deviceid' /></th>
+										<th><spring:message code='stream_type' /></th>
+										<th><spring:message code='clj_ip' /></th>
+										<th><spring:message code='nest_addr_list' /></th>
+										<th><spring:message code='user_region' /></th>
+
+									</tr>
+								</thead>
+								<tbody>
+									<c:forEach items="${page.list}" var="log" varStatus="status"
+										step="1">
+										<tr>
+											<td>${log.cfgId}</td>
+											<td>${log.entranceId}</td>
+											<td><c:if test="${log.action eq 16 }">
+													<spring:message code="action_reject" />
+												</c:if> <c:if test="${log.action eq 1 }">
+													<spring:message code="action_monit" />
+												</c:if></td>
+											<td><c:forEach items="${fns:getDictList('DIRECTION')}"
+													var="dic">
+													<c:if test="${log.direction==dic.itemCode}">
+														<spring:message code="${dic.itemValue }" />
+													</c:if>
+												</c:forEach></td>
+											<td>${log.pid}</td>
+											<td>${log.url}</td>
+											<td>${log.logUri}</td>
+											<td>${log.refer}</td>
+											<td>${log.level}</td>
+											<td><c:if test="${log.fdType eq 0 }">
+													<spring:message code="black_block_list" />
+												</c:if> <c:if test="${log.fdType eq 1 }">
+													<spring:message code="static_cfg_block" />
+												</c:if> <c:if test="${log.fdType eq 2 }">
+													<spring:message code="first_hit" />
+												</c:if></td>
+											<td>${log.protocol}</td>
+											<td>${log.foundTime}</td>
+											<td>${log.recvTime}</td>
+											<td>${log.transProto}</td>
+											<td><c:forEach items="${fns:getDictList('IP_TYPE')}"
+													var="dic">
+													<c:if test="${log.addrType==dic.itemCode}">
+														<spring:message code="${dic.itemValue }" />
+													</c:if>
+												</c:forEach></td>
+											<td>${log.dIp}</td>
+											<td>${log.sIp}</td>
+											<td>${log.dPort}</td>
+											<td>${log.sPort}</td>
+											<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
+											<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
+											<td>${log.deviceId}</td>
+											<td><c:forEach
+													items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
+													<c:if test="${log.streamDir==dic.itemCode}">
+														<spring:message code="${dic.itemValue }" />
+													</c:if>
+												</c:forEach></td>
+											<td>${log.capIp}</td>
+											<td>${log.addrList}</td>
+											<td>${log.userRegion}</td>
+										</tr>
+									</c:forEach>
+								</tbody>
+							</table>
+							<div class="page">${page}</div>
+						</div>
 					</div>
+				</div>
 			</div>
 		</div>
 	</div>
-	</div>
-	</div>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
index 1bc575f01..c165879e6 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
@@ -185,6 +185,8 @@ $(document).ready(function(){
 									<th><spring:message code='clientip'/></th>
 									<th><spring:message code='serverport'/></th>
 									<th><spring:message code='clientport'/></th>
+									<th><spring:message code='server_locate'/></th>
+									<th><spring:message code='client_locate'/></th>
 									<th><spring:message code='deviceid'/></th>
 									<th><spring:message code='stream_type'/></th>
 									<th><spring:message code='clj_ip'/></th>
@@ -230,6 +232,8 @@ $(document).ready(function(){
 									<td>${log.sIp}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
+									<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
+									<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 									<td>${log.deviceId}</td>
 									<td>
 										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
index ab315eccf..28f2f706a 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
@@ -185,6 +185,8 @@ $(document).ready(function(){
 									<th><spring:message code='clientip'/></th>
 									<th><spring:message code='serverport'/></th>
 									<th><spring:message code='clientport'/></th>
+									<th><spring:message code='server_locate'/></th>
+									<th><spring:message code='client_locate'/></th>
 									<th><spring:message code='deviceid'/></th>
 									<th><spring:message code='stream_type'/></th>
 									<th><spring:message code='clj_ip'/></th>
@@ -231,6 +233,8 @@ $(document).ready(function(){
 									<td>${log.sIp}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
+									<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
+									<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 									<td>${log.deviceId}</td>
 									<td>
 										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
index c164d6131..47838aa97 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
@@ -72,19 +72,12 @@
 											</div>
 											<input id="beginDate" name="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate" data-options="buttons:buttons"
 													value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-											
 										</div>
 									</div>
 									<div class="pull-left">
-										<button type="button" class="btn blue" onClick="return page()">
-											<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>
-										<button type="button" class="btn btn-default" id="filter-btn">
-											<spring:message code="filter"></spring:message><i class="fa fa-angle-double-down"></i>
-										</button>
+	                               		 <button type="button" class="btn blue" onClick="page()"> <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>
+	                                     <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"></spring:message>  <i class="fa fa-angle-double-down"></i></button>
 									</div>
 									
 									<div class="pull-right">
@@ -174,6 +167,8 @@
 										<th><spring:message code="clientip" /></th>
 										<th><spring:message code="serverport" /></th>
 										<th><spring:message code="clientport" /></th>
+										<th><spring:message code='server_locate'/></th>
+										<th><spring:message code='client_locate'/></th>
 										<th><spring:message code="deviceid" /></th>
 										<th><spring:message code="stream_type" /></th>
 										<th><spring:message code="clj_ip" /></th>
@@ -187,11 +182,7 @@
 									<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
 										<tr>
 											<td>${log.cfgId}</td>
-											<td>
-												<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
-													<c:if test="${log.entranceId==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
-						               			</c:forEach>
-											</td>
+											<td>${log.entranceId }</td>
 											<td>
 												<c:if test="${log.action eq 1 }"><spring:message code="action_monit"/></c:if>
 												<c:if test="${log.action eq 16 }"><spring:message code="action_reject"/></c:if>
@@ -203,11 +194,7 @@
 											</td>
 											<td>${log.foundTime }</td>
 											<td>${log.recvTime }</td>
-											<td>
-												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
-													<c:if test="${log.transProto==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
-						               			</c:forEach>
-											</td>
+											<td>${log.transProto }</td>
 											<td>
 												<c:forEach items="${fns:getDictList('IP_TYPE')}" var="dict">
 													<c:if test="${log.addrType==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
@@ -217,6 +204,8 @@
 											<td>${log.sIp}</td>
 											<td>${log.dPort}</td>
 											<td>${log.sPort}</td>
+											<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
+											<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 											<td>${log.deviceId}</td>
 											<td>
 												<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dict">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
index 066a20201..d8cee1822 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
@@ -55,8 +55,8 @@
 											<form:option value="" ><spring:message code="action"/></form:option>
 											<form:option value="16" ><spring:message code="action_reject"/></form:option>
 											<form:option value="1" ><spring:message code="action_monit"/></form:option>
-						             	</form:select>
-									</div>
+										</form:select>
+						            </div>
 									<div class="pull-left">
 										<div class="input-group">
 											<div class="input-group-btn">
@@ -81,19 +81,12 @@
 											</div>
 											<input id="beginDate" name="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate" data-options="buttons:buttons"
 													value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-											
 										</div>
 									</div>
 									<div class="pull-left">
-										<button type="button" class="btn blue" onClick="return page()">
-											<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>
-										<button type="button" class="btn btn-default" id="filter-btn">
-											<spring:message code="filter"></spring:message><i class="fa fa-angle-double-down"></i>
-										</button>
+	                               		 <button type="button" class="btn blue" onClick="page()"> <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>
+	                                     <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"></spring:message>  <i class="fa fa-angle-double-down"></i></button>
 									</div>
 									
 									<div class="pull-right">
@@ -183,6 +176,8 @@
 										<th><spring:message code="clientip" /></th>
 										<th><spring:message code="serverport" /></th>
 										<th><spring:message code="clientport" /></th>
+										<th><spring:message code='server_locate'/></th>
+										<th><spring:message code='client_locate'/></th>
 										<th><spring:message code="deviceid" /></th>
 										<th><spring:message code="stream_type" /></th>
 										<th><spring:message code="clj_ip" /></th>
@@ -198,11 +193,7 @@
 									<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
 										<tr>
 											<td>${log.cfgId}</td>
-											<td>
-												<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
-													<c:if test="${log.entranceId==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
-						               			</c:forEach>
-											</td>
+											<td>${log.entranceId }</td>
 											<td>
 												<c:if test="${log.action eq 1 }"><spring:message code="action_monit"/></c:if>
 												<c:if test="${log.action eq 16 }"><spring:message code="action_reject"/></c:if>
@@ -214,11 +205,7 @@
 											</td>
 											<td>${log.foundTime }</td>
 											<td>${log.recvTime }</td>
-											<td>
-												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
-													<c:if test="${log.transProto==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
-						               			</c:forEach>
-											</td>
+											<td>${log.transProto }</td>
 											<td>
 												<c:forEach items="${fns:getDictList('IP_TYPE')}" var="dict">
 													<c:if test="${log.addrType==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
@@ -228,6 +215,8 @@
 											<td>${log.sIp}</td>
 											<td>${log.dPort}</td>
 											<td>${log.sPort}</td>
+											<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
+											<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 											<td>${log.deviceId}</td>
 											<td>
 												<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dict">