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://192.168.10.125/k18_web/NFS.git into

Browse Source 
develop

Conflicts:
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	拦截ip不展示限速字段
This commit is contained in:
DuanDongmei
2018-11-16 15:02:21 +08:00
parent 50ce151d29 6f6a129193
commit 09f3477a49
52 changed files with 377 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
View File

@@ -322,23 +322,24 @@
<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc"><spring:message code="config_describe"/></th>
<th class="sort-column r.action"><spring:message code="block_type"/></th>
<th><spring:message code="ip_type"/></th>
<%-- <th><spring:message code="client_ip"/></th>
<th><spring:message code="client_port"/></th> --%>
<th><spring:message code="server_ip"/></th>
<th><spring:message code="server_port"/></th>
<th><spring:message code="ip_pattern"/></th>
<th><spring:message code="port_pattern"/></th>
<th><spring:message code="direction"/></th>
<th><spring:message code="protocol"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th>
<th><spring:message code="whether_area_block"/></th>
<th><spring:message code="antiddos_protocol"/></th>
<th><spring:message code="bps_threadshold"/></th>
<th><spring:message code="pps_threadshold"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th>
<th><spring:message code="whether_area_block"/></th>
<th><spring:message code="ip_type"/></th>
<%-- <th><spring:message code="client_ip"/></th>
<th><spring:message code="client_port"/></th> --%>
<th><spring:message code="ip_pattern"/></th>
<th><spring:message code="server_ip"/></th>
<th><spring:message code="port_pattern"/></th>
<th><spring:message code="server_port"/></th>
<th><spring:message code="direction"/></th>
<th><spring:message code="protocol"/></th>
<th><spring:message code="letter"/></th>
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
@@ -366,38 +367,6 @@
</c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
</c:forEach>
</td>
<%-- <td>${cfg.srcIpAddress }</td>
<td>${cfg.srcPort }</td> --%>
<td title="${cfg.destIpAddress }">${fns:abbr(cfg.destIpAddress, 42)}</td>
<td>${cfg.destPort }</td>
<td>
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemValue }"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemValue }"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemValue }"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
</c:forEach>
</td>
<td>${cfg.antiddosProtocol }</td>
<td>${cfg.bpsThreadshold }</td>
<td>${cfg.ppsThreadshold }</td>
<td>
<c:choose>
<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
@@ -416,6 +385,40 @@
</a>
</c:if>
</td>
<td>${cfg.antiddosProtocol }</td>
<td>${cfg.bpsThreadshold }</td>
<td>${cfg.ppsThreadshold }</td>
<td>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemValue }"/></c:if>
</c:forEach>
</td>
<%-- <td>${cfg.srcIpAddress }</td>
<td>${cfg.srcPort }</td> --%>
<td title="${cfg.destIpAddress }">${fns:abbr(cfg.destIpAddress, 42)}</td>
<td>
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemValue }"/></c:if>
</c:forEach>
</td>
<td>${cfg.destPort }</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemValue }"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
</c:forEach>
</td>
<td>${cfg.requestName }</td>
<td >
<c:set var="classify"></c:set>

23
src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
View File

@@ -370,10 +370,14 @@
<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column a.action"><spring:message code="block_type"/></th>
<c:if test="${cfg.functionId ne 212 }">
<c:if test="${cfg.functionId eq 201 }">
<th><spring:message code="ratelimit"/></th>
<%-- <th><spring:message code="bandwith"/></th> --%>
<th><spring:message code="intercept_file_strategy"/></th>
</c:if>
<c:if test="${cfg.functionId eq 200 }">
<%-- <th><spring:message code="bandwith"/></th> --%>
<th><spring:message code="intercept_file_strategy"/></th>
</c:if>
<c:if test="${cfg.functionId eq 212 }">
<th><spring:message code="replace_zone"/></th>
@@ -427,7 +431,7 @@
</td>
<c:if test="${cfg.functionId ne 212 }">
<c:if test="${cfg.functionId eq 201 }">
<td>
<c:if test="${indexCfg.action eq 64}">
<c:forEach items="${fns:getDictList('RATE_LIMIT')}" var="ratelimitC">
@@ -450,6 +454,21 @@
</c:forEach>
</c:if>
</td>
</c:if>
<c:if test="${cfg.functionId eq 200 }">
<%-- <td>
<c:if test="${indexCfg.action eq 64}">
${indexCfg.userRegion3 }
</c:if>
</td> --%>
<td>
<c:if test="${indexCfg.action eq 1}">
<c:forEach items="${certificateList}" var="certificate">
${indexCfg.userRegion1}
<c:if test="${indexCfg.userRegion1=='${certificate.compileId}'}">${certificate.cfgDesc}</c:if>
</c:forEach>
</c:if>
</td>
</c:if>
<c:if test="${cfg.functionId eq 212 }">
<td>

5
src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
View File

@@ -38,8 +38,7 @@
<div class="fl_fc">
<%-- <a href="${ctx}/dashboard/bandwidthList"> 详情显示--%>
<p>
<label data-original-title="<spring:message code="bandwith"/>"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
<label data-original-title="<spring:message code="bandwith"/>" class="tooltips" data-flag="false" data-html="true" data-placement="top">
<!-- 网络带宽 --><spring:message code="bandwith"/>
</label>
</p>
@@ -53,7 +52,7 @@
</div>
<div class="fl_fc">
<!-- <a href="javacript:;"> -->
<p>
<p style="margin-left: 0px;width:100%">
<label data-original-title="<spring:message code="action_reject"/>"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
<!-- 阻断链接数 --><spring:message code="action_reject"/>

6
src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
View File

@@ -124,10 +124,10 @@ $(document).ready(function(){
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -303,7 +303,7 @@ $(document).ready(function(){
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<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:forEach>
</td>

6
src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
View File

@@ -115,10 +115,10 @@ $(document).ready(function(){
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -295,7 +295,7 @@ $(document).ready(function(){
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<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:forEach>
</td>

6
src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
View File

@@ -109,10 +109,10 @@
<div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code='direct'/>：</label>
<label class="control-label"><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction" >
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
</c:forEach>
</form:select>
@@ -257,7 +257,7 @@
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<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:forEach>
</td>

6
src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
View File

@@ -104,10 +104,10 @@ $(document).ready(function(){
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -276,7 +276,7 @@ $(document).ready(function(){
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<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:forEach>
</td>

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

@@ -111,10 +111,10 @@
<div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code='direct'/>：</label>
<label class="control-label"><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="direction" >
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
</c:forEach>
</form:select>
@@ -307,7 +307,7 @@
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<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:forEach>
</td>

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

@@ -115,10 +115,10 @@ $(document).ready(function(){
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -283,7 +283,7 @@ $(document).ready(function(){
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<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:forEach>
</td>

6
src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp
View File

@@ -134,10 +134,10 @@
<div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code='direct'/>：</label>
<label class="control-label"><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="direction" >
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
</c:forEach>
</form:select>
@@ -303,7 +303,7 @@
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<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:forEach>
</td>

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

@@ -110,10 +110,10 @@
<div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code='direct'/>：</label>
<label class="control-label"><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="direction" >
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
</c:forEach>
</form:select>
@@ -345,7 +345,7 @@
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<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:forEach>
</td>

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

@@ -110,10 +110,10 @@
<div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code='direct'/>：</label>
<label class="control-label"><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="direction" >
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
</c:forEach>
</form:select>
@@ -253,7 +253,7 @@
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<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:forEach>
</td>

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

@@ -101,10 +101,10 @@ $(document).ready(function(){
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -259,7 +259,7 @@ $(document).ready(function(){
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<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:forEach>
</td>

6
src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
View File

@@ -113,10 +113,10 @@
</div>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker form-control select2">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -271,7 +271,7 @@
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<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:forEach>
</td>

6
src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
View File

@@ -109,10 +109,10 @@
<div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code='direct'/>：</label>
<label class="control-label"><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="direction" >
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
</c:forEach>
</form:select>
@@ -284,7 +284,7 @@
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<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:forEach>
</td>

12
src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
View File

@@ -114,10 +114,10 @@ $(document).ready(function(){
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -195,7 +195,7 @@ $(document).ready(function(){
<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
<th class="sort-column direction"><spring:message code="direction"/></th>
<%-- <th class="sort-column direction"><spring:message code="direction"/></th> --%>
<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -299,11 +299,11 @@ $(document).ready(function(){
<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<%-- <td>
<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:forEach>
</td>
</td> --%>
<td>${log.innerSmac }</td>
<td>${log.innerDmac }</td>
<td>

12
src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
View File

@@ -115,10 +115,10 @@ $(document).ready(function(){
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -192,7 +192,7 @@ $(document).ready(function(){
<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
<th class="sort-column direction"><spring:message code="direction"/></th>
<%-- <th class="sort-column direction"><spring:message code="direction"/></th> --%>
<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -295,11 +295,11 @@ $(document).ready(function(){
<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<%-- <td>
<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:forEach>
</td>
</td> --%>
<td>${log.innerSmac }</td>
<td>${log.innerDmac }</td>
<td>

12
src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
View File

@@ -114,10 +114,10 @@ $(document).ready(function(){
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -193,7 +193,7 @@ $(document).ready(function(){
<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
<th class="sort-column direction"><spring:message code="direction"/></th>
<%-- <th class="sort-column direction"><spring:message code="direction"/></th> --%>
<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -297,11 +297,11 @@ $(document).ready(function(){
<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<%-- <td>
<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:forEach>
</td>
</td> --%>
<td>${log.innerSmac }</td>
<td>${log.innerDmac }</td>
<td>

12
src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
View File

@@ -115,10 +115,10 @@ $(document).ready(function(){
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -191,7 +191,7 @@ $(document).ready(function(){
<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
<th class="sort-column direction"><spring:message code="direction"/></th>
<%-- <th class="sort-column direction"><spring:message code="direction"/></th> --%>
<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -295,11 +295,11 @@ $(document).ready(function(){
<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<%-- <td>
<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:forEach>
</td>
</td> --%>
<td>${log.innerSmac }</td>
<td>${log.innerDmac }</td>
<td>

12
src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
View File

@@ -112,10 +112,10 @@ $(document).ready(function(){
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -190,7 +190,7 @@ $(document).ready(function(){
<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
<th class="sort-column direction"><spring:message code="direction"/></th>
<%-- <th class="sort-column direction"><spring:message code="direction"/></th> --%>
<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -294,11 +294,11 @@ $(document).ready(function(){
<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<%-- <td>
<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:forEach>
</td>
</td> --%>
<td>${log.innerSmac }</td>
<td>${log.innerDmac }</td>
<td>

6
src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
View File

@@ -115,10 +115,10 @@ $(document).ready(function(){
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -297,7 +297,7 @@ $(document).ready(function(){
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<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:forEach>
</td>

6
src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
View File

@@ -115,10 +115,10 @@ $(document).ready(function(){
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -297,7 +297,7 @@ $(document).ready(function(){
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<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:forEach>
</td>

12
src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
View File

@@ -156,13 +156,13 @@
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct" />：</label>
<label><spring:message code="direction" />：</label>
<form:select path="direction"
class="selectpicker select2 form-control">
<form:option value="">
<spring:message code="select" />
</form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}"
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}"
var="dict">
<form:option value="${dict.itemCode}">
<spring:message code="${dict.itemValue}" />
@@ -250,7 +250,7 @@
<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
<th class="sort-column direction"><spring:message code="direction"/></th>
<%-- <th class="sort-column direction"><spring:message code="direction"/></th> --%>
<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -354,11 +354,11 @@
<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<%-- <td>
<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:forEach>
</td>
</td> --%>
<td>${log.innerSmac }</td>
<td>${log.innerDmac }</td>
<td>

12
src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
View File

@@ -115,10 +115,10 @@ $(document).ready(function(){
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -192,7 +192,7 @@ $(document).ready(function(){
<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
<th class="sort-column direction"><spring:message code="direction"/></th>
<%-- <th class="sort-column direction"><spring:message code="direction"/></th> --%>
<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -296,11 +296,11 @@ $(document).ready(function(){
<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<%-- <td>
<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:forEach>
</td>
</td> --%>
<td>${log.innerSmac }</td>
<td>${log.innerDmac }</td>
<td>

12
src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
View File

@@ -115,10 +115,10 @@ $(document).ready(function(){
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -192,7 +192,7 @@ $(document).ready(function(){
<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
<th class="sort-column direction"><spring:message code="direction"/></th>
<%-- <th class="sort-column direction"><spring:message code="direction"/></th> --%>
<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -296,11 +296,11 @@ $(document).ready(function(){
<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<%-- <td>
<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:forEach>
</td>
</td> --%>
<td>${log.innerSmac }</td>
<td>${log.innerDmac }</td>
<td>

12
src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
View File

@@ -114,10 +114,10 @@ $(document).ready(function(){
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -191,7 +191,7 @@ $(document).ready(function(){
<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
<th class="sort-column direction"><spring:message code="direction"/></th>
<%-- <th class="sort-column direction"><spring:message code="direction"/></th> --%>
<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -295,11 +295,11 @@ $(document).ready(function(){
<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<%-- <td>
<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:forEach>
</td>
</td> --%>
<td>${log.innerSmac }</td>
<td>${log.innerDmac }</td>
<td>

12
src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
View File

@@ -115,10 +115,10 @@ $(document).ready(function(){
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -192,7 +192,7 @@ $(document).ready(function(){
<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
<th class="sort-column direction"><spring:message code="direction"/></th>
<%-- <th class="sort-column direction"><spring:message code="direction"/></th> --%>
<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -296,11 +296,11 @@ $(document).ready(function(){
<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<%-- <td>
<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:forEach>
</td>
</td> --%>
<td>${log.innerSmac }</td>
<td>${log.innerDmac }</td>
<td>

12
src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
View File

@@ -115,10 +115,10 @@ $(document).ready(function(){
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -192,7 +192,7 @@ $(document).ready(function(){
<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
<th class="sort-column direction"><spring:message code="direction"/></th>
<%-- <th class="sort-column direction"><spring:message code="direction"/></th> --%>
<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -296,11 +296,11 @@ $(document).ready(function(){
<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<%-- <td>
<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:forEach>
</td>
</td> --%>
<td>${log.innerSmac }</td>
<td>${log.innerDmac }</td>
<td>

6
src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
View File

@@ -115,10 +115,10 @@ $(document).ready(function(){
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -300,7 +300,7 @@ $(document).ready(function(){
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<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:forEach>
</td>

12
src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
View File

@@ -115,10 +115,10 @@ $(document).ready(function(){
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -199,7 +199,7 @@ $(document).ready(function(){
<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
<th class="sort-column direction"><spring:message code="direction"/></th>
<%-- <th class="sort-column direction"><spring:message code="direction"/></th> --%>
<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -300,11 +300,11 @@ $(document).ready(function(){
<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<%-- <td>
<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:forEach>
</td>
</td> --%>
<td>${log.innerSmac }</td>
<td>${log.innerDmac }</td>
<td>

12
src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
View File

@@ -115,10 +115,10 @@ $(document).ready(function(){
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -200,7 +200,7 @@ $(document).ready(function(){
<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
<th class="sort-column direction"><spring:message code="direction"/></th>
<%-- <th class="sort-column direction"><spring:message code="direction"/></th> --%>
<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -301,11 +301,11 @@ $(document).ready(function(){
<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<%-- <td>
<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:forEach>
</td>
</td> --%>
<td>${log.innerSmac }</td>
<td>${log.innerDmac }</td>
<td>

6
src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp
View File

@@ -115,10 +115,10 @@ $(document).ready(function(){
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -265,7 +265,7 @@ $(document).ready(function(){
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<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:forEach>
</td>

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

@@ -115,10 +115,10 @@ $(document).ready(function(){
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -272,7 +272,7 @@ $(document).ready(function(){
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<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:forEach>
</td>

6
src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
View File

@@ -126,10 +126,10 @@
<div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code='direct'/>：</label>
<label class="control-label"><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction" >
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
</c:forEach>
</form:select>
@@ -278,7 +278,7 @@
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<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:forEach>
</td>

6
src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
View File

@@ -112,10 +112,10 @@
</div>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker form-control select2">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -264,7 +264,7 @@
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<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:forEach>
</td>

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

@@ -115,10 +115,10 @@ $(document).ready(function(){
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -271,7 +271,7 @@ $(document).ready(function(){
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<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:forEach>
</td>

6
src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
View File

@@ -121,10 +121,10 @@
</div>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker form-control select2">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
@@ -271,7 +271,7 @@
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<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:forEach>
</td>

6
src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
View File

@@ -96,10 +96,10 @@
<div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code='direct'/>：</label>
<label class="control-label"><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="direction" >
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
</c:forEach>
</form:select>
@@ -278,7 +278,7 @@
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
<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:forEach>
</td>

28
src/main/webapp/WEB-INF/views/report/list.jsp
View File

@@ -89,6 +89,10 @@ $(document).ready(function() {
$('.table-responsive').css({'height':height-166+'px'});
//style.height=height-130+'px';
}
var li=document.getElementById("liwhite").offsetWidth;
var lipx=Number(li/6);
$(".lireport").css({'width':lipx+'px','text-overflow':'ellipsis','overflow':'hidden'});
});
function getXlsxFileName() {
var cfgName = $("[name=cfgName2]").val() + "_";
@@ -356,8 +360,16 @@ function customColumnClick(){
if($('.table-responsive')){
$('.table-responsive').css({'height':height-186+'px'});
}
var li=document.getElementById("liwhite").offsetWidth;
var lipx=Number(li/6);
$(".lireport").css({'width':lipx+'px','text-overflow':'ellipsis','overflow':'hidden'});
}
</script>
<style type="text/css">
li{
white-space:nowrap;
}
</style>
</head>
<body>
<div class="page-content">
@@ -470,40 +482,40 @@ function customColumnClick(){
</form:form>
</div>
<div>
<div id="liwhite">
<sys:message content="${message}"/>
<br>
<ul class="nav nav-tabs nav-justified">
<ul class="nav nav-tabs nav-justified" >
<li
<c:if test="${bean.reportBusinessType eq 'label_report' or bean.reportBusinessType ==null}">
class="active"
</c:if>
><a data-bussiness="label_report" data-toggle="tab" href="#label"><spring:message code="label_report"/></a></li>
><a class="lireport" data-bussiness="label_report" data-toggle="tab" href="#label" title="<spring:message code="label_report"/>"><spring:message code="label_report"/></a></li>
<li
<c:if test="${bean.reportBusinessType eq 'attr_type_report'}">
class="active"
</c:if>
><a data-bussiness="attr_type_report" data-toggle="tab" href="#attrType"><spring:message code="attr_type_report"/></a></li>
><a class="lireport" data-bussiness="attr_type_report" data-toggle="tab" href="#attrType" title="<spring:message code="attr_type_report"/>" ><spring:message code="attr_type_report"/></a></li>
<li
<c:if test="${bean.reportBusinessType eq 'lwhh_report'}">
class="active"
</c:if>
><a data-bussiness="lwhh_report" data-toggle="tab" href="#lwhh"><spring:message code="lwhh_report"/></a></li>
><a class="lireport" data-bussiness="lwhh_report" data-toggle="tab" href="#lwhh" title="<spring:message code="lwhh_report"/>" ><spring:message code="lwhh_report"/></a></li>
<li
<c:if test="${bean.reportBusinessType eq 'src_ip_report'}">
class="active"
</c:if>
><a data-bussiness="src_ip_report" data-toggle="tab" href="#srcIp"><spring:message code="src_ip_report"/></a></li>
><a class="lireport" data-bussiness="src_ip_report" data-toggle="tab" href="#srcIp" title="<spring:message code="src_ip_report"/>" ><spring:message code="src_ip_report"/></a></li>
<li
<c:if test="${bean.reportBusinessType eq 'dest_ip_report'}">
class="active"
</c:if>
><a data-bussiness="dest_ip_report" data-toggle="tab" href="#destIp"><spring:message code="dest_ip_report"/></a></li>
><a class="lireport" data-bussiness="dest_ip_report" data-toggle="tab" href="#destIp" title="<spring:message code="dest_ip_report"/>" ><spring:message code="dest_ip_report"/></a></li>
<li
<c:if test="${bean.reportBusinessType eq 'isp_report'}">
class="active"
</c:if>
><a data-bussiness="isp_report" data-toggle="tab" href="#entranceId"><spring:message code="isp_report"/></a></li>
><a class="lireport" data-bussiness="isp_report" data-toggle="tab" href="#entranceId" title="<spring:message code="isp_report"/>"><spring:message code="isp_report"/></a></li>
</ul>
<div class="tab-content table-responsive">
<div id="label" class="tab-pane fade

4
src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css vendored
View File

@@ -2227,7 +2227,7 @@ table th[class*="col-"] {
.table-responsive {
overflow-x: auto;
min-height: 0.01%;
position: fixed;
/* position: fixed; */
right: 14px;
left: 14px;
margin-top: 20px;
@@ -3182,7 +3182,7 @@ tbody.collapse.in {
position: absolute;
top: 100%;
left: 0/*rtl:auto*/;
z-index: 1000;
z-index: 2147483647;
display: none;
float: left;
min-width: 160px;

44
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js
View File

@@ -4,7 +4,7 @@
*/
(function ($) {
$.extend($.validator.messages, {
required: "Поле обязательно для заполнения.",
required: "Это поле является обязательным.",
remote: "Пожалуйста, исправьте это поле.",
email: "Введите действующий адрес эл. почты.",
url: "Введите действительный URL.",
@@ -27,22 +27,22 @@
ipMask:"Введите правильный IP/маску",
ipPart:"Недопустимая часть IP",
//ipv6MaskPart:"Mаска-показатель степени 2, небольше 128",
ipv6MaskPart:"掩码介于2到128",
ipv6MaskPart:"Маска должна быть между 2 и 128",
//ipMaskRange:"Маска IP между 0 и 32",
ipMaskRange:"Маска IP должна между 16 и 32",
srcIpNotEqDestIp:"IP Источник",
destIpNotEqDestIp:"IP Назначение",
srcIpNotEqDestIp:"IP-адрес клиента",
destIpNotEqDestIp:"и IP-адрес сервера",
IpNotEqDestIp:"Не может быть одинаковым",
srcIpIsNotValue:"Исходный IP не может быть ",
destIpIsNotValue:"IP назначение не может быть",
ipRange:"IP范围格式错误或者起始IP与结束IP不在C网段",
srcIpIsNotValue:"IP-адрес клиента не может быть",
destIpIsNotValue:"IP-адрес сервера не может быть",
ipRange:"Неверный IP-формат или начальный IP и конечный IP в C подсетях",
ipRange1:"Начальный IP должен быть меньше конечного IP",
portCheck: "Введите  правильный  порт.",
notStartZero:"Введите действительное целое число",
portRange:"Порт должен между 0 и 65535",
portMaskRange:"Порт и маска должны находиться между 0 и 65535. Правильный шаблон -«порт/маска».",
portMaskRange:"Порт и маска должны быть между 0 и 65535. Правильный шаблон -«порт/маска».",
chooseAreaOrIsp:"Регион или оператор должны выбрать один",
areaControl:"Действие сброса и петли не требуется управление областью",
areaControl:"Падению и циклу не нужно управление зоны",
ip_type: "IP Тип",
ip_pattern: "IP Формат",
area: "Район",
@@ -58,7 +58,7 @@
ip_subnet: "IP/Маска Подсети",
ip_range: "IP Диапазон",
timeout:"Тайм-аут",
areaIpPrefix:"Запрещенное Значение: ",
areaIpPrefix:"Запрещенное значение：",
domainCheck:"Введите действительный домен.",
checkParent:"Тип конфигурации должен совпадать с родительским типом.",
specServiceCodeCheck:"Номер протокола повторяется.",
@@ -67,17 +67,17 @@
invisibleChar:"Введите видимый символ",
hasInvisibleChar:"Тег {0} включает невидимый символ",
haveInvisibleChar:"Теги {0} включают невидимый символ",
httpCheck:"Please enter a correct url(http[s]://xxx.xx)",
failed:"Failed",
go_back:"Go Back Policies",
log_5_minutes:"Log For The Last Five Minutes",
log_1_hour:"Log For The Last Hour",
input:"Please Enter ",
protocolPort:"TCP protocol or UDP protocol must be chosen when port is greater than 0",
protocolPort1:"Only when TCP protocol or UDP protocol is chosen can port greater than 0",
netAddress:"C类IP地址网络位必须相同",
ipUnique:"IP already exists.",
asnNoUnique:"ASN already exists.",
areaUnique:"Area already exists."
httpCheck:"Введите правильный URL(http[s]://xxx.xx)",
failed:"Неудачно",
go_back:"Вернуть назад Политики",
log_5_minutes:"Журнал за последние пять минут",
log_1_hour:"Журнал За последний час",
input:"Введите, пожалуйста ",
protocolPort:"Если порт больше 0, необходимо выбрать протокол TCP или протокол UDP",
protocolPort1:"Только при выборе протокола TCP или протокола UDP порт может быть больше 0",
netAddress:"Тип IP-адресов класса C должен иметь один и тот же номер сети бит поля.",
ipUnique:"IP уже существует.",
asnNoUnique:"ASN уже существует.",
areaUnique:"Регион уже существует."
});
}(jQuery));

26
src/main/webapp/static/pages/css/data_text.css
View File

@@ -43,7 +43,7 @@ p{
margin-top: 15px;
}
.data_content .data_info .fr_fc .fl_fc{
width: 68%;
width: 70%;
height: 110px;
border-width: 0 1px;
margin-left: 0px;
@@ -105,58 +105,74 @@ p{
text-align: center;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
/* text-overflow: ellipsis; */
margin-left: -12px;
}
.data_content .data_info .info_1 label:nth-child(1){
width:100%;
color:#fff;
font-size: 18px;
text-align: center;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
margin: -3px;
margin-left: -20px;
}
.data_content .data_info>div.info_1 p:nth-child(2){
width:100%;
font-weight: 600;
font-size: 16px;
color:#288dce;
margin-top: 2.0em;
margin-top: 2.1em;
margin-left: 0px;
}
.data_content .data_info .info_2 .fr_fc .numberRun2{
width:100%;
font-weight: 600;
font-size: 16px;
color:#288dce;
margin-top: 2.1em;
margin-left: 0px;
}
.data_content .data_info .info_2 .fr_fc .numberRun3{
width:100%;
font-weight: 600;
font-size: 16px;
color:#288dce;
margin-top: 2.1em;
margin-left: 0px;
}
.data_content .data_info .info_2 .fr_fc .numberRun5{
width:100%;
font-weight: 600;
font-size: 16px;
color:#288dce;
margin-top: 2.1em;
margin-left: 0px;
}
.data_content .data_info .info_2 .fr_fc .numberRun6{
width:100%;
font-weight: 600;
font-size: 16px;
color:#288dce;
margin-top: 2.1em;
margin-left: 0px;
}
.data_content .data_info .info_2 .fr_fc .numberRun{
width:100%;
font-weight: 600;
font-size: 16px;
color:#288dce;
margin-top: 2.1em;
margin-left: 0px;
}
.data_content .data_info>div.info_1 .fl_fc .numberRun4{
width:100%;
font-weight: 600;
font-size: 16px;
color:#288dce;
margin-top: 1px;
margin-left: 0px;
}
.data_content .data_info>div.info_1 .fl_fc .numberRun4-unit{
font-weight: 500;
@@ -344,7 +360,7 @@ p{
margin-bottom: 5px;
}
.data_content .data_main1 .main_left1 div .main_title1{
width: 230px;
width: 250px;
height: 35px;
line-height: 33px;
background-color: #3D3D3D;

12
src/main/webapp/static/pages/scripts/echart.js
View File

@@ -47,7 +47,6 @@
},
exporting: {
allowHTML:true,
filename:'Protocol-Type',
chartOptions: {
plotOptions: {
@@ -233,8 +232,7 @@
},
exporting: {
allowHTML:true,
//
// filename:'Active-IP',
filename:'Active-IP',
chartOptions: {
plotOptions: {
series: {
@@ -396,7 +394,6 @@
},
exporting: {
allowHTML:true,
filename:'App',
chartOptions: {
plotOptions: {
@@ -555,7 +552,6 @@ function echart_2(rs){
},
exporting: {
allowHTML:true,
filename:'BS',
chartOptions: {
plotOptions: {
@@ -699,7 +695,6 @@ function echart_5(rs){
},
exporting: {
allowHTML:true,
filename:'BS',
chartOptions: {
plotOptions: {
@@ -845,7 +840,6 @@ function echart_4(rs){
},
exporting: {
allowHTML:true,
filename:'Website',
chartOptions: {
plotOptions: {
@@ -984,7 +978,6 @@ function echart_6(rs){
},
exporting: {
allowHTML:true,
filename:'Website',
chartOptions: {
plotOptions: {
@@ -1128,8 +1121,7 @@ function echart_topic_domain(rs){
},
exporting: {
allowHTML:true,
filename:'Topic',
chartOptions: {
plotOptions: {
series: {