diff --git a/src/main/java/com/nis/domain/log/SearchReport.java b/src/main/java/com/nis/domain/log/SearchReport.java index 5342db1f6..e0585e6a7 100644 --- a/src/main/java/com/nis/domain/log/SearchReport.java +++ b/src/main/java/com/nis/domain/log/SearchReport.java @@ -30,7 +30,9 @@ public class SearchReport extends BaseEntity{ private Integer functionId; private String cfgName; private Integer action; - private Integer reportType; + private Integer reportType;//小时报,日报,月报 + //标签,性质,来文函号,境内源Ip,各国目的IP,运营商局点 + private String reportBusinessType; private String searchBusinessType; private String searchReportStartTime; private String searchReportEndTime; @@ -39,6 +41,20 @@ public class SearchReport extends BaseEntity{ public static final String searchConditionSplitor=","; public int searchConditionLimit; + /** + * reportBusinessType + * @return reportBusinessType + */ + + public String getReportBusinessType() { + return reportBusinessType; + } + /** + * @param reportBusinessType the reportBusinessType to set + */ + public void setReportBusinessType(String reportBusinessType) { + this.reportBusinessType = reportBusinessType; + } /** * reportType * @return reportType diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp index 73b10b86f..ec468546b 100644 --- a/src/main/webapp/WEB-INF/views/report/list.jsp +++ b/src/main/webapp/WEB-INF/views/report/list.jsp @@ -23,6 +23,9 @@ $(this).parent(".btn").button("toggle"); } }) + $("a[data-toggle='tab']").on("click",function(){ + $("#reportBusinessType").val($(this).data("bussiness")); + }); }); @@ -52,6 +55,7 @@ + @@ -73,24 +77,24 @@
- +
@@ -114,12 +118,36 @@
<%@include file="/WEB-INF/views/report/label.jsp" %>