From 4eb895307f2fafb7d5ab18e9744189ca9509cf7e Mon Sep 17 00:00:00 2001 From: urp Date: Tue, 19 Aug 2025 13:13:06 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=90=EC=82=B0=EC=A0=95=EB=B3=B4=EC=B6=94?= =?UTF-8?q?=EA=B0=80,=20=EC=A0=90=EA=B2=80=EB=B3=B4=EA=B3=A0=EC=84=9C=20?= =?UTF-8?q?=EC=9D=B8=EC=87=84=20=EB=B0=A9=EC=8B=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../srm/controller/ReportCheckController.java | 2 + .../WEB-INF/jsp/itms/rem/ResourceDetail.jsp | 61 ++++++++- .../WEB-INF/jsp/itms/rem/ResourceInsert.jsp | 7 +- .../WEB-INF/jsp/itms/srm/PopAssetDtlYn.jsp | 124 ++++++++++++++++++ .../jsp/itms/srm/ReportCheckDetail.jsp | 27 +++- .../jsp/itms/srm/ReportCheckPrintPop.jsp | 33 +++++ .../WEB-INF/jsp/itms/srm/SvcDeskDetail.jsp | 3 +- 7 files changed, 247 insertions(+), 10 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/itms/srm/PopAssetDtlYn.jsp diff --git a/src/main/java/com/urpsys/itmsfront/srm/controller/ReportCheckController.java b/src/main/java/com/urpsys/itmsfront/srm/controller/ReportCheckController.java index c842475e..9fabdc94 100644 --- a/src/main/java/com/urpsys/itmsfront/srm/controller/ReportCheckController.java +++ b/src/main/java/com/urpsys/itmsfront/srm/controller/ReportCheckController.java @@ -214,6 +214,7 @@ public class ReportCheckController Map returnMap = new LinkedHashMap(); int inReportSeq = CommonUtil.zeroConvert(reportCheckListVo.getInReportSeq()); + String strAssetDtlYn = CommonUtil.getData(request, "assetDtlYn"); // 2025.08.19 나혁제 자산정보 상세여부 // Body Setting Start --------------------------------- bodyMap.put("inReportSeq", inReportSeq); @@ -250,6 +251,7 @@ public class ReportCheckController model.addAttribute("privType" , privType ); // String model.addAttribute("incidentId" , incidentId ); // String model.addAttribute("approvalReq" , approvalReq ); // int + model.addAttribute("assetDtlYn" , strAssetDtlYn ); // 2025.08.19 나혁제 자산정보 상세여부 model.addAttribute("resultReport" , resultReportCheck ); // Map model.addAttribute("resultSharings" , resultSharings ); // List diff --git a/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceDetail.jsp b/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceDetail.jsp index a9c66cbe..5189e1f9 100644 --- a/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceDetail.jsp @@ -236,6 +236,25 @@ ,"dialogWidth:1800px;dialogHeight:500px;resizable:yes;center:yes"); } + //---------------------------------------- + // 2025.08.18 나혁제 추가 + // 그룹조회 + // ---------------------------------------- + function fncSelectAuthorGroupPop() + { + window.open("","notice","height=500, width=650, top=50, left=20, scrollbars=no, resizable=no"); + } + + //---------------------------------------- + // 2025.08.18 나혁제 추가 + // 그룹조회 후 응답 함수 + // ---------------------------------------- + function resGroupConfirm(strGroupId, strGroupNm) + { + $('#vcGrpNm').val(strGroupNm); + $('#vcGrpId').val(strGroupId); + } + //---------------------------------------- // 서블릿 통신 @@ -493,8 +512,17 @@ 시리얼 - - + 관리그룹 + + + + + 조치예정자 검색 + + + + + 호스트명 @@ -504,9 +532,38 @@ + <%-- 2025.08.18 나혁제 추가 --%> + 점검대상여부 + + + + + + + + 상세 CPU + + 상세 DISK + + 상세 MEM + + + + + IP ADDRESS + + + + + + + 용도 diff --git a/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceInsert.jsp b/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceInsert.jsp index c063996b..ba0fd675 100644 --- a/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceInsert.jsp +++ b/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceInsert.jsp @@ -154,7 +154,6 @@ $('#vcGrpId').val(strGroupId); } - // 서블릿 통신 var proc = { @@ -443,13 +442,14 @@ <%-- 2025.08.18 나혁제 추가 --%> 점검대상여부 - + 상세 CPU @@ -469,8 +469,7 @@ - - + 용도 diff --git a/src/main/webapp/WEB-INF/jsp/itms/srm/PopAssetDtlYn.jsp b/src/main/webapp/WEB-INF/jsp/itms/srm/PopAssetDtlYn.jsp new file mode 100644 index 00000000..8ccdcd2b --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/itms/srm/PopAssetDtlYn.jsp @@ -0,0 +1,124 @@ + + +<%-- + /** + * @Class Name : PopAssetDtlYn.jsp + * @Description : 자산상세 선택 팝엄 화면 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ---------- -------- --------------------------- + * @ 2025.08.09 나혁제 최초 생성 + * + * @author urp 인프라본부 나혁제 + * @since 2025.08.09 + * @version 1.0 + * @see + * + */ +--%> + +<%@ page 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" %> + + + +${pageTitle} <spring:message code="title.list" /> + + + + + + + + + + + + + + + +
+

보고서 선택

+
+ + +
+ + + "> + + + + + + + + + + + +
처리완료
자산상세 인쇄여부 + + +         +         + + + +
+ +
+ +
+ + +
+ + + + + diff --git a/src/main/webapp/WEB-INF/jsp/itms/srm/ReportCheckDetail.jsp b/src/main/webapp/WEB-INF/jsp/itms/srm/ReportCheckDetail.jsp index 35e828d7..a6f770f9 100644 --- a/src/main/webapp/WEB-INF/jsp/itms/srm/ReportCheckDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/itms/srm/ReportCheckDetail.jsp @@ -137,7 +137,7 @@ var bYes = confirm("점검보고서 승인/반려 처리를 하시겠습니까?"); if(bYes==false) return; - // 승인반려 메세지 팝업 open + // 승인반려 메세지 팝업 open, CallBack : fncAppRejLast PopupOpen("/srm/PopApprovalReject", 340, 450, ''); } @@ -188,11 +188,32 @@ } //---------------------------------------- - // 인쇄 팝업 오픈 + // 2025.08.19 나혁제 + // 인쇄 (자산상세여부 확인) // ---------------------------------------- function fncReportCheckPrint(inReportSeq) { - var strUrl = "/srm/getReportWithBodyCheckPrint.do?inReportSeq="+inReportSeq; + // 자산상세인쇄 여부 메세지 팝업 open, CallBack : fncAssetDtlChoiceCompleted + PopupOpen("/srm/PopAssetDtlYn", 340, 450, ''); + } + + //---------------------------------------- + // 2025.08.19 나혁제 + // 자상상세여부 팝업 콜백함수 + // ---------------------------------------- + function fncAssetDtlChoiceCompleted(strAssetDtlYn) + { + fncReportCheckPrintReal(strAssetDtlYn, $('#inReportSeq').val()); + } + + //---------------------------------------- + // 인쇄 팝업 오픈 + // ---------------------------------------- + function fncReportCheckPrintReal(strAssetDtlYn, inReportSeq) + { + var strUrl = "/srm/getReportWithBodyCheckPrint.do"+"?inReportSeq="+inReportSeq + +"&assetDtlYn=" +strAssetDtlYn + ; var arrParam = new Array(6); arrParam[0] = window; diff --git a/src/main/webapp/WEB-INF/jsp/itms/srm/ReportCheckPrintPop.jsp b/src/main/webapp/WEB-INF/jsp/itms/srm/ReportCheckPrintPop.jsp index c038b42e..fa177994 100644 --- a/src/main/webapp/WEB-INF/jsp/itms/srm/ReportCheckPrintPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/itms/srm/ReportCheckPrintPop.jsp @@ -199,6 +199,36 @@
+ + + + + + + + + + + + + + + + + + + + + + +
연결자산정보
구분 + ${assets.vcCate3} + 제품영
+ + + + + @@ -228,6 +258,9 @@
연결자산정보
+ + +
diff --git a/src/main/webapp/WEB-INF/jsp/itms/srm/SvcDeskDetail.jsp b/src/main/webapp/WEB-INF/jsp/itms/srm/SvcDeskDetail.jsp index 94a5e03a..1de6e1c0 100644 --- a/src/main/webapp/WEB-INF/jsp/itms/srm/SvcDeskDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/itms/srm/SvcDeskDetail.jsp @@ -221,8 +221,9 @@ // 점검보고서 등록 화면 이동 // ---------------------------------------- function fncReportRegist() - { + {ㅌ // 보고서 선택 화면 메세지 팝업 open + // CallBack : fncReportChoiceCompleted PopupOpen("/srm/PopReportChoice", 300, 450, ''); }