调整预览页面代码结构

src/main/webapp/WEB-INF/views/preview.html

@@ -536,8 +536,8 @@ See https://github.com/adobe-type-tools/cmap-resources
 <script src="static/lib/pdf.js/web/l10n.js"></script>
 <script src="static/lib/pdf.js/build/pdf.js"></script>
 <script src="static/lib/jquery/jquery.min.js"></script>
-<script src="static/js/print/utils.js"></script>
-<script src="static/js/print/preview/app.js"></script>
+<script src="static/js/preview/utils.js"></script>
+<script src="static/js/preview/app.js"></script>
 <script src="static/lib/pdf.js/web/debugger.js"></script>
 <script src="static/lib/pdf.js/web/viewer.js"></script>
 </html>

src/main/webapp/resources/js/print/preview/app.js → src/main/webapp/resources/js/preview/app.js

@@ -1,3 +1,16 @@
+// 隐藏的iframe，用于加载pdf，以便打印（pdf.js自带的打印有问题）
+var hiddenframe = document.getElementById("hiddenframe");
+var PDFData, DEFAULT_URL;
+var pageIndex = 1, pageSize = 1;// 当前页码，页码总数
+loadPdfData();
+// 是否立即打印
+var printType = getParameter("printType");
+if (printType && printType == 'PRINT') {
+	hiddenframe.onload = function() {
+		hiddenframe.contentWindow.print();
+	}
+}
+
 $("#print2").click(function() {
 	if (hiddenframe.src) {
 		hiddenframe.contentWindow.print();
@@ -17,62 +30,21 @@ $("#download_excel_with_only_data").click(function() {
 	window.location = downloadUrl("xls_with_only_data");
 });
 
-// 获取所有参数
-var getParameters = function() {
-	var userName = getParameter("userName");
-	var reportName = getParameter("reportName");
-	var whereCondition = getParameter("whereCondition");
-	var otherParameters = getParameter("otherParameters");
-	pageIndex = getParameter("pageIndex") || 1;
-
-	var parameters = new Object();
-	if (userName) {
-		parameters.userName = userName;
-	}
-	if (reportName) {
-		parameters.reportName = reportName;
-	}
-	if (whereCondition) {
-		parameters.whereCondition = whereCondition;
-	}
-	if (otherParameters) {
-		parameters.otherParameters = otherParameters;
-	}
-	if (pageIndex) {
-		parameters.pageIndex = pageIndex;
-	}
-	return parameters;
-}
-
-// 获取数据
-function loadData() {
-	var loadDataUrl = "print/loadPdfData" + window.location.search;
+//获取数据
+function loadPdfData() {
+	var loadPdfDataUrl = "print/loadPdfData" + window.location.search;
 	pageIndex = getParameter("pageIndex");
 	if (!pageIndex) {
 		pageIndex = 1;
-		loadDataUrl = loadDataUrl + "&pageIndex=" + pageIndex;
+		loadPdfDataUrl = loadPdfDataUrl + "&pageIndex=" + pageIndex;
 	}
 	$.ajax({
 		type : "get",
 		async : false,
-		url : loadDataUrl,
+		url : loadPdfDataUrl,
 		success : function(data) {
 			DEFAULT_URL = data.pdfPath;
 			hiddenframe.src = data.pdfPath;
 		}
 	});
-
-};
-
-// 隐藏的iframe，用于加载pdf，以便打印（pdf.js自带的打印有问题）
-var hiddenframe = document.getElementById("hiddenframe");
-var PDFData, DEFAULT_URL;
-var pageIndex = 1, pageSize = 1;// 当前页码，页码总数
-loadData();
-// 是否立即打印
-var printType = getParameter("printType");
-if (printType && printType == 'PRINT') {
-	hiddenframe.onload = function() {
-		hiddenframe.contentWindow.print();
-	}
-}
+};

src/main/webapp/resources/js/print/utils.js → src/main/webapp/resources/js/preview/utils.js

@@ -1,5 +1,5 @@
 // 下载报表
-var downloadUrl = function(exportFileType) {
+function downloadUrl(exportFileType) {
 	var downloadUrl = "print/export" + window.location.search;
 	exportFileType = exportFileType || "pdf";
 	// 导出文件的格式
@@ -8,7 +8,7 @@ var downloadUrl = function(exportFileType) {
 }
 
 // 获取链接参数
-var getParameter = function(key) {
+function getParameter(key) {
 	var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
 	var r = window.location.search.substr(1).match(reg);
 	if (r != null)
@@ -16,6 +16,33 @@ var getParameter = function(key) {
 	return null;
 };
 
+// 获取所有参数
+function getParameters() {
+	var userName = getParameter("userName");
+	var reportName = getParameter("reportName");
+	var whereCondition = getParameter("whereCondition");
+	var otherParameters = getParameter("otherParameters");
+	pageIndex = getParameter("pageIndex") || 1;
+
+	var parameters = '?';
+	if (userName) {
+		parameters += 'userName=' + userName + '&';
+	}
+	if (reportName) {
+		parameters += 'reportName=' + reportName + '&';
+	}
+	if (whereCondition) {
+		parameters += 'whereCondition=' + whereCondition + '&';
+	}
+	if (otherParameters) {
+		parameters += 'otherParameters=' + otherParameters + '&';
+	}
+	if (pageIndex) {
+		parameters += 'pageIndex=' + pageIndex + '&';
+	}
+	return parameters;
+}
+
 // base64 解码
 function base64_decode(str) {
 	var c1, c2, c3, c4;