# Conflicts:
#	src/main/webapp/WEB-INF/jsp/admin/request.jsp
master
강석 최 2022-03-03 16:00:16 +09:00
commit e80e18c035
34 changed files with 1839 additions and 1683 deletions

View File

@ -51,17 +51,17 @@ public class ImgPaginationRenderer extends AbstractPaginationRenderer implements
* @see * @see
*/ */
public void initVariables() { public void initVariables() {
// firstPageLabel = "<a href=\"#\" onclick=\"{0}({1}); return false;\">" + "<image src='" + servletContext.getContextPath() + "/images/egovframework/cmmn/btn_page_pre10.gif' border=0/></a>&#160;";
firstPageLabel = "";//""<a href=\"#\" onclick=\"{0}({1}); return false;\">" + "<image src='" + servletContext.getContextPath() + "/images/egovframework/cmmn/btn_page_pre10.gif' border=0/></a>&#160;"; firstPageLabel = "";//"<a href=\"#\" onclick=\"{0}({1}); return false;\">" + "<image src='" + servletContext.getContextPath() + "/images/egovframework/cmmn/btn_page_pre10.gif' border=0/></a>&#160;";
previousPageLabel = "<li class=\"page-item\">\n" + previousPageLabel = "<li class=\"page-item\">\n" +
"\t\t\t\t\t <a class=\"page-link\" href=\"#\" aria-label=\"Previous\">\n" + "\t\t\t\t\t <a class=\"page-link\" onclick=\"{0}({1}); return false;\" href=\"#\" aria-label=\"Previous\">\n" +
"\t\t\t\t\t\t<span aria-hidden=\"true\">&laquo;</span>\n" + "\t\t\t\t\t\t<span aria-hidden=\"true\">&laquo;</span>\n" +
"\t\t\t\t\t </a>\n" + "\t\t\t\t\t </a>\n" +
"\t\t\t\t\t</li>"; "\t\t\t\t\t</li>";
currentPageLabel = "<li class = \"page-item active\"><a class=\"page-link\" href=\"#\">{0}</a></li>"; currentPageLabel = "<li class = \"page-item active\"><a class=\"page-link\" href=\"#\">{0}</a></li>";
otherPageLabel = "<li class=\"page-item\"><a class=\"page-link\" href=\"#\" onclick=\"{0}({1}); return false;\">{2}</a></li>"; otherPageLabel = "<li class=\"page-item\"><a class=\"page-link\" href=\"#\" onclick=\"{0}({1}); return false;\">{2}</a></li>";
nextPageLabel = "<li class=\"page-item\">\n" + nextPageLabel = "<li class=\"page-item\">\n" +
"\t\t\t\t\t <a class=\"page-link\" href=\"#\" aria-label=\"Next\">\n" + "\t\t\t\t\t <a class=\"page-link\" onclick=\"{0}({1}); return false;\" href=\"#\" aria-label=\"Next\">\n" +
"\t\t\t\t\t\t<span aria-hidden=\"true\">&raquo;</span>\n" + "\t\t\t\t\t\t<span aria-hidden=\"true\">&raquo;</span>\n" +
"\t\t\t\t\t </a>\n" + "\t\t\t\t\t </a>\n" +
"\t\t\t\t\t</li>"; "\t\t\t\t\t</li>";

View File

@ -8,13 +8,13 @@
<formset> <formset>
<form name="sampleVO"> <form name="sampleVO">
<field property="name" depends="required"> <field property="name" depends="required">
<arg0 key="title.sample.name" /> <arg0 key="title.sample.name"/>
</field> </field>
<field property="description" depends="required"> <field property="description" depends="required">
<arg0 key="title.sample.description" /> <arg0 key="title.sample.description"/>
</field> </field>
<field property="regUser" depends="required"> <field property="regUser" depends="required">
<arg0 key="title.sample.regUser" /> <arg0 key="title.sample.regUser"/>
</field> </field>
</form> </form>
</formset> </formset>

View File

@ -1,8 +1,8 @@
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <%@ 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="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%--<script src="/js/admin/dashBoard.js"></script>--%> <%--<script src="/js/admin/dashBoard.js"></script>--%>
@ -16,7 +16,7 @@
</div> </div>
<div class="col-auto"> <div class="col-auto">
<a href="/admin/request?status=99" class="text-black-50">지도사용 요청 승인대기</a> <a href="/admin/request?status=99" class="text-black-50">지도사용 요청 승인대기</a>
<h3><c:out value="${statusCnt}" /></h3> <h3><c:out value="${statusCnt}"/></h3>
</div> </div>
</div> </div>
</div> </div>
@ -27,7 +27,7 @@
</div> </div>
<div class="col-auto"> <div class="col-auto">
<a href="/admin/userInfo?auth=99" class="text-black-50">회원가입 승인대기</a> <a href="/admin/userInfo?auth=99" class="text-black-50">회원가입 승인대기</a>
<h3><c:out value="${standByCount}" /></h3> <h3><c:out value="${standByCount}"/></h3>
</div> </div>
</div> </div>
</div> </div>
@ -37,8 +37,9 @@
<img src="/images/icon/icon_003.png" width="60" height="60" alt=""> <img src="/images/icon/icon_003.png" width="60" height="60" alt="">
</div> </div>
<div class="col-auto"> <div class="col-auto">
<a href="/admin/fieldData?status0=1&status1=1&status2=1&status3=1&status4=0" class="mb-0 text-black-50">확인 요청 데이터</a> <a href="/admin/fieldData?status0=1&status1=1&status2=1&status3=1&status4=0"
<h3><c:out value="${standFieldData}" /></h3> class="mb-0 text-black-50">확인 요청 데이터</a>
<h3><c:out value="${standFieldData}"/></h3>
</div> </div>
</div> </div>
@ -76,7 +77,7 @@
</div> </div>
<div class="col-auto"> <div class="col-auto">
<p class="mb-0 text-black-50">오늘 방문자 수</p> <p class="mb-0 text-black-50">오늘 방문자 수</p>
<h3><c:out value="${dayLoginCount}" /></h3> <h3><c:out value="${dayLoginCount}"/></h3>
</div> </div>
</div> </div>
</div> </div>
@ -87,7 +88,7 @@
</div> </div>
<div class="col-auto"> <div class="col-auto">
<p class="mb-0 text-black-50">최근 한달 방문자 수</p> <p class="mb-0 text-black-50">최근 한달 방문자 수</p>
<h3><c:out value="${monthLoginCount}" /></h3> <h3><c:out value="${monthLoginCount}"/></h3>
</div> </div>
</div> </div>
</div> </div>

View File

@ -1,14 +1,14 @@
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <%@ 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="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<script src="/js/admin/fieldData.js"></script> <script src="<c:url value="/js/admin/fieldData.js"/>"></script>
<style> <style>
.searchList > li{ .searchList > li {
display: inline; display: inline;
} }
</style> </style>
@ -20,32 +20,37 @@
<ul class="nav"> <ul class="nav">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link ${fieldDataSearchVO.status0 eq 1?'active':'disabled'}" href="#"> <a class="nav-link ${fieldDataSearchVO.status0 eq 1?'active':'disabled'}" href="#">
<input type="checkbox" class="statusChkBox d-none" name="status0" id="status0" value="1" ${fieldDataSearchVO.status0 eq 1?'checked':''}> <input type="checkbox" class="statusChkBox d-none" name="status0" id="status0"
value="1" ${fieldDataSearchVO.status0 eq 1?'checked':''}>
<label for="status0">수집</label> <label for="status0">수집</label>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link ${fieldDataSearchVO.status1 eq 1?'active':'disabled'}" href="#"> <a class="nav-link ${fieldDataSearchVO.status1 eq 1?'active':'disabled'}" href="#">
<input type="checkbox" class="statusChkBox d-none" name="status1" id="status1" value="1" ${fieldDataSearchVO.status1 eq 1?'checked':''}> <input type="checkbox" class="statusChkBox d-none" name="status1" id="status1"
<label for="status1" >검증실패</label> value="1" ${fieldDataSearchVO.status1 eq 1?'checked':''}>
<label for="status1">검증실패</label>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link ${fieldDataSearchVO.status2 eq 1?'active':'disabled'}" href="#"> <a class="nav-link ${fieldDataSearchVO.status2 eq 1?'active':'disabled'}" href="#">
<input type="checkbox" class="statusChkBox d-none" name="status2" id="status2" value="1" ${fieldDataSearchVO.status2 eq 1?'checked':''}> <input type="checkbox" class="statusChkBox d-none" name="status2" id="status2"
<label for="status2" >검증</label> value="1" ${fieldDataSearchVO.status2 eq 1?'checked':''}>
<label for="status2">검증</label>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link ${fieldDataSearchVO.status3 eq 1?'active':'disabled'}"> <a class="nav-link ${fieldDataSearchVO.status3 eq 1?'active':'disabled'}">
<input type="checkbox" class="statusChkBox d-none" name="status3" id="status3" value="1" ${fieldDataSearchVO.status3 eq 1?'checked':''}> <input type="checkbox" class="statusChkBox d-none" name="status3" id="status3"
<label for="status3" >반영실패</label> value="1" ${fieldDataSearchVO.status3 eq 1?'checked':''}>
<label for="status3">반영실패</label>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link ${fieldDataSearchVO.status4 eq 1?'active':'disabled'}" href="#"> <a class="nav-link ${fieldDataSearchVO.status4 eq 1?'active':'disabled'}" href="#">
<input type="checkbox" class="statusChkBox d-none" name="status4" id="status4" value="1" ${fieldDataSearchVO.status4 eq 1?'checked':''}> <input type="checkbox" class="statusChkBox d-none" name="status4" id="status4"
<label for="status4" >반영</label> value="1" ${fieldDataSearchVO.status4 eq 1?'checked':''}>
<label for="status4">반영</label>
</a> </a>
</li> </li>
</ul> </ul>
@ -54,15 +59,24 @@
<div class="col-auto row"> <div class="col-auto row">
<div class="col-auto"> <div class="col-auto">
<select class="form-select" name="searchCondition"> <select class="form-select" name="searchCondition">
<option <c:if test="${fieldDataSearchVO.searchCondition eq 'all'}"><c:out value="selected" /></c:if> value="all">통합검색</option> <option <c:if test="${fieldDataSearchVO.searchCondition eq 'all'}"><c:out
<option <c:if test="${fieldDataSearchVO.searchCondition eq 'name'}"><c:out value="selected" /></c:if> value="name">이름</option> value="selected"/></c:if> value="all">통합검색
<option <c:if test="${fieldDataSearchVO.searchCondition eq 'company'}"><c:out value="selected" /></c:if> value="company">소속</option> </option>
<option <c:if test="${fieldDataSearchVO.searchCondition eq 'region'}"><c:out value="selected" /></c:if> value="region">위치</option> <option <c:if test="${fieldDataSearchVO.searchCondition eq 'name'}"><c:out
value="selected"/></c:if> value="name">이름
</option>
<option <c:if test="${fieldDataSearchVO.searchCondition eq 'company'}"><c:out value="selected"/></c:if>
value="company">소속
</option>
<option <c:if test="${fieldDataSearchVO.searchCondition eq 'region'}"><c:out value="selected"/></c:if>
value="region">위치
</option>
</select> </select>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<input type="text" class="form-control" name="searchKeyword" value="${fieldDataSearchVO.searchKeyword}"/> <input type="text" class="form-control" name="searchKeyword"
value="${fieldDataSearchVO.searchKeyword}"/>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<input class="btn btn-outline-secondary" type="submit" value="검색"/> <input class="btn btn-outline-secondary" type="submit" value="검색"/>
@ -86,17 +100,19 @@
<c:if test="${count >= 1}"> <c:if test="${count >= 1}">
<c:forEach var="item" items="${fieldDataList}"> <c:forEach var="item" items="${fieldDataList}">
<tr> <tr>
<td><a href="/admin/fieldData/${item.id}"><c:out value="${item.id}" /></a></td> <td><a href="/admin/fieldData/${item.id}"><c:out value="${item.id}"/></a></td>
<td><a href="/admin/fieldData/${item.id}"><c:out value="${item.region}" /></a></td> <td><a href="/admin/fieldData/${item.id}"><c:out value="${item.region}"/></a></td>
<td><c:out value="${item.userVO.company}" /></td> <td><c:out value="${item.userVO.company}"/></td>
<td><c:out value="${item.userVO.name}" /></td> <td><c:out value="${item.userVO.name}"/></td>
<td class="td_date"><c:out value="${item.save_date}" /></td> <td class="td_date"><c:out value="${item.save_date}"/></td>
<td> <td>
<c:choose> <c:choose>
<c:when test="${item.status eq '0'}"><span class="card-warning">수집</span> </c:when> <c:when test="${item.status eq '0'}"><span class="card-warning">수집</span> </c:when>
<c:when test="${item.status eq '1'}"><span class="card-default">검증실패</span> </c:when> <c:when test="${item.status eq '1'}"><span
class="card-default">검증실패</span> </c:when>
<c:when test="${item.status eq '2'}"><span class="card-warning">검증</span> </c:when> <c:when test="${item.status eq '2'}"><span class="card-warning">검증</span> </c:when>
<c:when test="${item.status eq '3'}"><span class="card-default">반영실패</span> </c:when> <c:when test="${item.status eq '3'}"><span
class="card-default">반영실패</span> </c:when>
<c:when test="${item.status eq '4'}"><span class="card-success">반영</span> </c:when> <c:when test="${item.status eq '4'}"><span class="card-success">반영</span> </c:when>
</c:choose> </c:choose>
</td> </td>
@ -104,17 +120,19 @@
</c:forEach> </c:forEach>
</c:if> </c:if>
<c:if test="${count == 0}"> <c:if test="${count == 0}">
<tr><td colspan="4">요청한 목록이 없습니다.</td></tr> <tr>
<td colspan="4">요청한 목록이 없습니다.</td>
</tr>
</c:if> </c:if>
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="text-page"> <div class="text-page">
<form:hidden path="pageIndex" /> <form:hidden path="pageIndex"/>
<nav aria-label="Page navigation"> <nav aria-label="Page navigation">
<ul class="pagination justify-content-center"> <ul class="pagination justify-content-center">
<ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page" /> <ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page"/>
</ul> </ul>
</nav> </nav>
</div> </div>

View File

@ -1,8 +1,8 @@
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <%@ 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="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<link href="<c:out value="/css/normalize.css" />" rel="stylesheet"> <link href="<c:out value="/css/normalize.css" />" rel="stylesheet">
<link href="<c:out value="/css/openlayers/ol.css" />" rel="stylesheet"> <link href="<c:out value="/css/openlayers/ol.css" />" rel="stylesheet">
@ -15,10 +15,11 @@
<script src="<c:out value="/js/admin/fieldView.js" />"></script> <script src="<c:out value="/js/admin/fieldView.js" />"></script>
<div class="section_title"> <div class="section_title">
<!-- <p>현장 지원 시스템</p> --> <!-- <p>현장 지원 시스템</p> -->
</div> </div>
<div class="section_content"> <div class="section_content">
<div class="row justify-content-end bg-white mx-3 py-2"> <div class="row justify-content-end bg-white mx-3 py-2">
<table class="table table-hover text-center"> <table class="table table-hover text-center">
<thead> <thead>
@ -29,11 +30,11 @@
<tbody> <tbody>
<tr> <tr>
<th>소속</th> <th>소속</th>
<td class="text-center"><c:out value='${userVO.company}' /></td> <td class="text-center"><c:out value='${userVO.company}'/></td>
<th>이름</th> <th>이름</th>
<td class="text-center"><c:out value='${userVO.name}' /></td> <td class="text-center"><c:out value='${userVO.name}'/></td>
<th>연락처</th> <th>연락처</th>
<td class="text-center"><c:out value='${userVO.phonenum}' /></td> <td class="text-center"><c:out value='${userVO.phonenum}'/></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -48,13 +49,13 @@
<tbody> <tbody>
<tr> <tr>
<th>레이어 ID</th> <th>레이어 ID</th>
<td class="text-center"><c:out value="${fieldDataVO.layer_id}" /></td> <td class="text-center"><c:out value="${fieldDataVO.layer_id}"/></td>
<th>수집일</th> <th>수집일</th>
<td class="text-center"><c:out value="${fieldDataVO.save_date}" /></td> <td class="text-center"><c:out value="${fieldDataVO.save_date}"/></td>
</tr> </tr>
<tr> <tr>
<th>지역</th> <th>지역</th>
<td class="text-center"><c:out value="${fieldDataVO.region}" /></td> <td class="text-center"><c:out value="${fieldDataVO.region}"/></td>
<th>상태</th> <th>상태</th>
<td class="text-center"> <td class="text-center">
<c:choose> <c:choose>
@ -88,7 +89,7 @@
<div class="border border-2 border border-dark border border-start-0 border-end-0 py-2 mx-3"> <div class="border border-2 border border-dark border border-start-0 border-end-0 py-2 mx-3">
<div class="mapWrap"> <div class="mapWrap">
<div class="map-title text-center">측량데이터</div> <div class="map-title text-center">측량데이터</div>
<div class="map" id="map"> </div> <div class="map" id="map"></div>
</div> </div>
<div class="fieldDataDiv"> <div class="fieldDataDiv">
<table class="fieldDataTable" id="fieldDataTable"> <table class="fieldDataTable" id="fieldDataTable">
@ -106,12 +107,12 @@
</div> </div>
<div class="section_btn"> <div class="section_btn">
<p class="search_p1"> <p class="search_p1">
<input class="btn btn-primary" type="button" value="목록" onclick="location.href='/admin/fieldData'" /> <input class="btn btn-primary" type="button" value="목록" onclick="location.href='/admin/fieldData'"/>
</p> </p>
<p class="search_p2"> <p class="search_p2">
<input class="btn btn-secondary" type="button" value="표준DB변환 및 검증" onclick="fieldVerify();" /> <input class="btn btn-secondary" type="button" value="표준DB변환 및 검증" onclick="fieldVerify();"/>
<input class="btn btn-success" type="button" value="반영" onclick="fieldReflect();" /> <input class="btn btn-success" type="button" value="반영" onclick="fieldReflect();"/>
</p> </p>
</div> </div>
</div> </div>
</div> </div>

View File

@ -1,16 +1,17 @@
<%@ 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="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<script src="../../../js/admin/history.js"></script>
<script src="<c:url value="/js/admin/history.js"/>"></script>
<div class="section_title"> <div class="section_title">
<!-- <p>지도사용 이력</p> --> <!-- <p>지도사용 이력</p> -->
</div> </div>
<div class="section_content"> <div class="section_content">
<h1 class="h4 m-3">지도사용 이력</h1> <h1 class="h4 m-3">지도사용 이력</h1>
<form:form commandName="UseHistorySearchVO" name="searchForm" action="/admin/history" method="get"> <form:form commandName="UseHistorySearchVO" name="searchForm" action="/admin/history" method="get">
@ -19,18 +20,27 @@
<div class="col-auto row"> <div class="col-auto row">
<div class="col-auto"> <div class="col-auto">
<select class="form-select" name="searchCondition"> <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 'all'}"><c:out value="selected"/></c:if>
<option <c:if test="${UseHistorySearchVO.searchCondition eq 'name'}"><c:out value="selected" /></c:if> value="name">이름</option> value="all">통합검색
<option <c:if test="${UseHistorySearchVO.searchCondition eq 'company'}"><c:out value="selected" /></c:if> value="company">소속</option> </option>
<option <c:if test="${UseHistorySearchVO.searchCondition eq 'req_area'}"><c:out value="selected" /></c:if> value="req_area">위치</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> </select>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<input type="text" class="form-control" name="searchKeyword" value="${UseHistorySearchVO.searchKeyword}" /> <input type="text" class="form-control" name="searchKeyword"
value="${UseHistorySearchVO.searchKeyword}"/>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<input class="btn btn-outline-secondary" type="submit" value="검색" /> <input class="btn btn-outline-secondary" type="submit" value="검색"/>
</div> </div>
</div> </div>
</div> </div>
@ -50,25 +60,27 @@
<c:if test="${count >= 1}"> <c:if test="${count >= 1}">
<c:forEach var="item" items="${useHistoryList}"> <c:forEach var="item" items="${useHistoryList}">
<tr> <tr>
<td><c:out value="${item.reqArea}" /></td> <td><c:out value="${item.reqArea}"/></td>
<td><c:out value="${item.company}" /></td> <td><c:out value="${item.company}"/></td>
<td><c:out value="${item.name}" /></td> <td><c:out value="${item.name}"/></td>
<td class="td_date"><c:out value="${item.logDate}" /></td> <td class="td_date"><c:out value="${item.logDate}"/></td>
</tr> </tr>
</c:forEach> </c:forEach>
</c:if> </c:if>
<c:if test="${count == 0}"> <c:if test="${count == 0}">
<tr><td colspan="5">요청한 목록이 없습니다.</td></tr> <tr>
<td colspan="5">요청한 목록이 없습니다.</td>
</tr>
</c:if> </c:if>
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="text-page"> <div class="text-page">
<form:hidden path="pageIndex" /></form:form> <form:hidden path="pageIndex"/></form:form>
<nav aria-label="Page navigation"> <nav aria-label="Page navigation">
<ul class="pagination justify-content-center"> <ul class="pagination justify-content-center">
<ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page" /> <ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page"/>
</ul> </ul>
</nav> </nav>
</div> </div>
</div> </div>

View File

@ -1,50 +1,68 @@
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
<script src="/js/admin/request.js"></script> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<script src="<c:url value="/js/admin/request.js"/>"></script>
<div class="section_content"> <div class="section_content">
<h1 class="h4 m-3">지도사용 요청</h1> <h1 class="h4 m-3">지도사용 요청</h1>
<form:form commandName="useRequestSearchVO" name="searchForm" action="/admin/request" method="get"> <form:form commandName="useRequestSearchVO" name="searchForm" action="/admin/request" method="get">
<input type="hidden" name="status" value="<c:out value="${useRequestSearchVO.status}" />" /> <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="row justify-content-between bg-white mx-3 py-2">
<div class="col-auto"> <div class="col-auto">
<ul class="nav nav-pills" role="tablist"> <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" style="margin-left: 16px"><a
<li role="presentation" class="nav-item"><a class="nav-link ${useRequestSearchVO.status eq '0'?'active':''}" href="/admin/request?status=0">승인</a></li> class="nav-link ${empty useRequestSearchVO.status?'active':''}" href="/admin/request">전체</a>
<li role="presentation" class="nav-item"><a class="nav-link ${useRequestSearchVO.status eq '-1'?'active':''}" href="/admin/request?status=-1">반려</a></li> </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> <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> </ul>
</div> </div>
<div class="col-auto row"> <div class="col-auto row">
<div class="col-auto"> <div class="col-auto">
<select class="form-select" name="searchCondition"> <select class="form-select" name="searchCondition">
<option <c:if test="${useRequestSearchVO.searchCondition eq 'all'}"><c:out value="selected" /></c:if> value="all">통합검색</option> <option <c:if test="${useRequestSearchVO.searchCondition eq 'all'}"><c:out value="selected"/></c:if>
<option <c:if test="${useRequestSearchVO.searchCondition eq 'title'}"><c:out value="selected" /></c:if> value="title">작업명</option> value="all">통합검색
<option <c:if test="${useRequestSearchVO.searchCondition eq 'name'}"><c:out value="selected" /></c:if> value="name">이름</option> </option>
<option <c:if test="${useRequestSearchVO.searchCondition eq 'company'}"><c:out value="selected" /></c:if> value="company">소속</option> <option <c:if test="${useRequestSearchVO.searchCondition eq 'title'}"><c:out
value="selected"/></c:if> value="title">작업명
</option>
<option <c:if test="${useRequestSearchVO.searchCondition eq 'name'}"><c:out
value="selected"/></c:if> value="name">이름
</option>
<option <c:if test="${useRequestSearchVO.searchCondition eq 'company'}"><c:out
value="selected"/></c:if> value="company">소속
</option>
</select> </select>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<input type="text" class="form-control" name="searchKeyword" value="${userSearchVO.searchKeyword}" /> <input type="text" class="form-control" name="searchKeyword" value="${userSearchVO.searchKeyword}"/>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<input class="btn btn-outline-secondary" type="submit" value="검색" /> <input class="btn btn-outline-secondary" type="submit" value="검색"/>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="row m-3 p-2 bg-white">
<div class="row m-3 p-2 bg-white">
<table class="table table-hover text-center"> <table class="table table-hover text-center">
<thead> <thead>
<tr> <tr>
@ -60,35 +78,41 @@
<c:if test="${count >= 1}"> <c:if test="${count >= 1}">
<c:forEach var="item" items="${useRequestList}" varStatus="idx"> <c:forEach var="item" items="${useRequestList}" varStatus="idx">
<tr> <tr>
<td><c:out value="${item.idx}" /></td> <td><c:out value="${item.idx}"/></td>
<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><c:out value="${item.company}" /></td> </td>
<td><c:out value="${item.name}" /></td> <td><c:out value="${item.company}"/></td>
<td class="td_date"><c:out value="${item.r_date}" /></td> <td><c:out value="${item.name}"/></td>
<td class="td_date"><c:out value="${item.r_date}"/></td>
<td> <td>
<c:choose> <c:choose>
<c:when test="${item.status eq '99'}"><span class="card-warning"><c:out value='승인대기' /></span></c:when> <c:when test="${item.status eq '99'}"><span class="card-warning"><c:out
<c:when test="${item.status eq '0'}"><span class="card-success"><c:out value='승인' /></span></c:when> value='승인대기'/></span></c:when>
<c:when test="${item.status eq '-1'}"><span class="card-default"><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="card-default"><c:out
value='반려'/></span></c:when>
</c:choose> </c:choose>
</td> </td>
</tr> </tr>
</c:forEach> </c:forEach>
</c:if> </c:if>
<c:if test="${count == 0}"> <c:if test="${count == 0}">
<tr><td colspan="6">요청한 목록이 없습니다.</td></tr> <tr>
<td colspan="6">요청한 목록이 없습니다.</td>
</tr>
</c:if> </c:if>
</tbody> </tbody>
</table> </table>
</div>
<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" />
</ul>
</nav>
</div> </div>
<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"/>
</ul>
</nav>
</div>
</div> </div>
<div class="section_title"> <div class="section_title">

View File

@ -1,16 +1,16 @@
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <%@ 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="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<script src="../../../js/admin/requestView.js"></script> <script src="<c:url value="/js/admin/requestView.js"/>"></script>
<form:form commandName="useRequestVO" name="frm" method="POST" action="/admin/updateReqConfirm" id="updateFrm"> <form:form commandName="useRequestVO" name="frm" method="POST" action="/admin/updateReqConfirm" id="updateFrm">
<input type="hidden" name="idx" value="<c:out value='${useRequestVO.idx}' />" /> <input type="hidden" name="idx" value="<c:out value='${useRequestVO.idx}' />"/>
<input type="hidden" name="admin_id" value="<c:out value='${loginUserVO.userid}' />" /> <input type="hidden" name="admin_id" value="<c:out value='${loginUserVO.userid}' />"/>
<div class="section_title"> <div class="section_title">
<!-- <p>현장 지원 시스템</p> --> <!-- <p>현장 지원 시스템</p> -->
</div> </div>
@ -27,17 +27,20 @@
<tbody> <tbody>
<tr> <tr>
<th>소속</th> <th>소속</th>
<td class="text-center"><c:out value='${userVO.company}' /></td> <td class="text-center"><c:out value='${userVO.company}'/></td>
<th>이름</th> <th>이름</th>
<td class="text-center"><c:out value='${userVO.name}' /></td> <td class="text-center"><c:out value='${userVO.name}'/></td>
<th>연락처</th> <th>연락처</th>
<td class="text-center"><c:out value='${userVO.phonenum}' /></td> <td class="text-center"><c:out value='${userVO.phonenum}'/></td>
<th>상태</th> <th>상태</th>
<td class="text-center"> <td class="text-center">
<c:choose> <c:choose>
<c:when test="${useRequestVO.status eq '99'}"><span class="label label-warning"><c:out value='승인대기' /></span></c:when> <c:when test="${useRequestVO.status eq '99'}"><span class="label label-warning"><c:out
<c:when test="${useRequestVO.status eq '0'}"><span class="label label-success"><c:out value='승인' /></span></c:when> value='승인대기'/></span></c:when>
<c:when test="${useRequestVO.status eq '-1'}"><span class="label label-default"><c:out value='반려' /></span></c:when> <c:when test="${useRequestVO.status eq '0'}"><span class="label label-success"><c:out
value='승인'/></span></c:when>
<c:when test="${useRequestVO.status eq '-1'}"><span class="label label-default"><c:out
value='반려'/></span></c:when>
</c:choose> </c:choose>
</td> </td>
</tr> </tr>
@ -54,18 +57,18 @@
<tr> <tr>
<th colspan="2">작업명</th> <th colspan="2">작업명</th>
<td><c:out value='${useRequestVO.title}' /></td> <td><c:out value='${useRequestVO.title}'/></td>
</tr> </tr>
<tr> <tr>
<th colspan="2">기간</th> <th colspan="2">기간</th>
<td><c:out value='${useRequestVO.s_date}' /> ~ <c:out value='${useRequestVO.e_date}' /></td> <td><c:out value='${useRequestVO.s_date}'/> ~ <c:out value='${useRequestVO.e_date}'/></td>
</tr> </tr>
<tr> <tr>
<th colspan="2">장소</th> <th colspan="2">장소</th>
<td id="area_select_td"> <td id="area_select_td">
<c:forEach var="item" items="${selectArea}" varStatus="status"> <c:forEach var="item" items="${selectArea}" varStatus="status">
<div id="addedBlock<c:out value='${status.index}' />"> <div id="addedBlock<c:out value='${status.index}' />">
<c:out value='' />${item} <c:out value=''/>${item}
</div> </div>
</c:forEach> </c:forEach>
</td> </td>
@ -77,15 +80,16 @@
<div class="facility"> <div class="facility">
<c:forEach var="item" items="${layersVO}" varStatus="status"> <c:forEach var="item" items="${layersVO}" varStatus="status">
<c:if test="${item.code eq 'facility'}"> <c:if test="${item.code eq 'facility'}">
<c:set var="faciltySize" value="${faciltySize+1}" /> <c:set var="faciltySize" value="${faciltySize+1}"/>
<label class="layer-label"> <label class="layer-label">
<input type="checkbox" name="${item.code}" id="${item.code}" disabled="disabled" value="${item.layer}" <input type="checkbox" name="${item.code}" id="${item.code}" disabled="disabled"
value="${item.layer}"
<c:forEach var="item2" items="${layers}" varStatus="status2"> <c:forEach var="item2" items="${layers}" varStatus="status2">
<c:if test="${item.layer eq item2}"> <c:if test="${item.layer eq item2}">
<c:out value='checked' /> <c:out value='checked'/>
</c:if> </c:if>
</c:forEach> </c:forEach>
/> <c:out value='${item.name}' /> /> <c:out value='${item.name}'/>
</label> </label>
</c:if> </c:if>
</c:forEach> </c:forEach>
@ -98,13 +102,14 @@
<div class="structure"> <div class="structure">
<c:forEach var="item" items="${layersVO}" varStatus="status"> <c:forEach var="item" items="${layersVO}" varStatus="status">
<c:if test="${item.code eq 'structure'}"> <c:if test="${item.code eq 'structure'}">
<label class="layer-label"><input type="checkbox" name="${item.code}" id="${item.code}" disabled="disabled" value="${item.layer}" <label class="layer-label"><input type="checkbox" name="${item.code}" id="${item.code}"
disabled="disabled" value="${item.layer}"
<c:forEach var="item2" items="${layers}" varStatus="status2"> <c:forEach var="item2" items="${layers}" varStatus="status2">
<c:if test="${item.layer eq item2}"> <c:if test="${item.layer eq item2}">
<c:out value='checked' /> <c:out value='checked'/>
</c:if> </c:if>
</c:forEach> </c:forEach>
/> <c:out value='${item.name}' /> /> <c:out value='${item.name}'/>
</label> </label>
</c:if> </c:if>
</c:forEach> </c:forEach>
@ -117,13 +122,14 @@
<div class="ground"> <div class="ground">
<c:forEach var="item" items="${layersVO}" varStatus="status"> <c:forEach var="item" items="${layersVO}" varStatus="status">
<c:if test="${item.code eq 'ground'}"> <c:if test="${item.code eq 'ground'}">
<label class="layer-label"><input type="checkbox" name="${item.code}" id="${item.code}" disabled="disabled" value="${item.layer}" <label class="layer-label"><input type="checkbox" name="${item.code}" id="${item.code}"
disabled="disabled" value="${item.layer}"
<c:forEach var="item2" items="${layers}" varStatus="status2"> <c:forEach var="item2" items="${layers}" varStatus="status2">
<c:if test="${item.layer eq item2}"> <c:if test="${item.layer eq item2}">
checked checked
</c:if> </c:if>
</c:forEach> </c:forEach>
/> <c:out value='${item.name}' /> /> <c:out value='${item.name}'/>
</label> </label>
</c:if> </c:if>
</c:forEach> </c:forEach>
@ -134,7 +140,7 @@
<tr> <tr>
<th colspan="2">요청 내용</th> <th colspan="2">요청 내용</th>
<td><c:out value='${useRequestVO.user_msg}' /></td> <td><c:out value='${useRequestVO.user_msg}'/></td>
</tr> </tr>
@ -144,7 +150,7 @@
<c:choose> <c:choose>
<c:when test="${useRequestVO.status eq '99'}"> <c:when test="${useRequestVO.status eq '99'}">
<table class="detail_table mx-3" > <table class="detail_table mx-3">
<tbody> <tbody>
<tr> <tr>
<th>전달 메세지</th> <th>전달 메세지</th>
@ -154,19 +160,21 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<input type="hidden" name="status" id="status" /> <input type="hidden" name="status" id="status"/>
</div> </div>
<div class="row justify-content-between bg-white mx-3 py-2"> <div class="row justify-content-between bg-white mx-3 py-2">
<div class="section_btn"> <div class="section_btn">
<p class="search_p1"> <p class="search_p1">
<input class="btn btn-primary" type="button" value="목록" onclick="location.href='/admin/request'" /> <input class="btn btn-primary" type="button" value="목록"
onclick="location.href='/admin/request'"/>
</p> </p>
<p class="search_p2"> <p class="search_p2">
<input class="btn btn-danger" type="button" value="거절" onclick="confirmReqBtn('-1'); return false;" /> <input class="btn btn-danger" type="button" value="거절"
<input class="btn btn-success" type="button" value="승인" onclick="confirmReqBtn('0'); return false;" /> onclick="confirmReqBtn('-1'); return false;"/>
<input class="btn btn-success" type="button" value="승인"
onclick="confirmReqBtn('0'); return false;"/>
</p> </p>
</div> </div>
</div> </div>
@ -179,7 +187,7 @@
<tbody> <tbody>
<tr> <tr>
<th>전달 메세지</th> <th>전달 메세지</th>
<td><c:out value='${useRequestVO.admin_msg}' /></td> <td><c:out value='${useRequestVO.admin_msg}'/></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -187,12 +195,12 @@
<div class="section_btn"> <div class="section_btn">
<p class="search_p1"> <p class="search_p1">
<input class="btn btn-primary" type="button" value="목록" onclick="location.href='/admin/request'" /> <input class="btn btn-primary" type="button" value="목록" onclick="location.href='/admin/request'"/>
</p> </p>
</div> </div>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</form:form> </form:form>

View File

@ -1,11 +1,12 @@
<%@ 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="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<script src="<c:url value="/js/admin/userinfo.js"/>"></script>
<script src="/js/admin/userinfo.js"></script>
<div class="section_title"> <div class="section_title">
<!-- <p>현장 지원 시스템</p> --> <!-- <p>현장 지원 시스템</p> -->
@ -17,28 +18,44 @@
<div class="row justify-content-between bg-white mx-3 py-2"> <div class="row justify-content-between bg-white mx-3 py-2">
<div class="col-auto"> <div class="col-auto">
<ul class="nav nav-pills" role="tablist" style="margin-left: 16px"> <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
<li role="presentation" class="nav-item"><a class="nav-link ${empty userSearchVO.auth?'active':''}" href="/admin/userInfo">회원 관리</a></li> 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> </ul>
<input type="hidden" name="auth" value="${userSearchVO.auth}" /> <input type="hidden" name="auth" value="${userSearchVO.auth}"/>
</div> </div>
<div class="col-auto row"> <div class="col-auto row">
<div class="col-auto"> <div class="col-auto">
<select class="form-select" name="searchCondition"> <select class="form-select" name="searchCondition">
<option <c:if test="${userSearchVO.searchCondition eq 'all'}">selected</c:if> value="all">통합검색</option> <option
<option <c:if test="${userSearchVO.searchCondition eq 'name'}">selected</c:if> value="name">이름</option> <c:if test="${userSearchVO.searchCondition eq 'all'}">selected</c:if> value="all">통합검색
<option <c:if test="${userSearchVO.searchCondition eq 'company'}">selected</c:if> value="company">소속</option> </option>
<option <c:if test="${userSearchVO.searchCondition eq 'email'}">selected</c:if> value="email">이메일</option> <option
<option <c:if test="${userSearchVO.searchCondition eq 'phonenum'}">selected</c:if> value="phonenum">전화번호</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> </select>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<input type="text" class="form-control" name="searchKeyword" value="${userSearchVO.searchKeyword}" /> <input type="text" class="form-control" name="searchKeyword" value="${userSearchVO.searchKeyword}"/>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<input class="btn btn-outline-secondary" type="submit" value="검색" /> <input class="btn btn-outline-secondary" type="submit" value="검색"/>
</div> </div>
</div> </div>
</div> </div>
@ -62,19 +79,21 @@
<c:forEach var="user" items="${userList}" varStatus="idx"> <c:forEach var="user" items="${userList}" varStatus="idx">
<tr> <tr>
<%--<a href="/admin/userInfo/<c:out value='${item.userid}' />"></a>--%> <%--<a href="/admin/userInfo/<c:out value='${item.userid}' />"></a>--%>
<td class="clickAbleObj userInfoModalBtn useridTd"><c:out value='${user.userid}' /></td> <td class="clickAbleObj userInfoModalBtn useridTd"><c:out value='${user.userid}'/></td>
<td class="clickAbleObj userInfoModalBtn"><c:out value='${user.name}' /></td> <td class="clickAbleObj userInfoModalBtn"><c:out value='${user.name}'/></td>
<td class="clickAbleObj userInfoModalBtn"><c:out value='${user.company}' /></td> <td class="clickAbleObj userInfoModalBtn"><c:out value='${user.company}'/></td>
<td class="clickAbleObj userInfoModalBtn"><c:out value='${user.phonenum}' /></td> <td class="clickAbleObj userInfoModalBtn"><c:out value='${user.phonenum}'/></td>
<td class="clickAbleObj userInfoModalBtn"><c:out value='${user.email}' /></td> <td class="clickAbleObj userInfoModalBtn"><c:out value='${user.email}'/></td>
<td class="clickAbleObj userInfoModalBtn td_date"><c:out value='${user.regdate}' /></td> <td class="clickAbleObj userInfoModalBtn td_date"><c:out value='${user.regdate}'/></td>
<td> <td>
<c:choose> <c:choose>
<c:when test="${user.auth eq '1'}">관리자</c:when> <c:when test="${user.auth eq '1'}">관리자</c:when>
<c:when test="${user.auth eq '2'}">사용자</c:when> <c:when test="${user.auth eq '2'}">사용자</c:when>
<c:when test="${user.auth eq '99'}"> <c:when test="${user.auth eq '99'}">
<input type="button" class="btn btn-outline-success" value="승인" onclick="confirmBtn('${user.userid}','2'); return false;" /> <input type="button" class="btn btn-outline-success" value="승인"
<input type="button" class="btn btn-outline-danger" value="삭제" onclick="confirmBtn('${user.userid}','-1'); return false;" /> onclick="confirmBtn('${user.userid}','2'); return false;"/>
<input type="button" class="btn btn-outline-danger" value="삭제"
onclick="confirmBtn('${user.userid}','-1'); return false;"/>
</c:when> </c:when>
</c:choose> </c:choose>
</td> </td>
@ -82,28 +101,31 @@
</c:forEach> </c:forEach>
</c:if> </c:if>
<c:if test="${count == 0}"> <c:if test="${count == 0}">
<tr><td colspan="7">요청한 목록이 없습니다.</td></tr> <tr>
<td colspan="7">요청한 목록이 없습니다.</td>
</tr>
</c:if> </c:if>
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="text-page"> <div class="text-page">
<form:hidden path="pageIndex" /> <form:hidden path="pageIndex"/>
<nav aria-label="Page navigation"> <nav aria-label="Page navigation">
<ul class="pagination justify-content-center"> <ul class="pagination justify-content-center">
<ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page" /> <ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page"/>
</ul> </ul>
</nav> </nav>
</div> </div>
</form:form> </form:form>
<form:form commandName="userVO" id="updateFrm" method="post" action="/admin/userSign"> <form:form commandName="userVO" id="updateFrm" method="post" action="/admin/userSign">
<input type="hidden" id="userid" name="userid" /> <input type="hidden" id="userid" name="userid"/>
<input type="hidden" id="auth" name="auth" /> <input type="hidden" id="auth" name="auth"/>
</form:form> </form:form>
</div> </div>
<div class="modal fade" id="userInfoModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="userInfoModalLabel" aria-hidden="true"> <div class="modal fade" id="userInfoModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1"
aria-labelledby="userInfoModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-lg">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">

View File

@ -1,14 +1,14 @@
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <%@ 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="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<div class="row justify-content-between bg-white mx-3 py-2"> <div class="row justify-content-between bg-white mx-3 py-2">
<form:form commandName="userVO" name="updateForm" id="updateForm" action="/admin/userUpdate" method="post"> <form:form commandName="userVO" name="updateForm" id="updateForm" action="/admin/userUpdate" method="post">
<div class="section_content"> <div class="section_content">
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" /> <input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
<input type="hidden" name="userid" value="${userVO.userid}" /> <input type="hidden" name="userid" value="${userVO.userid}"/>
<table class="join_table"> <table class="join_table">
<tbody> <tbody>
@ -19,32 +19,36 @@
<tr> <tr>
<th><label for="password">비밀번호</label></th> <th><label for="password">비밀번호</label></th>
<td> <td>
<p><label for="changePw"><input type="checkbox" id="changePw" /> 비밀번호 변경</label></p> <p><label for="changePw"><input type="checkbox" id="changePw"/> 비밀번호 변경</label></p>
<input type="password" class="form-control" id="password" name="password" value="" disabled="true" /> <input type="password" class="form-control" id="password" name="password" value=""
disabled="true"/>
</td> </td>
</tr> </tr>
<tr> <tr>
<th><label for="passwordCheck">비밀번호 확인</label></th> <th><label for="passwordCheck">비밀번호 확인</label></th>
<td><input type="password" class="form-control" id="passwordCheck" name="passwordCheck" value="" disabled="true" /> <td><input type="password" class="form-control" id="passwordCheck" name="passwordCheck" value=""
disabled="true"/>
</td> </td>
</tr> </tr>
<tr> <tr>
<th><label for="name">이름</label></th> <th><label for="name">이름</label></th>
<td><input type="text" class="form-control" name="name" id="name" value="${userVO.name}" /></td> <td><input type="text" class="form-control" name="name" id="name" value="${userVO.name}"/></td>
</tr> </tr>
<tr> <tr>
<th><label for="company">소속기관</label></th> <th><label for="company">소속기관</label></th>
<td><input type="text" class="form-control" name="company" id="company" value="${userVO.company}" /></td> <td><input type="text" class="form-control" name="company" id="company" value="${userVO.company}"/>
</td>
</tr> </tr>
<tr> <tr>
<th><label for="phonenum">연락처</label></th> <th><label for="phonenum">연락처</label></th>
<td><input type="text" class="form-control" name="phonenum" id="phonenum" value="${userVO.phonenum}"/></td> <td><input type="text" class="form-control" name="phonenum" id="phonenum"
value="${userVO.phonenum}"/></td>
</tr> </tr>
<tr> <tr>
<th><label for="email">이메일</label></th> <th><label for="email">이메일</label></th>
<td> <td>
<div> <div>
<input type="text" class="form-control" name="email" id="email" value="${userVO.email}" /> <input type="text" class="form-control" name="email" id="email" value="${userVO.email}"/>
</div> </div>
</td> </td>
</tr> </tr>
@ -53,9 +57,11 @@
<tr> <tr>
<th>권한</th> <th>권한</th>
<td> <td>
<input type="radio" name="auth" id="auth2" value="2" <c:if test="${userVO.auth eq '2'}">checked</c:if>/> <input type="radio" name="auth" id="auth2" value="2"
<c:if test="${userVO.auth eq '2'}">checked</c:if>/>
<label for="auth2" class="auth-label">사용자</label> <label for="auth2" class="auth-label">사용자</label>
<input type="radio" name="auth" id="auth1" value="1" <c:if test="${userVO.auth eq '1'}">checked</c:if>/> <input type="radio" name="auth" id="auth1" value="1"
<c:if test="${userVO.auth eq '1'}">checked</c:if>/>
<label for="auth1" class="auth-label">관리자</label> <label for="auth1" class="auth-label">관리자</label>
</td> </td>
</tr> </tr>
@ -66,11 +72,13 @@
<p class="search_p2"> <p class="search_p2">
<c:choose> <c:choose>
<c:when test="${userVO.auth eq '99'}"> <c:when test="${userVO.auth eq '99'}">
<input type="button" class="btn btn-success" value="승인" onclick="confirmBtn('${userVO.userid}','2'); return false;" /> <input type="button" class="btn btn-success" value="승인"
<input type="button" class="btn btn-danger" value="삭제" onclick="confirmBtn('${userVO.userid}','-1'); return false;" /> onclick="confirmBtn('${userVO.userid}','2'); return false;"/>
<input type="button" class="btn btn-danger" value="삭제"
onclick="confirmBtn('${userVO.userid}','-1'); return false;"/>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<input class="btn btn-success" type="button" value="수정" onclick="update();" /> <input class="btn btn-success" type="button" value="수정" onclick="update();"/>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</p> </p>

View File

@ -1,13 +1,13 @@
<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="ko" xml:lang="ko"> <html xmlns="http://www.w3.org/1999/xhtml" lang="ko" xml:lang="ko">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>Error</title> <title>Error</title>
</head> </head>
<body> <body>
<spring:message code='fail.common.sql' /> <spring:message code='fail.common.sql'/>
</body> </body>
</html> </html>

View File

@ -1,13 +1,13 @@
<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="ko" xml:lang="ko"> <html xmlns="http://www.w3.org/1999/xhtml" lang="ko" xml:lang="ko">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>Error</title> <title>Error</title>
</head> </head>
<body> <body>
<spring:message code='fail.common.msg' /> <spring:message code='fail.common.msg'/>
</body> </body>
</html> </html>

View File

@ -1,13 +1,13 @@
<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="ko" xml:lang="ko"> <html xmlns="http://www.w3.org/1999/xhtml" lang="ko" xml:lang="ko">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>Error</title> <title>Error</title>
</head> </head>
<body> <body>
<spring:message code='fail.common.msg' /> <spring:message code='fail.common.msg'/>
</body> </body>
</html> </html>

View File

@ -1,13 +1,13 @@
<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="ko" xml:lang="ko"> <html xmlns="http://www.w3.org/1999/xhtml" lang="ko" xml:lang="ko">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>Error</title> <title>Error</title>
</head> </head>
<body> <body>
<spring:message code='fail.common.msg' /> <spring:message code='fail.common.msg'/>
</body> </body>
</html> </html>

View File

@ -1,28 +1,28 @@
<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@ taglib uri="http://www.springframework.org/security/tags" prefix="sec" %> <%@ taglib uri="http://www.springframework.org/security/tags" prefix="sec" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" > <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="content-language" content="ko"> <meta http-equiv="content-language" content="ko">
<title>Error</title> <title>Error</title>
<script src="<c:out value="/js/jquery-3.5.1.min.js" />"></script> <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> <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/normalize.css" />" rel="stylesheet">
<link href="<c:out value="/css/bootstrap.min.css" />" rel="stylesheet"> <link href="<c:out value="/css/bootstrap.min.css" />" rel="stylesheet">
<link href="<c:out value="/css/style.css" />" rel="stylesheet"> <link href="<c:out value="/css/style.css" />" rel="stylesheet">
<link type="text/css" rel="stylesheet" href="<c:url value='/css/egov.css'/>" > <link type="text/css" rel="stylesheet" href="<c:url value='/css/egov.css'/>">
</head> </head>
<style> <style>
.errorWrap{ .errorWrap {
border: 8px solid #094e84; border: 8px solid #094e84;
width:600px; width: 600px;
text-align: left; text-align: left;
position: absolute; position: absolute;
left: 50%; left: 50%;
@ -30,26 +30,29 @@
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
} }
.errorTable{
.errorTable {
margin: 0 auto; margin: 0 auto;
margin-bottom: 20px; margin-bottom: 20px;
} }
.errorTable > tbody > tr > td{
padding:10px; .errorTable > tbody > tr > td {
padding: 10px;
} }
.errorBtn{
width:200px; .errorBtn {
width: 200px;
margin: 0 auto; margin: 0 auto;
margin-bottom: 20px; margin-bottom: 20px;
} }
</style> </style>
<body style="text-align: center; margin: 0 auto; display: inline; padding-top: 100px;"> <body style="text-align: center; margin: 0 auto; display: inline; padding-top: 100px;">
<div class="errorWrap"> <div class="errorWrap">
<img src="<c:url value='/images/error/er_logo.jpg'/>" width="379" height="57" alt="" /> <img src="<c:url value='/images/error/er_logo.jpg'/>" width="379" height="57" alt=""/>
<table class="errorTable"> <table class="errorTable">
<tbody> <tbody>
<tr> <tr>
<td><img src="<c:url value='/images/error/danger.jpg'/>" width="74" height="74" alt="" /></td> <td><img src="<c:url value='/images/error/danger.jpg'/>" width="74" height="74" alt=""/></td>
<td style="width:300px;">Access Denied</td> <td style="width:300px;">Access Denied</td>
</tr> </tr>
</tbody> </tbody>

View File

@ -1,28 +1,28 @@
<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@ taglib uri="http://www.springframework.org/security/tags" prefix="sec" %> <%@ taglib uri="http://www.springframework.org/security/tags" prefix="sec" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" > <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="content-language" content="ko"> <meta http-equiv="content-language" content="ko">
<title>Error</title> <title>Error</title>
<script src="<c:out value="/js/jquery-3.5.1.min.js" />"></script> <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> <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/normalize.css" />" rel="stylesheet">
<link href="<c:out value="/css/bootstrap.min.css" />" rel="stylesheet"> <link href="<c:out value="/css/bootstrap.min.css" />" rel="stylesheet">
<link href="<c:out value="/css/style.css" />" rel="stylesheet"> <link href="<c:out value="/css/style.css" />" rel="stylesheet">
<link type="text/css" rel="stylesheet" href="<c:url value='/css/egov.css'/>" > <link type="text/css" rel="stylesheet" href="<c:url value='/css/egov.css'/>">
</head> </head>
<style> <style>
.errorWrap{ .errorWrap {
border: 8px solid #094e84; border: 8px solid #094e84;
width:600px; width: 600px;
text-align: left; text-align: left;
position: absolute; position: absolute;
left: 50%; left: 50%;
@ -30,26 +30,29 @@
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
} }
.errorTable{
.errorTable {
margin: 0 auto; margin: 0 auto;
margin-bottom: 20px; margin-bottom: 20px;
} }
.errorTable > tbody > tr > td{
padding:10px; .errorTable > tbody > tr > td {
padding: 10px;
} }
.errorBtn{
width:200px; .errorBtn {
width: 200px;
margin: 0 auto; margin: 0 auto;
margin-bottom: 20px; margin-bottom: 20px;
} }
</style> </style>
<body style="text-align: center; margin: 0 auto; display: inline; padding-top: 100px;"> <body style="text-align: center; margin: 0 auto; display: inline; padding-top: 100px;">
<div class="errorWrap"> <div class="errorWrap">
<img src="<c:url value='/images/error/er_logo.jpg'/>" width="379" height="57" alt="" /> <img src="<c:url value='/images/error/er_logo.jpg'/>" width="379" height="57" alt=""/>
<table class="errorTable"> <table class="errorTable">
<tbody> <tbody>
<tr> <tr>
<td><img src="<c:url value='/images/error/danger.jpg'/>" width="74" height="74" alt="" /></td> <td><img src="<c:url value='/images/error/danger.jpg'/>" width="74" height="74" alt=""/></td>
<td style="width:300px;">404 not found</td> <td style="width:300px;">404 not found</td>
</tr> </tr>
</tbody> </tbody>

View File

@ -1,28 +1,28 @@
<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@ taglib uri="http://www.springframework.org/security/tags" prefix="sec" %> <%@ taglib uri="http://www.springframework.org/security/tags" prefix="sec" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" > <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="content-language" content="ko"> <meta http-equiv="content-language" content="ko">
<title>Error</title> <title>Error</title>
<script src="<c:out value="/js/jquery-3.5.1.min.js" />"></script> <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> <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/normalize.css" />" rel="stylesheet">
<link href="<c:out value="/css/bootstrap.min.css" />" rel="stylesheet"> <link href="<c:out value="/css/bootstrap.min.css" />" rel="stylesheet">
<link href="<c:out value="/css/style.css" />" rel="stylesheet"> <link href="<c:out value="/css/style.css" />" rel="stylesheet">
<link type="text/css" rel="stylesheet" href="<c:url value='/css/egov.css'/>" > <link type="text/css" rel="stylesheet" href="<c:url value='/css/egov.css'/>">
</head> </head>
<style> <style>
.errorWrap{ .errorWrap {
border: 8px solid #094e84; border: 8px solid #094e84;
width:600px; width: 600px;
text-align: left; text-align: left;
position: absolute; position: absolute;
left: 50%; left: 50%;
@ -30,26 +30,29 @@
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
} }
.errorTable{
.errorTable {
margin: 0 auto; margin: 0 auto;
margin-bottom: 20px; margin-bottom: 20px;
} }
.errorTable > tbody > tr > td{
padding:10px; .errorTable > tbody > tr > td {
padding: 10px;
} }
.errorBtn{
width:200px; .errorBtn {
width: 200px;
margin: 0 auto; margin: 0 auto;
margin-bottom: 20px; margin-bottom: 20px;
} }
</style> </style>
<body style="text-align: center; margin: 0 auto; display: inline; padding-top: 100px;"> <body style="text-align: center; margin: 0 auto; display: inline; padding-top: 100px;">
<div class="errorWrap"> <div class="errorWrap">
<img src="<c:url value='/images/error/er_logo.jpg'/>" width="379" height="57" alt="" /> <img src="<c:url value='/images/error/er_logo.jpg'/>" width="379" height="57" alt=""/>
<table class="errorTable"> <table class="errorTable">
<tbody> <tbody>
<tr> <tr>
<td><img src="<c:url value='/images/error/danger.jpg'/>" width="74" height="74" alt="" /></td> <td><img src="<c:url value='/images/error/danger.jpg'/>" width="74" height="74" alt=""/></td>
<td style="width:300px;">500 Internal Server error</td> <td style="width:300px;">500 Internal Server error</td>
</tr> </tr>
</tbody> </tbody>

View File

@ -1,8 +1,8 @@
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
<%@ taglib uri="http://www.springframework.org/security/tags" prefix="sec" %> <%@ taglib uri="http://www.springframework.org/security/tags" prefix="sec" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<c:set var="thisURL" value="${requestScope['javax.servlet.forward.request_uri']}" /> <c:set var="thisURL" value="${requestScope['javax.servlet.forward.request_uri']}"/>
<form id="logout" action="/j_spring_security_logout" method="POST"> <form id="logout" action="/j_spring_security_logout" method="POST">
<input name="${_csrf.parameterName}" type="hidden" value="${_csrf.token}"/> <input name="${_csrf.parameterName}" type="hidden" value="${_csrf.token}"/>
@ -24,8 +24,14 @@
<div class="header_menu"> <div class="header_menu">
<ul> <ul>
<li <c:if test="${thisURL eq '/map/request'}">class="thisOn"</c:if> onclick="location.href='/map/request'">지도사용 요청</li> <li
<li <c:if test="${thisURL eq '/map/userInfo'}">class="thisOn"</c:if> onclick="location.href='/map/userInfo'">회원정보수정</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> </ul>
</div> </div>
</nav> </nav>
@ -45,16 +51,31 @@
<nav class="common_nav"> <nav class="common_nav">
<div class="header_menu"> <div class="header_menu">
<ul> <ul>
<li <c:if test="${fn:contains(thisURL, '/dashBoard')}">class="thisOn"</c:if> onclick="location.href='/admin/dashBoard'"> <li
<img src="/images/icon/icon_analysis.png" width="30" height="30" alt=""> &nbsp;대시보드</li> <c:if test="${fn:contains(thisURL, '/dashBoard')}">class="thisOn"</c:if>
<li <c:if test="${fn:contains(thisURL, '/request')}">class="thisOn"</c:if> onclick="location.href='/admin/request'"> onclick="location.href='/admin/dashBoard'">
<img src="/images/icon/icon_map.png" width="30" height="30" alt=""> &nbsp;지도사용 요청</li> <img src="/images/icon/icon_analysis.png" width="30" height="30" alt=""> &nbsp;대시보드
<li <c:if test="${fn:contains(thisURL, '/history')}">class="thisOn"</c:if> onclick="location.href='/admin/history'"> </li>
<img src="/images/icon/icon_log_on.png" width="30" height="30" alt=""> &nbsp;지도사용 이력</li> <li
<li <c:if test="${fn:contains(thisURL, '/fieldData')}">class="thisOn"</c:if> onclick="location.href='/admin/fieldData'"> <c:if test="${fn:contains(thisURL, '/request')}">class="thisOn"</c:if>
<img src="/images/icon/icon_eq_on.png" width="30" height="30" alt=""> &nbsp;현장수집 데이터</li> onclick="location.href='/admin/request'">
<li <c:if test="${fn:contains(thisURL, '/userInfo')}">class="thisOn"</c:if> onclick="location.href='/admin/userInfo?auth=99'"> <img src="/images/icon/icon_map.png" width="30" height="30" alt=""> &nbsp;지도사용 요청
<img src="/images/icon/icon_supervisor_on.png" width="30" height="30" alt=""> &nbsp;회원 관리</li> </li>
<li
<c:if test="${fn:contains(thisURL, '/history')}">class="thisOn"</c:if>
onclick="location.href='/admin/history'">
<img src="/images/icon/icon_log_on.png" width="30" height="30" alt=""> &nbsp;지도사용 이력
</li>
<li
<c:if test="${fn:contains(thisURL, '/fieldData')}">class="thisOn"</c:if>
onclick="location.href='/admin/fieldData'">
<img src="/images/icon/icon_eq_on.png" width="30" height="30" alt=""> &nbsp;현장수집 데이터
</li>
<li
<c:if test="${fn:contains(thisURL, '/userInfo')}">class="thisOn"</c:if>
onclick="location.href='/admin/userInfo?auth=99'">
<img src="/images/icon/icon_supervisor_on.png" width="30" height="30" alt=""> &nbsp;회원 관리
</li>
</ul> </ul>
</div> </div>
</nav> </nav>

View File

@ -1,70 +1,86 @@
<%@ 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="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="ko"> <html lang="ko">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>모바일센터 관리시스템</title> <title>모바일센터 관리시스템</title>
<script src="<c:out value="/js/jquery-3.5.1.min.js" />"></script> <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> <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/normalize.css" />" rel="stylesheet">
<link href="<c:out value="/css/bootstrap.min.css" />" rel="stylesheet"> <link href="<c:out value="/css/bootstrap.min.css" />" rel="stylesheet">
<link href="<c:out value="/css/style.css" />" rel="stylesheet"> <link href="<c:out value="/css/style.css" />" rel="stylesheet">
</head> </head>
<body> <body>
<header class="header"> <header class="header">
<div class="header_title"><a href="/">모바일센터 관리시스템</a></div> <div class="header_title"><a href="/">모바일센터 관리시스템</a></div>
<div class="header_menu"></div> <div class="header_menu"></div>
</header> </header>
<section class="join_section"> <section class="join_section">
<div class="join_top"> <div class="join_top">
<h2> <h2>
<span class="glyphicon glyphicon-edit"></span> 회원 정보 입력 <span class="glyphicon glyphicon-edit"></span> 회원 정보 입력
</h2> </h2>
</div> </div>
<form:form commandName="userVO" name="insertFrm" action="/insertUser" id="insertFrm" autocomplete="off" method="post"> <form:form commandName="userVO" name="insertFrm" action="/insertUser" id="insertFrm" autocomplete="off"
method="post">
<table class="join_table"> <table class="join_table">
<tbody> <tbody>
<tr> <tr>
<th>아이디</th> <th>
<label for="id">아이디</label>
</th>
<td> <td>
<input type="text" class="form-control" name="userid" id="id" /> <input type="text" class="form-control" name="userid" id="id"/>
<span id="idMsg"></span> <span id="idMsg"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<th>비밀번호</th> <th>
<td><input type="password" class="form-control" id="password"name="password" value="" /></td> <label for="password">비밀번호</label>
</th>
<td><input type="password" class="form-control" id="password" name="password" value=""/></td>
</tr> </tr>
<tr> <tr>
<th>비밀번호 확인</th> <th>
<td><input type="password" class="form-control" id="passwordCheck" name="passwordCheck" value="" /></td> <label for="passwordCheck">비밀번호 확인</label>
</th>
<td><input type="password" class="form-control" id="passwordCheck" name="passwordCheck" value=""/></td>
</tr> </tr>
<tr> <tr>
<th>이름</th> <th>
<td><input type="text" class="form-control" name="name" id="name" /></td> <label for="name">이름</label>
</th>
<td><input type="text" class="form-control" name="name" id="name"/></td>
</tr> </tr>
<tr> <tr>
<th>소속기관</th> <th>
<td><input type="text" class="form-control" name="company" id="company" /></td> <label for="company">소속기관</label>
</th>
<td><input type="text" class="form-control" name="company" id="company"/></td>
</tr> </tr>
<tr> <tr>
<th>연락처</th> <th>
<td><input type="text" class="form-control" name="phonenum" id="phonenum" /></td> <label for="phonenum">연락처</label>
</th>
<td><input type="tel" class="form-control" name="phonenum" id="phonenum"/></td>
</tr> </tr>
<tr> <tr>
<th>이메일</th> <th>
<label for="email">이메일</label>
</th>
<td> <td>
<div> <div>
<input type="text" class="form-control" name="email" id="email" /> <input type="email" class="form-control" name="email" id="email"/>
</div> </div>
</td> </td>
</tr> </tr>
@ -72,7 +88,8 @@
</table> </table>
<div class="join_bottom" style="padding-top: 10px"> <div class="join_bottom" style="padding-top: 10px">
<p>※ 회원 가입을 요청한 후에 승인을 기다려주세요.</p> <p>※ 회원 가입을 요청한 후에 승인을 기다려주세요.</p>
<p class="join_bottom_p"><input class="btn_join big on" type="submit" value="가입신청" onclick="join(); return false;" /></p> <p class="join_bottom_p"><input class="btn_join big on" type="submit" value="가입신청"
onclick="join(); return false;"/></p>
</div> </div>
</form:form> </form:form>
@ -81,28 +98,28 @@
var header = $("meta[name='_csrf_header']").attr("content"); var header = $("meta[name='_csrf_header']").attr("content");
var checkId = false; var checkId = false;
var getId= RegExp(/^[a-zA-Z0-9]{5,12}$/); var getId = RegExp(/^[a-zA-Z0-9]{5,12}$/);
var getMail = RegExp(/^[A-Za-z0-9_\.\-]+@[A-Za-z0-9\-]+\.[A-Za-z0-9\-]+/); var getMail = RegExp(/^[A-Za-z0-9_\.\-]+@[A-Za-z0-9\-]+\.[A-Za-z0-9\-]+/);
$(document).ready(function(){ $(document).ready(function () {
$("#id").focusout(function(){ $("#id").focusout(function () {
var id = $(this).val(); var id = $(this).val();
if (id == "" || id == undefined || id == null) { if (id == "" || id == undefined || id == null) {
$("#idMsg").text("아이디를 입력해주세요."); $("#idMsg").text("아이디를 입력해주세요.");
checkId = false; checkId = false;
return false; return false;
} else if(!getId.test(id)){ } else if (!getId.test(id)) {
$("#idMsg").text("5~20자의 영문 소문자, 숫자만 사용 가능합니다."); $("#idMsg").text("5~20자의 영문 소문자, 숫자만 사용 가능합니다.");
checkId = false; checkId = false;
return false; return false;
}else { } else {
$.ajax({ $.ajax({
url : "/userIdCheck", url: "/userIdCheck",
type : "GET", type: "GET",
data : { data: {
"checkId" : id "checkId": id
}, },
success : function(data) { success: function (data) {
if (data == "duplicate") { if (data == "duplicate") {
$("#idMsg").text("이미 존재하는 아이디 입니다."); $("#idMsg").text("이미 존재하는 아이디 입니다.");
checkId = false; checkId = false;
@ -111,7 +128,7 @@
checkId = true; checkId = true;
} }
}, },
error : function(request, status, error) { error: function (request, status, error) {
alert("접속 실패 관리자에게 문의해주세요."); alert("접속 실패 관리자에게 문의해주세요.");
} }
}); });
@ -163,6 +180,6 @@
} }
} }
</script> </script>
</section> </section>
</body> </body>
</html> </html>

View File

@ -1,11 +1,11 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ 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="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<script type="text/javascript"> <script type="text/javascript">
$(document).on('click', '#logoutLink', function (){ $(document).on('click', '#logoutLink', function () {
$("#logoutForm").submit(); $("#logoutForm").submit();
}) })
</script> </script>
@ -27,7 +27,9 @@
</div> </div>
<sec:authorize access="hasAnyRole('ROLE_ADMIN','ROLE_USER')"> <sec:authorize access="hasAnyRole('ROLE_ADMIN','ROLE_USER')">
<div class="header_info"> <div class="header_info">
<a id="logoutLink" href="#"><i class="bi bi-box-arrow-right"></i> 로그아웃</a> <a id="logoutLink" href="#">
<i class="bi bi-box-arrow-right"></i> 로그아웃
</a>
</div> </div>
</sec:authorize> </sec:authorize>
</header> </header>

View File

@ -1,7 +1,8 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ 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="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %><!--시큐리티 태그 라이브러리 선언--> <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> <!--시큐리티 태그 라이브러리 선언-->
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<c:set var="tilesURI" value="${requestScope['javax.servlet.forward.request_uri']}"/> <c:set var="tilesURI" value="${requestScope['javax.servlet.forward.request_uri']}"/>
@ -11,10 +12,14 @@
<nav class="common_nav"> <nav class="common_nav">
<div class="header_menu"> <div class="header_menu">
<ul> <ul>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/map/request')?"thisOn":""}" onclick="location.href='/map/request'"> <li class="fs-6 ps-3 ${fn:contains(tilesURI, '/map/request')?"thisOn":""}"
<i class="bi bi-map fs-5" ></i> &nbsp;지도사용 요청</li> onclick="location.href='/map/request'">
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/map/userInfo')?"thisOn":""}" onclick="location.href='/map/userInfo'"> <i class="bi bi-map fs-5"></i> &nbsp;지도사용 요청
<i class="bi bi-person-circle"></i> &nbsp;회원정보 수정</li> </li>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/map/userInfo')?"thisOn":""}"
onclick="location.href='/map/userInfo'">
<i class="bi bi-person-circle"></i> &nbsp;회원정보 수정
</li>
</ul> </ul>
</div> </div>
</nav> </nav>
@ -23,16 +28,26 @@
<nav class="common_nav"> <nav class="common_nav">
<div class="header_menu"> <div class="header_menu">
<ul> <ul>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/dashBoard')?"thisOn":""}" onclick="location.href='/admin/dashBoard'"> <li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/dashBoard')?"thisOn":""}"
<i class="bi bi-grid fs-5"></i> &nbsp;대시보드</li> onclick="location.href='/admin/dashBoard'">
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/request')?"thisOn":""}" onclick="location.href='/admin/request'"> <i class="bi bi-grid fs-5"></i> &nbsp;대시보드
<i class="bi bi-map fs-5" ></i>&nbsp; 지도사용 요청</li> </li>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/history')?"thisOn":""}" onclick="location.href='/admin/history'"> <li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/request')?"thisOn":""}"
<i class="bi bi-signpost-2 fs-5"></i></i>&nbsp; 지도사용 이력</li> onclick="location.href='/admin/request'">
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/fieldData')?"thisOn":""}" onclick="location.href='/admin/fieldData?status0=1&status1=1&status2=1&status3=1&status4=1'"> <i class="bi bi-map fs-5"></i>&nbsp; 지도사용 요청
<i class="bi bi-flag fs-5"></i>&nbsp; 현장수집 데이터</li> </li>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/userInfo')?"thisOn":""}" onclick="location.href='/admin/userInfo?auth=99'"> <li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/history')?"thisOn":""}"
<i class="bi bi-person-circle"></i>&nbsp;&nbsp; 회원 관리</li> onclick="location.href='/admin/history'">
<i class="bi bi-signpost-2 fs-5"></i></i>&nbsp; 지도사용 이력
</li>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/fieldData')?"thisOn":""}"
onclick="location.href='/admin/fieldData?status0=1&status1=1&status2=1&status3=1&status4=1'">
<i class="bi bi-flag fs-5"></i>&nbsp; 현장수집 데이터
</li>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/userInfo')?"thisOn":""}"
onclick="location.href='/admin/userInfo?auth=99'">
<i class="bi bi-person-circle"></i>&nbsp;&nbsp; 회원 관리
</li>
</ul> </ul>
</div> </div>
</nav> </nav>

View File

@ -1,7 +1,7 @@
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <%@ 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="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %> <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<tiles:insertAttribute name="center" /> <tiles:insertAttribute name="center"/>

View File

@ -1,5 +1,5 @@
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <%@ 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="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %> <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
@ -9,7 +9,7 @@
<html lang="ko"> <html lang="ko">
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="stylesheet" type="text/css" href="<c:url value="/css/jquery-ui.min.css"/>"> <link rel="stylesheet" type="text/css" href="<c:url value="/css/jquery-ui.min.css"/>">
<link rel="stylesheet" type="text/css" href="<c:url value="/css/bootstrap-5.1.3.css"/>"> <link rel="stylesheet" type="text/css" href="<c:url value="/css/bootstrap-5.1.3.css"/>">
@ -17,27 +17,27 @@
<link href="<c:out value="/css/normalize.css" />" rel="stylesheet"> <link href="<c:out value="/css/normalize.css" />" rel="stylesheet">
<link href="<c:out value="/css/style.css" />" rel="stylesheet"> <link href="<c:out value="/css/style.css" />" rel="stylesheet">
<style> <style>
#wrap{ #wrap {
background-image: url("/images/main1.jpg"); background-image: url("/images/main1.jpg");
background-size: cover; background-size: cover;
height: 1080px; height: 1080px;
} }
</style> </style>
<title> <title>
<tiles:insertAttribute name="title" ignore="true" /> <tiles:insertAttribute name="title" ignore="true"/>
</title> </title>
<script src="<c:url value='/js/jquery-3.5.1.min.js' />"></script> <script src="<c:url value='/js/jquery-3.5.1.min.js' />"></script>
<script src="<c:url value='/js/jquery-ui.min.js' />"></script> <script src="<c:url value='/js/jquery-ui.min.js' />"></script>
<script src="<c:url value="/js/bootstrap-5.1.3.min.js"/>"></script> <script src="<c:url value="/js/bootstrap-5.1.3.min.js"/>"></script>
</head> </head>
<body class="overflow-hidden htmlBody"> <body class="overflow-hidden htmlBody">
<div id="wrap"> <div id="wrap">
<tiles:insertAttribute name="center"/> <tiles:insertAttribute name="center"/>
</div> </div>
</body> </body>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function () {
var errMsg = "${errMsg}"; var errMsg = "${errMsg}";
if (errMsg) { if (errMsg) {
alert(errMsg); alert(errMsg);

View File

@ -1,5 +1,5 @@
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <%@ 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="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %> <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
@ -9,7 +9,7 @@
<html lang="ko"> <html lang="ko">
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="stylesheet" type="text/css" href="<c:url value="/css/jquery-ui.min.css"/>"> <link rel="stylesheet" type="text/css" href="<c:url value="/css/jquery-ui.min.css"/>">
<link rel="stylesheet" type="text/css" href="<c:url value="/css/bootstrap-5.1.3.css"/>"> <link rel="stylesheet" type="text/css" href="<c:url value="/css/bootstrap-5.1.3.css"/>">
@ -17,19 +17,19 @@
<link href="<c:out value="/css/normalize.css" />" rel="stylesheet"> <link href="<c:out value="/css/normalize.css" />" rel="stylesheet">
<link href="<c:out value="/css/style.css" />" rel="stylesheet"> <link href="<c:out value="/css/style.css" />" rel="stylesheet">
<title> <title>
<tiles:insertAttribute name="title" ignore="true" /> <tiles:insertAttribute name="title" ignore="true"/>
</title> </title>
<script src="<c:url value='/js/jquery-3.5.1.min.js' />"></script> <script src="<c:url value='/js/jquery-3.5.1.min.js' />"></script>
<script src="<c:url value='/js/jquery-ui.min.js' />"></script> <script src="<c:url value='/js/jquery-ui.min.js' />"></script>
<script src="<c:url value="/js/bootstrap-5.1.3.min.js"/>"></script> <script src="<c:url value="/js/bootstrap-5.1.3.min.js"/>"></script>
</head> </head>
<body class="htmlBody"> <body class="htmlBody">
<div id="wrap"> <div id="wrap">
<tiles:insertAttribute name="header"/> <tiles:insertAttribute name="header"/>
<tiles:insertAttribute name="left"/> <tiles:insertAttribute name="left"/>
<section class="section overflow-auto"> <section class="section overflow-auto">
<tiles:insertAttribute name="center"/> <tiles:insertAttribute name="center"/>
</section> </section>
</div> </div>
</body> </body>
</html> </html>

View File

@ -1,23 +1,23 @@
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <%@ 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="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<div class="loginWrap"> <div class="loginWrap">
<div class="loginBox"> <div class="loginBox">
<form method="POST" action="/j_spring_security_check"> <form method="POST" action="/j_spring_security_check">
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" /> <input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
<input type=hidden name=login_error value="${login_error}" /> <input type=hidden name=login_error value="${login_error}"/>
<p class="login_title text-white">모바일센터 관리시스템</p> <p class="login_title text-white">모바일센터 관리시스템</p>
<p class="login_text"> <p class="login_text">
<input type="text" class="form-control" name="username" id="user_id" value="" placeholder="사용자 ID" /> <input type="text" class="form-control" name="username" id="user_id" value="" placeholder="사용자 ID"/>
</p> </p>
<p class="login_text"> <p class="login_text">
<input type="password" class="form-control" name="password" id="user_pw" value="" placeholder="비밀번호" /> <input type="password" class="form-control" name="password" id="user_pw" value="" placeholder="비밀번호"/>
</p> </p>
<p class="login_btn"> <p class="login_btn">
<input type="image" src="images/login_.png" /> <input type="image" src="images/login_.png"/>
</p> </p>
<div class="parent"> <div class="parent">

View File

@ -58,7 +58,7 @@
</div> </div>
</div> </div>
</form:form> </form:form>
<script> <script>
$(function(){ $(function(){
$("#changePw").click(function(){ $("#changePw").click(function(){
if($(this).is(":checked")){ if($(this).is(":checked")){
@ -112,4 +112,4 @@
$("#updateForm").submit(); $("#updateForm").submit();
} }
} }
</script> </script>

View File

@ -7,10 +7,10 @@
<body> <body>
<script> <script>
var resultMessage = '${resultMsg}'; var resultMessage = '${resultMsg}';
if(resultMessage){ if (resultMessage) {
alert(resultMessage); alert(resultMessage);
} }
location.href='${url}'; location.href = '${url}';
</script> </script>
</body> </body>
</html> </html>

View File

@ -1,16 +1,17 @@
<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="ko" xml:lang="ko"> <html xmlns="http://www.w3.org/1999/xhtml" lang="ko" xml:lang="ko">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>모바일센터 관리시스템</title> <title>모바일센터 관리시스템</title>
</head> </head>
<body> <body>
<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0"> <table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
<tr> <tr>
<td width="100%" height="100%" align="center" valign="middle" style="padding-top: 150px;"><table border="0" cellspacing="0" cellpadding="0"> <td width="100%" height="100%" align="center" valign="middle" style="padding-top: 150px;">
<table border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<td class="<spring:message code='image.errorBg' />"> <td class="<spring:message code='image.errorBg' />">
<span style="font-family: Tahoma; font-weight: bold; color: #000000; line-height: 150%; width: 440px; height: 70px;"></span> <span style="font-family: Tahoma; font-weight: bold; color: #000000; line-height: 150%; width: 440px; height: 70px;"></span>
@ -19,6 +20,6 @@
</table> </table>
</td> </td>
</tr> </tr>
</table> </table>
</body> </body>
</html> </html>

View File

@ -1,5 +1,4 @@
$(document).on("click", ".nav-item", function () {
$(document).on("click", ".nav-item", function (){
const chkBox = $(this).find(".statusChkBox")[0] const chkBox = $(this).find(".statusChkBox")[0]
chkBox.checked = !chkBox.checked; chkBox.checked = !chkBox.checked;
$("[name='searchForm']").submit(); $("[name='searchForm']").submit();
@ -10,6 +9,7 @@ function fn_link_page(pageNo) {
document.searchForm.action = "<c:url value='/admin/fieldData' />"; document.searchForm.action = "<c:url value='/admin/fieldData' />";
document.searchForm.submit(); document.searchForm.submit();
} }
function getCheckoxValue() { function getCheckoxValue() {
const query = 'input[name="check1"]:checked'; const query = 'input[name="check1"]:checked';
const selectedEls = document.querySelectorAll(query); const selectedEls = document.querySelectorAll(query);

View File

@ -3,76 +3,76 @@ let 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'); 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');
let baseMap = new ol.layer.Tile({ let baseMap = new ol.layer.Tile({
title : 'vworldMap', title: 'vworldMap',
visible : true, visible: true,
type : 'base', type: 'base',
source : new ol.source.XYZ({ 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' url: 'http://api.vworld.kr/req/wmts/1.0.0/5616CAD1-5D79-3EE3-87D5-878A4AD0F91F/Base/{z}/{y}/{x}.png'
}) })
}); });
let view = new ol.View({ let view = new ol.View({
center : ol.proj.transform([ 203766.984, 541132.2 ], 'EPSG:5186', 'EPSG:3857'), center: ol.proj.transform([203766.984, 541132.2], 'EPSG:5186', 'EPSG:3857'),
zoom : 18, // 초기화면 zoom level zoom: 18, // 초기화면 zoom level
minZoom : 1, // 최소 zoom level minZoom: 1, // 최소 zoom level
maxZoom : 19, // 최대 zoom level maxZoom: 19, // 최대 zoom level
}); });
let map = new ol.Map({ let map = new ol.Map({
layers : [ baseMap ], layers: [baseMap],
logo : false, //우측하단 로고 제거 logo: false, //우측하단 로고 제거
target : 'map', target: 'map',
loadTilesWhileAnimating : true, loadTilesWhileAnimating: true,
view : view view: view
}); });
let format = new ol.format.WKT(); let format = new ol.format.WKT();
let objVectorSource = new ol.source.Vector({}); let objVectorSource = new ol.source.Vector({});
let objVectorLayer = new ol.layer.Vector({ let objVectorLayer = new ol.layer.Vector({
source : objVectorSource, source: objVectorSource,
style : objStyle style: objStyle
}); });
let cursorStyle = ""; let cursorStyle = "";
let selected = null; let selected = null;
let highlightStyle = new ol.style.Style({ let highlightStyle = new ol.style.Style({
stroke : new ol.style.Stroke({ stroke: new ol.style.Stroke({
color : '#3399CC', color: '#3399CC',
width : 8, width: 8,
}), }),
}); });
$(function() { $(function () {
makePropPaging(); makePropPaging();
makePropTable(); makePropTable();
map = new ol.Map({ map = new ol.Map({
layers : [ baseMap ], layers: [baseMap],
logo : false, //우측하단 로고 제거 logo: false, //우측하단 로고 제거
target : 'map', target: 'map',
loadTilesWhileAnimating : true, loadTilesWhileAnimating: true,
view : view view: view
}); });
drawingObj(); drawingObj();
}); });
function fieldVerify(){ function fieldVerify() {
alert('준비중'); alert('준비중');
} }
function fieldReflect(){ function fieldReflect() {
alert('준비중'); alert('준비중');
} }
map.on("pointermove", function(e) { map.on("pointermove", function (e) {
if (selected !== null) { if (selected !== null) {
selected.setStyle(undefined); selected.setStyle(undefined);
selected = null; selected = null;
} }
var newStyle = this.hasFeatureAtPixel(e.pixel) ? "pointer" : ""; var newStyle = this.hasFeatureAtPixel(e.pixel) ? "pointer" : "";
newStyle !== cursorStyle && $(this.getTargetElement()).css("cursor", cursorStyle = newStyle); newStyle !== cursorStyle && $(this.getTargetElement()).css("cursor", cursorStyle = newStyle);
map.forEachFeatureAtPixel(e.pixel, function(f) { map.forEachFeatureAtPixel(e.pixel, function (f) {
selected = f; selected = f;
f.setStyle(highlightStyle); f.setStyle(highlightStyle);
return true; return true;
@ -81,8 +81,8 @@ map.on("pointermove", function(e) {
// feature click evt // feature click evt
map.on('click', function(event) { map.on('click', function (event) {
map.forEachFeatureAtPixel(event.pixel, function(feature, layer) { map.forEachFeatureAtPixel(event.pixel, function (feature, layer) {
var idx = feature.get("idx"); var idx = feature.get("idx");
makePropTable(idx); makePropTable(idx);
}) })
@ -93,16 +93,16 @@ function objStyle(feature, resolution) {
var style = null; var style = null;
if (selected) { if (selected) {
style = new ol.style.Style({ style = new ol.style.Style({
stroke : new ol.style.Stroke({ stroke: new ol.style.Stroke({
color : '#f00', color: '#f00',
width : 5 width: 5
}) })
}); });
} else { } else {
style = new ol.style.Style({ style = new ol.style.Style({
stroke : new ol.style.Stroke({ stroke: new ol.style.Stroke({
color : '#52b4e7', color: '#52b4e7',
width : 5 width: 5
}) })
}); });
} }
@ -123,11 +123,11 @@ function makePropTable(idx) {
var num = 0; var num = 0;
var tags = ""; var tags = "";
for(var i in field_data[idx].prop) { for (var i in field_data[idx].prop) {
num++; num++;
if(num % 2 == 0){ if (num % 2 == 0) {
tags += "<th>" + i + "</th><td>" + field_data[idx].prop[i] + "</td></tr>"; tags += "<th>" + i + "</th><td>" + field_data[idx].prop[i] + "</td></tr>";
}else{ } else {
tags += "<tr><th>" + i + "</th><td>" + field_data[idx].prop[i] + "</td>"; tags += "<tr><th>" + i + "</th><td>" + field_data[idx].prop[i] + "</td>";
} }
} }
@ -149,16 +149,16 @@ function makePropTable(idx) {
} }
} }
function nowPagingOn(idx){ function nowPagingOn(idx) {
$(".paging_li").removeClass("fieldPagingOn") $(".paging_li").removeClass("fieldPagingOn")
$("#paging_li"+idx).attr("class", "fieldPagingOn paging_li"); $("#paging_li" + idx).attr("class", "fieldPagingOn paging_li");
} }
function makePropPaging() { function makePropPaging() {
var pagingNumber = 0; var pagingNumber = 0;
for (var idx in field_data) { for (var idx in field_data) {
pagingNumber++; pagingNumber++;
$("#fieldDataPaging").append('<li class="paging_li" id="paging_li'+idx+'" onclick="makePropTable(' + idx + ')">' + pagingNumber+ '</li>'); $("#fieldDataPaging").append('<li class="paging_li" id="paging_li' + idx + '" onclick="makePropTable(' + idx + ')">' + pagingNumber + '</li>');
} }
} }
@ -168,12 +168,12 @@ function drawingObj() {
var objFeatures = []; var objFeatures = [];
for (var idx in field_data) { for (var idx in field_data) {
var objFeature = format.readFeature(field_data[idx].WKT, { var objFeature = format.readFeature(field_data[idx].WKT, {
dataProjection : 'EPSG:5186', dataProjection: 'EPSG:5186',
featureProjection : 'EPSG:3857' featureProjection: 'EPSG:3857'
}); });
objFeature.setProperties({ objFeature.setProperties({
"idx" : idx, "idx": idx,
"selected" : false "selected": false
}); });
objFeatures.push(objFeature); objFeatures.push(objFeature);
} }

View File

@ -1,5 +1,4 @@
function fn_link_page(pageNo) {
function fn_link_page(pageNo) {
document.searchForm.pageIndex.value = pageNo; document.searchForm.pageIndex.value = pageNo;
document.searchForm.action = '/admin/history'; document.searchForm.action = '/admin/history';
document.searchForm.submit(); document.searchForm.submit();

View File

@ -1,5 +1,4 @@
function fn_link_page(pageNo) {
function fn_link_page(pageNo) {
document.searchForm.pageIndex.value = pageNo; document.searchForm.pageIndex.value = pageNo;
document.searchForm.action = '/admin/request'; document.searchForm.action = '/admin/request';
document.searchForm.submit(); document.searchForm.submit();

View File

@ -1,17 +1,16 @@
function confirmReqBtn(val) {
function confirmReqBtn(val){
$("#status").val(val); $("#status").val(val);
var msg; var msg;
if(val == 0){ if (val == 0) {
msg = "승인"; msg = "승인";
}else{ } else {
msg = "거절"; msg = "거절";
} }
if(confirm("지도사용요청을 "+msg+" 하시겠습니까?")){ if (confirm("지도사용요청을 " + msg + " 하시겠습니까?")) {
$("#updateFrm").submit(); $("#updateFrm").submit();
}else{ } else {
return false; return false;
} }
} }

View File

@ -1,19 +1,19 @@
let userInfoModal; let userInfoModal;
$(function(){ $(function () {
userInfoModal = new bootstrap.Modal(document.getElementById('userInfoModal')); userInfoModal = new bootstrap.Modal(document.getElementById('userInfoModal'));
}) })
$(document).on('click', '.userInfoModalBtn', function (){ $(document).on('click', '.userInfoModalBtn', function () {
const userid = $(this.parentNode).find(".useridTd")[0].innerText; const userid = $(this.parentNode).find(".useridTd")[0].innerText;
$.ajax({ $.ajax({
url: '/admin/userInfo/'+userid, url: '/admin/userInfo/' + userid,
type: 'GET', type: 'GET',
dataType:"html", dataType: "html",
success: function(html){ success: function (html) {
$("#userInfoModalBody").empty().append(html); $("#userInfoModalBody").empty().append(html);
userInfoModal.show(); userInfoModal.show();
}, },
error:function(){ error: function () {
} }
}); });
@ -25,31 +25,31 @@ function fn_link_page(pageNo) {
document.searchForm.submit(); document.searchForm.submit();
} }
function confirmBtn(userid, auth){ function confirmBtn(userid, auth) {
$("#userid").val(userid); $("#userid").val(userid);
$("#auth").val(auth); $("#auth").val(auth);
var msg; var msg;
if(auth === "2"){ if (auth === "2") {
msg = "승인"; msg = "승인";
}else{ } else {
msg = "삭제"; msg = "삭제";
} }
if(confirm(msg+" 처리 하시겠습니까?")){ if (confirm(msg + " 처리 하시겠습니까?")) {
$("#updateFrm").submit(); $("#updateFrm").submit();
}else{ } else {
return false; return false;
} }
} }
$(function(){ $(function () {
$("#changePw").click(function(){ $("#changePw").click(function () {
if($(this).is(":checked")){ if ($(this).is(":checked")) {
$("#password").attr("disabled", false); $("#password").attr("disabled", false);
$("#passwordCheck").attr("disabled", false); $("#passwordCheck").attr("disabled", false);
}else{ } else {
$("#password").attr("disabled", true); $("#password").attr("disabled", true);
$("#passwordCheck").attr("disabled", true); $("#passwordCheck").attr("disabled", true);
} }