From 496a7ee4e58777f8252045f7b4c12809ea4aad88 Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Tue, 3 Jul 2018 19:45:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/log/ntc/mailList.jsp | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
index 487133e09..5702cd948 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
@@ -48,7 +48,7 @@
 						<!-- 搜索内容与操作按钮栏 -->
 						<div class="col-md-12">
 							<div class="pull-left">
-								<form:select path="serviceType" class="selectpicker select2 input-small">
+								<form:select path="service" 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>
@@ -92,7 +92,7 @@
 								<div class="col-md-2">
 									<div class="form-group">
                                 		<label class="control-label"><spring:message code='protocol_type'/>：</label>
-                                       	<form:select path="protocol" class="selectpicker form-control">
+                                       	<form:select path="transProto" class="selectpicker form-control">
 											<form:option value=""><spring:message code="select"/></form:option>
 											<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
 												<form:option value="${protocol.itemCode}"><spring:message code="${protocol.itemValue}"></spring:message></form:option>
@@ -128,21 +128,21 @@
 								<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="clj_ip"></spring:message>：</label>
-										<input name="cljIp" type="text" class="form-control" value="${log.cljIp }"/>
+										<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"></spring:message>：</label>
-										<input name="clientIp" type="text" class="form-control" value="${log.clientIp }"/>
+										<input name="sIp" type="text" class="form-control" value="${log.sIp }"/>
 									</div>
 								</div>
 								
 								<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="serverip"></spring:message>：</label>
-										<input name="serverIp" type="text" class="form-control" value="${log.serverIp }"/>
+										<input name="dIp" type="text" class="form-control" value="${log.dIp }"/>
 									</div>
 								</div>
 							</div>
@@ -198,13 +198,13 @@
 									<td>${_log.mailTo }</td>
 									<td>${_log.subject }</td>
 									<td>${_log.emlFile }</td>
-									<td>${_log.clientIp }</td>
-									<td>${_log.clientPort }</td>
-									<td>${_log.serverIp }</td>
-									<td>${_log.serverPort }</td>
+									<td>${_log.sIp }</td>
+									<td>${_log.sPort }</td>
+									<td>${_log.dIp }</td>
+									<td>${_log.dPort }</td>
 									<td>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="logProtocol">
-											<c:if test="${logProtocol.itemCode eq _log.protocol}">${logProtocol.itemValue}</c:if>
+											<c:if test="${logProtocol.itemCode eq _log.transProto}">${logProtocol.itemValue}</c:if>
 					                	</c:forEach>
 									</td>
 									<td>
@@ -226,11 +226,11 @@
 									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="streamType">
-											<c:if test="${streamType.itemCode eq _log.streamType}">${streamType.itemValue}</c:if>
+											<c:if test="${streamType.itemCode eq _log.streamDir}">${streamType.itemValue}</c:if>
 					                	</c:forEach>
 									</td>
-									<td>${_log.cljIp }</td>
-									<td>${_log.nestAddrList }</td>
+									<td>${_log.capIp }</td>
+									<td>${_log.addrList }</td>
 									<td>${_log.userRegion }</td>
 								</tr>
 							</c:forEach>