From d9ab7e4f8bed01de1379ba05729fd3c457e36d8d Mon Sep 17 00:00:00 2001 From: leebj Date: Thu, 4 Jul 2024 17:59:26 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=A0=EB=A5=B8=EC=A1=B0=ED=9A=8C=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 --- .../xit/fims/sprt/web/Sprt01Controller.java | 14 +---------- .../WEB-INF/jsp/fims/sprt/sprt01010-main.jsp | 23 ++++++++++--------- src/main/webapp/WEB-INF/jsp/include/top.jsp | 12 ++++------ src/main/webapp/WEB-INF/jsp/index.jsp | 2 ++ 4 files changed, 20 insertions(+), 31 deletions(-) diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java index 01b18aa4..6235f70e 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java @@ -146,7 +146,7 @@ public class Sprt01Controller extends ApplicationController { * @return /fims/sprt/sprt01010 */ @RequestMapping(name="통합조회 메인", value=METHOD_URL.integrationSearchMain) - public ModelAndView integrationSearchMain(HttpServletRequest req) { + public ModelAndView integrationSearchMain() { ModelAndView mav = new ModelAndView("fims/sprt/sprt01010-main"); mav.addObject("pageName", "sprt01010"); @@ -173,18 +173,6 @@ public class Sprt01Controller extends ApplicationController { addCodes(commonCodes, mav, "FIM003", "FIM010", "FIM026", "FIM054" ,"FIM004","FIM005","FIM006","FIM061","FIM064"); - String fastBy = req.getParameter("fastBy"); - String fastTerm = req.getParameter("fastTerm"); - - if(!ifEmpty(fastBy, () -> "").equals("") && !ifEmpty(fastTerm, () -> "").equals("")) { - mav.addObject("fastSearch", toJson(Map.of( - "fastBy", fastBy, - "fastTerm", fastTerm - ))); - } else { - mav.addObject("fastSearch", "null"); - } - return mav; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp index 33b27637..d1fea420 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp @@ -135,8 +135,6 @@ $(document).ready(function() { }); }; - $P.fastSearch = ${fastSearch}; - $P.toast = new bootstrap.Toast(document.getElementById('divToast--${pageName}'), { animation: true, autohide: true, @@ -840,15 +838,18 @@ $(document).ready(function() { $P.fnResetAndChangeBiz(""); - if($P.fastSearch != null){ - if($P.fastSearch.fastBy == "vhrno"){ - $("#ischVhrno--${pageName}").val($P.fastSearch.fastTerm); - } else if($P.fastSearch.fastBy == "rtpyrNm"){ - $("#ischRtpyrNm--${pageName}").val($P.fastSearch.fastTerm); - } else if($P.fastSearch.fastBy == "rtpyrNo"){ - $("#ischRtpyrNo--${pageName}").val($P.fastSearch.fastTerm); - } else if($P.fastSearch.fastBy == "cvlcptAplcntNm"){ - $("#ischCvlcptAplcntNm--${pageName}").val($P.fastSearch.fastTerm); + if(fastSearch){ + fastSearch = false; + + + if($("#fastBy--top").val() == "vhrno"){ + $("#ischVhrno--${pageName}").val($("#fastTerm--top").val()); + } else if($("#fastBy--top").val() == "rtpyrNm"){ + $("#ischRtpyrNm--${pageName}").val($("#fastTerm--top").val()); + } else if($("#fastBy--top").val() == "rtpyrNo"){ + $("#ischRtpyrNo--${pageName}").val($("#fastTerm--top").val()); + } else if($("#fastBy--top").val() == "cvlcptAplcntNm"){ + $("#ischCvlcptAplcntNm--${pageName}").val($("#fastTerm--top").val()); } else { return; } diff --git a/src/main/webapp/WEB-INF/jsp/include/top.jsp b/src/main/webapp/WEB-INF/jsp/include/top.jsp index f52a4cd0..d39a748e 100644 --- a/src/main/webapp/WEB-INF/jsp/include/top.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/top.jsp @@ -491,15 +491,13 @@ function fnGlobalFastSearch(){ if(mainTabs.getDataset().find(i => i.url == integrationSearchUrl) != null){ mainTabs.close(integrationSearchUrl); } - + + if($("#fastTerm--top").val() != ""){ - var fastTerm = $("#fastTerm--top").val(); - var fastBy = $("#fastBy--top").val(); - - openMenu(integrationSearchUrl+"?fastBy="+fastBy+"&fastTerm="+fastTerm); - } else { - openMenu(integrationSearchUrl); + fastSearch = true; } + openMenu(integrationSearchUrl); + } /*--------------------- 종합민원관리 클릭 이벤트 ---------------------*/ diff --git a/src/main/webapp/WEB-INF/jsp/index.jsp b/src/main/webapp/WEB-INF/jsp/index.jsp index c1244141..b71318e4 100644 --- a/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/src/main/webapp/WEB-INF/jsp/index.jsp @@ -172,6 +172,8 @@ }); }); + let fastSearch = false; + var pageObject = {}; pageObject.childReq = []; pageObject.parentRes = [];