From f287465a8afca47e2f789a823d643377bddfc0b6 Mon Sep 17 00:00:00 2001
From: Hyung Geun <vndanwl@naver.com>
Date: Thu, 3 Mar 2022 09:05:00 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B0=B0=EA=B2=BD=EC=88=98=EC=A0=95=3F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/jsp/admin/fieldView.jsp    | 116 +++++++++---------
 .../webapp/WEB-INF/jsp/admin/requestView.jsp  |  12 +-
 src/main/webapp/css/style.css                 |   3 +-
 3 files changed, 69 insertions(+), 62 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp b/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp
index c731ed3..4889aca 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp
@@ -12,13 +12,15 @@
 <script>
   const field_data = JSON.parse('${fieldDataVO.field_data}');
 </script>
+
+
 <script src="<c:out value="/js/admin/fieldView.js" />"></script>
 <div class="section_title">
   <!-- <p>현장 지원 시스템</p> -->
 </div>
-<div class="row justify-content-end bg-white mx-3 py-2">
   <div class="section_content">
-    <table class="table table-hover text-center">
+	  <div class="row justify-content-end bg-white mx-3 py-2">
+	  <table class="table table-hover text-center">
       <thead>
         <tr>
           <h5>담당자</h5>
@@ -35,57 +37,59 @@
         </tr>
       </tbody>
     </table>
-
-    <table class="table table-hover text-center">
-      <thead>
-        <tr>
-          <h3>현장수집 데이터</h3>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <th>레이어 ID</th>
-          <td class="text-center"><c:out value="${fieldDataVO.layer_id}" /></td>
-          <th>수집일</th>
-          <td class="text-center"><c:out value="${fieldDataVO.save_date}" /></td>
-        </tr>
-        <tr>
-          <th>지역</th>
-          <td class="text-center"><c:out value="${fieldDataVO.region}" /></td>
-          <th>상태</th>
-          <td class="text-center">
-            <c:choose>
-          <c:when test="${fieldDataVO.status eq '0'}">
-            <span class="label label-warning">수집</span>
-          </c:when>
-          <c:when test="${fieldDataVO.status eq '1'}">
-            <span class="label label-danger">검증실패</span>
-          </c:when>
-          <c:when test="${fieldDataVO.status eq '2'}">
-            <span class="label label-success">검증성공</span>
-          </c:when>
-          <c:when test="${fieldDataVO.status eq '3'}">
-            <span class="label label-danger">반영실패</span>
-          </c:when>
-          <c:when test="${fieldDataVO.status eq '4'}">
-            <span class="label label-success">반영</span>
-          </c:when>
-        </c:choose>
-          </td>
-        </tr>
-        <tr>
-          <th>설명</th>
-          <td></td>
-          <th>오류내용</th>
-          <td></td>
-        </tr>
-      </tbody>
-    </table>
-    <div class="table table-hover text-center">
-      <div class="mapWrap">
-        <div class="map-title text-center">측량데이터</div>
-        <div class="map" id="map">	</div>
-      </div>
+	  </div>
+	  <div class="row justify-content-end bg-white mx-3 mt-3 mb-2 py-2">
+			<table class="table table-hover text-center">
+			  <thead>
+				<tr>
+				  <h3>현장수집 데이터</h3>
+				</tr>
+			  </thead>
+			  <tbody>
+				<tr>
+				  <th>레이어 ID</th>
+				  <td class="text-center"><c:out value="${fieldDataVO.layer_id}" /></td>
+				  <th>수집일</th>
+				  <td class="text-center"><c:out value="${fieldDataVO.save_date}" /></td>
+				</tr>
+				<tr>
+				  <th>지역</th>
+				  <td class="text-center"><c:out value="${fieldDataVO.region}" /></td>
+				  <th>상태</th>
+				  <td class="text-center">
+					<c:choose>
+				  <c:when test="${fieldDataVO.status eq '0'}">
+					<span class="label label-warning">수집</span>
+				  </c:when>
+				  <c:when test="${fieldDataVO.status eq '1'}">
+					<span class="label label-danger">검증실패</span>
+				  </c:when>
+				  <c:when test="${fieldDataVO.status eq '2'}">
+					<span class="label label-success">검증성공</span>
+				  </c:when>
+				  <c:when test="${fieldDataVO.status eq '3'}">
+					<span class="label label-danger">반영실패</span>
+				  </c:when>
+				  <c:when test="${fieldDataVO.status eq '4'}">
+					<span class="label label-success">반영</span>
+				  </c:when>
+				</c:choose>
+				  </td>
+				</tr>
+				<tr>
+				  <th>설명</th>
+				  <td></td>
+				  <th>오류내용</th>
+				  <td></td>
+				</tr>
+			  </tbody>
+			</table>
+  	</div>
+	  <div class="py-2 mx-3">
+		  <div class="mapWrap">
+			<div class="map-title text-center">측량데이터</div>
+			<div class="map" id="map">	</div>
+		  </div>
       <div class="fieldDataDiv">
         <table class="fieldDataTable" id="fieldDataTable">
           <thead>
@@ -97,9 +101,9 @@
 
           </tbody>
         </table>
-      </div>
-      <ul id="fieldDataPaging" class="fieldDataPaging"></ul>
-    </div>
+	  </div>
+      	<ul id="fieldDataPaging" class="fieldDataPaging"></ul>
+	  </div>
     <div class="section_btn">
       <p class="search_p1">
         <input class="btn btn-primary" type="button" value="목록" onclick="location.href='/admin/fieldData'" />
diff --git a/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp b/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp
index 4660715..b4165af 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp
@@ -14,12 +14,12 @@
 		<div class="section_title">
 			<!-- <p>현장 지원 시스템</p> -->
 		</div>
-		<div class="row justify-content-between bg-white mx-3 py-2">
 
 		<div class="section_content">
 			<input type="hidden" id="layers" name="layers"/>
 			<input type="hidden" id="places" name="places"/>
-			
+		<div class="row justify-content-between bg-white mx-3 py-2">
+
 			<table class="table table-hover text-center">
 				<thead>
 					<h5 class="">&nbsp;담당자</h5>
@@ -45,7 +45,7 @@
 			</table>
 		</div>
 
-		<div class="row justify-content-between bg-white mx-3 py-2">
+		<div class="row justify-content-between  bg-white mx-3 mt-4 py-2">
 			<table class="table table-hover text-center">
 				<thead>
 					<h3 class="h4 m-3">지도사용 요청</h3>
@@ -144,7 +144,7 @@
 			
 			<c:choose>
 				<c:when test="${useRequestVO.status eq '99'}">
-					<table class="detail_table">
+					<table class="detail_table mx-3" >
 						<tbody>
 							<tr>
 								<th>전달 메세지</th>
@@ -174,7 +174,8 @@
 
 				</c:when>
 				<c:otherwise>
-					<table class="detail_table">
+
+					<table class="detail_table bg">
 						<tbody>
 							<tr>
 								<th>전달 메세지</th>
@@ -183,6 +184,7 @@
 						</tbody>
 					</table>
 
+
 					<div class="section_btn">
 						<p class="search_p1">
 							<input class="btn btn-primary" type="button" value="목록" onclick="location.href='/admin/request'" />
diff --git a/src/main/webapp/css/style.css b/src/main/webapp/css/style.css
index 499f4b1..b39d17c 100644
--- a/src/main/webapp/css/style.css
+++ b/src/main/webapp/css/style.css
@@ -177,6 +177,7 @@ a {
 .fieldDataTable{
 	width:100%;
 	box-sizing: border-box;
+
 }
 
 .fieldDataTable>thead>tr:first-child>th {
@@ -501,7 +502,7 @@ a {
 .fieldDataDiv{
 	float:left;
 	width:50%;
-	height:490px;
+	height:495px;
 	margin-left: 2%;
 	overflow-y: scroll;
 	border-bottom:1px solid #ccc;