From 1c8223226f8a02a39574f8ff300918ab2aee1793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Thu, 3 Mar 2022 16:23:25 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A7=80=EB=8F=84=EC=82=AC=EC=9A=A9=20?= =?UTF-8?q?=EC=9A=94=EC=B2=AD=20=EC=A1=B0=ED=9A=8C=20=EB=AA=A8=EB=8B=AC?= =?UTF-8?q?=ED=99=94.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mca/cmmn/web/MapController.java | 2 +- src/main/webapp/WEB-INF/jsp/admin/request.jsp | 1 - src/main/webapp/WEB-INF/jsp/map/request.jsp | 3 +- .../webapp/WEB-INF/jsp/map/requestView.jsp | 866 +++++++----------- src/main/webapp/css/style.css | 1 - src/main/webapp/js/map/request.js | 45 +- 6 files changed, 370 insertions(+), 548 deletions(-) diff --git a/src/main/java/com/mca/cmmn/web/MapController.java b/src/main/java/com/mca/cmmn/web/MapController.java index 777d2d3..5c0ec56 100644 --- a/src/main/java/com/mca/cmmn/web/MapController.java +++ b/src/main/java/com/mca/cmmn/web/MapController.java @@ -129,7 +129,7 @@ public class MapController { model.addAttribute("layers", layers); model.addAttribute("layersVO", layersVO); - return "map/requestView"; + return "map/html/requestView"; }else { model.addAttribute("url", "/map/request"); model.addAttribute("resultMsg", "권한이 없습니다."); diff --git a/src/main/webapp/WEB-INF/jsp/admin/request.jsp b/src/main/webapp/WEB-INF/jsp/admin/request.jsp index 217d6f3..18cf0d2 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/request.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/request.jsp @@ -1,4 +1,3 @@ - <%@ 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="form" uri="http://www.springframework.org/tags/form" %> diff --git a/src/main/webapp/WEB-INF/jsp/map/request.jsp b/src/main/webapp/WEB-INF/jsp/map/request.jsp index aec22b3..b78add8 100644 --- a/src/main/webapp/WEB-INF/jsp/map/request.jsp +++ b/src/main/webapp/WEB-INF/jsp/map/request.jsp @@ -34,8 +34,9 @@ + <%----%> ${idx.count} - ${item.title} + ${item.title} ${item.r_date} diff --git a/src/main/webapp/WEB-INF/jsp/map/requestView.jsp b/src/main/webapp/WEB-INF/jsp/map/requestView.jsp index 8332354..be16443 100644 --- a/src/main/webapp/WEB-INF/jsp/map/requestView.jsp +++ b/src/main/webapp/WEB-INF/jsp/map/requestView.jsp @@ -5,549 +5,335 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> - - -
- -
-
- - + + +
+ +
+
+ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
지도 사용 요청
작업명
기간 - ~ - -
장소 -
- - - - -
-
- - - - - - - -
-
레이어 - - - - - />${item.name} - - - -
- - - - />${item.name} - - -
- - - - />${item.name} - - -
요청 내용
-
-

- -

-

- - -

-
- - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
지도 사용 요청
작업명${useRequestVO.title}상태 - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
작업명
기간 + ~ + +
장소 +
+ + + + +
+
+ + + + + + + +
+
레이어 + + + + + />${item.name} + + + +
+ + + + />${item.name} + + +
+ + + + />${item.name} + + +
요청 내용
+
+

+ + +

+
+ + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - -
작업명${useRequestVO.title}상태 + + + - + - - -
기간${useRequestVO.s_date} ~ ${useRequestVO.e_date}
장소 - - -
- ${item.name} -
- -
레이어 - -
- - - - - />${item.name} - - - -
-
- -
- - - - />${item.name} - - -
-
- -
- - - - />${item.name} - - -
-
요청 내용${useRequestVO.user_msg}
전달 메세지${useRequestVO.admin_msg}
+ + +
기간${useRequestVO.s_date} ~ ${useRequestVO.e_date}
장소 + + +
+ ${item.name} +
+ +
레이어 + +
+ + + + + />${item.name} + + + +
+
+ +
+ + + + />${item.name} + + +
+
+ +
+ + + + />${item.name} + + +
+
요청 내용${useRequestVO.user_msg}
전달 메세지${useRequestVO.admin_msg}
-
-

- -

-
- - +
- - - \ No newline at end of file + \ No newline at end of file diff --git a/src/main/webapp/css/style.css b/src/main/webapp/css/style.css index 6919273..59e054f 100644 --- a/src/main/webapp/css/style.css +++ b/src/main/webapp/css/style.css @@ -656,7 +656,6 @@ a { } .title-td{ - text-align:left !important; width:50%; } diff --git a/src/main/webapp/js/map/request.js b/src/main/webapp/js/map/request.js index ad4c60a..d501f3d 100644 --- a/src/main/webapp/js/map/request.js +++ b/src/main/webapp/js/map/request.js @@ -18,8 +18,14 @@ $(function(){ }); $(document).on('click', '#mapRequestModalBtn', function (){ + mapRequestModalOpen('/map/reqWrite'); +}) +$(document).on('click', '.title-td', function (){ + mapRequestModalOpen('/map/request/'+$(this).attr("data-idx")); +}) +function mapRequestModalOpen(url){ $.ajax({ - url: '/map/reqWrite', + url: url, type: 'GET', dataType:"html", success: function(html){ @@ -30,8 +36,7 @@ $(document).on('click', '#mapRequestModalBtn', function (){ } }); -}) - +} /* 날짜포맷 yyyy-MM-dd 변환 */ function getFormatDate(date){ var year = date.getFullYear(); @@ -237,4 +242,36 @@ function insertReqBtn(){ }else{ $("#insertFrm").submit(); } -} \ No newline at end of file +} + +function updateReqBtn(){ + + if($("#title").val() == ""){ + alert('작업명을 입력해주세요.'); + $("#title").focus(); + return; + }else if($("#startDate").val() == ""){ + alert('시작 기간을 입력해주세요.'); + $("#startDate").focus(); + return; + }else if($("#endDate").val() == ""){ + alert('종료 기간을 입력해주세요.'); + $("#endDate").focus(); + return; + }else if(!areaCheck()){ + alert('지역을 추가해주세요.'); + return; + }else if(!layersCheck()){ + alert('레이어를 선택해주세요.'); + return; + }else{ + $("#updateFrm").submit(); + } +} + +function deleteReqBtn(){ + if(confirm('지도사용요청을 취소하시겠습니까?')){ + $("#updateFrm").attr("action", "/map/deleteReq"); + $("#updateFrm").submit(); + } +}