From b72fb5e919f4b295b33e1420891200c86815f85d Mon Sep 17 00:00:00 2001 From: tolag3 Date: Fri, 3 Nov 2023 16:00:35 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 텍스트 수정 - 용어사전 개발중 --- .../glossary/service/GlossaryService.java | 19 ++ .../kccadr/glossary/service/GlossaryVO.java | 69 +++++++ .../glossary/service/impl/GlossaryDAO.java | 44 +++++ .../service/impl/GlossaryServiceImpl.java | 56 ++++++ .../glossary/web/GlossaryController.java | 125 +++++++++++++ .../web/EgovBBSAttributeManageController.java | 2 +- .../cop/bbs/web/EgovBBSManageController.java | 8 +- src/main/java/kcc/web/MainController.java | 13 +- .../spring/com/context-idgen.xml | 18 ++ .../cubrid/sql-map-config-cubrid-glossary.xml | 7 + .../kccadr/glossary/Glossary_SQL_Cubrid.xml | 75 ++++++++ src/main/webapp/WEB-INF/decorators.xml | 1 + .../WEB-INF/jsp/cntCNT_000000000862.jsp | 22 +-- .../adjPgrMgr/apm/popup/addRpplPastPop.jsp | 2 +- .../apm/popup/addRpplPastUpdtPop.jsp | 2 +- .../kccadr/adjPgrMgr/apm/popup/addRpplPop.jsp | 2 +- .../kccadr/adjPgrMgr/apm/popup/appChgPop.jsp | 2 +- .../adjPgrMgr/apm/popup/fncOpenDocPop.jsp | 2 +- .../adjPgrMgr/apm/popup/updtRpplPop.jsp | 2 +- .../apm/popup/updtRpplPop_backup.jsp | 2 +- .../kccadr/adjPgrMgr/drt/popup/addAgntPop.jsp | 2 +- .../popup/adjReqMgrOffAppReqPop.jsp | 2 +- .../jsp/kccadr/glossary/glossaryDetail.jsp | 161 +++++++++++++++++ .../jsp/kccadr/glossary/glossaryList.jsp | 171 ++++++++++++++++++ .../jsp/kccadr/glossary/glossaryRegist.jsp | 149 +++++++++++++++ .../kccadr/textSense/EgovTextSenseDetail.jsp | 2 +- .../webapp/WEB-INF/jsp/layout/adminLayout.jsp | 2 +- .../WEB-INF/jsp/layout/adminLayoutPopup.jsp | 2 +- .../WEB-INF/jsp/main/inc/EgovIncFooter.jsp | 8 - .../WEB-INF/jsp/main/inc/EgovIncFooter1.jsp | 6 +- .../WEB-INF/jsp/main/inc/EgovIncLeftmenu.jsp | 4 +- .../mnu/mpm/EgovMenuAuthoritySelectJtree.jsp | 2 +- .../sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp | 2 +- .../WEB-INF/jsp/uss/ion/cnf/ScriptMngList.jsp | 2 +- .../jsp/web/com/pop/quickWrapGlossaryPop.jsp | 107 +++++++++++ .../WEB-INF/jsp/web/com/webCommonNaviWrap.jsp | 6 +- .../jsp/web/com/webCommonQuickMenu.jsp | 26 ++- .../jsp/web/cop/bbs/CntBbs01ListAjax.jsp | 4 +- .../WEB-INF/jsp/web/cop/bbs/CntBbsList.jsp | 4 +- .../jsp/web/cop/bbs/CntBbsListAjax.jsp | 4 +- .../WEB-INF/jsp/web/cop/bbs/FaqList.jsp | 2 +- .../WEB-INF/jsp/web/cop/bbs/NewsList_back.jsp | 2 +- .../WEB-INF/jsp/web/cop/bbs/PubOperList.jsp | 2 +- .../jsp/web/cop/bbs/PubOperListAjax.jsp | 2 +- .../jsp/web/cop/bbs/PubOperMainAjax.jsp | 2 +- .../jsp/web/cop/bbs/PubOperSubList.jsp | 2 +- .../jsp/web/cop/bbs/PubOperSubListAjax.jsp | 2 +- .../WEB-INF/jsp/web/cop/bbs/QnaList.jsp | 2 +- .../WEB-INF/jsp/web/cop/bbs/QnaListAjax.jsp | 4 +- .../jsp/web/cop/bbs/TotMngListAjax.jsp | 2 +- .../kccadr/accdnt/ass/AdjustSchStatusList.jsp | 2 +- .../chg/popup/AdjustSchStatusDtailPop.jsp | 2 +- .../jsp/web/kccadr/adjstExp/mainExpPage.jsp | 2 +- src/main/webapp/js/kccadr/kccadrCom.js | 3 +- src/main/webapp/kccadrPb/adm/guide.html | 2 +- src/main/webapp/publish/css/content.css | 4 +- src/main/webapp/publish/email.html | 12 +- src/main/webapp/publish/guide.html | 4 +- src/main/webapp/publish/index.html | 132 +++++++------- src/main/webapp/publish/js/common.js | 2 +- src/main/webapp/publish/js/main_2.js | 4 +- src/main/webapp/publish/js/main_backup1.js | 4 +- src/main/webapp/publish/search.html | 38 ++-- src/main/webapp/publish/sub1_01.html | 28 +-- src/main/webapp/publish/sub1_02.html | 36 ++-- src/main/webapp/publish/sub1_03.html | 28 +-- src/main/webapp/publish/sub1_04.html | 18 +- src/main/webapp/publish/sub1_04_1.html | 36 ++-- src/main/webapp/publish/sub1_05.html | 38 ++-- src/main/webapp/publish/sub1_06.html | 32 ++-- src/main/webapp/publish/sub2_01.html | 56 +++--- src/main/webapp/publish/sub2_02.html | 18 +- src/main/webapp/publish/sub2_03.html | 42 ++--- src/main/webapp/publish/sub2_04.html | 34 ++-- src/main/webapp/publish/sub2_05.html | 14 +- src/main/webapp/publish/sub3_01.html | 22 +-- src/main/webapp/publish/sub3_02.html | 24 +-- src/main/webapp/publish/sub3_03.html | 18 +- src/main/webapp/publish/sub4_01.html | 36 ++-- src/main/webapp/publish/sub4_01_view.html | 22 +-- src/main/webapp/publish/sub4_02.html | 28 +-- src/main/webapp/publish/sub4_02_view.html | 16 +- src/main/webapp/publish/sub4_03.html | 36 ++-- src/main/webapp/publish/sub4_04.html | 42 ++--- src/main/webapp/publish/sub4_05.html | 30 +-- src/main/webapp/publish/sub5_01.html | 36 ++-- src/main/webapp/publish/sub5_02.html | 14 +- src/main/webapp/publish/sub5_02_answer.html | 16 +- src/main/webapp/publish/sub5_02_write.html | 12 +- .../webapp/publish/sub5_02_write_agree.html | 24 +-- src/main/webapp/publish/sub5_03.html | 18 +- src/main/webapp/publish/sub5_04.html | 30 +-- src/main/webapp/publish/sub6_01.html | 22 +-- src/main/webapp/publish/sub6_02.html | 12 +- src/main/webapp/publish/sub6_02_list.html | 12 +- src/main/webapp/publish/sub6_03.html | 20 +- src/main/webapp/publish/sub6_04.html | 22 +-- 97 files changed, 1632 insertions(+), 632 deletions(-) create mode 100644 src/main/java/kcc/kccadr/glossary/service/GlossaryService.java create mode 100644 src/main/java/kcc/kccadr/glossary/service/GlossaryVO.java create mode 100644 src/main/java/kcc/kccadr/glossary/service/impl/GlossaryDAO.java create mode 100644 src/main/java/kcc/kccadr/glossary/service/impl/GlossaryServiceImpl.java create mode 100644 src/main/java/kcc/kccadr/glossary/web/GlossaryController.java create mode 100644 src/main/resources/egovframework/sqlmap/config/cubrid/sql-map-config-cubrid-glossary.xml create mode 100644 src/main/resources/egovframework/sqlmap/kccadr/glossary/Glossary_SQL_Cubrid.xml create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/glossary/glossaryDetail.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/glossary/glossaryList.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/glossary/glossaryRegist.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/web/com/pop/quickWrapGlossaryPop.jsp diff --git a/src/main/java/kcc/kccadr/glossary/service/GlossaryService.java b/src/main/java/kcc/kccadr/glossary/service/GlossaryService.java new file mode 100644 index 00000000..55ab3cfe --- /dev/null +++ b/src/main/java/kcc/kccadr/glossary/service/GlossaryService.java @@ -0,0 +1,19 @@ +package kcc.kccadr.glossary.service; + +import java.util.List; + +public interface GlossaryService { + + public int insertGlossary(GlossaryVO glossaryVO) throws Exception; + + public List selectGlossaryList(GlossaryVO glossaryVO) throws Exception; + + public GlossaryVO selectGlossaryDetail(GlossaryVO glossaryVO) throws Exception; + + public void updateGlossaryStatus(GlossaryVO glossaryVO) throws Exception; + + public void updateGlossaryModify(GlossaryVO glossaryVO) throws Exception; + + public void deleteGlossary(GlossaryVO glossaryVO) throws Exception; + +} \ No newline at end of file diff --git a/src/main/java/kcc/kccadr/glossary/service/GlossaryVO.java b/src/main/java/kcc/kccadr/glossary/service/GlossaryVO.java new file mode 100644 index 00000000..3fc7f4fc --- /dev/null +++ b/src/main/java/kcc/kccadr/glossary/service/GlossaryVO.java @@ -0,0 +1,69 @@ +package kcc.kccadr.glossary.service; + +import java.io.Serializable; + +import kcc.com.cmm.ComDefaultVO; + +public class GlossaryVO extends ComDefaultVO implements Serializable{ + + private static final long serialVersionUID = 1L; + + private String glssrSeq; + private String glssrSubject; + private String glssrCn; + private String frstRegisterId; + private String frstRegistPnttm; + private String lastUpdusrId; + private String lastUpdtPnttm; + private String useYn; + + + public String getGlssrSeq() { + return glssrSeq; + } + public void setGlssrSeq(String glssrSeq) { + this.glssrSeq = glssrSeq; + } + public String getGlssrSubject() { + return glssrSubject; + } + public void setGlssrSubject(String glssrSubject) { + this.glssrSubject = glssrSubject; + } + public String getGlssrCn() { + return glssrCn; + } + public void setGlssrCn(String glssrCn) { + this.glssrCn = glssrCn; + } + public String getFrstRegisterId() { + return frstRegisterId; + } + public void setFrstRegisterId(String frstRegisterId) { + this.frstRegisterId = frstRegisterId; + } + public String getFrstRegistPnttm() { + return frstRegistPnttm; + } + public void setFrstRegistPnttm(String frstRegistPnttm) { + this.frstRegistPnttm = frstRegistPnttm; + } + public String getLastUpdusrId() { + return lastUpdusrId; + } + public void setLastUpdusrId(String lastUpdusrId) { + this.lastUpdusrId = lastUpdusrId; + } + public String getLastUpdtPnttm() { + return lastUpdtPnttm; + } + public void setLastUpdtPnttm(String lastUpdtPnttm) { + this.lastUpdtPnttm = lastUpdtPnttm; + } + public String getUseYn() { + return useYn; + } + public void setUseYn(String useYn) { + this.useYn = useYn; + } +} diff --git a/src/main/java/kcc/kccadr/glossary/service/impl/GlossaryDAO.java b/src/main/java/kcc/kccadr/glossary/service/impl/GlossaryDAO.java new file mode 100644 index 00000000..cadbcd0e --- /dev/null +++ b/src/main/java/kcc/kccadr/glossary/service/impl/GlossaryDAO.java @@ -0,0 +1,44 @@ +package kcc.kccadr.glossary.service.impl; + +import java.util.List; + +import org.springframework.stereotype.Repository; + +import egovframework.rte.psl.dataaccess.EgovAbstractDAO; +import kcc.kccadr.glossary.service.GlossaryVO; + +@Repository("GlossaryDAO") +public class GlossaryDAO extends EgovAbstractDAO{ + + + public int insertGlossary(GlossaryVO glossaryVO) throws Exception { + + return (int) insert("glossaryDAO.insertGlossary", glossaryVO); + } + + public List selectGlossaryList(GlossaryVO glossaryVO) throws Exception { + // TODO Auto-generated method stub + return null; + } + + public GlossaryVO selectGlossaryDetail(GlossaryVO glossaryVO) throws Exception { + // TODO Auto-generated method stub + return null; + } + + public void updateGlossaryStatus(GlossaryVO glossaryVO) throws Exception { + // TODO Auto-generated method stub + + } + + public void updateGlossaryModify(GlossaryVO glossaryVO) throws Exception { + // TODO Auto-generated method stub + + } + + public void deleteGlossary(GlossaryVO glossaryVO) throws Exception { + // TODO Auto-generated method stub + + } + +} diff --git a/src/main/java/kcc/kccadr/glossary/service/impl/GlossaryServiceImpl.java b/src/main/java/kcc/kccadr/glossary/service/impl/GlossaryServiceImpl.java new file mode 100644 index 00000000..ec4d8cba --- /dev/null +++ b/src/main/java/kcc/kccadr/glossary/service/impl/GlossaryServiceImpl.java @@ -0,0 +1,56 @@ +package kcc.kccadr.glossary.service.impl; + +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + +import kcc.kccadr.glossary.service.GlossaryService; +import kcc.kccadr.glossary.service.GlossaryVO; + +@Service("GlossaryService") +public class GlossaryServiceImpl implements GlossaryService{ + + @Resource(name = "GlossaryDAO") + private GlossaryDAO glossaryDAO; + + @Override + public int insertGlossary(GlossaryVO glossaryVO) throws Exception { + + return glossaryDAO.insertGlossary(glossaryVO); + } + + @Override + public List selectGlossaryList(GlossaryVO glossaryVO) throws Exception { + // TODO Auto-generated method stub + return null; + } + + @Override + public GlossaryVO selectGlossaryDetail(GlossaryVO glossaryVO) throws Exception { + // TODO Auto-generated method stub + return null; + } + + @Override + public void updateGlossaryStatus(GlossaryVO glossaryVO) throws Exception { + // TODO Auto-generated method stub + + } + + @Override + public void updateGlossaryModify(GlossaryVO glossaryVO) throws Exception { + // TODO Auto-generated method stub + + } + + @Override + public void deleteGlossary(GlossaryVO glossaryVO) throws Exception { + // TODO Auto-generated method stub + + } + + + +} diff --git a/src/main/java/kcc/kccadr/glossary/web/GlossaryController.java b/src/main/java/kcc/kccadr/glossary/web/GlossaryController.java new file mode 100644 index 00000000..afc06839 --- /dev/null +++ b/src/main/java/kcc/kccadr/glossary/web/GlossaryController.java @@ -0,0 +1,125 @@ +package kcc.kccadr.glossary.web; + +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; + +import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; +import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; +import kcc.com.cmm.LoginVO; +import kcc.kccadr.glossary.service.GlossaryService; +import kcc.kccadr.glossary.service.GlossaryVO; +import kcc.kccadr.textsense.service.TextSenseVO; + +@Controller +public class GlossaryController { + + @Resource(name = "GlossaryService") + private GlossaryService glossaryService; + + + /** + * @methodName : selectTextSenseList + * @author : JunHo Lee + * @date : 2023.11.03 + * @description : 용어해설 목록 + * @param glossaryVO + * @param model + * @return + * @throws Exception + */ + @RequestMapping(value="/kccadr/glossary/glossaryList.do") + public String glossaryList(@ModelAttribute("searchVO") GlossaryVO glossaryVO, ModelMap model) throws Exception{ + + LoginVO user = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + + if(user == null) { + + return "redirect:/uat/uia/EgovLoginUsr.do"; + + } + + if(glossaryVO.getPageUnit() != 10) { + glossaryVO.setPageUnit(glossaryVO.getPageUnit()); + } + + if("".equals(glossaryVO.getSearchSortCnd())){ + glossaryVO.setSearchSortCnd("frstRegistPnttm"); + glossaryVO.setSearchSortOrd("desc"); + } + + /** paging */ + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(glossaryVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(glossaryVO.getPageUnit()); + paginationInfo.setPageSize(glossaryVO.getPageSize()); + + glossaryVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + glossaryVO.setLastIndex(paginationInfo.getLastRecordIndex()); + glossaryVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + glossaryVO.setFrstRegisterId(user.getUniqId()); + +// paginationInfo.setTotalRecordCount(glossaryService.selectTextSenseListCount(textSenseVO)); + model.addAttribute("paginationInfo", paginationInfo); +// List list = glossaryService.selectTextSenseList(textSenseVO); + List list = new ArrayList(); + model.addAttribute("list", list); + + return "kccadr/glossary/glossaryList"; + } + + + @RequestMapping(value="/kccadr/glossary/glossaryRegist.do") + public String glossaryRegist(@ModelAttribute("searchVO") GlossaryVO glossaryVO, ModelMap model) throws Exception{ + + LoginVO user = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + + if(user == null) { + + return "redirect:/uat/uia/EgovLoginUsr.do"; + + } + + return "kccadr/glossary/glossaryRegist"; + } + + + @RequestMapping(value="/kccadr/glossary/glossaryRegistAjax.do") + public ModelAndView glossaryRegistAjax(GlossaryVO glossaryVO) throws Exception{ + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + LoginVO user = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + + glossaryVO.setFrstRegisterId(user.getId()); + + if(user == null) { + modelAndView.addObject("result", "FAIL"); + modelAndView.addObject("message", "다시 로그인 해주세요."); + return modelAndView; + + } + try { + glossaryService.insertGlossary(glossaryVO); + + modelAndView.addObject("result", "SUCCESS"); + modelAndView.addObject("message", "저장되었습니다."); + } catch (Exception e) { + modelAndView.addObject("result", "FAIL"); + modelAndView.addObject("message", "저장에 실패했습니다."); + } + + return modelAndView; + + } + + +} diff --git a/src/main/java/kcc/let/cop/bbs/web/EgovBBSAttributeManageController.java b/src/main/java/kcc/let/cop/bbs/web/EgovBBSAttributeManageController.java index be2325b9..67ecaa4d 100644 --- a/src/main/java/kcc/let/cop/bbs/web/EgovBBSAttributeManageController.java +++ b/src/main/java/kcc/let/cop/bbs/web/EgovBBSAttributeManageController.java @@ -685,7 +685,7 @@ public class EgovBBSAttributeManageController { } public String getBbsUrl(String bbsId , String bbsHomeUrl){ - //원자력소식 + //전자조정소식 if("BBSMSTR_000000000411".equals(bbsId) ||"BBSMSTR_000000000412".equals(bbsId) ){bbsHomeUrl = "/web/cop/bbs/NewsList.do"; return bbsHomeUrl ;} 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 e16223ef..f3494de9 100644 --- a/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java +++ b/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java @@ -1608,7 +1608,7 @@ public class EgovBBSManageController { } bmVO = bbsAttrbService.selectBBSMasterInf(bmVO); - if("/web/cop/bbs/NewsDetail.do".equals(request.getRequestURI()) || "/web/contentBbsDetail.do".equals(request.getRequestURI())) { //원자력소식 수정삭제등록 없음. + if("/web/cop/bbs/NewsDetail.do".equals(request.getRequestURI()) || "/web/contentBbsDetail.do".equals(request.getRequestURI())) { //전자조정소식 수정삭제등록 없음. bmVO.setWebChgYn("N"); model.addAttribute("masterVO", masterVO); } @@ -3163,7 +3163,7 @@ public class EgovBBSManageController { * * * URL - * /web/cop/bbs/NewsList.do (원자력소식) + * /web/cop/bbs/NewsList.do (전자조정소식) * /web/cop/bbs/selectLibList.do (자료실) * /web/cop/bbs/bussRealList.do (사업실명제) */ @@ -3190,7 +3190,7 @@ public class EgovBBSManageController { } } - if(0!=boardMenuList.size()) { //원자력 소식은 전체 매뉴 없음. + if(0!=boardMenuList.size()) { //전자조정 소식은 전체 매뉴 없음. if(!"9420000".equals(((BoardMasterVO)boardMenuList.get(0)).getMenuNo())) { BoardMasterVO totalBoardMasterVO = new BoardMasterVO(); totalBoardMasterVO.setBbsNm("전체"); @@ -3694,7 +3694,7 @@ public class EgovBBSManageController { } } - if(0!=boardMenuList.size()) { //원자력 소식은 전체 매뉴 없음. + if(0!=boardMenuList.size()) { //전자조정 소식은 전체 매뉴 없음. if(!"9420000".equals(((BoardMasterVO)boardMenuList.get(0)).getMenuNo())) { BoardMasterVO totalBoardMasterVO = new BoardMasterVO(); totalBoardMasterVO.setBbsNm("전체"); diff --git a/src/main/java/kcc/web/MainController.java b/src/main/java/kcc/web/MainController.java index e894382b..edc2f1ce 100644 --- a/src/main/java/kcc/web/MainController.java +++ b/src/main/java/kcc/web/MainController.java @@ -76,6 +76,7 @@ import kcc.com.uss.ion.pwm.service.MainzoneVO; import kcc.com.uss.ion.pwm.service.PopupManageVO; import kcc.com.uss.ion.pwm.service.PopupzoneVO; import kcc.com.utl.fcc.service.EgovStringUtil; +import kcc.kccadr.accdnt.ai.service.AdjstIncidentVO; import kcc.let.cop.bbs.service.BoardMasterVO; import kcc.let.cop.bbs.service.BoardVO; import kcc.let.cop.bbs.service.EgovBBSAttributeManageService; @@ -506,7 +507,7 @@ public class MainController { Collections.reverse(menuCurrentResultList); //타이틀 역순을 위해 model.addAttribute("menuCurrentResultList", menuCurrentResultList); - //팝업존 > 원자력 탑메뉴 위 팝업존 + //팝업존 > 전자조정 탑메뉴 위 팝업존 /* 팝업 가져오기 */ /*if(!isMobile(request)){ //PC인경우만 PopupManageVO popupManageVO = new PopupManageVO(); @@ -1386,7 +1387,7 @@ public class MainController { ModelMap model) throws Exception { - //원자력 시작 + //전자조정 시작 // 아래 처리중 중간네비 메뉴 조회를 위해 with recurseive 중첩절을 쓰는 쿼리가 있음으로, 큐브리드 쿼리화 필요 //로그인 권한 정보 불러오기 @@ -1541,7 +1542,7 @@ public class MainController { model.addAttribute("menuResultList", menuResultList); // 아래 처리중 중간네비 메뉴 조회를 위해 with recurseive 중첩절을 쓰는 쿼리가 있음으로, 큐브리드 쿼리화 필요 - // 원자력 종료 + // 전자조정 종료 if(request.getRequestURI().contains("/eng/")){ return "web/com/engWebCommonNaviWrap"; @@ -1951,6 +1952,12 @@ public class MainController { return "web/com/webCommonQuickMenu"; } + //용어해설 팝업 + @RequestMapping(value = "/web/com/popup/quickWrapGlossaryPop.do") + public String quickWrapGlossaryPop(@ModelAttribute("adjstIncidentVO") AdjstIncidentVO adjstIncidentVO, ModelMap model) throws Exception { + return "web/com/pop/quickWrapGlossaryPop"; + } + // 파일을 로컬로 부터 읽어와서 BodyPart 클래스로 만든다. (바운더리 변환) private BodyPart getFileAttachment(String realFile, String filename) throws MessagingException { // BodyPart 생성 diff --git a/src/main/resources/egovframework/spring/com/context-idgen.xml b/src/main/resources/egovframework/spring/com/context-idgen.xml index 3f131437..cad60661 100644 --- a/src/main/resources/egovframework/spring/com/context-idgen.xml +++ b/src/main/resources/egovframework/spring/com/context-idgen.xml @@ -2916,5 +2916,23 @@ + + + + + + + + + + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/config/cubrid/sql-map-config-cubrid-glossary.xml b/src/main/resources/egovframework/sqlmap/config/cubrid/sql-map-config-cubrid-glossary.xml new file mode 100644 index 00000000..5546ee91 --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/config/cubrid/sql-map-config-cubrid-glossary.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/kccadr/glossary/Glossary_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/kccadr/glossary/Glossary_SQL_Cubrid.xml new file mode 100644 index 00000000..cfcc1b80 --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/kccadr/glossary/Glossary_SQL_Cubrid.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + INSERT + INTO adr_glossary + ( + glssr_seq, + glssr_subject, + glssr_cn, + frst_register_id, + frst_regist_pnttm, + use_yn + ) + VALUES + ( + #glssrSeq#, + #glssrSubject#, + #glssrCn#, + #frstRegisterId#, + now(), + #useYn# + ) + + + + UPDATE adr_glossary + SET glssr_subject = '', + glssr_cn = '', + last_updusr_id = '', + last_updt_pnttm = now() + WHERE glssr_seq = #glssrSeq# + + + + UPDATE adr_glossary + SET last_updusr_id = '', + last_updt_pnttm = now(), + use_yn = 'N' + WHERE glssr_seq = #glssrSeq# + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/decorators.xml b/src/main/webapp/WEB-INF/decorators.xml index d4d0132f..2a48fd55 100644 --- a/src/main/webapp/WEB-INF/decorators.xml +++ b/src/main/webapp/WEB-INF/decorators.xml @@ -66,6 +66,7 @@ /web/kccadr/adjPgrMgr/cclt/membDeptDetailPop.do */web/kccadr/pdf/pdfview.do* + /web/com/popup/quickWrapGlossaryPop.do* diff --git a/src/main/webapp/WEB-INF/jsp/cntCNT_000000000862.jsp b/src/main/webapp/WEB-INF/jsp/cntCNT_000000000862.jsp index 17fb96f0..ffb7ed30 100644 --- a/src/main/webapp/WEB-INF/jsp/cntCNT_000000000862.jsp +++ b/src/main/webapp/WEB-INF/jsp/cntCNT_000000000862.jsp @@ -6,7 +6,7 @@
 
-

한국원자력안전재단

+

한국전자조정안전재단

경기도 성남시 분당구 대왕판교로644번길49 (삼평동, 디티씨타워 1관 7층)

@@ -46,17 +46,17 @@

버스 이용안내

-

- 309번(용인 - 성남) → ‘동안교’ 하차 → 도보 약 2분 → 한국원자력안전재단 도착

+

- 309번(용인 - 성남) → ‘동안교’ 하차 → 도보 약 2분 → 한국전자조정안전재단 도착

-

- 602-1번, 602-2번(맞춤형 버스) → ‘엔씨소프트.안랩’ 하차 → 도보 약 3분 → 한국원자력안전재단 도착

+

- 602-1번, 602-2번(맞춤형 버스) → ‘엔씨소프트.안랩’ 하차 → 도보 약 3분 → 한국전자조정안전재단 도착

-

- 4000번(수원 - 성남), 9414번(삼성 - 죽전) → ‘테크노육교’ 하차 → 도보 약 3분 → 한국원자력안전재단 도착

+

- 4000번(수원 - 성남), 9414번(삼성 - 죽전) → ‘테크노육교’ 하차 → 도보 약 3분 → 한국전자조정안전재단 도착

-

- 101번, 330번, 350번(잠실 - 성남) → ‘차그룹컨소시엄’ 하차 → 도보 약 3분 → 한국원자력안전재단 도착

+

- 101번, 330번, 350번(잠실 - 성남) → ‘차그룹컨소시엄’ 하차 → 도보 약 3분 → 한국전자조정안전재단 도착

-

- 9007번(서울역 - 성남) → ‘엔씨소프트.안랩’ 하차 → 도보 약 3분 → 한국원자력안전재단 도착

+

- 9007번(서울역 - 성남) → ‘엔씨소프트.안랩’ 하차 → 도보 약 3분 → 한국전자조정안전재단 도착

-

- 9000번, 9401번(서울역 - 성남) → ‘판교역.낙생육교.현대백화점’ 하차 → 도보 약 15분 → 한국원자력안전재단 도착

+

- 9000번, 9401번(서울역 - 성남) → ‘판교역.낙생육교.현대백화점’ 하차 → 도보 약 15분 → 한국전자조정안전재단 도착

@@ -64,10 +64,10 @@

자가용 이용안내

경부고속도로 이용시 -

- 판교 IC 통과 후 좌회전 → 약 700m 직진하여 사거리에서 우회전 → 약 500m 직진 (좌측 SK 주유소 옆건물(DTC타워1관7층)) → 한국원자력안전재단 도착

+

- 판교 IC 통과 후 좌회전 → 약 700m 직진하여 사거리에서 우회전 → 약 500m 직진 (좌측 SK 주유소 옆건물(DTC타워1관7층)) → 한국전자조정안전재단 도착

분당 - 수서간 도시고속화도로 이용시 -

- 벌말사거리에서 우회전 → 한화테크윈삼거리에서 판교역방면으로 좌회전 (NCSOFT 건물 지나기 전에 좌회전 하여 약100m 직진(좌측 SK 주유소 옆건물(DTC타워1관7층)) → 한국원자력안전재단 도착

+

- 벌말사거리에서 우회전 → 한화테크윈삼거리에서 판교역방면으로 좌회전 (NCSOFT 건물 지나기 전에 좌회전 하여 약100m 직진(좌측 SK 주유소 옆건물(DTC타워1관7층)) → 한국전자조정안전재단 도착

@@ -94,14 +94,14 @@ geocoder.addressSearch('경기도 성남시 분당구 대왕판교로 644번길 var coords = new kakao.maps.LatLng(result[0].y, result[0].x); // 결과값으로 받은 위치를 마커로 표시합니다 var marker = new kakao.maps.Marker({ - title: "한국원자력안전재단", + title: "한국전자조정안전재단", map: map, position: coords }); // 인포윈도우로 장소에 대한 설명을 표시합니다 var infowindow = new kakao.maps.InfoWindow({ - content: '
한국원자력안전재단
' + content: '
한국전자조정안전재단
' }); infowindow.open(map, marker); // 지도의 중심을 결과값으로 받은 위치로 이동시킵니다 diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/addRpplPastPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/addRpplPastPop.jsp index da3f2d8f..a1343ad2 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/addRpplPastPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/addRpplPastPop.jsp @@ -32,7 +32,7 @@ -<%-- 원자력 --%> +<%-- 전자조정 --%> -<%-- 원자력 --%> +<%-- 전자조정 --%> -<%-- 원자력 --%> +<%-- 전자조정 --%> -<%-- 원자력 --%> +<%-- 전자조정 --%> -<%-- 원자력 --%> +<%-- 전자조정 --%> -<%-- 원자력 --%> +<%-- 전자조정 --%> -<%-- 원자력 --%> +<%-- 전자조정 --%> -<%-- 원자력 --%> +<%-- 전자조정 --%> +용어해설 상세 + + + + +
+ + + + + + + + +
+
+ + +
+

용어해설 상세

+
    +
    • +
  • +

    용어해설 관리

    +
    • +
  • 상세
    • +
+
+ + +
+ +
+ + + + + + + + + + + + + + + + +
+ 용어명 + + + +
+

용어내용

+ 		+ +
+
+ + + +
+
+
+
+ + + +
+
+ +
+
+
+
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/glossary/glossaryList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/glossary/glossaryList.jsp new file mode 100644 index 00000000..447ad5d2 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/glossary/glossaryList.jsp @@ -0,0 +1,171 @@ + +<%@ 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="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" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<% + /** + * @Class Name : GlossaryList.jsp + * @Description : 용어해설 리스트 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2023.11.3 이준호 최초 생성 + * @author 이준호 + * @since 2023.11.3 + * @version 1.0 + * @see + * + */ +%> + + + + + +용어해설 목록 + + +
+ + " /> + " /> + + +
+
+ +
+

용어해설 목록

+
    +
  • + + + +
    • +
  • +

    용어해설 관리

    +
    • +
  • 목록
    • +
+
+ +
+ +
+
+
+
    +
  • +

    구분

    + + + +
    • +
+
+
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호용어명등록자등록일자
+ + + + + + + ');" style="cursor:pointer;"> + + ');" style="cursor:pointer;"> + + ');" style="cursor:pointer;"> + +
+
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/glossary/glossaryRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/glossary/glossaryRegist.jsp new file mode 100644 index 00000000..60cba504 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/glossary/glossaryRegist.jsp @@ -0,0 +1,149 @@ +<%@ 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="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"%> +<%@ taglib prefix="ckeditor" uri="http://ckeditor.com"%> + + + + + + +용어해설 등록 + + + + +
+ + + + + + + + +
+
+ + +
+

용어해설 등록

+
    +
    • +
  • +

    용어해설 관리

    +
    • +
  • 등록
    • +
+
+ + +
+ +
+ + + + + + + + + + + + + + + + +
+

용어명

+ 		+ +
+

용어내용

+ 		+ +
+
+ + + +
+
+
+
+ + +
+
+ +
+
+
+
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/textSense/EgovTextSenseDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/textSense/EgovTextSenseDetail.jsp index b8cbbf9d..edac4eea 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/textSense/EgovTextSenseDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/textSense/EgovTextSenseDetail.jsp @@ -279,7 +279,7 @@ function fnDelete(){
- +
diff --git a/src/main/webapp/WEB-INF/jsp/layout/adminLayout.jsp b/src/main/webapp/WEB-INF/jsp/layout/adminLayout.jsp index f8ecdbe8..36f77f51 100644 --- a/src/main/webapp/WEB-INF/jsp/layout/adminLayout.jsp +++ b/src/main/webapp/WEB-INF/jsp/layout/adminLayout.jsp @@ -22,7 +22,7 @@ - <%-- 원자력 --%> + <%-- 전자조정 --%> diff --git a/src/main/webapp/WEB-INF/jsp/layout/adminLayoutPopup.jsp b/src/main/webapp/WEB-INF/jsp/layout/adminLayoutPopup.jsp index 267a0430..a4156cd7 100644 --- a/src/main/webapp/WEB-INF/jsp/layout/adminLayoutPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/layout/adminLayoutPopup.jsp @@ -22,7 +22,7 @@ - <%-- 원자력 --%> + <%-- 전자조정 --%> <%-- --%> diff --git a/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncFooter.jsp b/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncFooter.jsp index 698d7a60..0bb1deb6 100644 --- a/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncFooter.jsp +++ b/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncFooter.jsp @@ -97,12 +97,4 @@ function deleteLodingBar(){ } } - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncFooter1.jsp b/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncFooter1.jsp index 4c2b1c49..b2b5cec2 100644 --- a/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncFooter1.jsp +++ b/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncFooter1.jsp @@ -12,6 +12,6 @@ --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncLeftmenu.jsp b/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncLeftmenu.jsp index b6c5a53d..ffd1bb96 100644 --- a/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncLeftmenu.jsp +++ b/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncLeftmenu.jsp @@ -133,7 +133,7 @@ $( document).ready(function() { - + <%-- --%> - +
" /> diff --git a/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuAuthoritySelectJtree.jsp b/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuAuthoritySelectJtree.jsp index d5ace20a..b264714f 100644 --- a/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuAuthoritySelectJtree.jsp +++ b/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuAuthoritySelectJtree.jsp @@ -520,7 +520,7 @@ function fn_save_menuInfo(menuNo) { if(!confirm("저장하시겠습니까?")) return; - <%-- 원자력 + <%-- 전자조정 //추가 게시판 저장후 메뉴 정보 저장 //if( $('#tr_bbs').length > 0 ){ if(!save_line()){ diff --git a/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp b/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp index 21b21fd5..42a32029 100644 --- a/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp +++ b/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp @@ -463,7 +463,7 @@ function fn_save_menuInfo(menuNo) { if(!confirm("저장하시겠습니까?")) return; - <%-- 원자력 + <%-- 전자조정 //추가 게시판 저장후 메뉴 정보 저장 //if( $('#tr_bbs').length > 0 ){ if(!save_line()){ diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/cnf/ScriptMngList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/cnf/ScriptMngList.jsp index 052a5bd1..d7ddb73c 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/cnf/ScriptMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/cnf/ScriptMngList.jsp @@ -179,7 +179,7 @@ function fn_modify(){
- 한국원자력안전재단 + 한국전자조정안전재단
diff --git a/src/main/webapp/WEB-INF/jsp/web/com/pop/quickWrapGlossaryPop.jsp b/src/main/webapp/WEB-INF/jsp/web/com/pop/quickWrapGlossaryPop.jsp new file mode 100644 index 00000000..dc206f4b --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/com/pop/quickWrapGlossaryPop.jsp @@ -0,0 +1,107 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + + + + + + + +저작권 용어해설 + + + + + + + + + + + + + + + + + + +
+ +
+
+
+

저작권 용어해설

+
+
+
+

용어검색

+ + +
+
+
    +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
+
+
+
+

전체 : 6,178건

+
    +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
+
+
+
+
+

조정제도

+
+

저작권 분쟁 당사자의 조정 신청이 있는 경우 전문가로 구성된 조정부가 분쟁을 신속하고 공정하게 해결해 주는 제도로서, 판결을 대신하여 분쟁을 종국적으로 해결하는 대체적 분쟁해결제도(ADR, Alternative Dispute Resolution) 중 하나입니다. 한국저작권위원회는 1988년부터 조정업무를 수행하여 왔으며, 저작물 이용 등으로 발생하는 다양한 저작권 침해 관련 분쟁을 해결하고 있습니다. 2020.08.05.부터 시행된 개정 저작권법에 의하여 한국저작권위원회 조정부는 ①“조정부가 제시한 조정안을 어느 한쪽 당사자가 합리적인 이유 없이 거부한 경우” 또는 ② “분쟁조정 예정가액이 1천만원 미만인 경우”에 해당할 때, 직권으로 조정을 갈음하는 결정(직권조정결정)을 할 수 있습니다.

+
+
+
+
+ +
+
+
+
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonNaviWrap.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonNaviWrap.jsp index 25bc38ae..279a1ca3 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonNaviWrap.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonNaviWrap.jsp @@ -6,7 +6,7 @@ <%-- --%> <%-- --%> -<%-- 원자력 HTML 시작 +<%-- 전자조정 HTML 시작
'); background-repeat:no-repeat;"> @@ -145,7 +145,7 @@ function snsShare(snsName) {
- //원자력 HTML 종료 --%> + //전자조정 HTML 종료 --%>
diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonQuickMenu.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonQuickMenu.jsp index b000c22a..66bcb1da 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonQuickMenu.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonQuickMenu.jsp @@ -1,16 +1,17 @@ <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/chg/popup/AdjustSchStatusDtailPop.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/chg/popup/AdjustSchStatusDtailPop.jsp index 4d09708d..7125a14d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/chg/popup/AdjustSchStatusDtailPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/chg/popup/AdjustSchStatusDtailPop.jsp @@ -18,7 +18,7 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -한국원자력안전재단 > 소통·참여 > 자주하는 질문 +한국전자조정안전재단 > 소통·참여 > 자주하는 질문 diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp index 14056290..d18b33a0 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp @@ -4,7 +4,7 @@ - + diff --git a/src/main/webapp/js/kccadr/kccadrCom.js b/src/main/webapp/js/kccadr/kccadrCom.js index 0f08656b..38e04077 100644 --- a/src/main/webapp/js/kccadr/kccadrCom.js +++ b/src/main/webapp/js/kccadr/kccadrCom.js @@ -353,7 +353,8 @@ function addDash(str) { return str.replace(/(^01[016789]{1}|070)([0-9]{3}|[0-9]{4})([0-9]{4})$/, "$1-$2-$3").replace("--", "-"); } -const formatPhoneNumber = (input) => { +//const formatPhoneNumber = (input) => { +function formatPhoneNumber(input){ const cleanInput = input.replaceAll(/[^0-9]/g, ""); let result = ""; const length = cleanInput.length; diff --git a/src/main/webapp/kccadrPb/adm/guide.html b/src/main/webapp/kccadrPb/adm/guide.html index 6460e7d5..3a03825f 100644 --- a/src/main/webapp/kccadrPb/adm/guide.html +++ b/src/main/webapp/kccadrPb/adm/guide.html @@ -121,7 +121,7 @@

  • - 관리자 목록 항목에 정렬버튼 원자력처럼 클래스로 모양 변경되게 부탁드려요~(요청 8.14 여현준)
    + 관리자 목록 항목에 정렬버튼 전자조정처럼 클래스로 모양 변경되게 부탁드려요~(요청 8.14 여현준)

  • diff --git a/src/main/webapp/publish/css/content.css b/src/main/webapp/publish/css/content.css index ff7d21d9..cc3581ba 100644 --- a/src/main/webapp/publish/css/content.css +++ b/src/main/webapp/publish/css/content.css @@ -899,10 +899,10 @@ div.contInfo p span{vertical-align: unset} .colorBox ul{padding: 25px 82px 25px 30px;} /* //CI/정관 */ - /* 원자력 안전정책 */ + /* 전자조정 안전정책 */ .sub2_01 .bdBox .flex li{padding: 14px 20px 15px 20px} .sub2_01 .titBox + ul > li{flex-basis: 43%;} - /* //원자력 안전정책 */ + /* //전자조정 안전정책 */ /* 대학교육 */ div.contInfo p span{vertical-align: auto;} diff --git a/src/main/webapp/publish/email.html b/src/main/webapp/publish/email.html index e626be81..5ace8dc2 100644 --- a/src/main/webapp/publish/email.html +++ b/src/main/webapp/publish/email.html @@ -75,7 +75,7 @@
  • 재단소식
  • 공지사항
  • 인재채용
    • -
  • 원자력안전 동향
    • +
  • 전자조정안전 동향
  • 자료실
    • @@ -101,7 +101,7 @@