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

去掉通联关系日志界面运营商展示，去掉流量统计app详情趋势运营商展示，同时修改导出去掉运营商列，app跳转到app详情界面时携带地域条件

Browse Source 
(cherry picked from commit d0b4907271)
This commit is contained in:
zhanghongqing
2019-01-21 08:54:09 +00:00
committed by 王鑫
parent f8a90c0c8f
commit cca47e3823
6 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp
View File

@@ -46,7 +46,12 @@
<select id="entranceId1" name="entranceId" class="selectpicker form-control" width="100px" data-live-search="true" data-live-search-placeholder="search">
<option value=""><spring:message code="select"/></option>
<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict" >
<c:if test="${!empty entranceId }">
<option value="${dict.itemCode}" <c:if test="${entranceId==dict.itemCode }">selected</c:if>><spring:message code="${dict.itemValue}"></spring:message></option>
</c:if>
<c:if test="${empty entranceId }">
<option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"></spring:message></option>
</c:if>
</c:forEach>
</select>
</div>
@@ -111,7 +116,12 @@
<select id="entranceId2" name="entranceId" class="selectpicker form-control" width="100px" data-live-search="true" data-live-search-placeholder="search">
<option value=""><spring:message code="select"/></option>
<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict" >
<c:if test="${!empty entranceId }">
<option value="${dict.itemCode}" <c:if test="${entranceId==dict.itemCode }">selected</c:if>><spring:message code="${dict.itemValue}"></spring:message></option>
</c:if>
<c:if test="${empty entranceId }">
<option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"></spring:message></option>
</c:if>
</c:forEach>
</select>
</div>
@@ -182,7 +192,7 @@
<thead>
<tr>
<th><spring:message code="client_ip"/></th>
<th><spring:message code="isp"/></th>
<%-- <th><spring:message code="isp"/></th> --%>
<th><spring:message code="link_num"/></th>
<th><spring:message code="percentage"/> (<spring:message code="link_num"/>)</th>
<th><spring:message code="packets"/></th>
@@ -361,7 +371,7 @@
if (data != null) {
var html ="<tr>";
html += "<td class='tc'>" + data.ipAddr + "</td>";
html += "<td class='tc'>" + data.ispName + "</td>";
// html += "<td class='tc'>" + data.ispName + "</td>";
html += "<td class='tc'>" + data.logNum + "</td>";
html += "<td class='tc'>" + data.logPercent + " %</td>";
// html += "<td class='tc'>" + (((data.entranceId)==1) ? "Astana":"Almaty") + "</td>";
@@ -375,7 +385,7 @@
if(index==fileDataS.length-1){
html+="<tr class='tr-total hidden'>"
html+= "<td class='tc'>"+"<spring:message code='report_total'/>"+"</td>";
html+= "<td class='tc'>" +"--"+"</td>";
// html+= "<td class='tc'>" +"--"+"</td>";
html+= "<td class='tc'>"+totalunique+"</td>";
html+= "<td class='tc'>" +"--"+"</td>";
html+= "<td class='tc'>"+totalpkt+"</td>";

3
src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
View File

@@ -381,7 +381,8 @@ function htmlData(fileDataS){
function openAppTrend(appType,appName){
var beginDate=$("#beginDateh").val();
var endDate=$("#endDateh").val();
var url= "${ctx}/dashboard/traffic/appTrendList?beginDate="+beginDate+"&endDate="+endDate+"&appName="+appName+"&appType="+appType;
var entranceId = $("#entranceId").val();
var url= "${ctx}/dashboard/traffic/appTrendList?beginDate="+beginDate+"&endDate="+endDate+"&appName="+appName+"&appType="+appType+"&entranceId="+entranceId;
window.location.href=(url)
}
/**

4
src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
View File

@@ -390,7 +390,7 @@
<th class="sort-column s_ip" column="client_ip"><spring:message code="client_ip"/></th>
<th class="sort-column d_port" column="server_port"><spring:message code="server_port"/></th>
<th class="sort-column s_port" column="client_port"><spring:message code="client_port"/></th>
<th class="sort-column device_id" column="isp"><spring:message code="isp"/></th>
<%-- <th class="sort-column device_id" column="isp"><spring:message code="isp"/></th> --%>
<th class="sort-column s2c_pkt_num" column="s2c_pkt_num"><spring:message code='s2c_pkt_num'/></th>
<th class="sort-column c2s_pkt_num" column="c2s_pkt_num"><spring:message code="c2s_pkt_num"/></th>
@@ -505,7 +505,7 @@
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>${log.ispName }</td>
<%-- <td>${log.ispName }</td> --%>
<td>${log.s2cPktNum }</td>
<td>${log.c2sPktNum }</td>