Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
===================================================================
diff -u -r27589 -r27592
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 27589)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 27592)
@@ -24,7 +24,7 @@
 var materialName = '${param.materialName}';
 var materialDefinitionId = '${param.materialDefinitionId}';
 var showToussePictures;
-
+var clientHeight = '${param.clientHeight}';
 //动态加载JS和CSS
 document.write('<link href="${ctx}/disinfectsystem/touchScreen/recycle/${param.resolution}/images/style.css" rel="stylesheet" type="text/css" />');
 
@@ -278,21 +278,54 @@
 		getMaterial();
 	}
 
-	var bodyHeight = $('body').height();
+	$(".toussePage").show();
 
-	if(window.screen.height - bodyHeight > 100){
-		$(".toussePage").show();
-		$('#imageAndMaterialID').height((bodyHeight-50)+'px');
-		$('#materialDIV').height((bodyHeight-93)+'px');
-		$('#tousseOrMaterialImage').height((bodyHeight-43-150)+'px');
-		$('#ImageID').height((bodyHeight-43-150)+'px');
+	var bodyHeight = $('body').height();
+	var newClientHeight = (clientHeight == '')?document.body.clientHeight:parseInt(clientHeight);
+	var screenHeight = window.screen.height;
+	var height = 0;
+	if(newClientHeight > bodyHeight){
+		height = bodyHeight;
 	}else {
-		$(".toussePage").show();
-		$('#imageAndMaterialID').height((bodyHeight-50)+'px');
-		$('#materialDIV').height((bodyHeight-93-97)+'px');
-		$('#tousseOrMaterialImage').height((bodyHeight-93-150-57)+'px');
-		$('#ImageID').height((bodyHeight-93-150-57)+'px');
+		height = newClientHeight;
 	}
+	if(newClientHeight == bodyHeight){
+		if(screenHeight - bodyHeight > 100){
+			$('#imageAndMaterialID').height((bodyHeight-50)+'px');
+			$('#materialDIV').height((bodyHeight-93)+'px');
+			$('#tousseOrMaterialImage').height((bodyHeight-193)+'px');
+			$('#ImageID').height((bodyHeight-193)+'px');
+		}else {
+			$('#imageAndMaterialID').height((bodyHeight-50)+'px');
+			$('#materialDIV').height((bodyHeight-190)+'px');
+			$('#tousseOrMaterialImage').height((bodyHeight-290)+'px');
+			$('#ImageID').height((bodyHeight-290)+'px');
+		}
+	}else {
+		if(screenHeight == 1080){
+			$('body').css('zoom',0.97);
+		}else if(screenHeight == 1050){
+			$('body').css('zoom',1.01);
+		}else if(screenHeight == 1024){
+			$('body').css('zoom',0.945);
+		}else if(screenHeight == 960){
+			$('body').css('zoom',0.861);
+		}else if(screenHeight == 900){
+			$('body').css('zoom',0.806);
+		}else if(screenHeight == 864){
+			$('body').css('zoom',0.734);
+		}else if(screenHeight == 800){
+			$('body').css('zoom',0.645);
+		}else if(screenHeight == 768){
+			$('body').css('zoom',0.601);
+		}else if(screenHeight == 720){
+			$('body').css('zoom',0.535);
+		}else if(screenHeight == 600){
+			$('body').css('zoom',0.365);
+		}else {
+			$('body').css('zoom',1);
+		}
+	}
 	
 	if(sstsConfig.toussePicturesShow && showToussePictures){
 		$(".instruction-book,.packing-teach,.tousse-video,.checkbox-materialTd").show();