From dd0a7e0d0a6142db7395d17edc1503e64b87d534 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Tue, 27 Jun 2023 13:09:01 +0900
Subject: [PATCH] =?UTF-8?q?1.=20=EA=B7=B8=EB=A6=AC=EB=93=9C=20=EC=A0=9C?=
 =?UTF-8?q?=EB=AA=A9=20=EA=B0=80=EC=9A=B4=EB=8D=B0=EC=A0=95=EB=A0=AC?=
 =?UTF-8?q?=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=202.=20?=
 =?UTF-8?q?=EB=B8=8C=EB=9D=BC=EC=9A=B0=EC=A0=80=EB=B3=84=20=EA=B0=80?=
 =?UTF-8?q?=EB=A1=9C=EC=8A=A4=ED=81=AC=EB=A1=A4=20=EB=86=92=EC=9D=B4?=
 =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EC=8A=A4=ED=81=AC=EB=A1=A4?=
 =?UTF-8?q?=EC=9D=B4=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

---
 .../WEB-INF/jsp/fims/crdn/crdn06010-main.jsp  |  4 ++-
 .../WEB-INF/jsp/fims/crdn/crdn06030-main.jsp  |  4 +--
 .../WEB-INF/jsp/fims/crdn/crdn06040-main.jsp  |  2 +-
 src/main/webapp/WEB-INF/jsp/index.jsp         | 32 ++++++++++++++++++-
 .../js/fims/framework/cmm/initGrid.js         |  3 +-
 5 files changed, 39 insertions(+), 6 deletions(-)

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 25b855fc..b65ddc58 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
@@ -313,7 +313,8 @@ $(document).ready(function(){
     	if(el.scrollTop() == 0){
     		return;
     	}
-    	if((el[0].scrollHeight - el.scrollTop() + 15) == el.outerHeight()){
+    	
+    	if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) == el.outerHeight()){
     		$P.scrollCrdnList();
     	}
     });
@@ -336,4 +337,5 @@ $(document).ready(function(){
     }
 });
 
+
 </script>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
index 8a71aa15..f825f06f 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
@@ -229,7 +229,7 @@ $(document).ready(function(){
 	    { header: '위반일시', 			name: 'CRDN_YMD_TM', 			width: 120, className: 'text-center' },
 	    { header: '차량번호', 			name: 'VHRNO', 					width: 80, 	className: 'text-center' },
 	    { header: '법정동', 			name: 'CRDN_STDG_NM', 			width: 80, 	className: 'text-center' },
-	    { header: '신고/단속자', 		name: 'CVLCPT_APLCNT_NM000', 	width: 80, 	className: 'text-center' },
+	    { header: '신고/단속자', 		name: 'APLCNT_CRDN_NM', 		width: 80, 	className: 'text-center' },
 	    { header: '잔액', 			name: 'UNKNOWN2', 				width: 80, 	className: 'text-end' },
 	    { header: '영상매체', 			name: 'UNKNOWN3', 				width: 80, 	className: 'text-center' },
 	    { header: '사진건수', 			name: 'ATCH_FILE_CNT', 			width: 40, 	className: 'text-center' },
@@ -273,7 +273,7 @@ $(document).ready(function(){
     	if(el.scrollTop() == 0){
     		return;
     	}
-    	if((el[0].scrollHeight - el.scrollTop() + 15) == el.outerHeight()){
+    	if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) == el.outerHeight()){
     		$P.scrollCrdnList();
     	}
     });
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp
index 5509a6c6..89b0bedd 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp
@@ -292,7 +292,7 @@ $(document).ready(function(){
     	if(el.scrollTop() == 0){
     		return;
     	}
-    	if((el[0].scrollHeight - el.scrollTop() + 15) == el.outerHeight()){
+    	if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) == el.outerHeight()){
     		$P.scrollCrdnList();
     	}
     });
diff --git a/src/main/webapp/WEB-INF/jsp/index.jsp b/src/main/webapp/WEB-INF/jsp/index.jsp
index 171b7280..9a56d2f0 100644
--- a/src/main/webapp/WEB-INF/jsp/index.jsp
+++ b/src/main/webapp/WEB-INF/jsp/index.jsp
@@ -41,7 +41,37 @@
     
     <script>
     	let pageObject = {};
-    
+    	
+    	function getBrowserName() {
+    	    var agent = navigator.userAgent.toUpperCase();
+    	    if (agent.indexOf('TRIDENT') >= 0) {
+    	        return 'IE';
+    	    } else if (agent.indexOf('FIREFOX') >= 0) {
+    	        return 'FIREFOX';
+    	    } else if (agent.indexOf('EDG') >= 0) {
+    	        return 'EDGE';
+    	    } else if (agent.indexOf('SAFARI') >= 0) {
+    	        return 'SAFARI';
+    	    } else if (agent.indexOf('CHROME') >= 0) {
+    	        return 'CHROME';
+    	    } else {
+    	        return '';
+    	    }
+    	}
+    	const BROWSER_NAME = getBrowserName();
+    	const VERTICAL_SCROLL_HEIGHT = 15;
+    	switch(BROWSER_NAME){
+    		case "EDGE" :
+    			VERTICAL_SCROLL_HEIGHT = 15;
+    			break;
+    		case "FIREFOX" :
+    			VERTICAL_SCROLL_HEIGHT = 17;
+    			break;
+    		case "CHROME" :
+    			VERTICAL_SCROLL_HEIGHT = 17;
+    			break;	
+    	}
+    	
         ${functions}
 
         ${topScript}
diff --git a/src/main/webapp/resources/js/fims/framework/cmm/initGrid.js b/src/main/webapp/resources/js/fims/framework/cmm/initGrid.js
index ee9c4e0a..04c54d56 100644
--- a/src/main/webapp/resources/js/fims/framework/cmm/initGrid.js
+++ b/src/main/webapp/resources/js/fims/framework/cmm/initGrid.js
@@ -40,6 +40,7 @@ var initGrid = (gridOptions) => {
 		if(!gClass){
 			gClass = "";
 		}
+		var thClass = gClass.replace("text-start","").replace("texter-center","").replace("text-end","");
 		
 		var titleClickEvent = ``;
 		
@@ -59,7 +60,7 @@ var initGrid = (gridOptions) => {
 		}
 		
 		strThs += `<th 
-			tabindex="0" rowspan="1" colspan="1" class="sorting ${gClass}"
+			tabindex="0" rowspan="1" colspan="1" class="sorting text-center ${thClass}"
 			style="width: ${gWidth};" 
 			${gHidden}
 			onclick="${titleClickEvent}"