Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

This commit is contained in:
段冬梅
2018-12-11 14:34:40 +08:00
4 changed files with 32 additions and 11 deletions

View File

@@ -243,7 +243,7 @@ $(document).ready(function(){
<c:set var="labelProtoIds">${log.labelProtoId }</c:set>
<c:forEach items="${protocolList}" var="dict">
<c:if test="${dict.code eq log.labelProtoId}">
<c:set var="labelProtoIds">${dic.item}</c:set>
<c:set var="labelProtoIds">${dict.item}</c:set>
</c:if>
</c:forEach>
<spring:message code="${labelProtoIds}"/>
@@ -255,7 +255,7 @@ $(document).ready(function(){
<c:set var="labelBehavIds">${log.labelBehavId }</c:set>
<c:forEach items="${behaviorList}" var="dict">
<c:if test="${dict.code eq log.labelBehavId}">
<c:set var="labelBehavIds">${dic.item}</c:set>
<c:set var="labelBehavIds">${dict.item}</c:set>
</c:if>
</c:forEach>
<spring:message code="${labelBehavIds}"/>
@@ -267,7 +267,7 @@ $(document).ready(function(){
<c:set var="labelAppIds">${log.labelAppId }</c:set>
<c:forEach items="${appList}" var="dict">
<c:if test="${dict.code eq log.labelAppId}">
<c:set var="labelAppIds">${dic.item}</c:set>
<c:set var="labelAppIds">${dict.item}</c:set>
</c:if>
</c:forEach>
<spring:message code="${labelAppIds}"/>

View File

@@ -278,7 +278,7 @@ $(document).ready(function(){
<c:set var="attackTypes">${log.attackType }</c:set>
<c:forEach items="${fns:getDictList('ATTACK_TYPE')}" var="dict">
<c:if test="${dict.itemCode eq log.attackType}">
<c:set var="attackTypes">${dic.itemValue}</c:set>
<c:set var="attackTypes">${dict.itemValue}</c:set>
</c:if>
</c:forEach>
<spring:message code="${attackTypes}"/>

View File

@@ -254,7 +254,7 @@ $(document).ready(function(){
<tr>
<td>
<%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
--%> <a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/ntc/av/ajaxfileSampleList" compileId="${log.cfgId } ><i class="icon-book-open"></i></a>
--%> <a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/ntc/av/ajaxfileSampleList" compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
</td>
<td>${log.cfgId }</td>
<td>
@@ -319,7 +319,8 @@ $(document).ready(function(){
<c:set var="avProtocol" value="${dic.itemValue }"></c:set>
</c:if>
</c:forEach>
${avProtocol }</td>
${avProtocol }
</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>

View File

@@ -344,31 +344,51 @@ $(document).ready(function(){
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>
<c:set var="deviceIds">${log.deviceId }</c:set>
<c:forEach items="${fns:getDictList('DEVICE')}" var="device">
<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
<c:if test="${device.itemCode eq log.deviceId}">
<c:set var="deviceIds">${device.itemValue}</c:set>
</c:if>
</c:forEach>
<spring:message code="${deviceIds}"/>
</td>
<td>
<c:set var="linkIds">${log.linkId }</c:set>
<c:forEach items="${fns:getDictList('LINK')}" var="link">
<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
<c:if test="${link.itemCode eq log.linkId}">
<c:set var="linkIds">${link.itemValue}</c:set>
</c:if>
</c:forEach>
<spring:message code="${linkIds}"/>
</td>
<td>
<c:set var="encapTypes">${log.encapType }</c:set>
<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
<c:if test="${encapType.itemCode eq log.encapType}">
<c:set var="encapTypes">${encapType.itemValue}</c:set>
</c:if>
</c:forEach>
<spring:message code="${encapTypes}"/>
</td>
<c:if test="${fns:getUser().isAdmin()}"><td>
<c:set var="directions">${log.direction }</c:set>
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
<c:if test="${direction.itemCode eq log.direction}">
<c:set var="directions">${direction.itemValue}</c:set>
</c:if>
</c:forEach>
<spring:message code="${directions}"/>
</td></c:if>
<td>${log.innerSmac }</td>
<td>${log.innerDmac }</td>
<td>
<c:set var="streamDirs">${log.streamDir }</c:set>
<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="streamType">
<c:if test="${streamType.itemCode eq log.streamDir}">${streamType.itemValue}</c:if>
<c:if test="${streamType.itemCode eq log.streamDir}">
<c:set var="streamDirs">${streamType.itemValue}</c:set>
</c:if>
</c:forEach>
<spring:message code="${streamDirs}"/>
</td>
<td>${log.addrList }</td>
<td>${log.serverLocate}</td>