Merge branch 'master' of http://192.168.0.157:3000/DBNT/GGWEB

src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp

@@ -93,11 +93,10 @@
 				</table>
 
 				<div class="text-page">
+					<form:hidden path="pageIndex" /></form:form>
 					<nav aria-label="Page navigation">
 						<ul class="pagination justify-content-center">
 							<ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page" />
-							<form:hidden path="pageIndex" />
-							</form:form>
 						</ul>
 					</nav>
 				</div>

src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp

@@ -3,9 +3,213 @@
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
 <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-
+<script src="<c:out value="/js/openlayers/ol.js" />"></script>
+<script src="<c:out value="/js/openlayers/proj4.js" />"></script>
+<link href="<c:out value="/css/normalize.css" />" rel="stylesheet">
+<link href="<c:out value="/css/openlayers/ol.css" />" rel="stylesheet">
 <script src="../../../js/admin/fieldView.js"></script>
+<script>
+	function fieldVerify(){
+		alert('준비중');
+	}
 
+	function fieldReflect(){
+		alert('준비중');
+	}
+
+	$(function() {
+		drawingObj();
+		makePropPaging();
+		makePropTable();
+	});
+
+	var field_data = JSON.parse('${fieldDataVO.field_data}');
+	var wkt = null;
+	proj4.defs('EPSG:5186', '+proj=tmerc +lat_0=38 +lon_0=127 +k=1 +x_0=200000 +y_0=600000 +ellps=GRS80 +units=m +no_defs');
+	var baseMap = new ol.layer.Tile({
+		title : 'vworldMap',
+		visible : true,
+		type : 'base',
+		source : new ol.source.XYZ({
+			url : 'http://api.vworld.kr/req/wmts/1.0.0/5616CAD1-5D79-3EE3-87D5-878A4AD0F91F/Base/{z}/{y}/{x}.png'
+		})
+	});
+
+	var view = new ol.View({
+		center : ol.proj.transform([ 203766.984, 541132.2 ], 'EPSG:5186', 'EPSG:3857'),
+		zoom : 18, // 초기화면 zoom level
+		minZoom : 1, // 최소 zoom level
+		maxZoom : 19, // 최대 zoom level
+	});
+
+	var map = new ol.Map({
+		layers : [ baseMap ],
+		logo : false, //우측하단 로고 제거
+		target : 'map',
+		loadTilesWhileAnimating : true,
+		view : view
+	});
+
+	var format = new ol.format.WKT();
+	var objVectorSource = new ol.source.Vector({});
+	var objVectorLayer = new ol.layer.Vector({
+		source : objVectorSource,
+		style : objStyle
+	});
+
+	var cursorStyle = "";
+	var selected = null;
+	map.on("pointermove", function(e) {
+		if (selected !== null) {
+			selected.setStyle(undefined);
+			selected = null;
+		}
+		var newStyle = this.hasFeatureAtPixel(e.pixel) ? "pointer" : "";
+		newStyle !== cursorStyle && $(this.getTargetElement()).css("cursor", cursorStyle = newStyle);
+		map.forEachFeatureAtPixel(e.pixel, function(f) {
+			selected = f;
+			f.setStyle(highlightStyle);
+			return true;
+		});
+	});
+
+	var highlightStyle = new ol.style.Style({
+		stroke : new ol.style.Stroke({
+			color : '#3399CC',
+			width : 8,
+		}),
+	});
+
+	// feature click evt
+	map.on('click', function(event) {
+		map.forEachFeatureAtPixel(event.pixel, function(feature, layer) {
+			var idx = feature.get("idx");
+			makePropTable(idx);
+		})
+	});
+
+	function objStyle(feature, resolution) {
+		var selected = feature.get('selected');
+		var style = null;
+		if (selected) {
+			style = new ol.style.Style({
+				stroke : new ol.style.Stroke({
+					color : '#f00',
+					width : 5
+				})
+			});
+		} else {
+			style = new ol.style.Style({
+				stroke : new ol.style.Stroke({
+					color : '#52b4e7',
+					width : 5
+				})
+			});
+		}
+		return style;
+	}
+
+	function resetObjStyle() {
+		var feature = getObjFeatureBySelected();
+		if (feature) {
+			feature.set("selected", false);
+		}
+	}
+
+	function makePropTable(idx) {
+		if (idx == null)
+			idx = 0;
+		$("#fieldDataBody > tr").remove();
+
+		var num = 0;
+		var tags = "";
+		for(var i in field_data[idx].prop) {
+			num++;
+			if(num % 2 == 0){
+				tags += "<th>" + i + "</th><td>" + field_data[idx].prop[i] + "</td></tr>";
+			}else{
+				tags += "<tr><th>" + i + "</th><td>" + field_data[idx].prop[i] + "</td>";
+			}
+		}
+		$("#fieldDataBody").append(tags);
+
+		nowPagingOn(idx);
+		resetObjStyle();
+
+		//중심좌표 구하기?
+		//var aa = feature.getGeometry().v;
+		//var oo = ol.extent.getCenter(aa);
+
+		var center = field_data[idx].center;
+		var feature = getObjFeatureByIdx(idx);
+
+		moveCenter(center);
+		if (feature) {
+			feature.set("selected", true);
+		}
+	}
+
+	function nowPagingOn(idx){
+		$(".paging_li").removeClass("fieldPagingOn")
+		$("#paging_li"+idx).attr("class", "fieldPagingOn paging_li");
+	}
+
+	function makePropPaging() {
+		var pagingNumber = 0;
+		for (var idx in field_data) {
+			pagingNumber++;
+			$("#fieldDataPaging").append('<li class="paging_li" id="paging_li'+idx+'" onclick="makePropTable(' + idx + ')">' + pagingNumber+ '</li>');
+		}
+	}
+
+	function drawingObj() {
+		objVectorSource.clear();
+		var objFeatures = [];
+		for (var idx in field_data) {
+			var objFeature = format.readFeature(field_data[idx].WKT, {
+				dataProjection : 'EPSG:5186',
+				featureProjection : 'EPSG:3857'
+			});
+			objFeature.setProperties({
+				"idx" : idx,
+				"selected" : false
+			});
+			objFeatures.push(objFeature);
+		}
+		objVectorSource.addFeatures(objFeatures);
+		map.addLayer(objVectorLayer);
+	}
+
+	function moveCenter(center) {
+		var coordinates = ol.proj.transform(center, 'EPSG:5186', 'EPSG:3857');
+		map.getView().setCenter(coordinates);
+	}
+
+	function getObjFeatureBySelected() {
+		var features = objVectorSource.getFeatures();
+		var feature = null;
+
+		for (var i = 0, size = features.length; i < size; i++) {
+			if (features[i].get('selected') == true) {
+				feature = features[i];
+				break;
+			}
+		}
+		return feature;
+	}
+
+	function getObjFeatureByIdx(idx) {
+		var features = objVectorSource.getFeatures();
+		var feature = null;
+		for (var i = 0, size = features.length; i < size; i++) {
+			if (features[i].get('idx') == idx) {
+				feature = features[i];
+				break;
+			}
+		}
+		return feature;
+	}
+</script>
 
 	    <div class="section_title">
 	      <!-- <p>현장 지원 시스템</p> -->
@@ -81,7 +285,8 @@
 
 				<div class="mapWrap">
 					<div class="map-title">측량데이터</div>
-					<div class="map" id="map"></div>
+
+					<div class="map" id="map">	</div>
 				</div>				
 				
 				
@@ -100,6 +305,8 @@
 				
 				<ul id="fieldDataPaging" class="fieldDataPaging"></ul>
 
+
+		    	
 			</div>
 		
 		      
@@ -108,8 +315,8 @@
 					<input class="btn btn-primary" type="button" value="목록" onclick="location.href='/admin/fieldData'" />
 				</p>
 				<p class="search_p2">
-					<input class="btn btn-primary" type="button" value="표준DB변환 및 검증" onclick="fieldVerify();" />
+					<input class="btn btn-secondary" type="button" value="표준DB변환 및 검증" onclick="fieldVerify();" />
-			        <input class="btn btn-primary" type="button" value="반영" onclick="fieldReflect();" />
+			        <input class="btn btn-success" type="button" value="반영" onclick="fieldReflect();" />
 				</p>
 			</div>
 		</div>

src/main/webapp/WEB-INF/jsp/admin/history.jsp

@@ -61,11 +61,10 @@
 			</table>
 
 	<div class="text-page">
+		<form:hidden path="pageIndex" /></form:form>
 		<nav aria-label="Page navigation">
 			<ul class="pagination justify-content-center">
 				<ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page" />
-				<form:hidden path="pageIndex" />
-				</form:form>
 			</ul>
 		</nav>
 	</div>

src/main/webapp/WEB-INF/jsp/admin/requestView.jsp

@@ -150,8 +150,8 @@
 							<input class="btn btn-primary" type="button" value="목록" onclick="location.href='/admin/request'" />
 						</p>
 						<p class="search_p2">
-					        <input class="btn btn-primary" type="button" value="거절" onclick="confirmReqBtn('-1'); return false;" />
+					        <input class="btn btn-danger" type="button" value="거절" onclick="confirmReqBtn('-1'); return false;" />
-							<input class="btn btn-primary" type="button" value="승인" onclick="confirmReqBtn('0'); return false;" />
+							<input class="btn btn-success" type="button" value="승인" onclick="confirmReqBtn('0'); return false;" />
 						</p>
 					</div>
 				</c:when>

src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp

@@ -109,7 +109,7 @@
 									<c:when test="${item.auth eq '1'}">관리자</c:when>
 									<c:when test="${item.auth eq '2'}">사용자</c:when>
 									<c:when test="${item.auth eq '99'}">
-										<input type="button" class="btn btn-outline-primary"  value="승인" onclick="confirmBtn('${item.userid}','2'); return false;" />
+										<input type="button" class="btn btn-outline-success"  value="승인" onclick="confirmBtn('${item.userid}','2'); return false;" />
 										<input type="button" class="btn btn-outline-danger"  value="삭제" onclick="confirmBtn('${item.userid}','-1'); return false;" />
 									</c:when>
 								</c:choose>
@@ -124,10 +124,10 @@
 		</table>
 
 		<div class="text-page">
+			<form:hidden path="pageIndex" />
 			<nav aria-label="Page navigation">
 				<ul class="pagination justify-content-center">
 					<ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page" />
-					<form:hidden path="pageIndex" />
 				</ul>
 			</nav>
 		</div>

src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp

@@ -81,11 +81,11 @@
 					<p class="search_p2">
 						<c:choose>
 							<c:when test="${userVO.auth eq '99'}">
-								<input type="button" class="btn btn-primary"  value="승인" onclick="confirmBtn('${item.userid}','2'); return false;" />
+								<input type="button" class="btn btn-success"  value="승인" onclick="confirmBtn('${item.userid}','2'); return false;" />
-								<input type="button" class="btn btn-primary"  value="삭제" onclick="confirmBtn('${item.userid}','-1'); return false;" />
+								<input type="button" class="btn btn-danger"  value="삭제" onclick="confirmBtn('${item.userid}','-1'); return false;" />
 							</c:when>
 							<c:otherwise>
-								<input class="btn btn-primary" type="button" value="수정" onclick="update();" />
+								<input class="btn btn-success" type="button" value="수정" onclick="update();" />
 							</c:otherwise>
 						</c:choose>
 					</p>

src/main/webapp/WEB-INF/jsp/include/header.jsp

@@ -23,6 +23,7 @@
 	<nav class="common_nav">
 		<div class="header_menu">
 			<ul>
+
 				<li <c:if test="${thisURL eq '/map/request'}">class="thisOn"</c:if> onclick="location.href='/map/request'">지도사용 요청</li>
 				<li <c:if test="${thisURL eq '/map/userInfo'}">class="thisOn"</c:if> onclick="location.href='/map/userInfo'">회원정보수정</li>
 			</ul>

src/main/webapp/WEB-INF/jsp/layout/leftMenu.jsp

@@ -1,5 +1,4 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-    pageEncoding="UTF-8"%>
 <%@ taglib prefix="c" 	uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %><!--시큐리티 태그 라이브러리 선언-->
 <%@ taglib prefix="fn" 	uri="http://java.sun.com/jsp/jstl/functions"%>
@@ -12,8 +11,10 @@
   <nav class="common_nav">
     <div class="header_menu">
       <ul>
-        <li <c:if test="${thisURL eq '/map/request'}">class="thisOn"</c:if> onclick="location.href='/map/request'">지도사용 요청</li>
+        <li <c:if test="${thisURL eq '/map/request'}">class="thisOn"</c:if> onclick="location.href='/map/request'">
-        <li <c:if test="${thisURL eq '/map/userInfo'}">class="thisOn"</c:if> onclick="location.href='/map/userInfo'">회원정보수정</li>
+          <img src="/images/icon/icon_map_on.png" width="30" height="30" alt=""> &nbsp;지도사용 요청</li>
+        <li <c:if test="${thisURL eq '/map/userInfo'}">class="thisOn"</c:if> onclick="location.href='/map/userInfo'">
+         <img src="/images/icon/icon_supervisor_on.png" width="30" height="30" alt=""> &nbsp;회원정보 수정</li>
       </ul>
     </div>
   </nav>

src/main/webapp/WEB-INF/jsp/map/request.jsp

@@ -4,24 +4,11 @@
 <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 
-<!DOCTYPE html>
+<div class="section_title">
-<html lang="ko">
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<title>모바일센터 관리시스템</title>
-<script src="<c:out value="/js/jquery-3.5.1.min.js" />"></script>
-<script src="<c:out value="/js/bootstrap-3.3.2.min.js" />"></script>
-<link href="<c:out value="/css/normalize.css" />" rel="stylesheet">
-<link href="<c:out value="/css/bootstrap.min.css" />" rel="stylesheet">
-<link href="<c:out value="/css/style.css" />" rel="stylesheet">
-</head>
-<body>
-		<div class="section_title">
 	<!-- <p>현장 지원 시스템</p> -->
-		</div>
+</div>
 
-		<div class="section_content">
+<div class="section_content">
 	<form:form commandName="useRequestSearchVO" id="searchForm" name="searchForm" method="get" >
 		<input type="hidden" name="id" />
 		<table class="list-table">
@@ -43,9 +30,9 @@
 							<td class="td_date">${item.r_date}</td>
 							<td>
 								<c:choose>
-											<c:when test="${item.status eq '99'}"><span class="label label-warning"><c:out value='승인대기' /></span></c:when>
+									<c:when test="${item.status eq '99'}"><span class="card-warning"><c:out value='승인대기' /></span></c:when>
-											<c:when test="${item.status eq '0'}"><span class="label label-success"><c:out value='승인' /></span></c:when>
+									<c:when test="${item.status eq '0'}"><span class="card-success"><c:out value='승인' /></span></c:when>
-											<c:when test="${item.status eq '-1'}"><span class="label label-default"><c:out value='반려' /></span></c:when>
+									<c:when test="${item.status eq '-1'}"><span class="card-default"><c:out value='반려' /></span></c:when>
 								</c:choose>
 							</td>
 						</tr>
@@ -56,22 +43,26 @@
 				</c:if>
 			</tbody>
 		</table>
-				<div class="div_write"">
+		<div class="div_write">
 			<p>
-						<input class="btn btn-primary" type="button" value="작성" onclick="location.href='/map/reqWrite'" />
+				<input class="btn btn-secondary" type="button" value="작성" onclick="location.href='/map/reqWrite'" />
 			</p>
 		</div>
-				<div id="paging" style="width: 100%;">
+
-					<ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page" />
+		<div class="text-page">
 			<form:hidden path="pageIndex" />
+			<nav aria-label="Page navigation">
+				<ul class="pagination justify-content-center">
+					<ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page" />
+				</ul>
+			</nav>
 		</div>
 	</form:form>
-		</div>
+</div>
-		<div class="section_btn">
+<div class="section_btn">
 	<!-- <p><input class="btn" type="button" value="관리" onclick="location.href='fieldDetail.html'" /></p> -->
-		</div>
+</div>
-</body>
+<script type="text/javascript">
-	<script type="text/javascript">
 	var start = "${b_start}";
 	var end = "${b_end}";
 	var now = "${current_page}";
@@ -125,5 +116,4 @@
 			document.searchForm.submit();
 		}
 
-	</script>
+</script>
-</html>

src/main/webapp/WEB-INF/jsp/map/requestView.jsp

@@ -5,22 +5,6 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 
-<!DOCTYPE html>
-<html lang="ko">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<title>모바일센터 관리시스템</title>
-<script src="<c:out value="/js/jquery-3.5.1.min.js" />"></script>
-<script src="<c:out value="/js/jquery-ui.min.js" />"></script>
-<script src="<c:out value="/js/bootstrap-3.3.2.min.js" />"></script>
-<link href="<c:out value="/css/normalize.css" />" rel="stylesheet">
-<link href="<c:out value="/css/bootstrap.min.css" />" rel="stylesheet">
-<link href="<c:out value="/css/jquery-ui.min.css" />" rel="stylesheet">
-<link href="<c:out value="/css/style.css" />" rel="stylesheet">
-</head>
-<body>
     <form:form commandName="useRequestVO" name="frm" method="POST" action="/map/updateReq" id="updateFrm">
         <input type="hidden" name="idx" value="${useRequestVO.idx}" />
         <div class="section_title">
@@ -140,8 +124,8 @@
                             <input class="btn btn-primary" type="button" value="목록" onclick="location.href='/map/request'" />
                         </p>
                         <p class="search_p2">
-                            <input class="btn btn-primary" type="button" value="취소" onclick="deleteReqBtn(); return false;" />
+                            <input class="btn btn-danger" type="button" value="취소" onclick="deleteReqBtn(); return false;" />
-                            <input class="btn btn-primary" type="button" value="수정" onclick="updateReqBtn(); return false;" />
+                            <input class="btn btn-success" type="button" value="수정" onclick="updateReqBtn(); return false;" />
                         </p>
                     </div>
                 </c:when>
@@ -567,8 +551,3 @@
 		});
 
 	</script>
-	
-</body>
-
-
-</html>

src/main/webapp/WEB-INF/jsp/map/requestWrite.jsp

@@ -4,23 +4,6 @@
 <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 
-<!DOCTYPE html>
-<html lang="ko">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<title>모바일센터 관리시스템</title>
-<script src="<c:out value="/js/jquery-3.5.1.min.js" />"></script>
-<script src="<c:out value="/js/jquery-ui.min.js" />"></script>
-<script src="<c:out value="/js/bootstrap-3.3.2.min.js" />"></script>
-<link href="<c:out value="/css/normalize.css" />" rel="stylesheet">
-<link href="<c:out value="/css/bootstrap.min.css" />" rel="stylesheet">
-<link href="<c:out value="/css/jquery-ui.min.css" />" rel="stylesheet">
-<link href="<c:out value="/css/style.css" />" rel="stylesheet">
-</head>
-
-<body>
 	<form:form commandName="useRequestVO" name="frm" method="POST" action="/map/insertReq" id="insertFrm">
 	<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
 		<div class="section_title">
@@ -62,7 +45,7 @@
 								<select id="town" name="town" class="form-control input-area-select">
 									<option value="0">::선택::</option>
 								</select>
-								<span class="glyphicon glyphicon-plus point-cursor" onclick="addAreaBtn();"></span>
+								<span class="btn btn-outline-primary" onclick="addAreaBtn();">추가</span>
 							</div>
 							<div id="addedArea" class="addedArea">
 							</div>
@@ -110,7 +93,7 @@
 					<input class="btn btn-primary" type="button" value="목록" onclick="location.href='/map/request'" />
 				</p>
 				<p class="search_p2">
-					<input class="btn btn-primary" type="button" value="요청" onclick="insertReqBtn(); return false;" />
+					<input class="btn btn-success" type="button" value="요청" onclick="insertReqBtn(); return false;" />
 				</p>
 			</div>
 		</div>
@@ -387,8 +370,3 @@
 		});
 
 	</script>
-	
-</body>
-
-
-</html>

src/main/webapp/WEB-INF/jsp/map/userInfo.jsp

@@ -4,21 +4,6 @@
 <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 
-<!DOCTYPE html>
-<html lang="ko">
-
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<title>모바일센터 관리시스템</title>
-<script src="<c:out value="/js/jquery-3.5.1.min.js" />"></script>
-<script src="<c:out value="/js/bootstrap-3.3.2.min.js" />"></script>
-<link href="<c:out value="/css/normalize.css" />" rel="stylesheet">
-<link href="<c:out value="/css/bootstrap.min.css" />" rel="stylesheet">
-<link href="<c:out value="/css/style.css" />" rel="stylesheet">
-</head>
-<body>
 		<form:form commandName="userVO" name="updateForm" action="/map/userUpdate" id="updateForm" method="post">
 			<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
 			<input type="hidden" name="userid" value="${userVO.userid}" />
@@ -68,7 +53,7 @@
 				</table>
 				<div class="join_top" style="margin-top:20px;">
 					<p class="search_p2">
-						<input class="btn btn-primary" type="button" value="수정" onclick="update();" />
+						<input class="btn btn-success" type="button" value="수정" onclick="update();" />
 					</p>
 				</div>
 			</div>
@@ -128,5 +113,3 @@
 			}
 		}
 	</script>
-</body>
-</html>

src/main/webapp/js/admin/requestView.js

@@ -15,3 +15,4 @@
         return false;
     }
 }
+