Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
===================================================================
diff -u -r33637 -r33642
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js	(.../awaitForRecycleList.js)	(revision 33637)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js	(.../awaitForRecycleList.js)	(revision 33642)
@@ -103,12 +103,12 @@
 }
 function recycleTheApplication(id, barcode) {
 	var rememberRecycleUser = CookieManager.getCookie("rememberRecycleUser");
-	location.href = "recycleForTouchScreen.jsp?resolution=${param.resolution}&recyclingApplicationId=" + id + "&barcode=" + barcode + "&rememberRecycleUser=" + rememberRecycleUser + '&source=' + source;
+	location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&recyclingApplicationId=" + id + "&barcode=" + barcode + "&rememberRecycleUser=" + rememberRecycleUser + '&source=' + source;
 }
 
 function openHistoryRecyclingRecord(id) {
 	var rememberRecycleUser = CookieManager.getCookie("rememberRecycleUser");
-	location.href = "recycleForTouchScreen.jsp?resolution=${param.resolution}&id=" + id + "&recordType=" + "history&rememberRecycleUser=" + rememberRecycleUser + '&source=' + source;   //添加recordType,表示是历史记录
+	location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&id=" + id + "&recordType=" + "history&rememberRecycleUser=" + rememberRecycleUser + '&source=' + source;   //添加recordType,表示是历史记录
 }
 /**
  * 直接添加“回收申请单”.
@@ -117,7 +117,7 @@
 	var departName = isUndefinedOrNullOrEmpty(departName) ? "" : departName;
 	var departCoding = isUndefinedOrNullOrEmpty(departCoding) ? "" : departCoding;
 	var rememberRecycleUser = CookieManager.getCookie("rememberRecycleUser");
-	location.href = "recycleForTouchScreen.jsp?resolution=${param.resolution}&rememberRecycleUser="
+	location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&rememberRecycleUser="
 		+ rememberRecycleUser + "&departName=" + departName + "&departCoding=" + departCoding;
 }
 function cancel() {
@@ -844,7 +844,7 @@
 
 //快速回收
 function openQuickRecyclePage() {
-	location.href = "expressRecycleForTouchScreen.jsp?resolution=${param.resolution}&id=" + id;
+	location.href = "expressRecycleForTouchScreen.jsp?resolution=" + resolution + "&id=" + id;
 }
 
 function onmouseoutImg() {
@@ -855,7 +855,7 @@
 }
 //消毒物品回收
 function openDisinfectionGoodsRecyclePage() {
-	location.href = "disinfectionGoodsRecycleForTouchScreen.jsp?resolution=${param.resolution}&id=" + id;
+	location.href = "disinfectionGoodsRecycleForTouchScreen.jsp?resolution=" + resolution + "&id=" + id;
 }
 
 function setApplyTimeOrderValue() {
@@ -1017,7 +1017,7 @@
 	$.layer({
 		type: 2,
 		title: [title, true],
-		iframe: { src: url + '&resolution=${param.resolution}&width=' + width + '&height=' + height },
+		iframe: { src: url + '&resolution=' + resolution + '&width=' + width + '&height=' + height },
 		area: [width + 'px', height + heightExtra + 'px'],
 		border: [5, 0.3, '#fff', true],
 		closeBtn: [2, true],