From 64e5cfcc0c85fdb7ca2d1a8564ad56732bfbc366 Mon Sep 17 00:00:00 2001
From: Hyung Geun <vndanwl@naver.com>
Date: Wed, 2 Mar 2022 17:31:55 +0900
Subject: [PATCH] no message

---
 .../webapp/WEB-INF/jsp/admin/fieldView.jsp    | 18 +++---
 src/main/webapp/WEB-INF/jsp/admin/history.jsp | 33 ++++++-----
 src/main/webapp/WEB-INF/jsp/admin/request.jsp | 32 +++++------
 .../webapp/WEB-INF/jsp/admin/requestView.jsp  | 57 ++++++++++++-------
 .../webapp/WEB-INF/jsp/admin/userInfo.jsp     | 43 ++++----------
 .../webapp/WEB-INF/jsp/admin/userInfoView.jsp | 17 +++---
 src/main/webapp/WEB-INF/jsp/map/request.jsp   | 29 ++++++----
 src/main/webapp/css/style.css                 | 10 ++--
 8 files changed, 122 insertions(+), 117 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp b/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp
index e8cecec..fb0f698 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp
@@ -214,20 +214,21 @@
 	    <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="detail_table">
+		    <table class="table table-hover text-center">
 		        <thead>
 		          <tr>
-		            <th colspan="6">담당자</th>
+					  <h5>담당자</h5>
 		          </tr>
 		        </thead>
 		        <tbody>
 		         	<tr>
 		         		<th>소속</th>
 						<td class="text-center"><c:out value='${userVO.company}' /></td>
-						<th>담당자</th>
+						<th>이름</th>
 						<td class="text-center"><c:out value='${userVO.name}' /></td>
 						<th>연락처</th>
 						<td class="text-center"><c:out value='${userVO.phonenum}' /></td>
@@ -235,10 +236,10 @@
 				</tbody>
 			</table>
     
-			<table class="detail_table">
+			<table class="table table-hover text-center">
 		        <thead>
 		          <tr>
-		            <th colspan="4">지도정보</th>
+					<h3>현장수집 데이터</h3>
 		          </tr>
 		        </thead>
 		        <tbody>
@@ -281,10 +282,10 @@
 		        </tbody>
 		      </table>
 
-			<div class="field_data_content">
+			<div class="table table-hover text-center">
 
 				<div class="mapWrap">
-					<div class="map-title">측량데이터</div>
+					<div class="map-title text-center">측량데이터</div>
 
 					<div class="map" id="map">	</div>
 				</div>				
@@ -319,4 +320,5 @@
 			        <input class="btn btn-success" type="button" value="반영" onclick="fieldReflect();" />
 				</p>
 			</div>
-		</div>
\ No newline at end of file
+		</div>
+</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/admin/history.jsp b/src/main/webapp/WEB-INF/jsp/admin/history.jsp
index fb10808..7ec65bd 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/history.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/history.jsp
@@ -9,18 +9,22 @@
 <div class="section_title">
 		<!-- <p>지도사용 이력</p> -->
 	</div>
+
 	<div class="section_content">
+		<h1 class="h4 m-3">지도사용 이력</h1>
 		<form:form commandName="UseHistorySearchVO" name="searchForm" action="/admin/history" method="get">
-			<div class="d-flex justify-content-end">
-				<div class="row">
-					<div class="col-auto">
-						<select class="form-select" name="searchCondition">
-								<option <c:if test="${UseHistorySearchVO.searchCondition eq 'all'}"><c:out value="selected" /></c:if> value="all">통합검색</option>
-								<option <c:if test="${UseHistorySearchVO.searchCondition eq 'name'}"><c:out value="selected" /></c:if> value="name">이름</option>
-								<option <c:if test="${UseHistorySearchVO.searchCondition eq 'company'}"><c:out value="selected" /></c:if> value="company">소속</option>
-								<option <c:if test="${UseHistorySearchVO.searchCondition eq 'req_area'}"><c:out value="selected" /></c:if> value="req_area">위치</option>
-						</select>
-					</div>
+
+			<div class="row justify-content-end bg-white mx-3 py-2">
+
+					<div class="col-auto row">
+						<div class="col-auto">
+							<select class="form-select" name="searchCondition">
+									<option <c:if test="${UseHistorySearchVO.searchCondition eq 'all'}"><c:out value="selected" /></c:if> value="all">통합검색</option>
+									<option <c:if test="${UseHistorySearchVO.searchCondition eq 'name'}"><c:out value="selected" /></c:if> value="name">이름</option>
+									<option <c:if test="${UseHistorySearchVO.searchCondition eq 'company'}"><c:out value="selected" /></c:if> value="company">소속</option>
+									<option <c:if test="${UseHistorySearchVO.searchCondition eq 'req_area'}"><c:out value="selected" /></c:if> value="req_area">위치</option>
+							</select>
+						</div>
 
 						<div class="col-auto">
 							<input type="text" class="form-control" name="searchKeyword" value="${UseHistorySearchVO.searchKeyword}" />
@@ -29,13 +33,12 @@
 							<input class="btn btn-outline-secondary" type="submit" value="검색" />
 						</div>
 					</div>
-				</div>
+			</div>
 
 
-
-			<table class="list-table">
+		<div class="row m-3 p-2 bg-white">
+			<table class="table table-hover text-center">
 				<thead>
-					<tr><th colspan="5">지도사용 이력</th></tr>
 					<tr>
 						<th>위치</th>
 						<th>소속</th>
@@ -59,7 +62,7 @@
 					</c:if>
 				</tbody>
 			</table>
-
+		</div>
 	<div class="text-page">
 		<form:hidden path="pageIndex" /></form:form>
 		<nav aria-label="Page navigation">
diff --git a/src/main/webapp/WEB-INF/jsp/admin/request.jsp b/src/main/webapp/WEB-INF/jsp/admin/request.jsp
index cb30652..8d8b648 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/request.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/request.jsp
@@ -7,22 +7,22 @@
 
 
 <div class="section_content">
+  <h1 class="h4 m-3">지도사용 요청</h1>
   <form:form commandName="useRequestSearchVO" name="searchForm" action="/admin/request" method="get">
   <input type="hidden" name="status" value="<c:out value="${useRequestSearchVO.status}" />" />
 
+  <div class="row justify-content-between bg-white mx-3 py-2">
 
-  <div class="search_div">
-    <div class="search_menu">
-      <ul class="nav nav-pills" role="tablist">
-        <li role="presentation" class="nav-item"><a class="nav-link ${empty useRequestSearchVO.status?'active':''}"  href="/admin/request">전체</a></li>
-        <li role="presentation" class="nav-item"><a class="nav-link ${useRequestSearchVO.status eq '0'?'active':''}" href="/admin/request?status=0">승인</a></li>
-        <li role="presentation" class="nav-item"><a class="nav-link ${useRequestSearchVO.status eq '-1'?'active':''}" href="/admin/request?status=-1">반려</a></li>
-        <li role="presentation" class="nav-item"><a class="nav-link ${useRequestSearchVO.status eq '99'?'active':''}" href="/admin/request?status=99">승인대기<span class="badge"><c:out value="${statusCnt}" /></span></a></li>
-      </ul>
-    </div>
+      <div class="col-auto">
+        <ul class="nav nav-pills" role="tablist">
+          <li role="presentation" class="nav-item" style="margin-left: 16px"><a class="nav-link ${empty useRequestSearchVO.status?'active':''}"  href="/admin/request">전체</a></li>
+          <li role="presentation" class="nav-item"><a class="nav-link ${useRequestSearchVO.status eq '0'?'active':''}" href="/admin/request?status=0">승인</a></li>
+          <li role="presentation" class="nav-item"><a class="nav-link ${useRequestSearchVO.status eq '-1'?'active':''}" href="/admin/request?status=-1">반려</a></li>
+          <li role="presentation" class="nav-item"><a class="nav-link ${useRequestSearchVO.status eq '99'?'active':''}" href="/admin/request?status=99">승인대기<span class="badge"><c:out value="${statusCnt}" /></span></a></li>
+        </ul>
+      </div>
 
-    <div class="d-flex justify-content-end">
-      <div class="row">
+      <div class="col-auto row">
         <div class="col-auto">
           <select class="form-select" name="searchCondition">
             <option <c:if test="${useRequestSearchVO.searchCondition eq 'all'}"><c:out value="selected" /></c:if> value="all">통합검색</option>
@@ -31,6 +31,7 @@
             <option <c:if test="${useRequestSearchVO.searchCondition eq 'company'}"><c:out value="selected" /></c:if> value="company">소속</option>
           </select>
         </div>
+
         <div class="col-auto">
           <input type="text" class="form-control" name="searchKeyword" value="${userSearchVO.searchKeyword}" />
         </div>
@@ -43,10 +44,9 @@
 
 
 
-
-  <table class="list-table">
+<div class="row m-3 p-2 bg-white">
+  <table class="table table-hover text-center">
     <thead>
-    <tr><th colspan="6" >지도사용 요청</th></tr>
     <tr>
       <th>번호</th>
       <th>작업명</th>
@@ -61,7 +61,7 @@
       <c:forEach var="item" items="${useRequestList}" varStatus="idx">
         <tr>
           <td><c:out value="${item.idx}" /></td>
-          <td class="title-td"><a href="/admin/request/<c:out value='${item.idx}' />"><c:out value="${item.title}" /></a></td>
+          <td><a href="/admin/request/<c:out value='${item.idx}' />"><c:out value="${item.title}" /></a></td>
           <td><c:out value="${item.company}" /></td>
           <td><c:out value="${item.name}" /></td>
           <td class="td_date"><c:out value="${item.r_date}" /></td>
@@ -80,7 +80,7 @@
     </c:if>
     </tbody>
   </table>
-
+</div>
   <div class="text-page">
     <form:hidden path="pageIndex" /></form:form>
     <nav aria-label="Page navigation">
diff --git a/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp b/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp
index 146a005..4660715 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp
@@ -14,19 +14,21 @@
 		<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"/>
 			
-			<table class="detail_table">
+			<table class="table table-hover text-center">
 				<thead>
-					<tr><th colspan="8">담당자</th></tr>
+					<h5 class="">&nbsp;담당자</h5>
 				</thead>
 				<tbody>
 					<tr>
 						<th>소속</th>
 						<td class="text-center"><c:out value='${userVO.company}' /></td>
-						<th>담당자</th>
+						<th>이름</th>
 						<td class="text-center"><c:out value='${userVO.name}' /></td>
 						<th>연락처</th>
 						<td class="text-center"><c:out value='${userVO.phonenum}' /></td>
@@ -41,12 +43,15 @@
 					</tr>
 				</tbody>
 			</table>
-			
-			<table class="detail_table">
+		</div>
+
+		<div class="row justify-content-between bg-white mx-3 py-2">
+			<table class="table table-hover text-center">
 				<thead>
-					<tr><th colspan="5">지도 사용 요청</th></tr>
+					<h3 class="h4 m-3">지도사용 요청</h3>
 				</thead>
 				<tbody>
+
 					<tr>
 						<th colspan="2">작업명</th>
 						<td><c:out value='${useRequestVO.title}' /></td>
@@ -125,12 +130,17 @@
 				        	</div>
 						</td>
 					</tr>
-					<tr>
-						<th colspan="2">요청 내용</th>
-						<td><c:out value='${useRequestVO.user_msg}' /></td>
-					</tr>
+
+
+						<tr>
+							<th colspan="2">요청 내용</th>
+							<td><c:out value='${useRequestVO.user_msg}' /></td>
+						</tr>
+
+
 				</tbody>
 			</table>
+		</div>
 			
 			<c:choose>
 				<c:when test="${useRequestVO.status eq '99'}">
@@ -145,15 +155,23 @@
 						</tbody>
 					</table>
 					<input type="hidden" name="status" id="status" />
-					<div class="section_btn">
-						<p class="search_p1">
-							<input class="btn btn-primary" type="button" value="목록" onclick="location.href='/admin/request'" />
-						</p>
-						<p class="search_p2">
-					        <input class="btn btn-danger" type="button" value="거절" onclick="confirmReqBtn('-1'); return false;" />
-							<input class="btn btn-success" type="button" value="승인" onclick="confirmReqBtn('0'); return false;" />
-						</p>
 					</div>
+
+
+
+					<div class="row justify-content-between bg-white mx-3 py-2">
+						<div class="section_btn">
+								<p class="search_p1">
+									<input class="btn btn-primary" type="button" value="목록" onclick="location.href='/admin/request'" />
+								</p>
+								<p class="search_p2">
+									<input class="btn btn-danger" type="button" value="거절" onclick="confirmReqBtn('-1'); return false;" />
+									<input class="btn btn-success" type="button" value="승인" onclick="confirmReqBtn('0'); return false;" />
+								</p>
+						</div>
+					</div>
+
+
 				</c:when>
 				<c:otherwise>
 					<table class="detail_table">
@@ -164,14 +182,15 @@
 							</tr>
 						</tbody>
 					</table>
+
 					<div class="section_btn">
 						<p class="search_p1">
 							<input class="btn btn-primary" type="button" value="목록" onclick="location.href='/admin/request'" />
 						</p>
 					</div>
+
 				</c:otherwise>
 			</c:choose>
-		</div>
 	</form:form>
 
 	
diff --git a/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp b/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp
index d7b1b9e..1a2709e 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp
@@ -18,17 +18,19 @@
 	<!-- <p>현장 지원 시스템</p> -->
 </div>
 <div class="section_content">
+	<h1 class="h4 m-3">회원관리</h1>
 	<form:form commandName="userSearchVO" name="searchForm" action="/admin/userInfo" method="get">
-		<div class="row justify-content-between">
+
+		<div class="row justify-content-between bg-white mx-3 py-2"">
 			<div class="col-auto">
-				<ul class="nav nav-pills"  role="tablist">
+				<ul class="nav nav-pills"  role="tablist" style="margin-left: 16px">
 					<li role="presentation" class="nav-item"><a class="nav-link ${userSearchVO.auth eq '99'?'active':''}" href="/admin/userInfo?auth=99">승인대기<span class="badge"><c:out value='${standByCount}' /></span></a></li>
 					<li role="presentation" class="nav-item"><a class="nav-link ${empty userSearchVO.auth?'active':''}" href="/admin/userInfo">회원 관리</a></li>
 				</ul>
 				<input type="hidden" name="auth" value="${userSearchVO.auth}" />
 			</div>
-			<div class="col-auto">
-				<div class="row">
+
+			<div class="col-auto row">
 					<div class="col-auto">
 						<select class="form-select" name="searchCondition">
 							<option <c:if test="${userSearchVO.searchCondition eq 'all'}">selected</c:if> value="all">통합검색</option>
@@ -38,45 +40,20 @@
 							<option <c:if test="${userSearchVO.searchCondition eq 'phonenum'}">selected</c:if> value="phonenum">전화번호</option>
 						</select>
 					</div>
+
 					<div class="col-auto">
 						<input type="text" class="form-control" name="searchKeyword" value="${userSearchVO.searchKeyword}" />
 					</div>
 					<div class="col-auto">
 						<input class="btn btn-outline-secondary" type="submit" value="검색" />
 					</div>
-				</div>
 			</div>
 		</div>
-		<%--<div class="search_div">
-			<div class="search_menu">
-				<ul class="nav nav-pills"  role="tablist">
-					<li role="presentation" class="nav-item"><a class="nav-link ${userSearchVO.auth eq '99'?'active':''}" href="/admin/userInfo?auth=99">승인대기<span class="badge"><c:out value='${standByCount}' /></span></a></li>
-					<li role="presentation" class="nav-item"><a class="nav-link ${empty userSearchVO.auth?'active':''}" href="/admin/userInfo">회원 관리</a></li>
-				</ul>
-				<input type="hidden" name="auth" value="${userSearchVO.auth}" />
-			</div>
 
 
-			<div class="search_keyword">
-				<select class="form-control search_selectbox" name="searchCondition">
-					<option <c:if test="${userSearchVO.searchCondition eq 'all'}">selected</c:if> value="all">통합검색</option>
-					<option <c:if test="${userSearchVO.searchCondition eq 'name'}">selected</c:if> value="name">이름</option>
-					<option <c:if test="${userSearchVO.searchCondition eq 'company'}">selected</c:if> value="company">소속</option>
-					<option <c:if test="${userSearchVO.searchCondition eq 'email'}">selected</c:if> value="email">이메일</option>
-					<option <c:if test="${userSearchVO.searchCondition eq 'phonenum'}">selected</c:if> value="phonenum">전화번호</option>
-				</select>
-
-				<input type="text" class="form-control search_inputbox" name="searchKeyword" value="${userSearchVO.searchKeyword}" />
-				<input class="btn btn-outline-secondary" type="submit" value="검색" />
-
-			</div>
-		</div>--%>
-
-
-
-		<table class="list-table">
+	<div class="row m-3 p-2 bg-white">
+		<table class="table table-hover text-center">
 			<thead>
-				<tr><th colspan="7">회원 관리</th></tr>
 				<tr>
 					<th>아이디</th>
 					<th>이름</th>
@@ -122,7 +99,7 @@
 				</c:if>
 			</tbody>
 		</table>
-
+	</div>
 		<div class="text-page">
 			<form:hidden path="pageIndex" />
 			<nav aria-label="Page navigation">
diff --git a/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp b/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp
index a91ae0d..6f39b09 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp
@@ -5,17 +5,15 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 
 <script src="../../../js/admin/userinfoView.js"></script>
+<div class="row justify-content-between bg-white mx-3 py-2">
 
-
-
-
-
-		<div class="section_content">
 			<form:form commandName="userVO" name="updateForm" id="updateForm" action="/admin/userUpdate" method="post">
+				<div class="section_content">
 				<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
 				<input type="hidden" name="userid" value="${userVO.userid}" />
+
 				<div class="join_top">
-					<h2><span class="glyphicon glyphicon-edit"></span> 회원 정보 수정</h2>
+					<h2>   <i class="bi bi-person-circle"></i>&nbsp;회원 정보 수정</h2>
 				</div>
 				<table class="join_table">
 					<tbody>
@@ -50,11 +48,12 @@
 						<tr>
 							<th>이메일</th>
 							<td>
-								<div> 
+								<div>
 									<input type="text" class="form-control" name="email" id="email" value="${userVO.email}" />
 								</div>
 							</td>
 						</tr>
+
 						<c:if test="${userVO.auth ne '99'}">
 							<tr>
 								<th>권한</th>
@@ -90,6 +89,6 @@
 						</c:choose>
 					</p>
 				</div>
+				</div>
 			</form:form>
-		</div>
-	
+
diff --git a/src/main/webapp/WEB-INF/jsp/map/request.jsp b/src/main/webapp/WEB-INF/jsp/map/request.jsp
index 1d65f0d..1d6b7e3 100644
--- a/src/main/webapp/WEB-INF/jsp/map/request.jsp
+++ b/src/main/webapp/WEB-INF/jsp/map/request.jsp
@@ -9,19 +9,23 @@
 </div>
 
 <div class="section_content">
+	<h1 class="h4 m-3">지도사용 요청</h1>
+
 	<form:form commandName="useRequestSearchVO" id="searchForm" name="searchForm" method="get" >
-		<input type="hidden" name="id" />
-		<table class="list-table">
-			<thead>
-				<tr><th colspan="4">지도 사용 요청 목록</th></tr>
-				<tr>
-					<th>번호</th>
-					<th>작업명</th>
-					<th>날짜</th>
-					<th>상태</th>
-				</tr>
-			</thead>
-			<tbody>
+		<div class="row justify-content-between bg-white mx-3 py-2">
+			<input type="hidden" name="id" />
+				<table class="table table-hover text-center">
+					<thead>
+						<tr>
+							<th>번호</th>
+							<th>작업명</th>
+							<th>날짜</th>
+							<th>상태</th>
+						</tr>
+					</thead>
+
+				<tbody>
+
 				<c:if test="${count >= 1}">
 					<c:forEach var="item" items="${useRequestList}" varStatus="idx">
 						<tr>
@@ -43,6 +47,7 @@
 				</c:if>
 			</tbody>
 		</table>
+		</div>
 		<div class="div_write">
 			<p>
 				<input class="btn btn-secondary" type="button" value="작성" onclick="location.href='/map/reqWrite'" />
diff --git a/src/main/webapp/css/style.css b/src/main/webapp/css/style.css
index 30f9fc0..7ce0822 100644
--- a/src/main/webapp/css/style.css
+++ b/src/main/webapp/css/style.css
@@ -186,9 +186,9 @@ a {
 
 .fieldDataTable>thead>tr:first-child>th {
 	border: 1px solid #ccc;
-	background-color: #337ab7;
+	background-color: #ccc;
 	padding: 10px 5px;
-	text-align: left;
+	text-align: center;
 	color: #fff;
 }
 
@@ -596,8 +596,6 @@ a {
 }
 .td_date{
 	text-align: center;
-	width:85px;
-	font-size:12px;
 }
 
 .td_name{
@@ -706,10 +704,12 @@ a {
 .mapWrap{
 	width: 48%;
 	float:left;
+
+
 }
 .map-title{
 	border-bottom: 1px solid #ccc;
-    background-color: #337ab7;
+    background-color: #ccc;
     padding: 10px 5px;
     text-align: left;
     color: #fff;