Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp =================================================================== diff -u -r33690 -r33936 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 33690) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 33936) @@ -381,7 +381,7 @@
清除过滤
添加
-
+
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js =================================================================== diff -u -r33933 -r33936 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 33933) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 33936) @@ -347,17 +347,15 @@ getRecyclingRecordList(parseInt(page, 10)); } function scrollLoadData(pageSize) { - $('.wait_item .scroll').scroll(function () { - var offsetHeight = $('.wait_item .scroll').height(); - var scrollTop = $(".wait_item .scroll").scrollTop(); - var scrollHeight = $('#awaitForRecycleTable').height(); - + $('#awaitForRecycleTableBody').scroll(function (e) { + var offsetHeight = $('#awaitForRecycleTableBody').height(); + var scrollTop = $("#awaitForRecycleTableBody").scrollTop(); + var scrollHeight = e.currentTarget.scrollHeight; if (scrollHeight !== 0) { if (offsetHeight + scrollTop >= scrollHeight) { clearTimeout(timeouts); timeouts = setTimeout(function () { scrollIndex++; - var id = $("#inputselect").val(); var appType = $("#appTypeSelect").val(); var applyTimeOrder = $("#applyTimeOrder").val();