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

현장수집 데이터 모달 양식 수정

master
강석 최 2022-03-11 18:00:56 +09:00
parent 74263cf57d
commit 8cb819d3c3
3 changed files with 106 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,68 +9,96 @@
</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 justify-content-end bg-white mx-3 py-2">
<div class="col-4"> <div class="col-12 row">
<h5><i class="bi bi-dot"></i> 작성자 정보</h5> <div class="col-12 row justify-content-end">
<div class="row mb-3 border border-dark border-start-0 border-end-0"> <div class="col-auto">
<label for="company" class="col-4 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">소속</label> <input type="button" class="btn btn-sm btn-info" id="collectionInfoBtn" value="수집 정보 확인">
<div class="col-8 border-bottom">
<input type="text" class="form-control bg-white border-0" id="company" placeholder="col-form-label" value="${userVO.company}" readonly>
</div>
<label for="name" 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="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>
<h5><i class="bi bi-dot"></i> 지도 정보</h5> <div class="col-4 collectionInfo" style="display: none;">
<div class="row mb-3 border border-dark border-start-0 border-end-0"> <h5><i class="bi bi-dot"></i> 작성자 정보</h5>
<label for="layer_id" class="col-4 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">레이어 ID</label> <div class="row mb-3 mx-2 border border-dark border-start-0 border-end-0">
<div class="col-8 border-bottom"> <label for="company" class="col-4 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">소속</label>
<input type="text" class="form-control bg-white border-0" id="layer_id" placeholder="col-form-label" value="${fieldDataVO.layer_id}" readonly> <div class="col-8 border-bottom">
<input type="text" class="form-control bg-white border-0" id="company" placeholder="col-form-label" value="${userVO.company}" readonly>
</div>
<label for="name" 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="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>
<label for="save_date" class="col-4 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">수집일</label> </div>
<div class="col-8 border-bottom"> <div class="col-8 collectionInfo" style="display: none;">
<input type="text" class="form-control bg-white border-0" id="save_date" placeholder="col-form-label" value="${fieldDataVO.save_date}" readonly> <h5><i class="bi bi-dot"></i> 지도 정보</h5>
</div> <div class="row mb-3 mx-2 border border-dark border-start-0 border-end-0">
<label for="region" class="col-4 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">지역</label> <label for="layer_id" class="col-2 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">레이어 ID</label>
<div class="col-8 border-bottom"> <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> <input type="text" class="form-control bg-white border-0" id="layer_id" placeholder="col-form-label" value="${fieldDataVO.layer_id}" readonly>
</div> </div>
<label class="col-4 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">상태</label> <label for="save_date" class="col-2 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">수집일</label>
<div class="col-8 border-bottom my-auto"> <div class="col-4 border-bottom">
<c:choose> <input type="text" class="form-control bg-white border-0" id="save_date" placeholder="col-form-label" value="${fieldDataVO.save_date}" readonly>
<c:when test="${fieldDataVO.status eq '0'}"> </div>
<span class="card-warning ms-2 w-50 text-center">수집</span> <label for="region" class="col-2 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">지역</label>
</c:when> <div class="col-4 border-bottom">
<c:when test="${fieldDataVO.status eq '1'}"> <input type="text" class="form-control bg-white border-0" id="region" placeholder="col-form-label" value="${fieldDataVO.region}" readonly>
<span class="card-danger ms-2 w-50 text-center">검증실패</span> </div>
</c:when> <label class="col-2 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">상태</label>
<c:when test="${fieldDataVO.status eq '2'}"> <div class="col-4 border-bottom my-auto">
<span class="card-success ms-2 w-50 text-center">검증성공</span> <c:choose>
</c:when> <c:when test="${fieldDataVO.status eq '0'}">
<c:when test="${fieldDataVO.status eq '3'}"> <span class="card-warning ms-2 w-50 text-center">수집</span>
<span class="card-danger ms-2 w-50 text-center">반영실패</span> </c:when>
</c:when> <c:when test="${fieldDataVO.status eq '1'}">
<c:when test="${fieldDataVO.status eq '4'}"> <span class="card-danger ms-2 w-50 text-center">검증실패</span>
<span class="card-success ms-2 w-50 text-center">반영</span> </c:when>
</c:when> <c:when test="${fieldDataVO.status eq '2'}">
</c:choose> <span class="card-success ms-2 w-50 text-center">검증성공</span>
</div> </c:when>
<label for="description" class="col-4 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">설명</label> <c:when test="${fieldDataVO.status eq '3'}">
<div class="col-8 border-bottom"> <span class="card-danger ms-2 w-50 text-center">반영실패</span>
<input type="text" class="form-control bg-white border-0" id="description" readonly> </c:when>
</div> <c:when test="${fieldDataVO.status eq '4'}">
<label for="errInfo" class="col-4 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">오류내용</label> <span class="card-success ms-2 w-50 text-center">반영</span>
<div class="col-8 border-bottom"> </c:when>
<input type="text" class="form-control bg-white border-0" id="errInfo" readonly> </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-8"> <div class="col-12 row">
<ul class="nav nav-tabs" id="myTab" role="tablist"> <div class="col-7">
<h5><i class="bi bi-dot"></i> 측량 데이터</h5>
<div class="map mx-2" id="map">
</div>
</div>
<div class="col-5">
<h5><i class="bi bi-dot"></i> 속성 정보</h5>
<div id="fieldDataDiv">
<table class="table table-hover mx-2">
<tbody id="fieldDataBody">
</tbody>
</table>
</div>
</div>
<div class="col-12">
<ul id="fieldDataPaging" class="fieldDataPaging"></ul>
</div>
<%--<ul class="nav nav-tabs" id="myTab" role="tablist">
<li class="nav-item" role="presentation"> <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> <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>
@ -92,7 +120,7 @@
</table> </table>
</div> </div>
</div> </div>
<ul id="fieldDataPaging" class="fieldDataPaging"></ul> <ul id="fieldDataPaging" class="fieldDataPaging"></ul>--%>
</div> </div>
</div> </div>
<div class="section_btn"> <div class="section_btn">

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

@ -188,41 +188,10 @@ a {
text-align: center; text-align: center;
} }
#fieldDataDiv{
.fieldDataTable { height: 400px;
width: 100%; overflow-y: auto;
box-sizing: border-box; overflow-x: hidden;
}
.fieldDataTable > thead > tr:first-child > th {
border: 1px solid #ccc;
background-color: #ccc;
padding: 10px 5px;
text-align: center;
color: #fff;
}
.fieldDataTable > tbody > tr > th {
background-color: #f1f1f1;
border: 1px solid #ccc;
text-align: center;
}
.fieldDataTable > tbody > tr > td {
padding: 5px 5px;
border: 1px solid #ccc;
text-align: center;
width: 170px;
word-break: break-all;
}
.fieldDataTable > tbody > tr:last-child > th {
border-bottom: 0px;
}
.fieldDataTable > tbody > tr:last-child > td {
border-bottom: 0px;
} }
.fieldDataPaging { .fieldDataPaging {
@ -510,7 +479,7 @@ a {
.map { .map {
width: 100%; width: 100%;
height: 450px; height: 400px;
float: left; float: left;
border: 1px solid #ccc; border: 1px solid #ccc;
} }

22
src/main/webapp/js/admin/fieldData.js
View File

@ -55,6 +55,16 @@ $(document).on("click", ".statusTab", function () {
chkBox.checked = !chkBox.checked; chkBox.checked = !chkBox.checked;
$("[name='searchForm']").submit(); $("[name='searchForm']").submit();
}) })
$(document).on('click', '#collectionInfoBtn', function (){
const btn = $(this);
if(btn.val()==="수집 정보 확인"){
$(".collectionInfo").show();
btn.val("감추기")
}else{
$(".collectionInfo").hide();
btn.val("수집 정보 확인")
}
})
function fn_link_page(pageNo) { function fn_link_page(pageNo) {
document.searchForm.pageIndex.value = pageNo; document.searchForm.pageIndex.value = pageNo;
@ -121,12 +131,12 @@ function makePropTable(idx) {
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>" + numberFormatter(field_data[idx].prop[i], 2) + "</td></tr>"; // tags += "<th>" + i + "</th><td>" + numberFormatter(field_data[idx].prop[i], 2) + "</td></tr>";
} else { // } else {
tags += "<tr><th>" + i + "</th><td>" + numberFormatter(field_data[idx].prop[i],2) + "</td>"; // tags += "<tr><th>" + i + "</th><td>" + numberFormatter(field_data[idx].prop[i],2) + "</td>";
// tags += "<tr><th>" + i + "</th><td>" + field_data[idx].prop[i] + "</td>"; // }
} tags += "<tr><th class='text-end bg-secondary' style='--bs-bg-opacity: .5'>" + i + "</th><td>" + numberFormatter(field_data[idx].prop[i],2) + "</td></tr>";
} }
$("#fieldDataBody").append(tags); $("#fieldDataBody").append(tags);