From d328fd34ecf9379b55c30e7a07a034eb81715800 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Thu, 25 Jan 2024 10:51:18 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8B=A4=EC=9D=B4=EC=96=BC=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=20=EC=B0=BD=20z-index=EC=88=98=EC=A0=95=20=EC=B2=98=EB=A6=AC?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/fims/crdn/crdn02010-main.jsp | 8 +++- .../WEB-INF/jsp/fims/crdn/crdn02050-info.jsp | 20 ++++++-- .../WEB-INF/jsp/fims/crdn/crdn03010-main.jsp | 8 +++- .../WEB-INF/jsp/fims/crdn/crdn05020-info.jsp | 20 ++++++-- .../WEB-INF/jsp/fims/crdn/crdn05030-info.jsp | 25 ++++++++-- .../WEB-INF/jsp/fims/crdn/crdn06020-info.jsp | 25 ++++++++-- .../WEB-INF/jsp/fims/crdn/crdn06030-info.jsp | 9 +++- .../WEB-INF/jsp/fims/crdn/crdn08010-main.jsp | 4 +- .../WEB-INF/jsp/fims/crdn/crdn08020-info.jsp | 5 +- .../WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp | 4 +- .../WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp | 47 ++++++++++++++----- .../WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp | 26 +++++++--- .../WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp | 5 +- .../WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp | 8 +++- .../WEB-INF/jsp/fims/cvlc/cvlc06010-main.jsp | 4 +- src/main/webapp/WEB-INF/jsp/include/top.jsp | 6 ++- src/main/webapp/WEB-INF/jsp/login.jsp | 12 ++++- .../webapp/resources/js/base/base-fims.js | 2 +- 18 files changed, 187 insertions(+), 51 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 5fac61fc..740a32d9 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 @@ -805,7 +805,9 @@ $(document).ready(function(){ if((typeof resp) != "string"){ dialog.alert({ content : resp.message, - init : function(){ focusClose(); } + init : function(){ + focusClose(); + } }); return; } @@ -849,7 +851,9 @@ $(document).ready(function(){ if((typeof resp) != "string"){ dialog.alert({ content : resp.message, - init : function(){ focusClose(); } + init : function(){ + focusClose(); + } }); return; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02050-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02050-info.jsp index a840b3ac..527da5e0 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02050-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02050-info.jsp @@ -75,7 +75,10 @@ $(document).ready(function(){ if (resp.saved) { dialog.alert({ content : "저장됐습니다.", - init : function(){ focusClose(); } + init : function(){ + setDialogZindex(); + focusClose(); + } }); dialog.close("overTimeProcessDialog--${openerPageName}"); @@ -94,7 +97,10 @@ $(document).ready(function(){ if(crdnInfo.OVTIME_YN == "Y"){ dialog.alert({ content : "이미 가산 처리된 자료입니다.", - init : function(){ focusClose(); } + init : function(){ + setDialogZindex(); + focusClose(); + } }); return; } @@ -104,7 +110,10 @@ $(document).ready(function(){ if(crdnInfo.OVTIME_PRTTN_YN == "Y"){ dialog.alert({ content : "이미 감액 처리된 자료입니다.", - init : function(){ focusClose(); } + init : function(){ + setDialogZindex(); + focusClose(); + } }); return; } @@ -121,7 +130,10 @@ $(document).ready(function(){ if(crdnInfo.OVTIME_YN != "Y" && crdnInfo.OVTIME_PRTTN_YN != "Y"){ dialog.alert({ content: "2시간 초과 처리되지 않은 자료입니다.", - init : function() { focusClose(); } + init : function() { + setDialogZindex(); + focusClose(); + } }); return; } 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 310f1883..06b6c716 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 @@ -321,14 +321,18 @@ $(document).ready(function(){ if(!$P.crdnControl.getCurrent()) { dialog.alert({ content : "선택된 자료가 없습니다.", - init : function(){ focusClose(); } + init : function(){ + focusClose(); + } }); return; }; dialog.alert({ content : "현 자료를 장애차량 확인된 자료로 변경하시겠습니까?", - init : function(){ focusOK(); }, + init : function(){ + focusOK(); + }, onOK:() => { $P.crdnControl.save({ 'crdnId' : $P.crdnControl.getCurrent()["CRDN_ID"] }); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05020-info.jsp index cf0f9d4f..c7621baf 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05020-info.jsp @@ -249,7 +249,10 @@ $(document).ready(function(){ } else { dialog.alert({ content : "파일 조회에 실패하였습니다.", - init : function(){ focusClose(); } + init : function(){ + setDialogZindex(); + focusClose(); + } }); } } @@ -263,7 +266,10 @@ $(document).ready(function(){ if($("#uploadFiles--${pageName}").val() == ""){ dialog.alert({ content : "파일이 없습니다.", - init : function(){ focusClose(); } + init : function(){ + setDialogZindex(); + focusClose(); + } }); return; } @@ -282,7 +288,10 @@ $(document).ready(function(){ } else { dialog.alert({ content : "파일 업로드에 실패하였습니다.", - init : function(){ focusClose(); } + init : function(){ + setDialogZindex(); + focusClose(); + } }); return; } @@ -371,7 +380,10 @@ $(document).ready(function(){ if($.isEmptyObject($P.tempGroup)){ dialog.alert({ content : "모든 자료가 처리 완료되었습니다.", - init : function(){ focusClose(); } + init : function(){ + setDialogZindex(); + focusClose(); + } }); return; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp index 906fbadb..a110dd8c 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp @@ -434,7 +434,10 @@ $(document).ready(function(){ if (resp.saved) { dialog.alert({ content : "저장됐습니다.", - init : function(){ focusClose(); } + init : function(){ + setDialogZindex(); + focusClose(); + } }); dialog.close("manualdialog"); } @@ -480,7 +483,10 @@ $(document).ready(function(){ if(rtpyrNm.value == ""){ dialog.alert({ content:"계고 처리를 하기 위해선 소유주정보가 입력되어야 합니다.", - init : function(){ focusClose(); }, + init : function(){ + setDialogZindex(); + focusClose(); + }, onClose:function(){rtpyrNm.focus();} }); return; @@ -558,7 +564,10 @@ $(document).ready(function(){ if(crdnYmd == ""){ dialog.alert({ content : "단속일자를 입력하세요.", - init : function(){ focusClose(); }, + init : function(){ + setDialogZindex(); + focusClose(); + }, onClose : function(){ $("#crdnYmd--${pageName}").focus(); } }); @@ -567,7 +576,10 @@ $(document).ready(function(){ if(vhrno == ""){ dialog.alert({ content:"차량번호를 입력하세요.", - init : function(){ focusClose(); }, + init : function(){ + setDialogZindex(); + focusClose(); + }, onClose:function(){ $(vhrnoEl).focus(); } }); return; @@ -584,7 +596,10 @@ $(document).ready(function(){ if(!resp.found){ dialog.alert({ content : "차량정보가 없습니다.", - init : function(){ focusClose(); } + init : function(){ + setDialogZindex(); + focusClose(); + } }); $("#rtpyrId--${pageName}").val(""); $("#rtpyrNm--${pageName}").val(""); diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-info.jsp index 047f61ec..c71b7a84 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-info.jsp @@ -334,7 +334,10 @@ dialog.alert({ content : showMessage, - init : function(){ focusClose(); } + init : function(){ + setDialogZindex(); + focusClose(); + } }); if (resp.saved) { @@ -385,7 +388,10 @@ if (!resp.found) { dialog.alert({ content : "차량 정보가 없습니다.", - init : function(){ focusClose(); } + init : function(){ + setDialogZindex(); + focusClose(); + } }); return; } @@ -459,7 +465,10 @@ if (crdnYmd == "") { dialog.alert({ content : "단속일자를 입력하세요.", - init : function(){ focusClose(); }, + init : function(){ + setDialogZindex(); + focusClose(); + }, onClose : function() { $("#crdnYmd--${pageName}").focus(); } }); return; @@ -467,7 +476,10 @@ if (vhrno == "") { dialog.alert({ content : "차량번호를 입력하세요.", - init : function(){ focusClose(); }, + init : function(){ + setDialogZindex(); + focusClose(); + }, onClose : function() { $("#vhrno--${pageName}").focus(); } }); @@ -497,7 +509,10 @@ dialog.alert({ content : "현재 " + ${pageName}Control.prefixName + " 정보를 저장하시겠습니까?", - init : function(){ focusOK(); }, + init : function(){ + setDialogZindex(); + focusOK(); + }, onOK : () => { ${pageName}Control.save(${pageName}Fields.get()); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-info.jsp index 9bec2f99..ac8eed61 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-info.jsp @@ -97,7 +97,10 @@ dialog.alert({ content : showMessage, - init : function(){ focusClose(); } + init : function(){ + setDialogZindex(); + focusClose(); + } }); if (resp.saved) { @@ -139,7 +142,9 @@ dialog.alert({ content : "현재 " + ${pageName}Control.prefixName + " 정보를 저장하시겠습니까?", - init : function() { focusOK(); }, + init : function() { + focusOK(); + }, onOK : () => { ${pageName}Control.save(${pageName}Fields.get()); } 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 792d9228..8a61a297 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 @@ -333,7 +333,9 @@ $(document).ready(function(){ if(data.DEL_YN == "Y"){ dialog.alert({ content : "삭제된 자료입니다.", - init : function() { focusClose(); } + init : function() { + focusClose(); + } }); return; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08020-info.jsp index 3eb70489..ef75f0f0 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08020-info.jsp @@ -134,7 +134,10 @@ $(document).ready(function(){ if (resp.saved) { dialog.alert({ content : "저장됐습니다.", - init : function() { focusClose(); } + init : function() { + setDialogZindex(); + focusClose(); + } }); dialog.close("exmptnvhcldialog"); $P.provided.refreshList(); 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 b96c654e..45fa6cda 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 @@ -531,7 +531,9 @@ $(document).ready(function(){ var curRcptYmd = cur["CVLCPT_RCPT_YMD"]; dialog.alert({ content : "접수일 : "+dateFormat.format(curRcptYmd)+"
모든 자료를 제거하시겠습니까?", - init : function() { focusOK(); }, + init : function() { + focusOK(); + }, onOK : () => { $P.fnRemove(curRcptYmd); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp index 8f19520c..feeec74f 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp @@ -455,7 +455,10 @@ $(document).ready(function(){ dialog.alert({ content : "저장됐습니다.", - init : function() { focusClose(); } + init : function() { + setDialogZindex(); + focusClose(); + } }); if($("#levyExcldialog--${pageName}").length > 0){ @@ -494,9 +497,8 @@ $(document).ready(function(){ dialog.alert({ content:"계고 처리를 하기 위해선 소유주정보가 입력되어야 합니다.", init : function() { - setZindex(); + setDialogZindex(); focusClose(); - }, onClose:function(){rtpyrNm.focus();} }); @@ -523,7 +525,9 @@ $(document).ready(function(){ title : "부과제외 정보", content : resp, size : "md", - init : () => {}, + init : () => { + setDialogZindex(); + }, onClose : () => {} }); } @@ -598,7 +602,10 @@ $(document).ready(function(){ if (resp.saved) { dialog.alert({ content : "복사 자료가 생성되었습니다.", - init : function() { focusClose(); } + init : function() { + setDialogZindex(); + focusClose(); + } }); $("#refreshEnd--${pageName}").attr("data-cursor-key", crdnId); @@ -750,7 +757,10 @@ $(document).ready(function(){ if(vhrno.value == ""){ dialog.alert({ content:"수용 처리를 하기 위해선 차량번호가 입력되어야 합니다.", - init : function() { focusClose(); }, + init : function() { + setDialogZindex(); + focusClose(); + }, onClose:function(){vhrno.focus();} }); return; @@ -759,7 +769,10 @@ $(document).ready(function(){ if(rtpyrNm.value == ""){ dialog.alert({ content:"수용 처리를 하기 위해선 소유주정보가 입력되어야 합니다.", - init : function() { focusClose(); }, + init : function() { + setDialogZindex(); + focusClose(); + }, onClose:function(){rtpyrNm.focus();} }); return; @@ -789,7 +802,10 @@ $(document).ready(function(){ dialog.alert({ content : message, - init : function() { focusClose(); } + init : function() { + setDialogZindex(); + focusClose(); + } }); @@ -855,7 +871,10 @@ $(document).ready(function(){ if(crdnYmd == ""){ dialog.alert({ content:"단속일자를 입력하세요.", - init : function() { focusClose(); }, + init : function() { + setDialogZindex(); + focusClose(); + }, onClose:function(){ $("#crdnYmd--${pageName}").focus(); } }); return; @@ -863,7 +882,10 @@ $(document).ready(function(){ if(vhrno == ""){ dialog.alert({ content:"차량번호를 입력하세요.", - init : function() { focusClose(); }, + init : function() { + setDialogZindex(); + focusClose(); + }, onClose:function(){ $(vhrnoEl).focus(); } }); return; @@ -881,7 +903,10 @@ $(document).ready(function(){ if(!resp.found){ dialog.alert({ content : "차량 정보가 없습니다.", - init : function() { focusClose(); } + init : function() { + setDialogZindex(); + focusClose(); + } }); $("#rtpyrId--${pageName}").val(""); 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 97cdd3a1..03ef8fe1 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 @@ -263,7 +263,9 @@ $(document).ready(function(){ if(resp.saved){ dialog.alert({ content : "처리되었습니다.", - init : function() { focusClose(); } + init : function() { + focusClose(); + } }); $P.refreshCrdnList(); } @@ -555,7 +557,9 @@ $(document).ready(function(){ dialog.alert({ content : "선택된 "+count+"건의 자료를 답변등록을 실행하시겠습니까?", - init : function() { focusOK(); }, + init : function() { + focusOK(); + }, onOK : () => { $P.crdnControl.save('answerExecute'); } @@ -568,7 +572,9 @@ $(document).ready(function(){ dialog.alert({ content : "선택된 "+count+"건의 자료를 답변완료 상태로 변경하시겠습니까?", - init : function() { focusOK(); }, + init : function() { + focusOK(); + }, onOK : () => { $P.crdnControl.save('answerComplete'); } @@ -591,7 +597,9 @@ $(document).ready(function(){ if(keys.length == 0){ dialog.alert({ content : "표지조회는 부과대상자료만 가능합니다.
선택된 자료 중에 부과대상자료가 없습니다.", - init : function() { focusClose(); } + init : function() { + focusClose(); + } }); return; } @@ -603,7 +611,10 @@ $(document).ready(function(){ dialog.alert({ content : message, - init : function() { focusOK(); }, + init : function() { + setDialogZindex(); + focusOK(); + }, onOK : () => { ajax.get({ url : wctx.url("/DPV/cvlc/cvlc02/040/update.do"), @@ -613,7 +624,10 @@ $(document).ready(function(){ success : resp => { dialog.alert({ content : "표지정보조회가 실행되었습니다.", - init : function() { focusClose(); } + init : function() { + setDialogZindex(); + focusClose(); + } }); $P.refreshCrdnList(); diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp index 3811fa3f..a664a5f8 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp @@ -122,7 +122,10 @@ $(document).ready(function() { if (resp.saved) { dialog.alert({ content : "표지정보조회가 실행되었습니다.", - init : function() { focusClose(); } + init : function() { + setDialogZindex(); + focusClose(); + } }); } } 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 5c8c9746..ebb6cdfb 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 @@ -382,14 +382,18 @@ $(document).ready(function(){ if(indivIds.length == 0){ dialog.alert({ content : "요청 완료자료가 없습니다.", - init : function() { focusClose(); } + init : function() { + focusClose(); + } }); return; } dialog.alert({ content : "완료된 자료를 모두 삭제하시겠습니까?", - init : function() { focusOK(); }, + init : function() { + focusOK(); + }, onOK : () => { $P.fnRemove(indivIds); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc06010-main.jsp index d53b0576..ad34cb7e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc06010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc06010-main.jsp @@ -283,7 +283,9 @@ $(document).ready(function(){ dialog.alert({ content : "저장하시겠습니까?", - init : function() { focusOK(); }, + init : function() { + focusOK(); + }, onOK: () => { ajax.get({ diff --git a/src/main/webapp/WEB-INF/jsp/include/top.jsp b/src/main/webapp/WEB-INF/jsp/include/top.jsp index 18d27a9a..4342e033 100644 --- a/src/main/webapp/WEB-INF/jsp/include/top.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/top.jsp @@ -221,7 +221,11 @@ function fnOpenChangePassword(){ function showHelp(){ dialog.alert({ content: '070-4490-74XX', - timeout: 0 + timeout: 0, + init : function() { + setDialogZindex(); + focusClose(); + }, }); } diff --git a/src/main/webapp/WEB-INF/jsp/login.jsp b/src/main/webapp/WEB-INF/jsp/login.jsp index a8aee4e8..bdf2ef46 100644 --- a/src/main/webapp/WEB-INF/jsp/login.jsp +++ b/src/main/webapp/WEB-INF/jsp/login.jsp @@ -116,12 +116,22 @@ function login() { success:function(resp) { if (resp.authenticated) { if (resp.message) - dialog.alert(resp.message); + dialog.alert({ + content : resp.message, + init : function() { + setDialogZindex(); + focusClose(); + }, + }); wctx.home(); } else { dialog.alert({ content:resp.reason, + init : function() { + setDialogZindex(); + focusClose(); + }, onClose:() => $("#userId").focus() }); } diff --git a/src/main/webapp/resources/js/base/base-fims.js b/src/main/webapp/resources/js/base/base-fims.js index 39dd001f..b33b56ad 100644 --- a/src/main/webapp/resources/js/base/base-fims.js +++ b/src/main/webapp/resources/js/base/base-fims.js @@ -1,7 +1,7 @@ /************************************************************************** * 모달창 z-index 초기화 **************************************************************************/ -function setZindex(){ +function setDialogZindex(){ var parentDialog = getLastOpenDialog(); var childDialog = getLastDialog();