From b235d0bcf6f405dd1968bf382043501b4aa2215f Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Fri, 6 Jul 2018 18:39:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2tab=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=9D=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/domain/log/SearchReport.java | 18 ++++++-
 src/main/webapp/WEB-INF/views/report/list.jsp | 48 +++++++++++++++----
 2 files changed, 55 insertions(+), 11 deletions(-)

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<SearchReport>{
 	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<SearchReport>{
 	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"));
+		});
 	});
 </script>
 </head>
@@ -52,6 +55,7 @@
 						<form:form id="searchForm" modelAttribute="bean" action="${ctx}/report/list" method="post" class="form-search">
 							<input id="functionId" name="functionId" type="hidden" value="${bean.functionId}"/>
 							<input name="cfgName" type="hidden" value="${bean.cfgName}"/>
+							<input id="reportBusinessType" name="reportBusinessType" type="hidden" value="${bean.reportBusinessType}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${bean.isFilterAction }"/>
 							<!-- 搜索内容与操作按钮栏 -->
@@ -73,24 +77,24 @@
                                   		<label class="btn btn-default">
                                   			<input type="radio" name="reportType" value="1" 
                                   			<c:if test="${bean.reportType==1}">checked</c:if>
-                                  			><spring:message code="日报"/>
+                                  			><spring:message code="小时报"/>
                                   		</label>
                                   		<label class="btn btn-default">
                                   			<input type="radio" name="reportType" value="2"
                                   			<c:if test="${bean.reportType==2}">checked</c:if>
-                                  			><spring:message code="月报"/>
+                                  			><spring:message code="日报"/>
                                   		</label>
                                   		<label class="btn btn-default">
                                   			<input type="radio" name="reportType" value="3"
                                   			<c:if test="${bean.reportType==3}">checked</c:if>
-                                  			><spring:message code="季报"/>
+                                  			><spring:message code="月报"/>
                                   		</label>
                                   	</div>
 								</div>
 								<div class="pull-left">
 									 <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
 									 <button type="button" class="btn btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
-	                                 <sys:delRow url="${ctx}/report/test/export?functionId=${cfg.functionId}" id="contentTable" label="export" maxRow="${page.maxExportSize}"></sys:delRow>
+	                                 <sys:delRow url="${ctx}/report/export?functionId=${cfg.functionId}" id="contentTable" label="export" maxRow="${page.maxExportSize}"></sys:delRow>
 	                                 <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/><i class="fa fa-angle-double-down"></i></button>
 								</div>
 								 <div class="pull-right">
@@ -114,12 +118,36 @@
 						<br>
 						<ul class="nav nav-tabs nav-justified">
 							<!-- <li><a data-toggle="tab" href="#serviceType">业务类型</a></li> -->
-							<li class="active"><a data-toggle="tab" href="#label">标签</a></li>
-							<li><a data-toggle="tab" href="#attrType">性质</a></li>
-							<li><a data-toggle="tab" href="#lwhh">来文函号</a></li>
-							<li><a data-toggle="tab" href="#srcIp">境内源IP</a></li>
-							<li><a data-toggle="tab" href="#destIp">各国家目的IP</a></li>
-							<li><a data-toggle="tab" href="#entranceId">运营商局点</a></li>
+							<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>
+							<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>
+							<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>
+							<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>
+							<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>
+							<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>
 						</ul>
 						<div class="tab-content">
 							<%@include file="/WEB-INF/views/report/label.jsp" %>