Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp =================================================================== diff -u -r27595 -r27596 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 27595) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 27596) @@ -265,6 +265,14 @@ } } +function isIE() { + if(!!window.ActiveXObject || "ActiveXObject" in window){ + return true; + }else{ + return false; +   } +} + function initPic(){ if(sstsConfig.toussePicturesShow){ showToussePictures = '${param.showToussePictures}'; @@ -289,6 +297,7 @@ }else { height = newClientHeight; } + if(newClientHeight == bodyHeight){ if(screenHeight - bodyHeight > 100){ $('#imageAndMaterialID').height((bodyHeight-50)+'px'); @@ -302,29 +311,73 @@ $('#ImageID').height((bodyHeight-290)+'px'); } }else { - if(screenHeight == 1080){ - $('body').css('zoom',0.97); - }else if(screenHeight == 1050){ - $('body').css('zoom',0.935); - }else if(screenHeight == 1024){ - $('body').css('zoom',0.901); - }else if(screenHeight == 960){ - $('body').css('zoom',0.812); - }else if(screenHeight == 900){ - $('body').css('zoom',0.731); - }else if(screenHeight == 864){ - $('body').css('zoom',0.685); - }else if(screenHeight == 800){ - $('body').css('zoom',0.596); - }else if(screenHeight == 768){ - $('body').css('zoom',0.550); - }else if(screenHeight == 720){ - $('body').css('zoom',0.485); - }else if(screenHeight == 600){ - $('body').css('zoom',0.365); + var zoom = 1; + if(!isIE()){ + if(screenHeight == 1080){ + zoom = 0.97; + }else if(screenHeight == 1050){ + zoom = 0.935; + }else if(screenHeight == 1024){ + zoom = 0.901; + }else if(screenHeight == 960){ + zoom = 0.812; + }else if(screenHeight == 900){ + zoom = 0.731; + }else if(screenHeight == 864){ + zoom = 0.685; + }else if(screenHeight == 800){ + zoom = 0.596; + }else if(screenHeight == 768){ + zoom = 0.550; + }else if(screenHeight == 720){ + zoom = 0.485; + }else if(screenHeight == 600){ + zoom = 0.365; + }else { + zoom = 1; + } + + $('body').css('zoom',zoom); }else { - $('body').css('zoom',1); + var bodyWidth = 100; + if(screenHeight == 1080){ + zoom = 0.97; + bodyWidth = 103; + }else if(screenHeight == 1050){ + zoom = 0.925; + bodyWidth = 108; + }else if(screenHeight == 1024){ + zoom = 0.89; + bodyWidth = 112; + }else if(screenHeight == 960){ + zoom = 0.8; + bodyWidth = 125; + }else if(screenHeight == 900){ + zoom = 0.72; + bodyWidth = 139; + }else if(screenHeight == 864){ + zoom = 0.675; + bodyWidth = 148; + }else if(screenHeight == 800){ + zoom = 0.59; + bodyWidth = 170; + }else if(screenHeight == 768){ + zoom = 0.545; + bodyWidth = 183; + }else if(screenHeight == 720){ + zoom = 0.48; + bodyWidth = 208; + }else if(screenHeight == 600){ + zoom = 1; + bodyWidth = 100; + }else { + zoom = 1; + } + + $('body').css('width',bodyWidth+'%'); + $('body').css('zoom',zoom); } + } if(sstsConfig.toussePicturesShow && showToussePictures){