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

调整导出列选择的问题

Browse Source
This commit is contained in:
dongxiaoyan
2018-12-18 06:24:03 +08:00
parent 6ac2cfccab
commit 67f8730fee
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/web/controller/report/ReportController.java
View File

@@ -344,7 +344,7 @@ public class ReportController extends BaseController {
titleList.add("Ntc_Ip_Range_Report");
classMap.put("Ntc_Ip_Range_Report", NtcIpRangeReport.class);
SysUser user = UserUtils.getUser();
hColumns += "s_asn,d_asn,cfg_id,action,found_time,recv_time,entrance_id,clj_ip,transport_layer_protocol,addr_type,server_ip,"
hColumns += ",s_asn,d_asn,cfg_id,action,found_time,recv_time,entrance_id,clj_ip,transport_layer_protocol,addr_type,server_ip,"
+ "client_ip,server_port,client_port,deviceid,link_id,encap_type,direction,inner_smac,inner_dmac,"
+ "stream_type,nest_addr_list,server_locate,client_locate,s_asn,d_asn,s_subscribe_id,d_subscribe_id,"
+ "user_region,scene_file,";
@@ -427,7 +427,7 @@ public class ReportController extends BaseController {
/*hColumns += "s_asn,d_asn,cfg_id,action,found_time,recv_time,entrance_id,clj_ip,transport_layer_protocol,addr_type,server_ip,"
+ "client_ip,server_port,client_port,deviceid,link_id,encap_type,direction,inner_smac,inner_dmac,"
+ "stream_type,nest_addr_list,server_locate,client_locate,s_subscribe_id,d_subscribe_id,user_region,scene_file,";*/
hColumns += "s_asn,d_asn,cfg_id,action,found_time,recv_time,entrance_id,clj_ip,transport_layer_protocol,addr_type,server_ip,"
hColumns += ",s_asn,d_asn,cfg_id,action,found_time,recv_time,entrance_id,clj_ip,transport_layer_protocol,addr_type,server_ip,"
+ "client_ip,server_port,client_port,deviceid,link_id,encap_type,direction,inner_smac,inner_dmac,"
+ "stream_type,nest_addr_list,server_locate,client_locate,s_subscribe_id,d_subscribe_id,user_region,scene_file,";
String cfgIndexInfoNoExport = "," + hColumns;

10
src/main/webapp/WEB-INF/views/report/ipRangeReportList.jsp
View File

@@ -113,11 +113,11 @@
<%-- <th><spring:message code="log"/></th> --%>
<%-- <th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th> --%>
<th class="sort-column ip_start" columan="ip_start"><spring:message code="ip_start"/></th>
<th class="sort-column ip_end" columan="ip_end"><spring:message code="ip_end"/></th>
<th class="sort-column ip_sub" columan="ip_sub"><spring:message code="ip_sub"/></th>
<th class="sort-column ip_start_num" columan="ip_start_num"><spring:message code="country"/></th>
<th class="sort-column ip_end_num" columan="ip_end_num"><spring:message code="desc"/></th>
<th class="sort-column ip_start" column="ip_start"><spring:message code="ip_start"/></th>
<th class="sort-column ip_end" column="ip_end"><spring:message code="ip_end"/></th>
<th class="sort-column ip_sub" column="ip_sub"><spring:message code="ip_sub"/></th>
<th class="sort-column ip_start_num" column="country"><spring:message code="country"/></th>
<th class="sort-column ip_end_num" column="desc"><spring:message code="desc"/></th>
</tr>
</thead>