From cd4585dc3c821b54072a351a0a039f012ba1fa51 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 22 Mar 2024 10:12:59 +0900 Subject: [PATCH] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20?= =?UTF-8?q?=EC=B0=BD,=20=EB=8F=99=EC=98=81=EC=83=81=EC=BA=A1=EC=B2=98,=20?= =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=ED=8E=B8=EC=A7=91=20=EC=B0=BD=20?= =?UTF-8?q?=EC=97=B4=EB=A6=B4=20=EB=95=8C=20=EB=B6=80=EB=AA=A8=EC=B0=BD=20?= =?UTF-8?q?=EB=B9=84=ED=99=9C=EC=84=B1=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/fims/crdn/crdn05030-info.jsp | 15 ++++++++-- src/main/webapp/WEB-INF/jsp/include/top.jsp | 15 ++++++++-- src/main/webapp/WEB-INF/jsp/login.jsp | 18 +++++++++-- .../webapp/resources/js/fims/photo-main.js | 30 ++++++++++++++++--- 4 files changed, 67 insertions(+), 11 deletions(-) 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 8af5d003..fc0043dc 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 @@ -533,10 +533,21 @@ $(document).ready(function(){ $("#btnAddFile--${pageName}").on('click', () => { $("#inputUploadSet--${pageName}").trigger("click"); }); $("#btnOpenVideoCapture--${pageName}").on('click', () => { - window.open(wctx.url("/sprt/sprt03/010/main.do?openerPageName=${pageName}") + var popupWidth = 1800; + var popupHeight = 950; + var popupX = (window.screen.width / 2) - (popupWidth / 2); + var popupY= (window.screen.height / 2) - (popupHeight / 2); + + var popup = window.open(wctx.url("/sprt/sprt03/010/main.do?openerPageName=${pageName}") ,"newVideoCapture" - ,"width=1800,height=950" + ,"width="+popupWidth+", height="+popupHeight+", left="+popupX+", top="+popupY ); + + popup.onload = () => { + popup.addEventListener('beforeunload', function() { + $.unblockUI(); + }); + }; }); $("#btnCancelAddFile--${pageName}").on('click', () => { diff --git a/src/main/webapp/WEB-INF/jsp/include/top.jsp b/src/main/webapp/WEB-INF/jsp/include/top.jsp index 2d3ae2b7..dc0b5f10 100644 --- a/src/main/webapp/WEB-INF/jsp/include/top.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/top.jsp @@ -296,11 +296,22 @@ function fnOpenEqmCrdnLayoutStngDialog(){ function fnOpenMyInfo(){ - window.open( + var popupWidth = 950; + var popupHeight = 500; + var popupX = (window.screen.width / 2) - (popupWidth / 2); + var popupY= (window.screen.height / 2) - (popupHeight / 2); + + var popup = window.open( wctx.url("/user/openMyInfo.do") ,"changeMyInfo" - ,'top=10, left=10, width=950, height=500' + ,"width="+popupWidth+", height="+popupHeight+", left="+popupX+", top="+popupY ); + + popup.onload = () => { + popup.addEventListener('beforeunload', function() { + $.unblockUI(); + }); + }; } function fnOpenChangePassword(){ diff --git a/src/main/webapp/WEB-INF/jsp/login.jsp b/src/main/webapp/WEB-INF/jsp/login.jsp index 2fabba47..8afd7ee3 100644 --- a/src/main/webapp/WEB-INF/jsp/login.jsp +++ b/src/main/webapp/WEB-INF/jsp/login.jsp @@ -164,11 +164,23 @@ function fnOpenSignup(){ alert("기관을 선택하세요."); return; } - dialog.close("selectInstDialog"); - window.open(wctx.url("/signupPage.do")+"?institute="+$("#selectInst").val(), + + var popupWidth = 950; + var popupHeight = 500; + var popupX = (window.screen.width / 2) - (popupWidth / 2); + var popupY= (window.screen.height / 2) - (popupHeight / 2); + + var popup = window.open(wctx.url("/signupPage.do")+"?institute="+$("#selectInst").val(), "regAccount", - "width=950, height=500"); + "width="+popupWidth+", height="+popupHeight+", left="+popupX+", top="+popupY); + + $.blockUI({message : ""}); + popup.onload = () => { + popup.addEventListener('beforeunload', function() { + $.unblockUI(); + }); + }; }, onClose : () => {} }); diff --git a/src/main/webapp/resources/js/fims/photo-main.js b/src/main/webapp/resources/js/fims/photo-main.js index 308b0352..4d1c0ab4 100644 --- a/src/main/webapp/resources/js/fims/photo-main.js +++ b/src/main/webapp/resources/js/fims/photo-main.js @@ -28,10 +28,21 @@ function settingPhotoMain(pageName, crdnIdElementId, carInfoFunc, carLinkFunc){ $("#btnOpenVideoCapture--"+pageName).on('click', () => { var crdnId = $("#"+crdnIdElementId).val(); - window.open(wctx.url("/sprt/sprt03/010/main.do?openerPageName="+pageName+"&"+"crdnId="+crdnId) + var popupWidth = 1800; + var popupHeight = 950; + var popupX = (window.screen.width / 2) - (popupWidth / 2); + var popupY= (window.screen.height / 2) - (popupHeight / 2); + + var popup = window.open(wctx.url("/sprt/sprt03/010/main.do?openerPageName="+pageName+"&"+"crdnId="+crdnId) ,"newVideoCapture" - ,"width=1800,height=950" + ,"width="+popupWidth+", height="+popupHeight+", left="+popupX+", top="+popupY ); + $.blockUI({message : ""}); + popup.onload = () => { + popup.addEventListener('beforeunload', function() { + $.unblockUI(); + }); + }; }); //편집버튼 @@ -44,10 +55,21 @@ function settingPhotoMain(pageName, crdnIdElementId, carInfoFunc, carLinkFunc){ var fileId = checked.val(); - window.open(wctx.url("/sprt/sprt03/020/main.do?openerPageName="+pageName+"&"+"fileId="+fileId) + var popupWidth = 1400; + var popupHeight = 750; + var popupX = (window.screen.width / 2) - (popupWidth / 2); + var popupY= (window.screen.height / 2) - (popupHeight / 2); + + var popup = window.open(wctx.url("/sprt/sprt03/020/main.do?openerPageName="+pageName+"&"+"fileId="+fileId) ,"editPhoto" - ,"width=1400,height=750" + ,"width="+popupWidth+", height="+popupHeight+", left="+popupX+", top="+popupY ); + $.blockUI({message : ""}); + popup.onload = () => { + popup.addEventListener('beforeunload', function() { + $.unblockUI(); + }); + }; }); //삭제버튼 $("#btnDeleteExistPhoto--"+pageName).on('click', async() => {