Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js =================================================================== diff -u -r27716 -r27719 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 27716) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 27719) @@ -273,7 +273,7 @@ $("#basketsUl li:first").find('input').val(json); updateRemoveImplantBtn($("#basketsUl li:first"),false); toggleItems(obj.find('span')[0]); - } + } refreshBasketStatus(); refreshAllBasketTotalNum(); }else{ @@ -1143,6 +1143,12 @@ liElement.find('.totalnum').hide(); liElement.find('i').css("text-align","right"); liElement.find('i').css("width","223px"); + if(screenWidth == 1024){ + if(isIE()){ + liElement.find('i').css({'width':'163px'}); + liElement.find('i a').css({'zoom':0.7}); + } + } }else{ liElement.find('.btn-removeImplant').hide(); liElement.find('.totalnum').show(); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp =================================================================== diff -u -r27709 -r27719 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 27709) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 27719) @@ -1910,62 +1910,80 @@ if(screenWidth == 1024){ $('.wait_item').css({'height':'1115px'}); $('.wait_item .scroll').css({'height':'950px'}); + $('.wait_item .sum').css('bottom','0px'); $('.his_item').css('height','1115px'); $('.his_item .scroll').css('height','950px'); + $('.his_item .page').css('bottom','0px'); if(isIE()){ $('.mbody_02').css('width','188%') } }else if(screenWidth == 1280 && screenHeight == 720){ $('.wait_item').css({'height':'850px'}); $('.wait_item .scroll').css({'height':'680px'}); + $('.wait_item .sum').css('bottom','0px'); $('.his_item').css('height','850px'); $('.his_item .scroll').css('height','680px'); + $('.his_item .page').css('bottom','0px'); if(isIE()){ - $('.mbody_02').css('width','159%') + $('.mbody_02').css('width','159%'); + $('.his_item .page').css('bottom','-30px'); + $('.wait_item .sum').css('bottom','-30px'); } }else if(screenWidth == 1280 && screenHeight == 800){ $('.wait_item').css({'height':'900px'}); $('.wait_item .scroll').css({'height':'730px'}); + $('.wait_item .sum').css('bottom','10px'); $('.his_item').css('height','900px'); $('.his_item .scroll').css('height','730px'); + $('.his_item .page').css('bottom','10px'); if(isIE()){ $('.mbody_02').css('width','150%') } }else if(screenWidth == 1360 || screenWidth == 1366){ $('.wait_item').css({'height':'855px'}); $('.wait_item .scroll').css({'height':'680px'}); + $('.wait_item .sum').css('bottom','0px'); $('.his_item').css('height','855px'); $('.his_item .scroll').css('height','680px'); + $('.his_item .page').css('bottom','0px'); if(isIE()){ - $('.mbody_02').css('width','149%') + $('.mbody_02').css('width','149%'); + $('.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'}); + $('.wait_item .sum').css('bottom','0px'); $('.his_item').css('height','870px'); $('.his_item .scroll').css('height','695px'); + $('.his_item .page').css('bottom','0px'); if(isIE()){ $('.mbody_02').css('width','126%') } }else if(screenWidth == 1280 && screenHeight == 1024){ $('.wait_item').css({'height':'1250px'}); $('.wait_item .scroll').css({'height':'1075px'}); + $('.wait_item .sum').css('bottom','10px'); $('.his_item').css('height','1120px'); $('.his_item .scroll').css('height','1080px'); + $('.his_item .page').css('bottom','-120px'); if(isIE()){ $('.mbody_02').css('width','150%') } }else if(screenWidth == 1920 && screenHeight == 1080){ $('.wait_item').css({'height':'880px'}); $('.wait_item .scroll').css({'height':'700px'}); + $('.wait_item .sum').css('bottom','0px'); $('.his_item').css('height','880px'); $('.his_item .scroll').css('height','700px'); + $('.his_item .page').css('bottom','0px'); if(isIE()){ $('.mbody_02').css('width','104%')