From 8d0fed143680bffe1240b701c2c2324a2977c7f0 Mon Sep 17 00:00:00 2001 From: hylee Date: Fri, 30 Sep 2022 11:32:19 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=EC=98=A4=EC=A6=88=EB=A6=AC?= =?UTF-8?q?=ED=8F=AC=ED=8A=B8=20ip=20=EB=B3=80=EA=B2=BD=20/=20=EA=B3=BC?= =?UTF-8?q?=EA=B1=B0=EB=93=B1=EB=A1=9D=EC=82=AC=EA=B1=B4=20value=20?= =?UTF-8?q?=EC=B2=B4=ED=81=AC=20=ED=95=B4=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kcc/com/cmm/util/IpUtil.java | 2 +- .../java/kcc/com/cmm/util/StringUtil.java | 2 +- .../adjPgrMgr/apm/web/ApmController.java | 28 +++++ .../adjst/web/AdjstReqWebController.java | 1 + .../kccadr/ozSchd/web/OzSchdExportUtil.java | 2 +- .../cop/bbs/web/EgovBBSManageController.java | 10 +- .../let/uat/uia/web/EgovLoginController.java | 2 +- .../egovProps/globals_local.properties | 5 - .../apm/popup/adjstReqOpenExamplePop.jsp | 17 ++- .../apm/popup/adjstReqOpenExamplePop2.jsp | 99 +++++++++++++++++ .../adjst/popup/adjstReqOpenExamplePop.jsp | 2 +- .../adjst/popup/adjstReqOpenExamplePop2.jsp | 19 +++- .../webapp/js/kccadr/adjReqMgrPast/event.js | 26 ++++- .../webapp/js/kccadr/adjReqMgrPast/value.js | 102 +++++++++--------- 14 files changed, 241 insertions(+), 76 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop2.jsp diff --git a/src/main/java/kcc/com/cmm/util/IpUtil.java b/src/main/java/kcc/com/cmm/util/IpUtil.java index bb94feb1..5a6d7e15 100644 --- a/src/main/java/kcc/com/cmm/util/IpUtil.java +++ b/src/main/java/kcc/com/cmm/util/IpUtil.java @@ -97,7 +97,7 @@ public class IpUtil { String ozServerNm = ""; - if(serverNm.contains("localhost") || serverNm.contains("219.240.88.15") || serverNm.contains("iten.co.kr")) {//로컬 및 개발서버 요청시 서버 경로 처리 + if(serverNm.contains("localhost") || serverNm.contains("119.193.215.98") || serverNm.contains("iten.co.kr")) {//로컬 및 개발서버 요청시 서버 경로 처리 ozServerNm = "http://192.168.0.176:8086"; diff --git a/src/main/java/kcc/com/cmm/util/StringUtil.java b/src/main/java/kcc/com/cmm/util/StringUtil.java index 0e1e7e70..f202ea77 100644 --- a/src/main/java/kcc/com/cmm/util/StringUtil.java +++ b/src/main/java/kcc/com/cmm/util/StringUtil.java @@ -506,7 +506,7 @@ public class StringUtil { }else{ //개발서버 시스템 주소 셋팅 - repUrl = url.replaceAll("host_dev", "http://219.240.88.15:8091"); + repUrl = url.replaceAll("host_dev", "http://119.193.215.98:8091"); } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java index 1a210bd4..7dcd1640 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.time.DateFormatUtils; import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.json.simple.JSONArray; import org.json.simple.JSONObject; @@ -635,6 +636,33 @@ public class ApmController { return "/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop"; } + /** + * 예문 팝업 상세 + * + * @param dlvinfoVO + * @param model + * @return + * @throws Exception + */ + @RequestMapping(value = "popup/adjstReqOpenExamplePop2.do") + public String adjstReqOpenExamplePop2(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model) throws Exception { + + AdjstReqVO exmp = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO); + + if (exmp != null && StringUtils.isNotBlank(exmp.getAtchFileId())) { + FileVO fileVO = new FileVO(); + fileVO.setAtchFileId(exmp.getAtchFileId()); + List fileList = fileService.selectFileInfs(fileVO); + model.addAttribute("fileList", fileList); + } + model.addAttribute("exmp", exmp); + model.addAttribute("ccTy", adjstReqVO.getCcTy()); + model.addAttribute("exmpCd", adjstReqVO.getExmpCd()); + + + return "/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop2"; + } + /** * 대리인등록 팝업 상세 diff --git a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java index bd1dbe0e..0f510eb1 100644 --- a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java +++ b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java @@ -228,6 +228,7 @@ public class AdjstReqWebController { List fileList = fileService.selectFileInfs(fileVO); model.addAttribute("fileList", fileList); } + System.out.println("exmp :: "+ exmp); model.addAttribute("exmp", exmp); return "/web/kccadr/adjst/popup/adjstReqOpenExamplePop2"; } diff --git a/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java b/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java index f4bbef3c..03f9fdd8 100644 --- a/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java +++ b/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java @@ -22,7 +22,7 @@ public class OzSchdExportUtil { //개발서버 및 운영서버 구분에 따른 서버 정보 셋팅 String serverNm = request.getServerName(); - if(serverNm.contains("localhost") || serverNm.contains("219.240.88.15") || serverNm.contains("iten.co.kr")) { + if(serverNm.contains("localhost") || serverNm.contains("119.193.215.98") || serverNm.contains("iten.co.kr")) { ozApiUrl = "http://192.168.0.125:8091/oz80/server"; ozApiIp = "192.168.0.125"; diff --git a/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java b/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java index 94ea7e71..1f1d33fe 100644 --- a/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java +++ b/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java @@ -325,7 +325,7 @@ public class EgovBBSManageController { if (ip == null) ip = request.getRemoteAddr(); String ddd = ""; - if("219.240.88.15".equals(ip) || "0:0:0:0:0:0:0:1".equals(ip)) { + if("119.193.215.98".equals(ip) || "0:0:0:0:0:0:0:1".equals(ip)) { model.addAttribute("Transfer", true ); } System.out.println("---ip----"+ip); @@ -701,7 +701,7 @@ public class EgovBBSManageController { if (ip == null) ip = request.getRemoteAddr(); String ddd = ""; - if("219.240.88.15".equals(ip) || "0:0:0:0:0:0:0:1".equals(ip)) { + if("119.193.215.98".equals(ip) || "0:0:0:0:0:0:0:1".equals(ip)) { model.addAttribute("Transfer", true ); } @@ -916,7 +916,7 @@ public class EgovBBSManageController { //임시 데이터 이관용 String ip = request.getHeader("X-Forwarded-For"); if (ip == null) ip = request.getRemoteAddr(); - if("219.240.88.15".equals(ip) || "0:0:0:0:0:0:0:1".equals(ip)) { + if("119.193.215.98".equals(ip) || "0:0:0:0:0:0:0:1".equals(ip)) { model.addAttribute("Transfer", true ); } @@ -3946,7 +3946,7 @@ public class EgovBBSManageController { String iniFilePath = "/usr/local/tomcat/damo/scpdb_agent.ini"; //실서버 if(request.getRequestURL().toString().contains("test.kofons.or.kr")){ //로컬 iniFilePath = "C:\\damo\\scpdb_agent.ini"; - }else if(request.getRequestURL().toString().contains("219.240.88.15")) { //테스트 + }else if(request.getRequestURL().toString().contains("119.193.215.98")) { //테스트 iniFilePath = "/usr/local/tomcat_kofons/damo/scpdb_agent.ini"; } System.out.println("iniFilePath --" + iniFilePath + "---"); @@ -3967,7 +3967,7 @@ public class EgovBBSManageController { String iniFilePath = "/usr/local/tomcat/damo/scpdb_agent.ini"; //실서버 if(request.getRequestURL().toString().contains("test.kofons.or.kr")){ //로컬 iniFilePath = "C:\\damo\\scpdb_agent.ini"; - }else if(request.getRequestURL().toString().contains("219.240.88.15")) { //테스트 + }else if(request.getRequestURL().toString().contains("119.193.215.98")) { //테스트 iniFilePath = "/usr/local/tomcat_kofons/damo/scpdb_agent.ini"; } System.out.println("iniFilePath --" + iniFilePath + "---"); diff --git a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java index 7ef1c5d8..3310e6bb 100644 --- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java @@ -436,7 +436,7 @@ public class EgovLoginController { SsoLoginVO ssoLoginVO = (SsoLoginVO) session.getAttribute("SSOLoginVO"); // 실서버 적용시 바꾸기 - /*String returnSiteUrl = "http://219.240.88.15:8091/web/user/login/ssoUsrModifyResult.do";*/ + /*String returnSiteUrl = "http://119.193.215.98:8091/web/user/login/ssoUsrModifyResult.do";*/ String returnSiteUrl = returnSiteUrlGlobal; ssoLoginVO.setReturnSiteUrl(URLEncoder.encode(returnSiteUrl)); diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index 893794f5..d40eb2aa 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -33,12 +33,7 @@ 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 -<<<<<<< HEAD -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:::?charset=utf8 ->>>>>>> refs/heads/anjooyoung #\uc2e4\uc11c\ubc84 #Globals.Url=jdbc:cubrid:192.168.39.14:30000:kcc_adrs4:::?charset=utf8 diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp index 6e8f7f45..0c4c5245 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp @@ -52,7 +52,7 @@ var exmpCd = $("#exmpCd").val(); console.log(exmpCd.replace(/(^0+)/, "")); var perId = '#reqCn'+exmpCd.replace(/(^0+)/, ""); - $(opener.document).find(perId).val($('#exmpCn').text()); + $(opener.document).find(perId).val($('#exmpCn').text().trim()); window.close(); }); @@ -60,7 +60,8 @@ /* * 상세내용 select */ - function fn_selectCn(){ + /* + function fn_selectCn( ){ $.ajax({ type: "POST", @@ -82,7 +83,7 @@ }, error: function (e) { alert("조회에 실패하였습니다."); console.log("ERROR : ", e); } }); - } + } */ fn_selectCn(); }); @@ -107,7 +108,12 @@ - + <%-- --%> + @@ -115,12 +121,13 @@ 내용 + 1)피신청인은 신청인에게 저작권 침해에 따른 손해배상 및 위자료로서 금삼백만원(W3,000,000)을 지급한다. 2)피신청인이 제작, 보유하고 있는 본 건 침해물 <월간 스키라이브>를 조정성립일로부터 14일 이내에 폐기처분한다. 라는 조정을 구합니다
- +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop2.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop2.jsp new file mode 100644 index 00000000..280f0e44 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop2.jsp @@ -0,0 +1,99 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator"%> +<%pageContext.setAttribute("crlf", "\r\n"); %> +<% +/** + * @Class Name : srcAdmNoPop.jsp + * @Description : 조정접수 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.16 김봉호 최초 생성 + * @author 김봉호 + * @since 2021.08.16 + * @version 1.0 + * @see + * + */ +%> + + +신청서 예문 조회 + + + + + + + + +
+
+

+ + + + + + + + + + + +
+ +
+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp index d96f4e58..e93c6343 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp @@ -47,7 +47,7 @@ $(document).ready(function(){ var exmpCd = $("#exmpCd").val(); console.log(exmpCd.replace(/(^0+)/, "")); var perId = '#reqCn'+exmpCd.replace(/(^0+)/, ""); - $(perId).val($('#exmpCn').text()); + $(perId).val($('#exmpCn').text().trim()); }); /* diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop2.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop2.jsp index 7736d1e9..03f5fd85 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop2.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop2.jsp @@ -32,11 +32,23 @@ $(document).ready(function(){ $('[data-tooltip="fee_info_popup"]').eq(1).focus(); }); } + + /* + * 등록버튼 event + */ + $('#redBtn').on('click', function(){ + var exmpCd = $("#exmpCd").val(); +// console.log(exmpCd.replace(/(^0+)/, "")); + var perId = '#reqCn'+exmpCd.replace(/(^0+)/, ""); + console.log('perId : ', perId); + $(perId).val($('#exmpCn').text().trim()); + }); }) diff --git a/src/main/webapp/js/kccadr/adjReqMgrPast/event.js b/src/main/webapp/js/kccadr/adjReqMgrPast/event.js index 6d1dcbc7..31e97465 100644 --- a/src/main/webapp/js/kccadr/adjReqMgrPast/event.js +++ b/src/main/webapp/js/kccadr/adjReqMgrPast/event.js @@ -5,8 +5,30 @@ function openExampleAdminPop(exmpCd) { var pop = document.pop; pop.ccTy.value = $('#ccTy').val(); pop.exmpCd.value = exmpCd; - - commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.do", '600', '400', "openExampleAdminPop", $('#pop')); + + + var uri = ''; + if(exmpCd == '01') + uri = "adjstReqOpenExamplePop.do"; + else if (exmpCd == '02') + uri = "adjstReqOpenExamplePop2.do"; + + console.log('uri :: ', uri); + + +// var uri = ''; +// if(exmpCd == '01') +// { +// uri = "adjstReqOpenExamplePop.do"; +// } +// else if (exmpCd == '02') +// { +// uri = "adjstReqOpenExamplePop2.do"; +// +// } + +// commonPopWindowopenForm("/web/kccadr/adjst/popup/"+uri, '500', '400', "openExampleAdminPop", $('#pop')); + commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/"+uri, '600', '400', "openExampleAdminPop", $('#pop')); } diff --git a/src/main/webapp/js/kccadr/adjReqMgrPast/value.js b/src/main/webapp/js/kccadr/adjReqMgrPast/value.js index 7a80574b..f61af07f 100644 --- a/src/main/webapp/js/kccadr/adjReqMgrPast/value.js +++ b/src/main/webapp/js/kccadr/adjReqMgrPast/value.js @@ -29,7 +29,7 @@ var rppl00RealPost = $('#rppl00RealPost').val(); var rppl00RealAddrDtl = $('#rppl00RealAddrDtl').val(); - if( rppl00Nm == ""){ + /*if( rppl00Nm == ""){ alert("대리인 이름을 입력해 주세요."); return false; @@ -97,7 +97,7 @@ alert("대리인 우편물 수령지 상세주소 정보를 입력해 주세요."); return false; - } + }*/ if($('#rppl00Email1')){ @@ -126,12 +126,12 @@ var rppl0101Nm = $('#rppl0101Nm').val(); - if(rppl0101Nm == ""){ + /*if(rppl0101Nm == ""){ alert("신청인 이름을 입력해 주세요."); return false; - } + }*/ }else if(rpplUsrTy == "02"){ // 법인일 경우 @@ -139,7 +139,7 @@ var rppl01BizNm = $('#rppl01BizNm').val(); var rppl01BizId = $('#rppl01BizId').val(); - if(rppl0102Nm == ""){ + /*if(rppl0102Nm == ""){ alert("신청인 대표자 이름을 입력해 주세요."); return false; @@ -158,14 +158,14 @@ alert("신청인 법인등록번호를 입력해 주세요."); return false; - } + }*/ }else { // 개인 사업자인 경우 var rppl0103Nm = $('#rppl0103Nm').val(); var rppl01BizNo = $('#rppl01BizNo').val(); - if(rppl0103Nm == ""){ + /* if(rppl0103Nm == ""){ alert("신청인 개인 사업자 이름을 입력해 주세요."); return false; @@ -177,7 +177,7 @@ alert("신청인 사업자 등록번호를 입력해 주세요."); return false; - } + }*/ } @@ -192,7 +192,7 @@ var rppl01RealPost = $('#rppl01RealPost').val(); var rppl01RealAddrDtl = $('#rppl01RealAddrDtl').val(); - if(rppl01Post == ""){ + /*if(rppl01Post == ""){ alert("신청인 주소 우편번호를 입력해 주세요."); return false; @@ -253,7 +253,7 @@ alert("신청인 우편물 수령지 상세주소 정보를 입력해 주세요."); return false; - } + }*/ //신청인 이메일정보 합쳐주기 var rppl01Email1 = $('#rppl01Email1').val(); @@ -280,12 +280,12 @@ var rppl0201Nm = $('#rppl0201Nm').val(); - if(rppl0201Nm == ""){ + /*if(rppl0201Nm == ""){ alert("피신청인 이름을 입력해 주세요."); return false; - } + }*/ }else if(rppl02UsrTy == "02"){ // 법인일 경우 @@ -293,7 +293,7 @@ var rppl02BizNm = $('#rppl02BizNm').val(); var rppl02BizId = $('#rppl02BizId').val(); - if(rppl0202Nm == ""){ + /*if(rppl0202Nm == ""){ alert("피신청인 대표자 이름을 입력해 주세요."); return false; @@ -312,14 +312,14 @@ alert("피신청인 법인등록번호를 입력해 주세요."); return false; - } + }*/ }else { // 개인 사업자인 경우 var rppl0203Nm = $('#rppl0203Nm').val(); var rppl02BizNo = $('#rppl02BizNo').val(); - if(rppl0203Nm == ""){ + /*if(rppl0203Nm == ""){ alert("피신청인 개인 사업자 이름을 입력해 주세요."); return false; @@ -331,7 +331,7 @@ alert("피신청인 개인 사업자 등록번호를 입력해 주세요."); return false; - } + }*/ } @@ -346,7 +346,7 @@ var rppl02RealPost = $('#rppl02RealPost').val(); var rppl02RealAddrDtl = $('#rppl02RealAddrDtl').val(); - if(rppl02Post == ""){ + /*if(rppl02Post == ""){ alert("피신청인 주소 우편번호를 입력해 주세요."); return false; @@ -407,7 +407,7 @@ alert("우편물 수령지 상세주소 정보를 입력해 주세요."); return false; - } + }*/ //신청인 이메일정보 합쳐주기 var rppl02Email1 = $('#rppl02Email1').val(); @@ -433,12 +433,12 @@ var rppl0301Nm = $('#rppl0301Nm').val(); - if(rppl0301Nm == ""){ + /*if(rppl0301Nm == ""){ alert("피신청인 이름을 입력해 주세요."); return false; - } + }*/ }else if(rppl03UsrTy == "02"){ // 법인일 경우 @@ -446,7 +446,7 @@ var rppl03BizNm = $('#rppl03BizNm').val(); var rppl03BizId = $('#rppl03BizId').val(); - if(rppl0302Nm == ""){ + /*if(rppl0302Nm == ""){ alert("피신청인 대표자 이름을 입력해 주세요."); return false; @@ -465,14 +465,14 @@ alert("피신청인 법인등록번호를 입력해 주세요."); return false; - } + }*/ }else { // 개인 사업자인 경우 var rppl0303Nm = $('#rppl0303Nm').val(); var rppl03BizNo = $('#rppl03BizNo').val(); - if(rppl0303Nm == ""){ + /*if(rppl0303Nm == ""){ alert("피신청인 개인 사업자 이름을 입력해 주세요."); return false; @@ -484,7 +484,7 @@ alert("피신청인 사업자 등록번호를 입력해 주세요."); return false; - } + }*/ } @@ -499,7 +499,7 @@ var rppl03RealPost = $('#rppl03RealPost').val(); var rppl03RealAddrDtl = $('#rppl03RealAddrDtl').val(); - if(rppl03Post == ""){ + /*if(rppl03Post == ""){ alert("피신청인 주소 우편번호를 입력해 주세요."); return false; @@ -560,7 +560,7 @@ alert("피신청인 우편물 수령지 상세주소 정보를 입력해 주세요."); return false; - } + }*/ //신청인 이메일정보 합쳐주기 var rppl03Email1 = $('#rppl03Email1').val(); @@ -586,12 +586,12 @@ var rppl0401Nm = $('#rppl0401Nm').val(); - if(rppl0401Nm == ""){ + /*if(rppl0401Nm == ""){ alert("피신청인 이름을 입력해 주세요."); return false; - } + }*/ }else if(rppl04UsrTy == "02"){ // 법인일 경우 @@ -599,7 +599,7 @@ var rppl04BizNm = $('#rppl04BizNm').val(); var rppl04BizId = $('#rppl04BizId').val(); - if(rppl0402Nm == ""){ + /*if(rppl0402Nm == ""){ alert("피신청인 대표자 이름을 입력해 주세요."); return false; @@ -618,14 +618,14 @@ alert("피신청인 법인등록번호를 입력해 주세요."); return false; - } + }*/ }else { // 개인 사업자인 경우 var rppl0403Nm = $('#rppl0403Nm').val(); var rppl04BizNo = $('#rppl04BizNo').val(); - if(rppl0403Nm == ""){ + /*if(rppl0403Nm == ""){ alert("피신청인 개인 사업자 이름을 입력해 주세요."); return false; @@ -637,7 +637,7 @@ alert("피신청인 사업자 등록번호를 입력해 주세요."); return false; - } + }*/ } @@ -652,7 +652,7 @@ var rppl04RealPost = $('#rppl04RealPost').val(); var rppl04RealAddrDtl = $('#rppl04RealAddrDtl').val(); - if(rppl04Post == ""){ + /*if(rppl04Post == ""){ alert("피신청인 주소 우편번호를 입력해 주세요."); return false; @@ -714,7 +714,7 @@ return false; } - + */ //신청인 이메일정보 합쳐주기 var rppl04Email1 = $('#rppl04Email1').val(); var rppl04Email2 = $('#rppl04Email2').val(); @@ -740,19 +740,19 @@ var rppl0501Nm = $('#rppl0501Nm').val(); - if(rppl0501Nm == ""){ + /*if(rppl0501Nm == ""){ alert("피신청인 이름을 입력해 주세요."); return false; - } + }*/ }else if(rppl05UsrTy == "02"){ // 법인일 경우 var rppl0502Nm = $('#rppl0502Nm').val(); var rppl05BizNm = $('#rppl05BizNm').val(); var rppl05BizId = $('#rppl05BizId').val(); - + /* if(rppl0502Nm == ""){ alert("피신청인 대표자 이름을 입력해 주세요."); @@ -772,13 +772,13 @@ alert("피신청인 법인등록번호를 입력해 주세요."); return false; - } + }*/ }else { // 개인 사업자인 경우 var rppl0503Nm = $('#rppl0503Nm').val(); var rppl05BizNo = $('#rppl05BizNo').val(); - + /* if(rppl0503Nm == ""){ alert("피신청인 개인 사업자 이름을 입력해 주세요."); @@ -791,7 +791,7 @@ alert("피신청인 사업자 등록번호를 입력해 주세요."); return false; - } + }*/ } @@ -805,7 +805,7 @@ var rppl05Phone3 = $('#rppl05Phone3').val(); var rppl05RealPost = $('#rppl05RealPost').val(); var rppl05RealAddrDtl = $('#rppl05RealAddrDtl').val(); - + /* if(rppl05Post == ""){ alert("피신청인 주소 우편번호를 입력해 주세요."); @@ -868,7 +868,7 @@ return false; } - + */ //신청인 이메일정보 합쳐주기 var rppl05Email1 = $('#rppl05Email1').val(); var rppl05Email2 = $('#rppl05Email2').val(); @@ -893,12 +893,12 @@ var rppl0601Nm = $('#rppl0601Nm').val(); - if(rppl0601Nm == ""){ + /*if(rppl0601Nm == ""){ alert("피신청인 이름을 입력해 주세요."); return false; - } + }*/ }else if(rppl06UsrTy == "02"){ // 법인일 경우 @@ -906,7 +906,7 @@ var rppl06BizNm = $('#rppl06BizNm').val(); var rppl06BizId = $('#rppl06BizId').val(); - if(rppl0602Nm == ""){ + /*if(rppl0602Nm == ""){ alert("피신청인 대표자 이름을 입력해 주세요."); return false; @@ -925,14 +925,14 @@ alert("피신청인 법인등록번호를 입력해 주세요."); return false; - } + }*/ }else { // 개인 사업자인 경우 var rppl0603Nm = $('#rppl0603Nm').val(); var rppl06BizNo = $('#rppl06BizNo').val(); - if(rppl0603Nm == ""){ + /*if(rppl0603Nm == ""){ alert("피신청인 개인 사업자 이름을 입력해 주세요."); return false; @@ -944,7 +944,7 @@ alert("피신청인 사업자 등록번호를 입력해 주세요."); return false; - } + }*/ } @@ -959,7 +959,7 @@ var rppl06RealPost = $('#rppl06RealPost').val(); var rppl06RealAddrDtl = $('#rppl06RealAddrDtl').val(); - if(rppl06Post == ""){ + /*if(rppl06Post == ""){ alert("피신청인 주소 우편번호를 입력해 주세요."); return false; @@ -1020,7 +1020,7 @@ alert("피신청인 우편물 수령지 상세주소 정보를 입력해 주세요."); return false; - } + }*/ //신청인 이메일정보 합쳐주기 var rppl06Email1 = $('#rppl06Email1').val(); @@ -1117,7 +1117,7 @@ if(data.status == 'OK') { $('#adrSeqHidden').val(data.dataSub); -// $('#nextGoPageForm').submit(); + $('#nextGoPageForm').submit(); } else if(data.status == 'Unauthorized' || data.status == 'BAD_REQUEST') { From 627a7fdb222e20f7f2b7fc16a41e0e47aa2f56c0 Mon Sep 17 00:00:00 2001 From: HappyITN Date: Fri, 30 Sep 2022 11:42:51 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=A1=B0=EC=83=81=ED=9D=AC=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=95=EC=A7=84=ED=96=89=20=EC=9B=8C=ED=81=AC=ED=94=8C?= =?UTF-8?q?=EB=A1=9C=EC=9A=B0=20=EA=B5=AC=EC=84=B1=20=EB=B0=8F=20css=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/web/kccadr/kccadrCom/workFlowJsp.jsp | 6 ++++-- src/main/webapp/kccadrPb/adm/css/content.css | 8 ++++---- src/main/webapp/kccadrPb/usr/css/content.css | 8 ++++---- .../kccadrPb/usr/image/workflow/nexticon4.png | Bin 5143 -> 7315 bytes 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowJsp.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowJsp.jsp index 33c4c1b0..874aa234 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowJsp.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowJsp.jsp @@ -24,9 +24,8 @@
  • 기일통지

    다음다음
      -
    • 1차 기일 개최

      다음
    • -

      2차 기일 개최다음

      다음 +

      1차 기일 개최다음

      다음
      • 조정성립

      • 직권조정다음

        @@ -39,6 +38,9 @@
      • 불성립종결

    • +
    • +

      2차 기일 개최

      다음 +
    • 3차 기일 개최

      다음
    • 4차 기일 개최

    diff --git a/src/main/webapp/kccadrPb/adm/css/content.css b/src/main/webapp/kccadrPb/adm/css/content.css index 4ac99972..800ee2a4 100644 --- a/src/main/webapp/kccadrPb/adm/css/content.css +++ b/src/main/webapp/kccadrPb/adm/css/content.css @@ -439,16 +439,16 @@ table select+button{vertical-align: middle;} .work_3,.work_5{float: right;} .work_5{margin-left: 10px; margin-top: 73px;} .work_flow_wrap .work_cont .work_3 li{overflow: visible;} -.work_4{float: right; margin-left: 240px; margin-top: -73px; position: relative;} +.work_4{float: right; margin-left: 240px; margin-top: 5px; position: relative;} .work_flow_wrap .work_cont p+.nexticon_3{position: absolute; top: 100%; left: 98px; top: 54px;} -.nexticon_4{position: absolute; top: -58px; left: 235px;} +.nexticon_4{position: absolute; top: 16px; left: 235px;} .nexticon_5{position: absolute; top: 22px; left: 215px;} .work_flow_wrap.off .work_cont{height: 0; padding: 0 25px; margin: 0; transition: all 0.5s ease;} .work_cont .status01 p{border: 1px solid #ea5404; color: #ea5404;} .work_cont p.status01{border: 1px solid #ea5404; color: #ea5404;} -.work_cont .status02 p{border: 2px solid #1b6fcd; color: #1b6fcd; font-weight: 500;} -.work_cont p.status02{border: 2px solid #1b6fcd; color: #1b6fcd; font-weight: 500;} +.work_cont .status02 p{border: 2px solid #1b6fcd; color: #1b6fcd; font-weight: 500;width:208px;height:43px;} +.work_cont p.status02{border: 2px solid #1b6fcd; color: #1b6fcd; font-weight: 500;width:208px;height:43px;} /* //워크플로우 */ /* 과거사건 기록 통합 검색 */ diff --git a/src/main/webapp/kccadrPb/usr/css/content.css b/src/main/webapp/kccadrPb/usr/css/content.css index bc388c5a..37a98d83 100644 --- a/src/main/webapp/kccadrPb/usr/css/content.css +++ b/src/main/webapp/kccadrPb/usr/css/content.css @@ -712,16 +712,16 @@ table .label{position: absolute;width: 1px; height: 1px; margin: 0; border: none .work_3,.work_5{float: right;} .work_5{margin-left: 10px; margin-top: 73px;} .work_flow_wrap .work_cont .work_3 li{overflow: visible;} -.work_4{float: right; margin-left: 240px; margin-top: -73px; position: relative;} +.work_4{float: right; margin-left: 240px; margin-top: 5px; position: relative;} .work_flow_wrap .work_cont p+.nexticon_3{position: absolute; top: 100%; left: 98px; top: 54px;} -.nexticon_4{position: absolute; top: -58px; left: 235px;} +.nexticon_4{position: absolute; top: 16px; left: 235px;} .nexticon_5{position: absolute; top: 22px; left: 215px;} .work_flow_wrap.off .work_cont{height: 0; padding: 0 25px; margin: 0; transition: all 0.5s ease;} .work_cont .status01 p{border: 1px solid #ea5404; color: #ea5404;} .work_cont p.status01{border: 1px solid #ea5404; color: #ea5404;} -.work_cont .status02 p{border: 2px solid #1b6fcd; color: #1b6fcd; font-weight: 500;} -.work_cont p.status02{border: 2px solid #1b6fcd; color: #1b6fcd; font-weight: 500;} +.work_cont .status02 p{border: 2px solid #1b6fcd; color: #1b6fcd; font-weight: 500;width:208px;height:43px;} +.work_cont p.status02{border: 2px solid #1b6fcd; color: #1b6fcd; font-weight: 500;width:208px;height:43px;} /* //워크플로우 */ /* 익스플로어 */ diff --git a/src/main/webapp/kccadrPb/usr/image/workflow/nexticon4.png b/src/main/webapp/kccadrPb/usr/image/workflow/nexticon4.png index d2bea615d0b8dcf2585c2b5c7ce2dfa4ba67fb16..ad2dfcd6c7a7af28f0ecc1f7283b23089d8ec3e8 100644 GIT binary patch literal 7315 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 literal 5143 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