DBNT
/
GGWEB
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

# Conflicts:
#	src/main/webapp/WEB-INF/jsp/admin/history.jsp
master
Hyung Geun 2022-03-16 09:48:48 +09:00
parent 425920e8e2 0b037c1a75
commit ee1f36f263
11 changed files with 337 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/mca/map/vo/UseHistoryVO.java
View File

@ -3,11 +3,29 @@ package com.mca.map.vo;
public class UseHistoryVO { public class UseHistoryVO {
private String logDate; private String logDate;
private String reqArea; private String reqArea;
private int client_type;
private int log_type;
// private String content; // private String content;
private String userid; private String userid;
private String name; private String name;
private String company; private String company;
public int getClient_type() {
return client_type;
}
public void setClient_type(int client_type) {
this.client_type = client_type;
}
public int getLog_type() {
return log_type;
}
public void setLog_type(int log_type) {
this.log_type = log_type;
}
public String getLogDate() { public String getLogDate() {
return logDate; return logDate;
} }

64
src/main/resources/egovframework/sqlmap/mappers/map/useHistory.xml
View File

@ -6,26 +6,29 @@
<select id="selectUseHistoryList" parameterType="useHistorySearchVO" resultType="useHistoryVO" > <select id="selectUseHistoryList" parameterType="useHistorySearchVO" resultType="useHistoryVO" >
SELECT SELECT
log_date AS logDate, log_date AS logDate,
req_area AS reqArea, client_type,
a.userid, log_type,
b.name, req_area AS reqArea,
b.company a.userid,
b.name,
b.company
FROM FROM
map_use_history a JOIN t_user b ON a.userid=b.userid map_use_history a JOIN t_user b ON a.userid=b.userid
WHERE 1 = '1' <where>
<if test='searchKeyword != null and searchKeyword != ""'> <if test='searchKeyword != null and searchKeyword != ""'>
<choose> <choose>
<when test='searchCondition eq "all"'> <when test='searchCondition eq "all"'>
AND (b.name LIKE CONCAT('%',#{searchKeyword},'%') AND (b.name LIKE CONCAT('%',#{searchKeyword},'%')
OR b.company LIKE CONCAT('%',#{searchKeyword},'%') OR b.company LIKE CONCAT('%',#{searchKeyword},'%')
OR a.req_area LIKE CONCAT('%',#{searchKeyword},'%')) OR a.req_area LIKE CONCAT('%',#{searchKeyword},'%'))
</when> </when>
<otherwise> <otherwise>
AND ${searchCondition} LIKE CONCAT('%',#{searchKeyword},'%') AND ${searchCondition} LIKE CONCAT('%',#{searchKeyword},'%')
</otherwise> </otherwise>
</choose> </choose>
</if> </if>
</where>
ORDER BY log_date DESC ORDER BY log_date DESC
LIMIT #{recordCountPerPage} OFFSET #{firstIndex} LIMIT #{recordCountPerPage} OFFSET #{firstIndex}
</select> </select>
@ -47,19 +50,20 @@
COUNT(*) COUNT(*)
FROM FROM
map_use_history a JOIN t_user b ON a.userid=b.userid map_use_history a JOIN t_user b ON a.userid=b.userid
WHERE 1 = 1 <where>
<if test='searchKeyword != null and searchKeyword != ""'> <if test='searchKeyword != null and searchKeyword != ""'>
<choose> <choose>
<when test='searchCondition eq "all"'> <when test='searchCondition eq "all"'>
AND (b.name LIKE CONCAT('%',#{searchKeyword},'%') AND (b.name LIKE CONCAT('%',#{searchKeyword},'%')
OR b.company LIKE CONCAT('%',#{searchKeyword},'%') OR b.company LIKE CONCAT('%',#{searchKeyword},'%')
OR a.req_area LIKE CONCAT('%',#{searchKeyword},'%')) OR a.req_area LIKE CONCAT('%',#{searchKeyword},'%'))
</when> </when>
<otherwise> <otherwise>
AND ${searchCondition} LIKE CONCAT('%',#{searchKeyword},'%') AND ${searchCondition} LIKE CONCAT('%',#{searchKeyword},'%')
</otherwise> </otherwise>
</choose> </choose>
</if> </if>
</where>
</select> </select>
<select id="selectDayMapUseData" parameterType="useHistorySearchVO" resultType="ChartVO" > <select id="selectDayMapUseData" parameterType="useHistorySearchVO" resultType="ChartVO" >

6
src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp
View File

@ -87,7 +87,7 @@
</div> </div>
<div class="col-lg-9"> <div class="col-lg-9">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-lg-12">
<div class="card my-2"> <div class="card my-2">
<div class="card-body"> <div class="card-body">
<p class="mb-0 text-black-50">지도사용 이력 추이</p> <p class="mb-0 text-black-50">지도사용 이력 추이</p>
@ -95,7 +95,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-5"> <div class="col-lg-5">
<div class="card my-2"> <div class="card my-2">
<div class="card-body"> <div class="card-body">
<div class="col-auto"> <div class="col-auto">
@ -105,7 +105,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-7"> <div class="col-lg-7">
<div class="card my-2"> <div class="card my-2">
<div class="card-body"> <div class="card-body">
<div class="col-auto"> <div class="col-auto">

172
src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp
View File

@ -19,39 +19,35 @@
<div class="mx-lg-2"> <div class="mx-lg-2">
<h1 class="h4 m-3"> 현장수집 데이터</h1> <h1 class="h4 m-3"> 현장수집 데이터</h1>
<form:form commandName="fieldDataSearchVO" name="searchForm" action="/admin/fieldData" method="get"> <form:form commandName="fieldDataSearchVO" name="searchForm" action="/admin/fieldData" method="get">
<div class="row justify-content-between bg-white mx-3 py-2"> <div class="row justify-content-between bg-white mx-3">
<div class="col-auto"> <div class="col-auto py-2">
<ul class="nav"> <ul class="nav">
<li class="nav-item statusTab"> <li class="nav-item statusTab">
<a class="nav-link ${fieldDataSearchVO.status0 eq 1?'active':'disabled'}" href="#"> <a class="nav-link px-2 ${fieldDataSearchVO.status0 eq 1?'active':'disabled'}" href="#">
<input type="checkbox" class="statusChkBox d-none" name="status0" id="status0" <input type="checkbox" class="statusChkBox d-none" name="status0" id="status0" value="1" ${fieldDataSearchVO.status0 eq 1?'checked':''}>
value="1" ${fieldDataSearchVO.status0 eq 1?'checked':''}>
<label for="status0">수집</label> <label for="status0">수집</label>
</a> </a>
</li> </li>
<li class="nav-item statusTab"> <li class="nav-item statusTab">
<a class="nav-link ${fieldDataSearchVO.status1 eq 1?'active':'disabled'}" href="#"> <a class="nav-link px-2 ${fieldDataSearchVO.status1 eq 1?'active':'disabled'}" href="#">
<input type="checkbox" class="statusChkBox d-none" name="status1" id="status1" <input type="checkbox" class="statusChkBox d-none" name="status1" id="status1" value="1" ${fieldDataSearchVO.status1 eq 1?'checked':''}>
value="1" ${fieldDataSearchVO.status1 eq 1?'checked':''}>
<label for="status1">검증실패</label> <label for="status1">검증실패</label>
</a> </a>
</li> </li>
<li class="nav-item statusTab"> <li class="nav-item statusTab">
<a class="nav-link ${fieldDataSearchVO.status2 eq 1?'active':'disabled'}" href="#"> <a class="nav-link px-2 ${fieldDataSearchVO.status2 eq 1?'active':'disabled'}" href="#">
<input type="checkbox" class="statusChkBox d-none" name="status2" id="status2" <input type="checkbox" class="statusChkBox d-none" name="status2" id="status2" value="1" ${fieldDataSearchVO.status2 eq 1?'checked':''}>
value="1" ${fieldDataSearchVO.status2 eq 1?'checked':''}>
<label for="status2">검증</label> <label for="status2">검증</label>
</a> </a>
</li> </li>
<li class="nav-item statusTab"> <li class="nav-item statusTab">
<a class="nav-link ${fieldDataSearchVO.status3 eq 1?'active':'disabled'}"> <a class="nav-link px-2 ${fieldDataSearchVO.status3 eq 1?'active':'disabled'}">
<input type="checkbox" class="statusChkBox d-none" name="status3" id="status3" <input type="checkbox" class="statusChkBox d-none" name="status3" id="status3" value="1" ${fieldDataSearchVO.status3 eq 1?'checked':''}>
value="1" ${fieldDataSearchVO.status3 eq 1?'checked':''}>
<label for="status3">반영실패</label> <label for="status3">반영실패</label>
</a> </a>
</li> </li>
<li class="nav-item statusTab"> <li class="nav-item statusTab">
<a class="nav-link ${fieldDataSearchVO.status4 eq 1?'active':'disabled'}" href="#"> <a class="nav-link px-2 ${fieldDataSearchVO.status4 eq 1?'active':'disabled'}" href="#">
<input type="checkbox" class="statusChkBox d-none" name="status4" id="status4" <input type="checkbox" class="statusChkBox d-none" name="status4" id="status4"
value="1" ${fieldDataSearchVO.status4 eq 1?'checked':''}> value="1" ${fieldDataSearchVO.status4 eq 1?'checked':''}>
<label for="status4">반영</label> <label for="status4">반영</label>
@ -60,8 +56,8 @@
</ul> </ul>
</div> </div>
<div class="col-auto row"> <div class="col-auto py-2 row">
<div class="col-auto"> <div class="col-12 col-sm-4">
<select class="form-select" name="searchCondition"> <select class="form-select" name="searchCondition">
<option <c:if test="${fieldDataSearchVO.searchCondition eq 'all'}"><c:out <option <c:if test="${fieldDataSearchVO.searchCondition eq 'all'}"><c:out
value="selected"/></c:if> value="all">통합검색 value="selected"/></c:if> value="all">통합검색
@ -78,57 +74,114 @@
</select> </select>
</div> </div>
<div class="col-auto"> <div class="col-9 col-sm-5">
<input type="text" class="form-control" name="searchKeyword" <input type="text" class="form-control" name="searchKeyword"
value="${fieldDataSearchVO.searchKeyword}"/> value="${fieldDataSearchVO.searchKeyword}"/>
</div> </div>
<div class="col-auto"> <div class="col-3 col-sm-3">
<input class="btn btn-outline-secondary" type="submit" value="검색"/> <input class="btn btn-outline-secondary w-100" type="submit" value="검색"/>
</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"> <div class="col-12 d-none d-sm-block">
<thead> <table class="table table-hover text-center">
<tr> <thead>
<th>Data ID</th>
<th>지역</th>
<th>소속</th>
<th>담당자</th>
<th>수집날짜</th>
<th>상태</th>
</tr>
</thead>
<tbody>
<c:if test="${count >= 1}">
<c:forEach var="item" items="${fieldDataList}">
<tr class="clickAbleObj fieldDataTr" data-id="${item.id}">
<%--<a href="/admin/fieldData/${item.id}">--%>
<td><c:out value="${item.id}"/></td>
<td><c:out value="${item.region}"/></td>
<td><c:out value="${item.userVO.company}"/></td>
<td><c:out value="${item.userVO.name}"/></td>
<td class="td_date"><c:out value="${item.save_date}"/></td>
<td>
<c:choose>
<c:when test="${item.status eq '0'}"><span class="status-bar status-warning">수집</span> </c:when>
<c:when test="${item.status eq '1'}"><span class="status-bar status-danger">검증실패</span> </c:when>
<c:when test="${item.status eq '2'}"><span class="status-bar status-warning">검증</span> </c:when>
<c:when test="${item.status eq '3'}"><span class="status-bar status-danger">반영실패</span> </c:when>
<c:when test="${item.status eq '4'}"><span class="status-bar status-success">반영</span> </c:when>
</c:choose>
</td>
</tr>
</c:forEach>
</c:if>
<c:if test="${count == 0}">
<tr> <tr>
<td colspan="4">요청한 목록이 없습니다.</td> <th>Data ID</th>
<th>지역</th>
<th>소속</th>
<th>담당자</th>
<th>수집날짜</th>
<th>상태</th>
</tr> </tr>
</c:if> </thead>
</tbody> <tbody>
</table> <c:if test="${count >= 1}">
<c:forEach var="item" items="${fieldDataList}">
<tr class="clickAbleObj fieldDataTr" data-id="${item.id}">
<%--<a href="/admin/fieldData/${item.id}">--%>
<td><c:out value="${item.id}"/></td>
<td><c:out value="${item.region}"/></td>
<td><c:out value="${item.userVO.company}"/></td>
<td><c:out value="${item.userVO.name}"/></td>
<td class="td_date"><c:out value="${item.save_date}"/></td>
<td>
<c:choose>
<c:when test="${item.status eq '0'}"><span class="status-bar status-warning">수집</span> </c:when>
<c:when test="${item.status eq '1'}"><span class="status-bar status-danger">검증실패</span> </c:when>
<c:when test="${item.status eq '2'}"><span class="status-bar status-warning">검증</span> </c:when>
<c:when test="${item.status eq '3'}"><span class="status-bar status-danger">반영실패</span> </c:when>
<c:when test="${item.status eq '4'}"><span class="status-bar status-success">반영</span> </c:when>
</c:choose>
</td>
</tr>
</c:forEach>
</c:if>
<c:if test="${count == 0}">
<tr>
<td colspan="4">요청한 목록이 없습니다.</td>
</tr>
</c:if>
</tbody>
</table>
</div>
<div class="col-12 d-block d-sm-none">
<table class="table table-hover text-center">
<tbody class="border-0 border-top border-bottom border-2 border-dark">
<c:if test="${count >= 1}">
<c:forEach var="item" items="${fieldDataList}">
<%--
<th></th>
<th>지역</th>
<th>소속</th>
<th></th>
<th></th>
<th></th>--%>
<tr class="clickAbleObj fieldDataTr" data-id="${item.id}">
<th class="bg-secondary" style="--bs-bg-opacity: .5">Data ID</th>
<td><c:out value="${item.id}"/></td>
</tr>
<tr class="clickAbleObj fieldDataTr" data-id="${item.id}">
<th class="bg-secondary" style="--bs-bg-opacity: .5">지역</th>
<td><c:out value="${item.region}"/></td>
</tr>
<tr class="clickAbleObj fieldDataTr" data-id="${item.id}">
<th class="bg-secondary" style="--bs-bg-opacity: .5">소속</th>
<td><c:out value="${item.userVO.company}"/></td>
</tr>
<tr class="clickAbleObj fieldDataTr" data-id="${item.id}">
<th class="bg-secondary" style="--bs-bg-opacity: .5">담당자</th>
<td><c:out value="${item.userVO.name}"/></td>
</tr>
<tr class="clickAbleObj fieldDataTr" data-id="${item.id}">
<th class="bg-secondary" style="--bs-bg-opacity: .5">수집날짜</th>
<td class="td_date"><c:out value="${item.save_date}"/></td>
</tr>
<tr class="clickAbleObj fieldDataTr border-0 border-bottom border-2 border-dark" data-id="${item.id}">
<th class="bg-secondary" style="--bs-bg-opacity: .5">상태</th>
<td>
<c:choose>
<c:when test="${item.status eq '0'}"><span class="status-bar status-warning">수집</span> </c:when>
<c:when test="${item.status eq '1'}"><span class="status-bar status-danger">검증실패</span> </c:when>
<c:when test="${item.status eq '2'}"><span class="status-bar status-warning">검증</span> </c:when>
<c:when test="${item.status eq '3'}"><span class="status-bar status-danger">반영실패</span> </c:when>
<c:when test="${item.status eq '4'}"><span class="status-bar status-success">반영</span> </c:when>
</c:choose>
</td>
</tr>
</c:forEach>
</c:if>
<c:if test="${count == 0}">
<tr>
<td>요청한 목록이 없습니다.</td>
</tr>
</c:if>
</tbody>
</table>
</div>
</div> </div>
<div class="text-page"> <div class="text-page">
@ -143,8 +196,7 @@
</div> </div>
<div class="modal fade" id="fieldViewModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" <div class="modal fade" id="fieldViewModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="fieldViewModalLabel" aria-hidden="true">
aria-labelledby="fieldViewModalLabel" aria-hidden="true">
<div class="modal-dialog modal-xl"> <div class="modal-dialog modal-xl">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">

164
src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp
View File

@ -8,84 +8,85 @@
field_data = JSON.parse('${fieldDataVO.field_data}'); field_data = JSON.parse('${fieldDataVO.field_data}');
</script> </script>
<div class="section_content"> <div class="section_content">
<div class="row justify-content-end bg-white mx-3 py-2"> <div class="row bg-white py-2">
<div class="col-12 row"> <div class="col-12 row justify-content-end">
<div class="col-12 row justify-content-end"> <div class="col-auto">
<div class="col-auto"> <input type="button" class="btn btn-sm btn-info" id="collectionInfoBtn" value="수집 정보 확인">
<input type="button" class="btn btn-sm btn-info" id="collectionInfoBtn" value="수집 정보 확인">
</div>
</div> </div>
<div class="col-4 collectionInfo" style="display: none;"> </div>
<h5><i class="bi bi-dot"></i> 작성자 정보</h5>
<div class="row mb-3 mx-2 border border-dark border-start-0 border-end-0"> <div class="col-12 col-sm-4 collectionInfo" style="display: none;">
<label for="company" class="col-4 col-form-label fw-bold text-end bg-secondary border-bottom" style="--bs-bg-opacity: .5">소속</label> <h5><i class="bi bi-dot"></i> 작성자 정보</h5>
<div class="col-8 border-bottom"> <div class="row mb-3 mx-2 border border-dark border-start-0 border-end-0">
<input type="text" class="form-control bg-white border-0" id="company" placeholder="col-form-label" value="${userVO.company}" readonly> <label for="company" class="col-4 col-form-label fw-bold text-end bg-secondary border-bottom" style="--bs-bg-opacity: .5">소속</label>
</div> <div class="col-8 border-bottom">
<label for="name" class="col-4 col-form-label fw-bold text-end bg-secondary border-bottom" style="--bs-bg-opacity: .5">이름</label> <input type="text" class="form-control bg-white border-0" id="company" placeholder="col-form-label" value="${userVO.company}" readonly>
<div class="col-8 border-bottom">
<input type="text" class="form-control bg-white border-0" id="name" placeholder="col-form-label" value="${userVO.name}" readonly>
</div>
<label for="phonenum" class="col-4 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">연락처</label>
<div class="col-8 border-bottom">
<input type="text" class="form-control bg-white border-0" id="phonenum" placeholder="col-form-label" value="${userVO.phonenum}" readonly>
</div>
</div> </div>
</div> <label for="name" class="col-4 col-form-label fw-bold text-end bg-secondary border-bottom" style="--bs-bg-opacity: .5">이름</label>
<div class="col-8 collectionInfo" style="display: none;"> <div class="col-8 border-bottom">
<h5><i class="bi bi-dot"></i> 지도 정보</h5> <input type="text" class="form-control bg-white border-0" id="name" placeholder="col-form-label" value="${userVO.name}" readonly>
<div class="row mb-3 mx-2 border border-dark border-start-0 border-end-0"> </div>
<label for="layer_id" class="col-2 col-form-label fw-bold text-end bg-secondary border-bottom" style="--bs-bg-opacity: .5">레이어 ID</label> <label for="phonenum" class="col-4 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">연락처</label>
<div class="col-4 border-bottom"> <div class="col-8 border-bottom">
<input type="text" class="form-control bg-white border-0" id="layer_id" placeholder="col-form-label" value="${fieldDataVO.layer_id}" readonly> <input type="text" class="form-control bg-white border-0" id="phonenum" placeholder="col-form-label" value="${userVO.phonenum}" readonly>
</div>
<label for="save_date" class="col-2 col-form-label fw-bold text-end bg-secondary border-bottom" style="--bs-bg-opacity: .5">수집일</label>
<div class="col-4 border-bottom">
<input type="text" class="form-control bg-white border-0" id="save_date" placeholder="col-form-label" value="${fieldDataVO.save_date}" readonly>
</div>
<label for="region" class="col-2 col-form-label fw-bold text-end bg-secondary border-bottom" style="--bs-bg-opacity: .5">지역</label>
<div class="col-4 border-bottom">
<input type="text" class="form-control bg-white border-0" id="region" placeholder="col-form-label" value="${fieldDataVO.region}" readonly>
</div>
<label class="col-2 col-form-label fw-bold text-end bg-secondary border-bottom" style="--bs-bg-opacity: .5">상태</label>
<div class="col-4 border-bottom my-auto">
<c:choose>
<c:when test="${fieldDataVO.status eq '0'}">
<span class="status-bar status-warning ms-2 w-50 text-center">수집</span>
</c:when>
<c:when test="${fieldDataVO.status eq '1'}">
<span class="status-bar status-danger ms-2 w-50 text-center">검증실패</span>
</c:when>
<c:when test="${fieldDataVO.status eq '2'}">
<span class="status-bar status-success ms-2 w-50 text-center">검증성공</span>
</c:when>
<c:when test="${fieldDataVO.status eq '3'}">
<span class="status-bar status-danger ms-2 w-50 text-center">반영실패</span>
</c:when>
<c:when test="${fieldDataVO.status eq '4'}">
<span class="status-bar status-success ms-2 w-50 text-center">반영</span>
</c:when>
</c:choose>
</div>
<label for="description" class="col-2 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">설명</label>
<div class="col-4 border-bottom">
<input type="text" class="form-control bg-white border-0" id="description" readonly>
</div>
<label for="errInfo" class="col-2 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">오류내용</label>
<div class="col-4 border-bottom">
<input type="text" class="form-control bg-white border-0" id="errInfo" readonly>
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-12 col-sm-8 collectionInfo" style="display: none;">
<h5><i class="bi bi-dot"></i> 지도 정보</h5>
<div class="row mb-3 mx-2 border border-dark border-start-0 border-end-0">
<label for="layer_id" class="col-4 col-sm-2 col-form-label fw-bold text-end bg-secondary border-bottom" style="--bs-bg-opacity: .5">레이어 ID</label>
<div class="col-8 col-sm-4 border-bottom">
<input type="text" class="form-control bg-white border-0" id="layer_id" placeholder="col-form-label" value="${fieldDataVO.layer_id}" readonly>
</div>
<label for="save_date" class="col-4 col-sm-2 col-form-label fw-bold text-end bg-secondary border-bottom" style="--bs-bg-opacity: .5">수집일</label>
<div class="col-8 col-sm-4 border-bottom">
<input type="text" class="form-control bg-white border-0" id="save_date" placeholder="col-form-label" value="${fieldDataVO.save_date}" readonly>
</div>
<label for="region" class="col-4 col-sm-2 col-form-label fw-bold text-end bg-secondary border-bottom" style="--bs-bg-opacity: .5">지역</label>
<div class="col-8 col-sm-4 border-bottom">
<input type="text" class="form-control bg-white border-0" id="region" placeholder="col-form-label" value="${fieldDataVO.region}" readonly>
</div>
<label class="col-4 col-sm-2 col-form-label fw-bold text-end bg-secondary border-bottom" style="--bs-bg-opacity: .5">상태</label>
<div class="col-8 col-sm-4 border-bottom my-auto">
<c:choose>
<c:when test="${fieldDataVO.status eq '0'}">
<span class="status-bar status-warning ms-2 w-50 text-center">수집</span>
</c:when>
<c:when test="${fieldDataVO.status eq '1'}">
<span class="status-bar status-danger ms-2 w-50 text-center">검증실패</span>
</c:when>
<c:when test="${fieldDataVO.status eq '2'}">
<span class="status-bar status-success ms-2 w-50 text-center">검증성공</span>
</c:when>
<c:when test="${fieldDataVO.status eq '3'}">
<span class="status-bar status-danger ms-2 w-50 text-center">반영실패</span>
</c:when>
<c:when test="${fieldDataVO.status eq '4'}">
<span class="status-bar status-success ms-2 w-50 text-center">반영</span>
</c:when>
</c:choose>
</div>
<label for="description" class="col-4 col-sm-2 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">설명</label>
<div class="col-8 col-sm-4 border-bottom">
<input type="text" class="form-control bg-white border-0" id="description" readonly>
</div>
<label for="errInfo" class="col-4 col-sm-2 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">오류내용</label>
<div class="col-8 col-sm-4 border-bottom">
<input type="text" class="form-control bg-white border-0" id="errInfo" readonly>
</div>
</div>
</div>
<div class="col-12 row"> <div class="col-12 row">
<div class="col-7"> <div class="col-12 col-sm-7">
<h5><i class="bi bi-dot"></i> 측량 데이터</h5> <h5><i class="bi bi-dot"></i> 측량 데이터</h5>
<div class="map mx-2" id="map"> <div class="map mx-2" id="map">
</div> </div>
</div> </div>
<div class="col-5"> <div class="col-12 col-sm-5">
<h5><i class="bi bi-dot"></i> 속성 정보</h5> <h5><i class="bi bi-dot"></i> 속성 정보</h5>
<div id="fieldDataDiv" class="mx-2 border border-dark border-start-0 border-end-0"> <div id="fieldDataDiv" class="mx-2 border border-dark border-start-0 border-end-0">
<table class="table table-hover"> <table class="table table-hover">
@ -98,36 +99,13 @@
<div class="col-12"> <div class="col-12">
<ul id="fieldDataPaging" class="fieldDataPaging"></ul> <ul id="fieldDataPaging" class="fieldDataPaging"></ul>
</div> </div>
<%--<ul class="nav nav-tabs" id="myTab" role="tablist">
<li class="nav-item" role="presentation">
<button class="nav-link active" id="home-tab" data-bs-toggle="tab" data-bs-target="#home" type="button" role="tab" aria-controls="home" aria-selected="true">측량데이터</button>
</li>
<li class="nav-item" role="presentation">
<button class="nav-link" id="profile-tab" data-bs-toggle="tab" data-bs-target="#profile" type="button" role="tab" aria-controls="profile" aria-selected="false">속성정보</button>
</li>
</ul>
<div class="tab-content" id="myTabContent">
<div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="home-tab">
<div class="map" id="map">
</div>
</div>
<div class="tab-pane fade" id="profile" role="tabpanel" aria-labelledby="profile-tab">
<table class="fieldDataTable" id="fieldDataTable">
<tbody id="fieldDataBody">
</tbody>
</table>
</div>
</div>
<ul id="fieldDataPaging" class="fieldDataPaging"></ul>--%>
</div> </div>
</div> </div>
<div class="section_btn"> <div class="row justify-content-between">
<p class="search_p1"> <p class="col-auto">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button> <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
</p> </p>
<p class="search_p2"> <p class="col-auto">
<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>

77
src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp
View File

@ -15,8 +15,8 @@
<h1 class="h4 m-3">회원관리</h1> <h1 class="h4 m-3">회원관리</h1>
<form:form commandName="userSearchVO" name="searchForm" action="/admin/userInfo" method="get"> <form:form commandName="userSearchVO" name="searchForm" action="/admin/userInfo" method="get">
<div class="row justify-content-between bg-white mx-3 py-2"> <div class="row justify-content-between bg-white mx-3">
<div class="col-auto"> <div class="col-auto py-2">
<ul class="nav nav-pills ms-2" role="tablist"> <ul class="nav nav-pills ms-2" role="tablist">
<li role="presentation" class="nav-item"> <li role="presentation" class="nav-item">
<a class="nav-link ${userSearchVO.auth eq '99'?'active':''}" href="/admin/userInfo?auth=99">승인대기(${standByCount})</a> <a class="nav-link ${userSearchVO.auth eq '99'?'active':''}" href="/admin/userInfo?auth=99">승인대기(${standByCount})</a>
@ -28,8 +28,8 @@
<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 py-2 row">
<div class="col-auto"> <div class="col-12 col-sm-4">
<select class="form-select" name="searchCondition"> <select class="form-select" name="searchCondition">
<option value="all" ${userSearchVO.searchCondition eq 'all'?'selected':''}>통합검색</option> <option value="all" ${userSearchVO.searchCondition eq 'all'?'selected':''}>통합검색</option>
<option value="name" ${userSearchVO.searchCondition eq 'name'?'selected':''}>이름</option> <option value="name" ${userSearchVO.searchCondition eq 'name'?'selected':''}>이름</option>
@ -38,18 +38,16 @@
<option value="phonenum" ${userSearchVO.searchCondition eq 'phonenum'?'selected':''}>전화번호</option> <option value="phonenum" ${userSearchVO.searchCondition eq 'phonenum'?'selected':''}>전화번호</option>
</select> </select>
</div> </div>
<div class="col-9 col-sm-5">
<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-3 col-sm-3">
<input class="btn btn-outline-secondary" type="submit" value="검색"/> <input class="btn btn-outline-secondary w-100" type="submit" value="검색"/>
</div> </div>
</div> </div>
</div> </div>
<div class="row m-3 p-2 bg-white"> <div class="row m-3 p-2 bg-white">
<div class="col-12 d-none d-sm-block">
<table class="table table-hover text-center"> <table class="table table-hover text-center">
<thead> <thead>
<tr> <tr>
@ -65,8 +63,8 @@
<tbody> <tbody>
<c:if test="${count >= 1}"> <c:if test="${count >= 1}">
<c:forEach var="user" items="${userList}" varStatus="idx"> <c:forEach var="user" items="${userList}" varStatus="idx">
<tr> <tr data-userid="${user.userid}">
<td class="clickAbleObj userInfoModalBtn useridTd"><c:out value='${user.userid}'/></td> <td class="clickAbleObj userInfoModalBtn"><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>
@ -94,6 +92,61 @@
</c:if> </c:if>
</tbody> </tbody>
</table> </table>
</div>
<div class="col-12 d-block d-sm-none">
<table class="table table-hover text-center">
<tbody class="border-0 border-top border-bottom border-2 border-dark">
<c:if test="${count >= 1}">
<c:forEach var="user" items="${userList}" varStatus="idx">
<tr class="clickAbleObj userInfoModalBtn border-bottom" data-userid="${user.userid}">
<th class="bg-secondary" style="--bs-bg-opacity: .5">아이디</th>
<td><c:out value='${user.userid}'/></td>
</tr>
<tr class="clickAbleObj userInfoModalBtn border-bottom" data-userid="${user.userid}">
<th class="bg-secondary" style="--bs-bg-opacity: .5">이름</th>
<td><c:out value='${user.name}'/></td>
</tr>
<tr class="clickAbleObj userInfoModalBtn border-bottom" data-userid="${user.userid}">
<th class="bg-secondary" style="--bs-bg-opacity: .5">소속</th>
<td><c:out value='${user.company}'/></td>
</tr>
<tr class="clickAbleObj userInfoModalBtn border-bottom" data-userid="${user.userid}">
<th class="bg-secondary" style="--bs-bg-opacity: .5">전화번호</th>
<td><c:out value='${user.phonenum}'/></td>
</tr>
<tr class="clickAbleObj userInfoModalBtn border-bottom" data-userid="${user.userid}">
<th class="bg-secondary" style="--bs-bg-opacity: .5">이메일</th>
<td><c:out value='${user.email}'/></td>
</tr>
<tr class="clickAbleObj userInfoModalBtn border-bottom" data-userid="${user.userid}">
<th class="bg-secondary" style="--bs-bg-opacity: .5">가입일</th>
<td class="td_date"><c:out value='${user.regdate}'/></td>
</tr>
<tr class="border-0 border-bottom border-2 border-dark">
<th class="bg-secondary" style="--bs-bg-opacity: .5">${userSearchVO.auth eq '99'?'상태':'권한'}</th>
<td>
<c:choose>
<c:when test="${user.auth eq '1'}">관리자</c:when>
<c:when test="${user.auth eq '2'}">사용자</c:when>
<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-danger" value="삭제"
onclick="confirmBtn('${user.userid}','-1'); return false;"/>
</c:when>
</c:choose>
</td>
</tr>
</c:forEach>
</c:if>
<c:if test="${count == 0}">
<tr>
<td>요청한 목록이 없습니다.</td>
</tr>
</c:if>
</tbody>
</table>
</div>
</div> </div>
<div class="text-page"> <div class="text-page">
<form:hidden path="pageIndex"/> <form:hidden path="pageIndex"/>

2
src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp
View File

@ -4,7 +4,7 @@
<%@ 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 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}"/>

20
src/main/webapp/WEB-INF/jsp/map/requestView.jsp
View File

@ -134,10 +134,8 @@
<td colspan="1" class="text-center" > <td colspan="1" class="text-center" >
<c:if test="${useRequestVO.status ne '99' }"> <c:if test="${useRequestVO.status ne '99' }">
<c:choose> <c:choose>
<c:when test="${useRequestVO.status eq '0' }"><span class="label label-success"> <c:when test="${useRequestVO.status eq '0' }"><span class="label label-success"><c:out value='사용중' /></span></c:when>
<c:out value='사용중' /></span></c:when> <c:otherwise><span class="label label-danger"><c:out value='사용불가' /></span></c:otherwise>
<c:otherwise><span class="label label-danger">
<c:out value='사용불가' /></span></c:otherwise>
</c:choose> </c:choose>
</c:if> </c:if>
</td> </td>
@ -160,15 +158,17 @@
<th rowspan="3" colspan="1">레이어</th> <th rowspan="3" colspan="1">레이어</th>
<th><label>지하시설물</label></th> <th><label>지하시설물</label></th>
<td colspan="4"> <td colspan="4">
<%-- <div class="setting_content2" class="facility">--%> <div class="setting_content2" 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"><input type="checkbox" class="me-2" name="${item.code}" id="${item.code}" disabled="disabled" value="${item.layer}" <c:forEach var="item2" items="${layers}" varStatus="status2"> <label class="layer-label">
<c:if test="${item.layer eq item2}"> <input type="checkbox" class="me-2" name="${item.code}" id="${item.code}" disabled="disabled" value="${item.layer}"
checked <c:forEach var="item2" items="${layers}" varStatus="status2">
</c:if> <c:if test="${item.layer eq item2}">
</c:forEach> checked
</c:if>
</c:forEach>
/>${item.name} />${item.name}
</label> </label>
</c:if> </c:if>

13
src/main/webapp/css/style.css
View File

@ -19,17 +19,13 @@ a {
padding-top: 10px; padding-top: 10px;
} }
.text-center {
text-align: center;
}
.point-cursor { .point-cursor {
cursor: pointer; cursor: pointer;
} }
.header { .header {
/*background: url('/images/header_bg.png') no-repeat;*/ /*background: url('/images/header_bg.png') no-repeat;*/
background-color: #5c5c5c; background-color: var(--bs-secondary);
background-size: cover; background-size: cover;
height: 70px; height: 70px;
position: fixed; position: fixed;
@ -44,7 +40,7 @@ a {
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
background: #5c5c5c; background: var(--bs-secondary);
height: auto; height: auto;
width: 200px; width: 200px;
min-width: inherit; min-width: inherit;
@ -232,10 +228,7 @@ a {
.setting_content2 { .setting_content2 {
width: 100%; width: 100%;
margin-top: 10px;
justify-content: space-between; justify-content: space-between;
line-height: 3;
} }
.setting_sub_title { .setting_sub_title {
@ -682,7 +675,7 @@ a {
.layer-label { .layer-label {
width: 140px; width: 140px;
display: inline-block; display: inline-block;
line-height: 50px; line-height: 30px;
margin-left: 20px; margin-left: 20px;
} }

20
src/main/webapp/js/admin/dashBoard.js
View File

@ -1,11 +1,29 @@
const smSize = 575;
let beforeSize;
window.onresize = function (){
const nowWidth = this.innerWidth;
if(beforeSize>smSize&&nowWidth<smSize){
loadChart(nowWidth)
}else if(beforeSize<smSize&&nowWidth>smSize){
loadChart(nowWidth)
}else if(beforeSize+100<nowWidth){
loadChart(nowWidth)
}else if(beforeSize>nowWidth+100){
loadChart(nowWidth)
}
}
$(function (){ $(function (){
loadChart(window.innerWidth)
})
function loadChart(nowWidth){
beforeSize = nowWidth;
google.charts.load('current', {packages: ['bar']}); google.charts.load('current', {packages: ['bar']});
google.charts.setOnLoadCallback(drawMapUseFromDayChart); google.charts.setOnLoadCallback(drawMapUseFromDayChart);
google.charts.load('current', {packages: ['corechart']}); google.charts.load('current', {packages: ['corechart']});
google.charts.setOnLoadCallback(drawAreaDonutChart); google.charts.setOnLoadCallback(drawAreaDonutChart);
google.charts.load('current', {packages:['line']}); google.charts.load('current', {packages:['line']});
google.charts.setOnLoadCallback(drawTempChart); google.charts.setOnLoadCallback(drawTempChart);
}) }
function drawMapUseFromDayChart() { function drawMapUseFromDayChart() {
var dataHeader = [['날짜', '사용량']]; var dataHeader = [['날짜', '사용량']];

2
src/main/webapp/js/admin/userinfo.js
View File

@ -4,7 +4,7 @@ $(function () {
}) })
$(document).on('click', '.userInfoModalBtn', function () { $(document).on('click', '.userInfoModalBtn', function () {
const userid = $(this.parentNode).find(".useridTd")[0].innerText; const userid = $(this.parentNode).attr("data-userid");
$.ajax({ $.ajax({
url: '/admin/userInfo/' + userid, url: '/admin/userInfo/' + userid,
type: 'GET', type: 'GET',