From 535e89b6941a8034606309470829deb2fe7c0d9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ITN=5F=EB=94=94=EC=9E=90=EC=9D=B8=ED=8C=80?= Date: Mon, 29 Jan 2024 13:08:53 +0900 Subject: [PATCH 1/2] =?UTF-8?q?2024/01/29=20=EC=9B=B9=EC=A0=91=EA=B7=BC?= =?UTF-8?q?=EC=84=B1=20>=20=EC=A3=BC=EC=84=9D=EC=B2=98=EB=A6=AC=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp | 11 ++++++----- .../webapp/WEB-INF/jsp/web/ve/comm/fileUploadPop.jsp | 8 ++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp index a730cf17..eae1d829 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp @@ -219,12 +219,13 @@ $(document).ready(function(){ btnLast.attr('data-focus-next','sub36_pop02'); btnLast.attr('data-focus','sub36_pop02_close'); */ + // 레이어팝업 포커싱 이동 수정 - //$(".tooltip-close").click(function(){ - //var activeTarget = $('[data-tooltip-con="sub37_pop20"]'); - //activeTarget.hide(); - //$('[data-tooltip="sub37_pop20"]:nth-child(2)').focus(); - //}); + /*$(".tooltip-close").click(function(){ + var activeTarget = $('[data-tooltip-con="sub37_pop20"]'); + activeTarget.hide(); + $('[data-tooltip="sub37_pop20"]:nth-child(2)').focus(); + });*/ $(".tooltip-close").click(function(e){ e.stopPropagation(); diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/comm/fileUploadPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/comm/fileUploadPop.jsp index 59e699d3..0dadc596 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/comm/fileUploadPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/comm/fileUploadPop.jsp @@ -49,10 +49,10 @@ $('[data-tooltip="sub35_pop01"]').focus(); }); */ - //$(".tooltip-close").click(function(){ - //var fileType = '${fileType}'; - //$('#'+fileType).focus(); - //}); + /*$(".tooltip-close").click(function(){ + var fileType = '${fileType}'; + $('#'+fileType).focus(); + });*/ $(".tooltip-close").click(function(e){ e.stopPropagation(); From d94e2f8c731988bfec222165c3551774e6b3270b Mon Sep 17 00:00:00 2001 From: jiwoo Date: Mon, 29 Jan 2024 15:46:31 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EB=A6=AC?= =?UTF-8?q?=ED=8F=AC=ED=8C=85=ED=88=B4=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp | 10 ++++++---- .../webapp/WEB-INF/jsp/uss/ion/fms/FmsFileModify.jsp | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp index 2bb65b84..1cbecd4b 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp @@ -492,8 +492,10 @@ - - + + + @@ -520,9 +522,9 @@ } if(isLocal == 'real'){ //운영 - var viewer = new m2soft.crownix.Viewer('http://101.79.81.151/ReportingServer/service'); + var viewer = new m2soft.crownix.Viewer('https://www.edu-copyright.or.kr/offedu/ReportingServer/service'); viewer.hideToolbarItem(["save"]); - viewer.openFile('adult_rslts_20240104.mrd', '/rf [http://101.79.81.151/offedu/ve/aplct/adultVisitEdu/eduAplct/adultRsltRprtListAjax.do?rsltList='+rsltList+']'); + viewer.openFile('adult_rslts_20240104.mrd', '/rf [https://www.edu-copyright.or.kr/offedu/ve/aplct/adultVisitEdu/eduAplct/adultRsltRprtListAjax.do?rsltList='+rsltList+']'); }else{ //개발 var viewer = new m2soft.crownix.Viewer('http://119.193.215.98:8093/ReportingServer/service'); viewer.hideToolbarItem(["save"]); diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/fms/FmsFileModify.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/fms/FmsFileModify.jsp index 0362d9b8..2a9e5833 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/fms/FmsFileModify.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/fms/FmsFileModify.jsp @@ -30,7 +30,9 @@