Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js =================================================================== diff -u -r27709 -r27716 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 27709) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 27716) @@ -481,6 +481,78 @@ tousseIntoBasketInfo.addTousseBasket({tousseDefinitionID:tousseDefinitionID,tousseName:tousseName, tousseType:tousseType},{barcode:basketBarcode,basketName:basketName}) } + + if(screenWidth == 1024){ + 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 == 1280 && screenHeight == 720){ + 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(screenWidth == 1280 && screenHeight == 800){ + 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 if(screenWidth == 1366 || screenWidth == 1360){ + 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 == 1600 && screenHeight == 900){ + 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 == 1280 && screenHeight == 1024){ + 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 == 1920){ + 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; } /** Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r27709 -r27716 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 27709) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 27716) @@ -484,7 +484,7 @@ $('.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').css({'margin-top':'240px'}); + $('.add-form .add,.add-form .add2,.add-form .addQM').css({'margin-top':'240px'}); $('.data-table').css({'left':'16px','bottom':'270px'}); $('#tousseItemBox').css({'height':'590px'}); @@ -494,9 +494,9 @@ $('.mbody').css('width','188%') } }else if(screenWidth == 1280 && screenHeight == 720){ - $('.add-form .name,.add-form .operator,.add-form .recyclingTime').css({'top':'-20px'}); - $('.add-form .depart,.add-form .appType,.add-form .applyTime').css({'top':'60px'}); - $('.add-form .remark,.add-form .communicationUserName').css({'top':'140px'}); + $('.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':'70px','bottom':'110px','height':'520px'}); @@ -507,9 +507,9 @@ $('.mbody').css('width','159%') } }else if(screenWidth == 1280 && screenHeight == 800){ - $('.add-form .name,.add-form .operator,.add-form .recyclingTime').css({'top':'-20px'}); - $('.add-form .depart,.add-form .appType,.add-form .applyTime').css({'top':'60px'}); - $('.add-form .remark,.add-form .communicationUserName').css({'top':'140px'}); + $('.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':'20px','bottom':'55px','height':'580px'}); @@ -549,7 +549,7 @@ $('.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':'200px'}); - $('.add-form .add,.add-form .add2').css({'margin-top':'280px'}); + $('.add-form .add,.add-form .add2,.add-form .addQM').css({'margin-top':'280px'}); $('.data-table').css({'left':'30px','bottom':'75px','height':'770px'}); $('#tousseItemBox').css({'height':'690px'}); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp =================================================================== diff -u -r27709 -r27716 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp (.../customIntoBasket.jsp) (revision 27709) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp (.../customIntoBasket.jsp) (revision 27716) @@ -114,6 +114,9 @@ .data-table td { padding-left: 5px; } +.basketName,.totalnum { + width: auto; +}