Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js =================================================================== diff -u -r29191 -r29192 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 29191) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 29192) @@ -490,84 +490,36 @@ trElement.find('dl').css({'width':'800px'}); trElement.find('dl .tousseName').css({'width':'330px'}); trElement.find('dl .materialName').css({'width':'250px'}); - - if(isIE()){ - trElement.find('dl').css({'width':'320px'}); - trElement.find('dl .tousseName').css({'width':'70px'}); - trElement.find('dl .materialName').css({'width':'30px'}); - } }else if(screenWidth>1270 && screenWidth<1300){ if(screenHeight<730){ trElement.find('dl').css({'width':'860px'}); trElement.find('dl .tousseName').css({'width':'360px'}); trElement.find('dl .materialName').css({'width':'280px'}); - - if(isIE()){ - trElement.find('dl').css({'width':'410px'}); - trElement.find('dl .tousseName').css({'width':'120px'}); - trElement.find('dl .materialName').css({'width':'70px'}); - } }else if(screenHeight>790 && screenHeight<810){ trElement.find('dl').css({'width':'805px'}); trElement.find('dl .tousseName').css({'width':'335px'}); trElement.find('dl .materialName').css({'width':'250px'}); - - if(isIE()){ - trElement.find('dl').css({'width':'410px'}); - trElement.find('dl .tousseName').css({'width':'120px'}); - trElement.find('dl .materialName').css({'width':'70px'}); - } }else { trElement.find('dl').css({'width':'820px'}); trElement.find('dl .tousseName').css({'width':'310px'}); trElement.find('dl .materialName').css({'width':'270px'}); - - if(isIE()){ - trElement.find('dl').css({'width':'400px'}); - trElement.find('dl .tousseName').css({'width':'120px'}); - trElement.find('dl .materialName').css({'width':'60px'}); - } } }else if(screenWidth>1350 && screenWidth<1370){ trElement.find('dl').css({'width':'855px'}); trElement.find('dl .tousseName').css({'width':'355px'}); trElement.find('dl .materialName').css({'width':'280px'}); - - 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>1390 && screenWidth<1450){ 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>1590 && screenWidth<1610){ trElement.find('dl').css({'width':'855px'}); trElement.find('dl .tousseName').css({'width':'355px'}); trElement.find('dl .materialName').css({'width':'280px'}); - - if(isIE()){ - trElement.find('dl').css({'width':'510px'}); - trElement.find('dl .tousseName').css({'width':'190px'}); - trElement.find('dl .materialName').css({'width':'100px'}); - } }else if(screenWidth>1910 && screenWidth<1930){ trElement.find('dl').css({'width':'855px'}); trElement.find('dl .tousseName').css({'width':'355px'}); trElement.find('dl .materialName').css({'width':'280px'}); - - if(isIE()){ - trElement.find('dl').css({'width':'600px'}); - trElement.find('dl .tousseName').css({'width':'240px'}); - trElement.find('dl .materialName').css({'width':'140px'}); - } } return true; }