Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

2018-12-18 15:30:53 +06:00
parent 0704d61cb8 1bc0f0381f
commit b81dca0fae
1 changed files with 7 additions and 1 deletions
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
@@ -12,8 +12,8 @@
 <script src="${ctxStatic }/global/plugins/tableExport-3.3.13/tableexport.js"></script>

 </head>
-
 <style type="text/css">
+@page { size: landscape; }
 </style>
 <body>

@@ -167,6 +167,9 @@
 					<sys:message content="${message}" type="${messageType }" />
 					<div class="row">
 						<div class="pull-right">
+						<button type="button" class="btn btn-default" id="print-btn" >
+									<i class="fa fa-download"> <spring:message code="print" /></i>
+						</button>
 						<button type="button" class="btn btn-default" id="export-btn" >
 									<i class="fa fa-download"> <spring:message code="export" /></i>
 						</button>
@@ -301,6 +304,9 @@
 			$("caption").remove();
 			getPageData(1, 10);
 		});
+		$("#print-btn").click(function() {
+			window.print();
+		});
 		/**
 		 * 获取本页数据
 		 * @param currentPage 当前页数 【初次查数据，默认第1页】