From 67f8730feef6c0b75491d6b2a5c8e4a616d1fdd3 Mon Sep 17 00:00:00 2001 From: dongxiaoyan Date: Tue, 18 Dec 2018 06:24:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AF=BC=E5=87=BA=E5=88=97?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nis/web/controller/report/ReportController.java | 4 ++-- .../webapp/WEB-INF/views/report/ipRangeReportList.jsp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/nis/web/controller/report/ReportController.java b/src/main/java/com/nis/web/controller/report/ReportController.java index 6ebddc734..852e60a1b 100644 --- a/src/main/java/com/nis/web/controller/report/ReportController.java +++ b/src/main/java/com/nis/web/controller/report/ReportController.java @@ -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; diff --git a/src/main/webapp/WEB-INF/views/report/ipRangeReportList.jsp b/src/main/webapp/WEB-INF/views/report/ipRangeReportList.jsp index ef14c177e..839c40f55 100644 --- a/src/main/webapp/WEB-INF/views/report/ipRangeReportList.jsp +++ b/src/main/webapp/WEB-INF/views/report/ipRangeReportList.jsp @@ -113,11 +113,11 @@ <%-- --%> <%-- --%> - - - - - + + + + +