tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'advc' of http://yongjoon.cho@vcs.iten.co.kr:9999/hylee/offedu into advc

Browse Source
This commit is contained in:
myname 2024-01-29 17:55:19 +09:00
commit 9a287d17ce
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp
View File

@ -492,8 +492,10 @@
<spring:eval expression="@property['Globals.prod.islocal']" var="isLocal"/>
<c:choose>
<c:when test="${isLocal eq 'real'}">
<script src="http://101.79.81.151/ReportingServer/html5/js/crownix-viewer.min.js"></script>
<link rel="stylesheet" type="text/css" href="http://101.79.81.151/ReportingServer/html5/css/crownix-viewer.min.css">
<!-- <script src="http://101.79.81.151/ReportingServer/html5/js/crownix-viewer.min.js"></script>
<link rel="stylesheet" type="text/css" href="http://101.79.81.151/ReportingServer/html5/css/crownix-viewer.min.css"> -->
<script src="https://www.edu-copyright.or.kr/offedu/ReportingServer/html5/js/crownix-viewer.min.js"></script>
<link rel="stylesheet" type="text/css" href="https://www.edu-copyright.or.kr/offedu/ReportingServer/html5/css/crownix-viewer.min.css">
</c:when>
<c:otherwise>
<script src="http://119.193.215.98:8093/ReportingServer/html5/js/crownix-viewer.min.js"></script>
@ -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"]);

4
src/main/webapp/WEB-INF/jsp/uss/ion/fms/FmsFileModify.jsp
View File

@ -30,7 +30,9 @@
<script type="text/javascript" src="<c:url value='/js/EgovMultiFile.js'/>"></script>
<script type="text/javaScript" language="javascript">
$( document ).ready(function(){
$(".btn_add_file").on('click', function(){
$("#file_temp").click();
});
});
/* pagination 페이지 링크 function */

11
src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp
View File

@ -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();

8
src/main/webapp/WEB-INF/jsp/web/ve/comm/fileUploadPop.jsp
View File

@ -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();