gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
wangxin
2018-07-03 17:17:36 +08:00
parent 7c70417d4c e783421ba8
commit f1c8b8be53
7 changed files with 126 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
View File

@@ -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"/>：</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"/>：</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"/>：</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>
@@ -237,13 +237,13 @@
</td>
<td title="${_log.qName }">${fns:abbr(_log.qName, 30)}</td>
<td>${_log.cName }</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>
@@ -265,11 +265,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>
<%-- <td>${_log.dnsSub }</td> --%>
</tr>

37
src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
View File

@@ -59,7 +59,7 @@ $(document).ready(function(){
<!-- 搜索内容与操作按钮栏 -->
<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>
@@ -105,7 +105,7 @@ $(document).ready(function(){
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="protocol" class="selectpicker select2 form-control" data-live-search="true" data-live-search-placeholder="search">
<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>
@@ -133,20 +133,25 @@ $(document).ready(function(){
</div>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="clj_ip"/>：</label>
<input id=cljIp name="cljIp" class="form-control" type="text" value="${log.cljIp}"/>
<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="clientip"/>：</label>
<input id="clientIp" name="clientIp" class="form-control" type="text" value="${log.clientIp}"/>
<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="serverIp" name="serverIp" class="form-control" type="text" value="${log.serverIp}"/>
<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
</div>
</div>
</div>
@@ -166,9 +171,9 @@ $(document).ready(function(){
<th><spring:message code='direct'/></th>
<th><spring:message code='found_time'/></th>
<th><spring:message code='recv_time'/></th>
<th><spring:message code='protocol_type'/></th>
<th><spring:message code='protocol'/></th>
<th><spring:message code='addr_type'/></th>
<th><spring:message code='serverip'/></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>
@@ -199,7 +204,7 @@ $(document).ready(function(){
<td>${log.recvTime}</td>
<td>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
<c:if test="${log.protocol==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
<c:if test="${log.transProto==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
</c:forEach>
</td>
<td>
@@ -207,18 +212,18 @@ $(document).ready(function(){
<c:if test="${log.addrType==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
</c:forEach>
</td>
<td>${log.serverIp}</td>
<td>${log.clientIp}</td>
<td>${log.serverPort}</td>
<td>${log.clientPort}</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.streamType==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.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>
<td>${log.ftpUrl}</td>
<td>${log.ftpContent}</td>

26
src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
View File

@@ -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>
@@ -203,13 +203,13 @@
<c:if test="${_log.action eq 1 }"><spring:message code="action_monit"/></c:if>
</td>
<td title="${_log.url }">${fns:abbr(_log.url, 30)}</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>
@@ -235,11 +235,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>

26
src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
View File

@@ -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>
@@ -188,13 +188,13 @@
<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>${_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>
@@ -216,11 +216,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>

36
src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
View File

@@ -20,7 +20,8 @@ $(document).ready(function(){
.attr("value",'');
$("#searchForm")[0].reset();
});
var a='${log.functionId}';
console.log(a)
});
//查询
function page(n,s){
@@ -98,7 +99,7 @@ $(document).ready(function(){
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="protocol" class="selectpicker select2 form-control" data-live-search="true" data-live-search-placeholder="search">
<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>
@@ -120,26 +121,31 @@ $(document).ready(function(){
</div>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="entrance_id"/>：</label>
<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
<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 id=cljIp name="cljIp" class="form-control" type="text" value="${log.cljIp}"/>
<input id=capIp name="capIp" class="form-control" type="text" value="${log.capIp}"/>
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="clientip"/>：</label>
<input id="clientIp" name="clientIp" class="form-control" type="text" value="${log.clientIp}"/>
<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="serverIp" name="serverIp" class="form-control" type="text" value="${log.serverIp}"/>
<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
</div>
</div>
</div>
@@ -192,7 +198,7 @@ $(document).ready(function(){
<td>${log.recvTime}</td>
<td>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
<c:if test="${log.protocol==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
<c:if test="${log.transProto==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
</c:forEach>
</td>
<td>
@@ -200,18 +206,18 @@ $(document).ready(function(){
<c:if test="${log.addrType==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
</c:forEach>
</td>
<td>${log.serverIp}</td>
<td>${log.clientIp}</td>
<td>${log.serverPort}</td>
<td>${log.clientPort}</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.streamType==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.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>
<td>
<c:if test="${log.exProtocol==1}">ISAKMP(V1)</c:if>

35
src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
View File

@@ -59,7 +59,7 @@ $(document).ready(function(){
<!-- 搜索内容与操作按钮栏 -->
<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>
@@ -105,7 +105,7 @@ $(document).ready(function(){
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="protocol" class="selectpicker select2 form-control" data-live-search="true" data-live-search-placeholder="search">
<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>
@@ -127,26 +127,31 @@ $(document).ready(function(){
</div>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="entrance_id"/>：</label>
<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
<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 id=cljIp name="cljIp" class="form-control" type="text" value="${log.cljIp}"/>
<input id=capIp name="capIp" class="form-control" type="text" value="${log.capIp}"/>
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="clientip"/>：</label>
<input id="clientIp" name="clientIp" class="form-control" type="text" value="${log.clientIp}"/>
<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="serverIp" name="serverIp" class="form-control" type="text" value="${log.serverIp}"/>
<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
</div>
</div>
</div>
@@ -201,7 +206,7 @@ $(document).ready(function(){
<td>${log.recvTime}</td>
<td>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
<c:if test="${log.protocol==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
<c:if test="${log.transProto==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
</c:forEach>
</td>
<td>
@@ -209,18 +214,18 @@ $(document).ready(function(){
<c:if test="${log.addrType==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
</c:forEach>
</td>
<td>${log.serverIp}</td>
<td>${log.clientIp}</td>
<td>${log.serverPort}</td>
<td>${log.clientPort}</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.streamType==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.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>
<td>${log.version}</td>
<td>${log.encryptMode}</td>

35
src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
View File

@@ -59,7 +59,7 @@ $(document).ready(function(){
<!-- 搜索内容与操作按钮栏 -->
<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>
@@ -105,7 +105,7 @@ $(document).ready(function(){
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="protocol" class="selectpicker select2 form-control" data-live-search="true" data-live-search-placeholder="search">
<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>
@@ -127,26 +127,31 @@ $(document).ready(function(){
</div>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="entrance_id"/>：</label>
<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
<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 id=cljIp name="cljIp" class="form-control" type="text" value="${log.cljIp}"/>
<input id=capIp name="capIp" class="form-control" type="text" value="${log.capIp}"/>
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="clientip"/>：</label>
<input id="clientIp" name="clientIp" class="form-control" type="text" value="${log.clientIp}"/>
<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="serverIp" name="serverIp" class="form-control" type="text" value="${log.serverIp}"/>
<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
</div>
</div>
</div>
@@ -203,7 +208,7 @@ $(document).ready(function(){
<td>${log.recvTime}</td>
<td>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
<c:if test="${log.protocol==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
<c:if test="${log.transProto==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
</c:forEach>
</td>
<td>
@@ -211,18 +216,18 @@ $(document).ready(function(){
<c:if test="${log.addrType==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
</c:forEach>
</td>
<td>${log.serverIp}</td>
<td>${log.clientIp}</td>
<td>${log.serverPort}</td>
<td>${log.clientPort}</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.streamType==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.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>
<td>${log.version}</td>
<td>${log.hostKey}</td>