From 8973944e2b8aeab02fe5c6555b296b1f074a0cac Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@zdjizhi.com>
Date: Mon, 7 Jan 2019 18:23:25 +0600
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=81=94=E5=85=B3=E7=B3=BB=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=8E=BB=E6=8E=89capIp=E7=9A=84title=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/log/ntc/connRecordLogList.jsp       | 48 ++++++++++++-------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
index 58cb96daf..dd383b531 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
@@ -128,8 +128,7 @@
 						<input id="protos"  type="hidden" value="${log.protoId}"/>
 						<!-- 筛选按钮展开状态-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
-						<sys:tableSort id="orderBy" name="orderBy.
-						" value="${page.orderBy}" callback="page();" />
+						<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();" />
 						<!-- 搜索内容与操作按钮栏 -->
 						<div class="col-md-12">
 						<%-- 	<div class="pull-left">
@@ -288,7 +287,7 @@
                                 		<label class="control-label"><spring:message code='Web'/>：</label>
 										<select id="webSelect" name="webId" title="<spring:message code="select"/>" class="selectpicker form-control" data-max-options="10" data-selected-text-format="count > 3" multiple  data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
 											<c:forEach items="${webList}" var="web" >
-												<option value="${web.code}"><spring:message code="${web.item}"></spring:message></option>
+												<option value="${web.id}"><spring:message code="${web.domain}"></spring:message></option>
 											</c:forEach>
 										</select> 
 									</div>
@@ -323,6 +322,20 @@
 										<input name="dAsn" type="text" class="form-control" value="${log.dAsn }"/>
 									</div>
 								</div>
+								
+								<div class="col-md-4">
+									<div class="form-group">
+										<label><spring:message code="s_subscribe_id"></spring:message>：</label>
+										<input name="sSubscribeId" type="text" class="form-control" value="${log.sSubscribeId }"/>
+									</div>
+								</div>
+								
+								<div class="col-md-4">
+									<div class="form-group">
+										<label><spring:message code="d_subscribe_id"></spring:message>：</label>
+										<input name="dSubscribeId" type="text" class="form-control" value="${log.dSubscribeId }"/>
+									</div>
+								</div>
 
 						</div>
 						</div>
@@ -424,8 +437,8 @@
 									<td>
 										<c:set var="webIds">${log.webId }</c:set>
 										<c:forEach items="${webList}" var="dict">
-											<c:if test="${dict.code eq log.webId}">
-												<c:set var="webIds">${dict.item}</c:set>
+											<c:if test="${dict.id eq log.webId}">
+												<c:set var="webIds">${dict.domain}</c:set>
 											</c:if>
 										</c:forEach>
 										<spring:message code="${webIds}"/>
@@ -441,7 +454,16 @@
 										</c:forEach>
 										<spring:message code="${labelAppIds}"/>
 									</td> --%>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
+									<td>
+										<c:set var="transProtos">${log.transProto }</c:set>
+										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
+											<c:if test="${dic.itemCode eq log.transProto}">
+												<c:set var="transProtos">${dic.itemValue}</c:set>
+											</c:if>
+										</c:forEach>
+										<spring:message code="${transProtos}"/>
+									</td>
 									<td>
 									<c:set var="addrTypes">${log.addrType }</c:set>
 										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="dic">
@@ -452,18 +474,8 @@
 				               			<spring:message code="${addrTypes}"/>
 									</td>
 									
-										<td>
-										<c:set var="transProtos">${log.transProto }</c:set>
-										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
-											<c:if test="${dic.itemCode eq log.transProto}">
-												<c:set var="transProtos">${dic.itemValue}</c:set>
-											</c:if>
-										</c:forEach>
-										<spring:message code="${transProtos}"/>
-									</td>
-									
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.dIp}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>