Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp =================================================================== diff -u -r27719 -r27769 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 27719) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 27769) @@ -1955,6 +1955,21 @@ $('.his_item .page').css('bottom','-20px'); $('.wait_item .sum').css('bottom','-20px'); } + }else if(screenWidth == 1440 || screenWidth == 1400){ + $('.wait_item').css({'height':'890px'}); + $('.wait_item .scroll').css({'height':'735px'}); + $('.wait_item .sum').css('bottom','0px'); + $('.his_item').css('height','890px'); + $('.his_item .scroll').css('height','735px'); + $('.his_item .page').css('bottom','0px'); + + if(isIE()){ + $('.mbody_02').css({'width':'134%','height':'1140px'}); + $('.wait_item,.his_item').css({'height':'920px','top':'138px'}); + $('.wait_item .scroll,.his_item .scroll').css({'height':'780px'}); + $('.his_item .page').css('bottom','-20px'); + $('.wait_item .sum').css('bottom','-20px'); + } }else if(screenWidth == 1600 && screenHeight == 900){ $('.wait_item').css({'height':'870px'}); $('.wait_item .scroll').css({'height':'695px'}); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp =================================================================== diff -u -r27716 -r27769 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp (.../customIntoBasket.jsp) (revision 27716) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp (.../customIntoBasket.jsp) (revision 27769) @@ -251,6 +251,19 @@ $('#tousseItemTable').css({'width':'780px'}); $('.zhuangzai-table').css({'width':'440px','height':'440px','bottom':'45px','right':'40px'}); } + }else if(screenWidth == 1400 || screenWidth == 1440){ + $('.data-table').css({'width':'1545px','height':'890px','bottom':'120px','left':'56px'}); + $('.data-table .box').css({'height':'810px'}); + $('#tousseItemTable').css({'width':'1525px'}); + $('.zhuangzai-table').css({'width':'830px','height':'890px','bottom':'90px','right':'80px'}); + + if(isIE()){ + $('.mbody').css('width','100%'); + $('.data-table').css({'width':'850px','height':'530px','bottom':'50px','left':'35px'}); + $('.data-table .box').css({'height':'450px'}); + $('#tousseItemTable').css({'width':'780px'}); + $('.zhuangzai-table').css({'width':'460px','height':'530px','bottom':'45px','right':'40px'}); + } }else if(screenWidth == 1600 && screenHeight == 900){ $('.data-table').css({'width':'1620px','height':'835px','bottom':'90px','left':'56px'}); $('.data-table .box').css({'height':'780px'}); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js =================================================================== diff -u -r27719 -r27769 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 27719) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 27769) @@ -522,6 +522,16 @@ trElement.find('dl .tousseName').css({'width':'140px'}); trElement.find('dl .materialName').css({'width':'80px'}); } + }else if(screenWidth == 1400 || screenWidth == 1440){ + trElement.find('dl').css({'width':'800px'}); + trElement.find('dl .tousseName').css({'width':'340px'}); + trElement.find('dl .materialName').css({'width':'250px'}); + + if(isIE()){ + trElement.find('dl').css({'width':'440px'}); + trElement.find('dl .tousseName').css({'width':'140px'}); + trElement.find('dl .materialName').css({'width':'80px'}); + } }else if(screenWidth == 1600 && screenHeight == 900){ trElement.find('dl').css({'width':'855px'}); trElement.find('dl .tousseName').css({'width':'355px'}); @@ -813,6 +823,14 @@ td_width_5 = '100px'; td_width_7 = '100px'; td_width_8 = '160px'; + }else if(screenWidth == 1400 || screenWidth == 1440){ + td_width_0 = '200px'; + td_width_1 = '260px'; + td_width_2 = '480px'; + td_width_3 = '100px'; + td_width_5 = '100px'; + td_width_7 = '100px'; + td_width_8 = '160px'; }else if(screenWidth == 1600 && screenHeight == 900){ td_width_0 = '200px'; td_width_1 = '260px'; Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r27716 -r27769 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 27716) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 27769) @@ -532,6 +532,21 @@ if(isIE()){ $('.mbody').css('width','149%') } + }else if(screenWidth == 1400 || screenWidth == 1440){ + $('.add-form .name,.add-form .operator,.add-form .recyclingTime').css({'top':'-30px'}); + $('.add-form .depart,.add-form .appType,.add-form .applyTime').css({'top':'40px'}); + $('.add-form .remark,.add-form .communicationUserName').css({'top':'110px'}); + $('.add-form .add,.add-form .add2').css({'margin-top':'170px'}); + + $('.data-table').css({'left':'10px','bottom':'80px','height':'540px'}); + $('#tousseItemBox').css({'height':'460px'}); + $('.zhuangzai-table').css({'height':'820px','bottom':'70px','right': '50px'}); + + if(isIE()){ + $('.mbody').css({'width':'134%','height':'1140px'}); + $('.data-table').css({'left':'40px'}); + $('.zhuangzai-table').css({'height':'850px','bottom':'60px','right': '50px'}); + } }else if(screenWidth == 1600 && screenHeight == 900){ $('.add-form .name,.add-form .operator,.add-form .recyclingTime').css({'top':'-30px'}); $('.add-form .depart,.add-form .appType,.add-form .applyTime').css({'top':'40px'});