Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp =================================================================== diff -u -r33688 -r33690 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 33688) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 33690) @@ -275,7 +275,7 @@ overflow: auto; top: 50px; position: absolute; - height: 683px; + height: 663px; width: 100%; } #awaitForRecycleTableBody tr td { Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js =================================================================== diff -u -r33677 -r33690 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 33677) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 33690) @@ -1786,66 +1786,68 @@ var screenHeight = ChangeRatio('height'); var htmlHeight = $('html').height(); var body_height = parseInt(htmlHeight / getZoom(1920, 1080)); - if (screenWidth < 1030) { var height = body_height * ratio; $('.mbody_02').css({ 'height': (height + 30) + 'px', 'width': '1920px', 'zoom': 0.535 / ratio }); $('.wait_item .sum,.his_item .page').css('bottom', '0px'); $('.wait_item,.his_item').css({ 'height': (height - 190) + 'px', 'top': '155px' }); $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 310) + 'px', 'top': '70px' }); $('#awaitForRecycleTable,#recyclingRecordTable').css({ 'height': (height - 310) + 'px' }); - $('#awaitForRecycleTableBody,#recyclingRecordTableBody').css({ 'height': (height - 360) + 'px' }); + $('#awaitForRecycleTableBody,#recyclingRecordTableBody').css({ 'height': (height - 400) + 'px' }); } else if (screenWidth > 1270 && screenWidth < 1300) { if (screenHeight < 730) { var height = body_height * ratio; $('.mbody_02').css({ 'height': (height - 60) + 'px', 'width': '1920px', 'zoom': 0.668 / ratio }); $('.wait_item .sum,.his_item .page').css('bottom', '0px'); $('.wait_item,.his_item').css({ 'height': (height - 210) + 'px', 'top': '105px' }); $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 310) + 'px' }); + $('#awaitForRecycleTableBody,#recyclingRecordTableBody').css({ 'height': (height - 390) + 'px' }); } else if (screenHeight > 730 && screenHeight < 780) { var height = body_height * ratio; $('.mbody_02').css({ 'height': height + 'px', 'width': '1920px', 'zoom': 0.668 / ratio }); $('.wait_item .sum,.his_item .page').css('bottom', '0px'); - $('.wait_item,.his_item').css({ 'height': (height - 170) + 'px', 'top': '118px' }); - $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 270) + 'px' }); + $('.wait_item,.his_item').css({ 'height': (height - 180) + 'px', 'top': '120px' }); + $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 280) + 'px' }); + $('#awaitForRecycleTableBody,#recyclingRecordTableBody').css({ 'height': (height - 360) + 'px' }); } else if (screenHeight > 790 && screenHeight < 810) { var height = body_height * ratio; $('.mbody_02').css({ 'height': height + 'px', 'width': '1920px', 'zoom': 0.668 / ratio }); $('.wait_item .sum,.his_item .page').css('bottom', '0px'); - $('.wait_item,.his_item').css({ 'height': (height - 180) + 'px', 'top': '125px' }); - $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 285) + 'px', 'top': '55px' }); + $('.wait_item,.his_item').css({ 'height': (height - 190) + 'px', 'top': '125px' }); + $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 290) + 'px', 'top': '55px' }); $('#awaitForRecycleTable,#recyclingRecordTable').css({ 'height': (height - 285) + 'px' }); - $('#awaitForRecycleTableBody,#recyclingRecordTableBody').css({ 'height': (height - 335) + 'px' }); + $('#awaitForRecycleTableBody,#recyclingRecordTableBody').css({ 'height': (height - 370) + 'px' }); } else if (screenHeight > 820 && screenHeight < 1000) { var height = body_height * ratio; $('.mbody_02').css({ 'height': height + 'px', 'width': '1920px', 'zoom': 0.668 / ratio }); $('.wait_item .sum,.his_item .page').css('bottom', '0px'); $('.wait_item,.his_item').css({ 'height': (height - 240) + 'px', 'top': '165px' }); $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 350) + 'px', 'top': '60px' }); $('#awaitForRecycleTable,#recyclingRecordTable').css({ 'height': (height - 350) + 'px' }); - $('#awaitForRecycleTableBody,#recyclingRecordTableBody').css({ 'height': (height - 408) + 'px' }); + $('#awaitForRecycleTableBody,#recyclingRecordTableBody').css({ 'height': (height - 430) + 'px' }); } else { var height = body_height * ratio; $('.mbody_02').css({ 'height': height + 'px', 'width': '1920px', 'zoom': 0.668 / ratio }); $('.wait_item .sum,.his_item .page').css('bottom', '0px'); - $('.wait_item,.his_item').css({ 'height': (height - 260) + 'px', 'top': '175px' }); + $('.wait_item,.his_item').css({ 'height': (height - 260) + 'px', 'top': '180px' }); $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 378) + 'px', 'top': '70px' }); $('#awaitForRecycleTable,#recyclingRecordTable').css({ 'height': (height - 378) + 'px' }); - $('#awaitForRecycleTableBody,#recyclingRecordTableBody').css({ 'height': (height - 428) + 'px' }); + $('#awaitForRecycleTableBody,#recyclingRecordTableBody').css({ 'height': (height - 458) + 'px' }); } } else if (screenWidth > 1350 && screenWidth < 1370) { var height = body_height * ratio; $('.mbody_02').css({ 'height': (height - 50) + 'px', 'width': '1920px', 'zoom': 0.715 / ratio }); $('.wait_item .sum,.his_item .page').css('bottom', '0px'); $('.wait_item,.his_item').css({ 'height': (height - 200) + 'px', 'top': '107px' }); $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 300) + 'px' }); + $('#awaitForRecycleTableBody,#recyclingRecordTableBody').css({ 'height': (height - 375) + 'px' }); } else if (screenWidth > 1390 && screenWidth < 1450) { var height = body_height * ratio; $('.mbody_02').css({ 'width': '1920px', 'height': height + 'px', 'zoom': 0.75 / ratio }); $('.wait_item .sum,.his_item .page').css('bottom', '0px'); $('.wait_item,.his_item').css({ 'height': (height - 190) + 'px', 'top': '128px' }); $('.wait_item .scroll,.his_item .scroll,#awaitForRecycleTable,#recyclingRecordTable').css({ 'height': (height - 290) + 'px' }); - $('#awaitForRecycleTableBody,#recyclingRecordTableBody').css({ 'height': (height - 340) + 'px' }); + $('#awaitForRecycleTableBody,#recyclingRecordTableBody').css({ 'height': (height - 365) + 'px' }); if (!isIE()) { $('#page').css({ 'height': '30px', 'top': '6px' }); } @@ -1855,6 +1857,7 @@ $('.wait_item .sum,.his_item .page').css('bottom', '0px'); $('.wait_item,.his_item').css({ 'height': (height - 200) + 'px', 'top': '110px' }); $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 300) + 'px' }); + $('#awaitForRecycleTableBody,#recyclingRecordTableBody').css({ 'height': (height - 370) + 'px' }); if (!isIE()) { $('#page').css({ 'height': '30px', 'top': '5px' }); }