From fa8c37392bfefa58caa88bf1126f7bfeb3c8650f Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Wed, 6 Dec 2023 09:31:17 +0900 Subject: [PATCH] =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A1=A4=20=EC=9D=B4?= =?UTF-8?q?=EB=B2=A4=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp | 6 ++++-- src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp | 8 +++++--- src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp | 8 +++++--- src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp | 9 ++++++--- src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp | 8 +++++--- src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp | 8 +++++--- src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp | 8 +++++--- src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp | 8 +++++--- src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp | 7 ++++--- src/main/webapp/WEB-INF/jsp/fims/levy/levy02010-main.jsp | 8 +++++--- 10 files changed, 49 insertions(+), 29 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp index 01c679a9..33941598 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp @@ -660,8 +660,10 @@ $(document).ready(function(){ return; } - obj.dataset.scrollStatus = "waiting"; - $P.scrollInspectionDataList(); + if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){ + obj.dataset.scrollStatus = "waiting"; + $P.scrollInspectionDataList(); + } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp index abf394a5..96b37967 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp @@ -214,9 +214,11 @@ $(document).ready(function(){ if(el.scrollTop() == 0){ return; } - - obj.dataset.scrollStatus = "waiting"; - $P.scrollCrdnList(); + + if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){ + obj.dataset.scrollStatus = "waiting"; + $P.scrollCrdnList(); + } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp index a677e0e9..7309ff0b 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp @@ -252,9 +252,11 @@ $(document).ready(function(){ if(el.scrollTop() == 0){ return; } - - obj.dataset.scrollStatus = "waiting"; - $P.scrollCrdnList(); + + if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){ + obj.dataset.scrollStatus = "waiting"; + $P.scrollCrdnList(); + } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp index 4b4fce72..2d7980f3 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp @@ -392,9 +392,12 @@ $(document).ready(function(){ if(el.scrollTop() == 0){ return; } - - obj.dataset.scrollStatus = "waiting"; - $P.scrollCrdnList(); + + if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){ + obj.dataset.scrollStatus = "waiting"; + $P.scrollCrdnList(); + } + } $P.scrollCrdnList = () => { diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp index 090c85c1..240ce51d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp @@ -309,9 +309,11 @@ $(document).ready(function(){ if(el.scrollTop() == 0){ return; } - - obj.dataset.scrollStatus = "waiting"; - $P.scrollExmptnVhclList(); + + if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){ + obj.dataset.scrollStatus = "waiting"; + $P.scrollExmptnVhclList(); + } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp index 07a45839..111db058 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp @@ -370,9 +370,11 @@ $(document).ready(function(){ if(el.scrollTop() == 0){ return; } - - obj.dataset.scrollStatus = "waiting"; - $P.scrollCrdnList(); + + if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){ + obj.dataset.scrollStatus = "waiting"; + $P.scrollCrdnList(); + } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp index 4c21c57e..34b12b3f 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp @@ -396,9 +396,11 @@ $(document).ready(function(){ if(el.scrollTop() == 0){ return; } - - obj.dataset.scrollStatus = "waiting"; - $P.scrollCrdnList(); + + if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){ + obj.dataset.scrollStatus = "waiting"; + $P.scrollCrdnList(); + } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp index 03bee62e..216c0f2c 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp @@ -357,9 +357,11 @@ $(document).ready(function(){ if(el.scrollTop() == 0){ return; } - - obj.dataset.scrollStatus = "waiting"; - $P.scrollCrdnList(); + + if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){ + obj.dataset.scrollStatus = "waiting"; + $P.scrollCrdnList(); + } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp index 356527c7..f06b0df9 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp @@ -306,9 +306,10 @@ $(document).ready(function(){ if(el.scrollTop() == 0){ return; } - - obj.dataset.scrollStatus = "waiting"; - $P.scrollDmndList(); + if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){ + obj.dataset.scrollStatus = "waiting"; + $P.scrollDmndList(); + } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/levy/levy02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/levy/levy02010-main.jsp index 93106213..9d7625b3 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/levy/levy02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/levy/levy02010-main.jsp @@ -253,9 +253,11 @@ $(document).ready(function(){ if(el.scrollTop() == 0){ return; } - - obj.dataset.scrollStatus = "waiting"; - $P.scrollRductList(); + + if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){ + obj.dataset.scrollStatus = "waiting"; + $P.scrollRductList(); + } }