From 5a4aec50c210bc1448f229c4b476831f2bfcace7 Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Sun, 16 Dec 2018 15:21:32 +0800
Subject: [PATCH] =?UTF-8?q?radius=E9=A1=B5=E9=9D=A2=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/tags/sys/delRow.tag           | 10 ++++++++++
 .../webapp/WEB-INF/views/log/ntc/radiusLogList.jsp    | 11 +++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
index f309b52db..911c24199 100644
--- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
@@ -30,6 +30,16 @@
 			<i class="fa fa-download"> <spring:message code="export"/></i>
 		</a>
 	</c:when>
+	<c:when test="${label eq 'excel'}">
+		<a href="javascript:void(0);"  onclick="exportData('${url}',${fns:getStringProperty('maxExportSize',1000000)},'${searchUrl}')" data-toggle="tooltip" data-placement="top">
+			<i class="fa fa-download"> <spring:message code="Excel"/></i>
+		</a>
+	</c:when>
+	<c:when test="${label eq 'csv'}">
+		<a href="javascript:void(0);"  onclick="exportData('${url}',${fns:getStringProperty('maxExportSize',1000000)},'${searchUrl}')" data-toggle="tooltip" data-placement="top">
+			<i class="fa fa-download"> <spring:message code="CSV"/></i>
+		</a>
+	</c:when>
 </c:choose>
 <%-- 使用方法： 1.将本tag写在查询的form之前；2.传入table的id和controller的url --%>
 <script type="text/javascript">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp
index c04ed3d18..b394b2a04 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp
@@ -98,17 +98,16 @@
                                 <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">
-								 	<%-- <div class="btn-group">
+								 	 <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="export"></spring:message>
 	                                            <i class="fa fa-angle-down"></i>
 	                                        </button>
-	                                        <ul class="dropdown-menu pull-right">
-	                                            <li><sys:delRow url="${ctx}/log/ntc/radiusLogs/exportRadius?cfgid=" searchUrl="${ctx}/log/ntc/radiusLogs/list" id="contentTable" maxRow="10000" label="excel"></sys:delRow></li>
-												<li><sys:delRow url="${ctx}/log/ntc/radiusLogs/exportRadius?cfgid=" searchUrl="${ctx}/log/ntc/radiusLogs/list" id="contentTable" maxRow="10000" label="csv"></sys:delRow></li>
+	                                        <ul class="dropdown-menu pull-right"  style="min-width: 110px;" >
+	                                            <li><sys:delRow url="${ctx}/log/ntc/radiusLogs/exportRadius?type=excel" searchUrl="${ctx}/log/ntc/radiusLogs/list" id="contentTable" maxRow="10000" label="excel"></sys:delRow></li>
+												<%-- <li><sys:delRow url="${ctx}/log/ntc/radiusLogs/exportRadius?type=csv" searchUrl="${ctx}/log/ntc/radiusLogs/list" id="contentTable" maxRow="10000" label="csv"></sys:delRow></li> --%>
 				                            </ul>
-				                         </div> --%>
-								<sys:delRow url="${ctx}/log/ntc/radiusLogs/exportRadius?cfgid=" searchUrl="${ctx}/log/ntc/radiusLogs/list" id="contentTable" maxRow="10000" label="export"></sys:delRow>
+				                         </div> 
                                	<a class="btn btn-icon-only btn-default setfields tooltips" 
                                      	data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
                                     <i class="icon-wrench"></i>