diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index af3f5471..bdab081a 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -33,8 +33,8 @@ Globals.DriverClassName=cubrid.jdbc.driver.CUBRIDDriver #\ud074\ub77c\uc6b0\ub4dc \uc11c\ubc84 #Globals.Url=jdbc:cubrid:158.247.225.133:30000:kcc_adrs4:::?charset=utf8 #\uac1c\ubc1c\uc11c\ubc84 -#Globals.Url=jdbc:CUBRID:119.193.215.98:30000:kcc_adr_advc_test:::?charset=utf8 -Globals.Url=jdbc:cubrid:119.193.215.98:30000:kcc_adr_advc:::?charset=utf8 +Globals.Url=jdbc:CUBRID:119.193.215.98:30000:kcc_adr_advc_test:::?charset=utf8 +#Globals.Url=jdbc:cubrid:119.193.215.98:30000:kcc_adr_advc:::?charset=utf8 #\uc2e4\uc11c\ubc84 #Globals.Url=jdbc:cubrid:192.168.39.146:30000:kcc_adr_advc:::?charset=utf8 diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp index b9dec0d7..d761733a 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp @@ -367,7 +367,9 @@ $(document).ready(function(){ success: function (returnData, status) { if(returnData.result == 'FAIL'){ if(returnData.message != ''){ - alert(returnData.message); + if(returnData.message != undifined){ + alert(returnData.message); + } }else{ alert("처리중 오류가 발생하였습니다."); } diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp index 00fdc2d4..3bbded4c 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp @@ -1244,11 +1244,11 @@ - + - +
@@ -1309,8 +1309,8 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp index d66c9bf1..37ea7fdf 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp @@ -1181,11 +1181,11 @@ function getPageUrl(idx) { - + - +
@@ -1243,8 +1243,8 @@ function getPageUrl(idx) { <%-- 최고관리자의 경우 결재, 반려 버튼 미노출 --%> - +
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp index b64b5488..855c23d3 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp @@ -368,8 +368,7 @@ resInfo--%>
-<%-- 웹접근성 인증 주석처리_이준호_230321 --%> -<%-- --%> + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail_in_workflow.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail_in_workflow.jsp index 4728c555..3cc1b532 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail_in_workflow.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail_in_workflow.jsp @@ -267,8 +267,7 @@

-<%-- 웹접근성 인증 주석처리_이준호_230321 --%> -<%-- --%> + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp index c0e38be6..44af24b8 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp @@ -79,8 +79,7 @@ function tutorialPop(){

조정신청

- <%-- 웹접근성 인증 주석처리_이준호_230321 --%> - <%-- --%> +
diff --git a/src/main/webapp/innorix/innorix.js b/src/main/webapp/innorix/innorix.js index 032fa2da..f1555940 100644 --- a/src/main/webapp/innorix/innorix.js +++ b/src/main/webapp/innorix/innorix.js @@ -9,7 +9,9 @@ // 라이선스 유형 : INNORIX WP 91일 체험 (만료 2022-09-30) /*var INNORIX_LICENSE = "WEiCgfGkBpqQN/Zw0Ae0YQDFQoK5vit/hNZK/8gGNUm+mtjwAJr4dLSFCiLgiY9BOWSg925hgOfaW1olUgUTccrrl6Y=";*/ // 라이선스 유형 : INNORIX WP 91일 체험 (만료 2022-12-31) -/*var INNORIX_LICENSE = "SQeXVJiPNj/2u6W8BXoc1pX1l1D0Dc1azbDxUT+BQPLxsV86kF62+FUvIaofOXnArJTjp9kn/ZtUA+Ps0JFla2QGiu0=";*/ +//var INNORIX_LICENSE = "SQeXVJiPNj/2u6W8BXoc1pX1l1D0Dc1azbDxUT+BQPLxsV86kF62+FUvIaofOXnArJTjp9kn/ZtUA+Ps0JFla2QGiu0="; +// 라이선스 유형 : INNORIX WP 30일 체험 (만료 2023-05-05) +//var INNORIX_LICENSE = "3v0AzGS0JgwSdFHLQQxxtUkUhisBNnaQemUNZDGw/tswnXPMQE446fqMs3uzb/EOWHvJhjRifBmG2cB2twGldoZzpkI="; // 운영라이선스 적용 var INNORIX_LICENSE = "FXA8KvVU99M9Ubbr3Yrz91zCNqyXdWCqUQ/OO1f7lj3nifVZZjuLqJIlHXjosrbPynCFJat5fwEgP/RVXftvXSsXmAHSnTVLYciyf8XmbxH8SLfUdCIEnFo+zL8=";