Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
===================================================================
diff -u -r31695 -r31696
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 31695)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 31696)
@@ -1964,75 +1964,105 @@
 </style>
 </body>
 <script>
+	function getRatio() {
+        var ratio = 0;
+        var screen = window.screen;
+        var ua = navigator.userAgent.toLowerCase();
+
+        if (window.devicePixelRatio !== undefined) {
+            ratio = window.devicePixelRatio;
+        } else if (~ua.indexOf('msie')) {
+            if (screen.deviceXDPI && screen.logicalXDPI) {
+                ratio = screen.deviceXDPI / screen.logicalXDPI;
+            }
+        } else if (window.outerWidth !== undefined && window.innerWidth !== undefined) {
+            ratio = window.outerWidth / window.innerWidth;
+        }
+		
+		return parseFloat(ratio).toFixed(2);
+	}
 	$(document).ready(function(){
 		if(isUndefinedOrNull(printConfig.recyclingItems)){
 			$(".recycleListPrint").hide();
 		}
 
+		var ratio = 1;
+
+		if(!isIE()){
+			ratio = getRatio();
+		}else {
+			ratio = screen.deviceXDPI / screen.logicalXDPI;
+			alert(ratio)
+		}
+
 		var screenWidth = ChangeRatio('width');
 		var screenHeight = ChangeRatio('height');
 		var htmlHeight = $('html').height();
 		var body_height = parseInt(htmlHeight/getZoom(1920,1080));
-		
+
 		if(screenWidth < 1030){
-			var height = body_height;
-			$('.mbody_02').css({'height':'1346px','width':'1920px'});
+			var height = body_height*ratio;
+			$('.mbody_02').css({'height':(height+30)+'px','width':'1920px','zoom':0.535/ratio});
 			$('.wait_item .sum,.his_item .page').css('bottom','0px');
-			$('.wait_item,.his_item').css({'height':(height-232)+'px','top':'170px'});
-			$('.wait_item .scroll,.his_item .scroll').css({'height':(height-378)+'px'});
+			$('.wait_item,.his_item').css({'height':(height-190)+'px','top':'155px'});
+			$('.wait_item .scroll,.his_item .scroll').css({'height':(height-340)+'px'});
 		}else if(screenWidth>1270 && screenWidth<1300){
 			if(screenHeight<730){
-				var height = body_height;
-				$('.mbody_02').css({'height':'1003px','width':'1920px'});
+				var height = body_height*ratio;
+				$('.mbody_02').css({'height':'1000px','width':'1920px','zoom':0.668/ratio});
 				$('.wait_item .sum,.his_item .page').css('bottom','0px');
-				$('.wait_item,.his_item').css({'height':(height-163)+'px','top':'115px'});
-				$('.wait_item .scroll,.his_item .scroll').css({'height':(height-300)+'px'});
+				$('.wait_item,.his_item').css({'height':(height-180)+'px','top':'115px'});
+				$('.wait_item .scroll,.his_item .scroll').css({'height':(height-325)+'px'});
 			}else if(screenHeight>730 && screenHeight<780){
-				var height = body_height;
-				$('.mbody_02').css({'height':'1075px','width':'1920px'});
+				var height = body_height*ratio;
+				$('.mbody_02').css({'height':height+'px','width':'1920px','zoom':0.668/ratio});
 				$('.wait_item .sum,.his_item .page').css('bottom','0px');
-				$('.wait_item,.his_item').css({'height':(height-180)+'px','top':'127px'});
-				$('.wait_item .scroll,.his_item .scroll').css({'height':(height-330)+'px'});
+				$('.wait_item,.his_item').css({'height':(height-170)+'px','top':'118px'});
+				$('.wait_item .scroll,.his_item .scroll').css({'height':(height-320)+'px'});
 			}else if(screenHeight>790 && screenHeight<810){
-				var height = body_height;
-				$('.mbody_02').css({'height':'1124px','width':'1920px'});
+				var height = body_height*ratio;
+				$('.mbody_02').css({'height':height+'px','width':'1920px','zoom':0.668/ratio});
 				$('.wait_item .sum,.his_item .page').css('bottom','0px');
-				$('.wait_item,.his_item').css({'height':(height-190)+'px','top':'134px'});
-				$('.wait_item .scroll,.his_item .scroll').css({'height':(height-340)+'px'});
+				$('.wait_item,.his_item').css({'height':(height-180)+'px','top':'125px'});
+				$('.wait_item .scroll,.his_item .scroll').css({'height':(height-330)+'px'});
+			}else if(screenHeight>820 && screenHeight<1000){
+				var height = body_height*ratio;
+				$('.mbody_02').css({'height':height+'px','width':'1920px','zoom':0.668/ratio});
+				$('.wait_item .sum,.his_item .page').css('bottom','0px');
+				$('.wait_item,.his_item').css({'height':(height-240)+'px','top':'165px'});
+				$('.wait_item .scroll,.his_item .scroll').css({'height':(height-390)+'px'});
 			}else {
-				var height = body_height;
-				$('.mbody_02').css({'height':'1460px','width':'1920px'});
+				var height = body_height*ratio;
+				$('.mbody_02').css({'height':height+'px','width':'1920px','zoom':0.668/ratio});
 				$('.wait_item .sum,.his_item .page').css('bottom','0px');
-				$('.wait_item,.his_item').css({'height':(height-260)+'px','top':'189px'});
+				$('.wait_item,.his_item').css({'height':(height-260)+'px','top':'175px'});
 				$('.wait_item .scroll,.his_item .scroll').css({'height':(height-408)+'px'});
 			}
 		}else if(screenWidth>1350 && screenWidth<1370){
-			var height = body_height;
-			$('.mbody_02').css({'height':'1014px','width':'1920px'});
+			var height = body_height*ratio;
+			$('.mbody_02').css({'height':(height-50)+'px','width':'1920px','zoom':0.715/ratio});
 			$('.wait_item .sum,.his_item .page').css('bottom','0px');
-			$('.wait_item,.his_item').css({'height':(height-164)+'px','top':'117px'});
-			$('.wait_item .scroll,.his_item .scroll').css({'height':(height-310)+'px'});
+			$('.wait_item,.his_item').css({'height':(height-200)+'px','top':'107px'});
+			$('.wait_item .scroll,.his_item .scroll').css({'height':(height-350)+'px'});
 		}else if(screenWidth>1390 && screenWidth<1450){
-			var height = body_height;
-			$('.mbody_02').css({'width':'1920px','height':'1135px'});
+			var height = body_height*ratio;
+			$('.mbody_02').css({'width':'1920px','height':height+'px','zoom':0.75/ratio});
 			$('.wait_item .sum,.his_item .page').css('bottom','0px');
-			$('.wait_item,.his_item').css({'height':(height-190)+'px','top':'136px'});
+			$('.wait_item,.his_item').css({'height':(height-190)+'px','top':'128px'});
 			$('.wait_item .scroll,.his_item .scroll').css({'height':(height-340)+'px'});
 		}else if(screenWidth>1590 && screenWidth<1610){
-			var height = body_height;
-			$('.mbody_02').css({'width':'1920px','height':'1020px'});
+			var height = body_height*ratio;
+			$('.mbody_02').css({'width':'1920px','height':(height-40)+'px','zoom':0.8333/ratio});
 			$('.wait_item .sum,.his_item .page').css('bottom','0px');
-			$('.wait_item,.his_item').css({'height':(height-165)+'px','top':'118px'});
-			$('.wait_item .scroll,.his_item .scroll').css({'height':(height-310)+'px'});
+			$('.wait_item,.his_item').css({'height':(height-200)+'px','top':'110px'});
+			$('.wait_item .scroll,.his_item .scroll').css({'height':(height-350)+'px'});
 		}else if(screenWidth>1910 && screenWidth<1930){
-			var height = body_height;
-			$('.mbody_02').css({'width':'1920px','height':'1030px'});
+			var height = body_height*ratio;
+			$('.mbody_02').css({'width':'1920px','height':(height-30)+'px','zoom':1/ratio});
 			$('.wait_item .sum,.his_item .page').css('bottom','0px');
-			$('.wait_item,.his_item').css({'height':(height-170)+'px','top':'120px'});
-			$('.wait_item .scroll,.his_item .scroll').css({'height':(height-315)+'px'});
+			$('.wait_item,.his_item').css({'height':(height-195)+'px','top':'115px'});
+			$('.wait_item .scroll,.his_item .scroll').css({'height':(height-340)+'px'});
 		}
-		var zoom = getZoom(1920,1080);
-		$('.mbody_02').css('zoom',zoom);
 	})
 	
 	var voluntarilyUrgentItems = '${param.voluntarilyUrgentItems}';