From dfea6bc2204bde5cacea1a736deda6466a57336a Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Mon, 18 Sep 2023 14:41:57 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A0=84=EA=B8=B0=EC=B0=A8,=EC=9E=A5=EC=95=A0?= =?UTF-8?q?=EC=9D=B8=20=EA=B3=BC=ED=83=9C=EB=A3=8C=EC=9D=98=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=EC=97=90=EB=8F=84=20=ED=8C=8C=EC=9D=BC=20=EC=88=98?= =?UTF-8?q?=EA=B8=B0=20=EB=93=B1=EB=A1=9D=EA=B0=80=EB=8A=A5=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20URL=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cokr/xit/fims/task/web/DpvController.java | 6 ++++++ src/main/java/cokr/xit/fims/task/web/EcaController.java | 6 ++++++ src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp | 6 ++++-- src/main/webapp/resources/js/base/base.js | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/main/java/cokr/xit/fims/task/web/DpvController.java b/src/main/java/cokr/xit/fims/task/web/DpvController.java index 6ca086aa..2dd64def 100644 --- a/src/main/java/cokr/xit/fims/task/web/DpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/DpvController.java @@ -219,6 +219,12 @@ public class DpvController { @RequestMapping(name="장애인과태료업무 단속등록업무", value=CLASS_URL+Crdn05Controller.CLASS_URL) class Crdn05Controller extends cokr.xit.fims.crdn.web.Crdn05Controller { + @Override + @RequestMapping(name="장애인태료업무 단속자료 파일 등록 화면", value=METHOD_URL.getFileRegistrationScreen) + public ModelAndView getFileRegistrationScreen() { + return super.getFileRegistrationScreen(); + } + @Override @RequestMapping(name="장애인과태료업무 당일 입력 단속자료 목록 조회", value=METHOD_URL.getTodayCrdnDataList) public ModelAndView getTodayCrdnDataList(CrdnQuery query) { diff --git a/src/main/java/cokr/xit/fims/task/web/EcaController.java b/src/main/java/cokr/xit/fims/task/web/EcaController.java index e855991a..5fb8b7a9 100644 --- a/src/main/java/cokr/xit/fims/task/web/EcaController.java +++ b/src/main/java/cokr/xit/fims/task/web/EcaController.java @@ -197,6 +197,12 @@ public class EcaController { @RequestMapping(name="전기차과태료업무 단속등록업무", value=CLASS_URL+Crdn05Controller.CLASS_URL) class Crdn05Controller extends cokr.xit.fims.crdn.web.Crdn05Controller { + @Override + @RequestMapping(name="전기차과태료업무 단속자료 파일 등록 화면", value=METHOD_URL.getFileRegistrationScreen) + public ModelAndView getFileRegistrationScreen() { + return super.getFileRegistrationScreen(); + } + @Override @RequestMapping(name="전기차과태료업무 당일 입력 단속자료 목록 조회", value=METHOD_URL.getTodayCrdnDataList) public ModelAndView getTodayCrdnDataList(CrdnQuery query) { diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp index b9144b20..0394afa7 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp @@ -212,11 +212,13 @@ $(document).ready(function(){ switch(taskSeCd){ case "PVS" : case "BPV" : - $("#btnInsertByFile--${pageName}").show(); - break; case "DPV" : case "ECA" : + case "미세먼지" : + $("#btnInsertByFile--${pageName}").show(); + break; case "TPV" : + default : $("#btnInsertByFile--${pageName}").hide(); break; } diff --git a/src/main/webapp/resources/js/base/base.js b/src/main/webapp/resources/js/base/base.js index 7b53e839..fe4599e1 100644 --- a/src/main/webapp/resources/js/base/base.js +++ b/src/main/webapp/resources/js/base/base.js @@ -178,7 +178,7 @@ var dialog = { } else { conf.content = container.replace(/{content}/g, conf.content); } - conf.timeout = ifEmpty(conf.timeout, 2000); + conf.timeout = ifEmpty(conf.timeout, 0); this.open(conf); } };