-
-
-
-
-
" />
-
-
-
-
-
-
+
diff --git a/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp b/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp
index 39af00e..ebe0e93 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp
@@ -5,34 +5,15 @@
<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-
-
+
+
-
-
-
-
-모바일센터 관리시스템
-">
-">
-" rel="stylesheet">
-" rel="stylesheet">
-" rel="stylesheet">
-
-
-
- <%@ include file="../include/header.jsp"%>
+
-
-
+
-
-
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/admin/request.jsp b/src/main/webapp/WEB-INF/jsp/admin/request.jsp
index 0bbb5e5..2168e98 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/request.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/request.jsp
@@ -3,25 +3,20 @@
<%@ 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"%>
+
+
-
-
-
-
-
+
+
+
+
+
+
-
+
+
-
-
+
-
+
+
+
-
-
- | 지도사용 이력 | ||||
|---|---|---|---|---|
| 위치 | -소속 | -담당자 | -날짜 | -|
| 요청한 목록이 없습니다. | ||||
-
-
- | 지도사용 이력 | ||||
|---|---|---|---|---|
| 위치 | +소속 | +담당자 | +날짜 | +|
| 요청한 목록이 없습니다. | ||||
+
+
+
@@ -62,9 +57,9 @@
-
diff --git a/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp b/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp
index 2381651..9add204 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp
@@ -5,23 +5,9 @@
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
-
-
-
-
-
-
-모바일센터 관리시스템
-">
-">
+
-" rel="stylesheet">
-" rel="stylesheet">
-" rel="stylesheet">
-
-
-<%@ include file="../include/header.jsp"%>
@@ -189,27 +175,5 @@
@@ -41,7 +22,7 @@
-
-
-
diff --git a/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp b/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp
index 5d74db9..ca8d8d6 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp
@@ -4,22 +4,12 @@
<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-
-
+
+
+
+
+
-
-
-
-
-모바일센터 관리시스템
-">
-">
-" rel="stylesheet">
-" rel="stylesheet">
-" rel="stylesheet">
-
-
- <%@ include file="../include/header.jsp"%>
@@ -105,61 +95,3 @@
-
-
-
-
diff --git a/src/main/webapp/WEB-INF/jsp/layout/leftMenu.jsp b/src/main/webapp/WEB-INF/jsp/layout/leftMenu.jsp
index e29c892..7fd3502 100644
--- a/src/main/webapp/WEB-INF/jsp/layout/leftMenu.jsp
+++ b/src/main/webapp/WEB-INF/jsp/layout/leftMenu.jsp
@@ -23,9 +23,9 @@
- class="thisOn" onclick="location.href='/admin/dashBoard'">
-
대시보드
+ - class="thisOn" onclick="location.href='/admin/request'">
-
지도사용 요청
+ - class="thisOn" onclick="location.href='/admin/history'">
지도사용 이력 - class="thisOn" onclick="location.href='/admin/fieldData'">
diff --git a/src/main/webapp/WEB-INF/jsp/layout/template_main.jsp b/src/main/webapp/WEB-INF/jsp/layout/template_main.jsp
index a1df637..830c018 100644
--- a/src/main/webapp/WEB-INF/jsp/layout/template_main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/layout/template_main.jsp
@@ -25,7 +25,7 @@
diff --git a/src/main/webapp/css/bootstrap-5.1.3.css b/src/main/webapp/css/bootstrap-5.1.3.css index f16c5be..4f8b395 100644 --- a/src/main/webapp/css/bootstrap-5.1.3.css +++ b/src/main/webapp/css/bootstrap-5.1.3.css @@ -2154,6 +2154,11 @@ progress { margin-bottom: 0.5rem; } +.col-form-label-warning{ + margin-bottom: 0.5rem; + color: #ffc107; +} + .col-form-label { padding-top: calc(0.375rem + 1px); padding-bottom: calc(0.375rem + 1px); @@ -4497,6 +4502,44 @@ textarea.form-control-lg { border: 1px solid rgba(0, 0, 0, 0.125); border-radius: 0.25rem; } + +.card-warning { + position: relative; + display: flex; + flex-direction: column; + min-width: 0; + word-wrap: break-word; + background-color: #eea236; + background-clip: border-box; + border: 1px solid rgba(0, 0, 0, 0.125); + border-radius: 0.25rem; +} + +.card-success { + position: relative; + display: flex; + flex-direction: column; + min-width: 0; + word-wrap: break-word; + background-color: #5cb85c; + background-clip: border-box; + border: 1px solid rgba(0, 0, 0, 0.125); + border-radius: 0.25rem; + +} + +.card-default { + position: relative; + display: flex; + flex-direction: column; + min-width: 0; + word-wrap: break-word; + background-color: #bb2d3b; + background-clip: border-box; + border: 1px solid rgba(0, 0, 0, 0.125); + border-radius: 0.25rem; +} + .card > hr { margin-right: 0; margin-left: 0; diff --git a/src/main/webapp/js/admin/fieldData.js b/src/main/webapp/js/admin/fieldData.js new file mode 100644 index 0000000..f535640 --- /dev/null +++ b/src/main/webapp/js/admin/fieldData.js @@ -0,0 +1,6 @@ + function fn_link_page(pageNo) { + document.searchForm.pageIndex.value = pageNo; + document.searchForm.action = "
" + i + " " + field_data[idx].prop[i] + " "; +}else{ + tags += "" + i + " " + field_data[idx].prop[i] + " "; +} +} + $("#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('- ' + pagingNumber+ '
'); +} +} + + 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; +} diff --git a/src/main/webapp/js/admin/history.js b/src/main/webapp/js/admin/history.js new file mode 100644 index 0000000..9f1b6f0 --- /dev/null +++ b/src/main/webapp/js/admin/history.js @@ -0,0 +1,6 @@ + + function fn_link_page(pageNo) { + document.searchForm.pageIndex.value = pageNo; + document.searchForm.action = '/admin/history'; + document.searchForm.submit(); +} diff --git a/src/main/webapp/js/admin/request.js b/src/main/webapp/js/admin/request.js new file mode 100644 index 0000000..1fa5ea5 --- /dev/null +++ b/src/main/webapp/js/admin/request.js @@ -0,0 +1,6 @@ + + function fn_link_page(pageNo) { + document.searchForm.pageIndex.value = pageNo; + document.searchForm.action = '/admin/request'; + document.searchForm.submit(); +} diff --git a/src/main/webapp/js/admin/requestView.js b/src/main/webapp/js/admin/requestView.js new file mode 100644 index 0000000..8085380 --- /dev/null +++ b/src/main/webapp/js/admin/requestView.js @@ -0,0 +1,17 @@ + + function confirmReqBtn(val){ + $("#status").val(val); + + var msg; + if(val == 0){ + msg = "승인"; + }else{ + msg = "거절"; + } + + if(confirm("지도사용요청을 "+msg+" 하시겠습니까?")){ + $("#updateFrm").submit(); + }else{ + return false; + } +} diff --git a/src/main/webapp/js/admin/userinfo.js b/src/main/webapp/js/admin/userinfo.js new file mode 100644 index 0000000..24df25a --- /dev/null +++ b/src/main/webapp/js/admin/userinfo.js @@ -0,0 +1,26 @@ + + function fn_link_page(pageNo) { + document.searchForm.pageIndex.value = pageNo; + document.searchForm.action = "
대시보드
지도사용 요청