Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r26076 -r26109
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 26076)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 26109)
@@ -1820,6 +1820,7 @@
                     items: [{
                         src:'tousseImage.jsp?resolution='+resolution+'&tousseDefinitionID='+tousseDefinitionID+'&tousseName='+encodeURIComponent(tousseName)+'&number='+1,
                         type :'iframe'
+						
                     },{
                     	//只是为了让箭头出现,如果可以有其他办法,这里可以去掉。因为在tousseImage.jsp内部,修改了下一页和上一页的处理
                     	src: '<div>永远看不到我</div>',
@@ -1836,16 +1837,16 @@
                     },
                     type: 'image' // this is default type
                 });
-				var windowH = window.innerHeight||document.documentElement.clientHeight||document.body.clientHeight;
-				if(windowH == 613 || windowH == 689){
-					$(".mfp-iframe-scaler iframe").css({"height":"748px"});
-				}else if(windowH == 661 || windowH == 641){
-					$(".mfp-iframe-scaler iframe").css({"height":"740px"});
-				}else if(windowH == 1001){
+				var windowScreenH = window.screen.height;
+				if(windowScreenH == 1080){
 					$(".mfp-iframe-scaler iframe").css({"top":"5%","height":"750px"});
-					$(".mfp-iframe-holder .mfp-close").css({"top":"1px"});
+					$(".mfp-iframe-holder .mfp-close").css({"top":"12px"});
+				}else if(windowScreenH == 1050){
+					$(".mfp-iframe-scaler iframe").css({"top":"5%","height":"750px"});
+					$(".mfp-iframe-holder .mfp-close").css({"top":"0px"});
+				}else{
+					$(".mfp-iframe-scaler iframe").css({"top":"1%","height":"750px"});
 				}
-//            },
 //            error:function(XMLHttpRequest, textStatus, errorThrown){
 //            }
 //        });