Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r27854 -r27855 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 27854) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 27855) @@ -576,15 +576,8 @@ $('.zhuangzai-table').css({'height':'1040px','bottom':'80px','right':'55px','width':'610px'}); if(isIE()){ $('.mbody').css({'height':'1350px','zoom':0.5078*(105/getRatio())}); - $('.add-form .name,.add-form .operator,.add-form .recyclingTime').css({'top':'10px'}); - $('.add-form .depart,.add-form .appType,.add-form .applyTime').css({'top':'90px'}); - $('.add-form .remark,.add-form .communicationUserName').css({'top':'170px'}); - $('.add-form .add,.add-form .add2,.add-form .addQM').css({'margin-top':'240px'}); - $('#divElement').css({'margin-top':'360px','right':'180px'}); - - $('.data-table').css({'left':'40px','height':'720px'}); - $('#tousseItemBox').css({'height':'640px'}); - $('.zhuangzai-table').css({'height':'1030px','bottom':'70px','right':'60px','width':'610px'}); + $('.data-table').css({'left':'40px','bottom':'70px','height':'840px'}); + $('.zhuangzai-table').css({'height':'1040px','bottom':'100px','right':'55px','width':'610px'}); } }else if(screenWidth>1270 && screenWidth<1300){ if(screenHeight<730){ @@ -601,8 +594,8 @@ if(isIE()){ $('.mbody').css('zoom',0.6*(105/getRatio())); - $('.data-table').css({'left':'40px','bottom':'50px','height':'580px','width':'1230px'}); - $('#tousseItemBox').css({'height':'500px'}); + $('.data-table').css({'left':'40px','bottom':'90px','height':'540px','width':'1230px'}); + $('#tousseItemBox').css({'height':'460px'}); } }else if(screenHeight>790 && screenHeight<810){ $('.mbody').css({'width':'1920px'}); @@ -637,16 +630,6 @@ $('.zhuangzai-table').css({'height':'1175px','bottom':'85px','right': '50px'}); if(isIE()){ $('.mbody').css('zoom',0.6348*(105/getRatio())); - $('.add-form').css({'top':'120px'}); - $('.add-form .name,.add-form .operator,.add-form .recyclingTime').css({'top':'40px'}); - $('.add-form .depart,.add-form .appType,.add-form .applyTime').css({'top':'120px'}); - $('.add-form .remark,.add-form .communicationUserName').css({'top':'220px'}); - $('.add-form .add,.add-form .add2,.add-form .addQM').css({'margin-top':'280px'}); - $('#divElement').css({'margin-top':'400px','right':'180px'}); - - $('.data-table').css({'left':'30px','bottom':'80px','height':'780px'}); - $('#tousseItemBox').css({'height':'700px'}); - $('.zhuangzai-table').css({'height':'1100px','bottom':'85px','right': '50px'}); } } }else if(screenWidth>1350 && screenWidth<1370){ Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r27827 -r27855 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 27827) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 27855) @@ -659,11 +659,11 @@ function openFullSizeWindowWithName(pageUrl,scrollbars,windowName){ var width=screen.availWidth; - var height=screen.availHeight; + var height=document.body.scrollHeight; var top=0; var left=0; var posStatement="top="+top+",left="+left+",width="+width+",height="+height; - var style='menubar=no,location=no,directories=no,toolbar=no,statusbar=no,resizable=yes,' + var style='menubar=no,location=yes,directories=no,toolbar=no,statusbar=no,resizable=yes,' +posStatement+",scrollbars="+scrollbars; var popwin=window.open(pageUrl,windowName,style); if(popwin == null){ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp =================================================================== diff -u -r27854 -r27855 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 27854) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 27855) @@ -1883,11 +1883,11 @@