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

master
강석 최 2022-03-07 17:03:40 +09:00
parent 6913c45c75 52303bb6d2
commit e2a69d1433
5 changed files with 220 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/main/webapp/WEB-INF/jsp/admin/requestView.jsp
View File

@ -16,11 +16,9 @@
<div class="section_content"> <div class="section_content">
<input type="hidden" id="layers" name="layers"/> <input type="hidden" id="layers" name="layers"/>
<input type="hidden" id="places" name="places"/> <input type="hidden" id="places" name="places"/>
<div class="row justify-content-between bg-white mx-3 py-2"> <table class="table table-hover">
<table class="table table-hover text-center">
<thead> <thead>
<h5 class="">&nbsp;담당자</h5> <h5>&nbsp;신청자</h5>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
@ -44,22 +42,17 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
<div class="row justify-content-between bg-white mx-3 mt-4 py-2"> <table class="detail_table">
<table class="table table-hover text-center">
<thead>
<h3 class="h4 m-3">지도사용 요청</h3>
</thead>
<tbody> <tbody>
<tr> <tr>
<th colspan="2">작업명</th> <th style="background-color: #f8f8f8" 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>
@ -72,15 +65,17 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<th style="width:7%;" rowspan="3">레이어</th>
<th rowspan="3">레이어</th>
<%-- <td colspan="3">--%>
<th><label>지하시설물</label></th> <th><label>지하시설물</label></th>
<td> <td>
<div class="form-check"> <%-- <div class="form-check">--%>
<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}"
<input type="checkbox" name="${item.code}" id="${item.code}" disabled="disabled" value="${item.layer}" 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'/>
@ -90,17 +85,18 @@
</label> </label>
</c:if> </c:if>
</c:forEach> </c:forEach>
</div> <%-- </div>--%>
</td> </td>
</tr> </tr>
<tr> <tr>
<th><label>지하구조물</label></th> <th><label>지하구조물</label></th>
<td> <td>
<div class="structure"> <%-- <div class="form-check">--%>
<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}" <label class="layer-label">
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'/>
@ -110,17 +106,18 @@
</label> </label>
</c:if> </c:if>
</c:forEach> </c:forEach>
</div> <%-- </div>--%>
</td> </td>
</tr> </tr>
<tr> <tr>
<th><label>지반</label></th> <th><label>지반</label></th>
<td> <td>
<div class="ground"> <%-- <div class="form-check">--%>
<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}" <label class="layer-label" style="display: inline-block">
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}">
checked checked
@ -130,38 +127,35 @@
</label> </label>
</c:if> </c:if>
</c:forEach> </c:forEach>
</div> <%-- </div>--%>
</td> </td>
</tr> </tr>
<tr> <tr>
<th colspan="2">요청 내용</th> <th colspan="2">요청 내용</th>
<td><c:out value='${useRequestVO.user_msg}'/></td> <td style="text-align: center"><c:out value='${useRequestVO.user_msg}'/></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
<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" style="margin-right: 1em">
<tbody> <tbody>
<tr> <tr>
<th>전달 메세지</th> <th>전달 메세지</th>
<td> <td>
<textarea class="form-control" rows="3" style="resize:none;" name="admin_msg"></textarea> <textarea class="form-control" rows="3" cols="50%" style="resize:none;"
name="admin_msg"></textarea>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<input type="hidden" name="status" id="status"/> <input type="hidden" name="status" id="status"/>
</div>
<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-secondary" type="button" value="닫기" data-bs-dismiss="modal"/> <input class="btn btn-secondary" type="button" value="닫기" data-bs-dismiss="modal"/>
@ -173,13 +167,12 @@
onclick="confirmReqBtn('0'); return false;"/> onclick="confirmReqBtn('0'); return false;"/>
</p> </p>
</div> </div>
</div>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<table class="detail_table bg"> <table class="detail_table">
<tbody> <tbody>
<tr> <tr>
<th>전달 메세지</th> <th>전달 메세지</th>
@ -187,16 +180,17 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
<div class="section_btn"> <div class="section_btn">
<p class="search_p1"> <p class="search_p1">
<input class="btn btn-secondary" type="button" value="닫기" data-bs-dismiss="modal"/> <input class="btn btn-secondary" type="button" value="닫기"
data-bs-dismiss="modal"/>
</p> </p>
</div> </div>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</form:form> </form:form>
</div>

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

@ -161,6 +161,7 @@
<td colspan="3"> <td colspan="3">
<label>지하시설물</label> <label>지하시설물</label>
<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}" />

8
src/main/webapp/WEB-INF/jsp/map/requestWrite.jsp
View File

@ -10,9 +10,6 @@
<!-- <p>현장 지원 시스템</p> --> <!-- <p>현장 지원 시스템</p> -->
</div> </div>
<div class="section_content"> <div class="section_content">
<input type="hidden" id="layers" name="layers"/>
<input type="hidden" id="places" name="places"/>
<table class="detail_table"> <table class="detail_table">
<tbody> <tbody>
<tr> <tr>
@ -83,8 +80,13 @@
<th colspan="2">요청 내용</th> <th colspan="2">요청 내용</th>
<td><textarea class="form-control" rows="3" style="resize:none;" name=user_msg></textarea></td> <td><textarea class="form-control" rows="3" style="resize:none;" name=user_msg></textarea></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<input type="hidden" id="layers" name="layers"/>
<input type="hidden" id="places" name="places"/>
<div class="section_btn"> <div class="section_btn">
<p class="search_p1"> <p class="search_p1">
<input class="btn btn-secondary" type="button" value="닫기" data-bs-dismiss="modal"/> <input class="btn btn-secondary" type="button" value="닫기" data-bs-dismiss="modal"/>

1
src/main/webapp/css/bootstrap-5.1.3.css
View File

@ -2468,6 +2468,7 @@ textarea.form-control-lg {
.form-check .form-check-input { .form-check .form-check-input {
float: left; float: left;
margin-left: -1.5em; margin-left: -1.5em;
display: inline-block;
} }
.form-check-input { .form-check-input {

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

@ -249,6 +249,7 @@ a {
width: 80%; width: 80%;
margin: 0 auto; margin: 0 auto;
margin-top: 10px; margin-top: 10px;
justify-content: space-between;
} }
.setting_sub_title { .setting_sub_title {
@ -639,6 +640,7 @@ a {
.detail_table{ .detail_table{
width:100%; width:100%;
margin-top: 20px; margin-top: 20px;
margin-outside: 5px;
} }
.detail_table > tbody> tr >th { .detail_table > tbody> tr >th {
@ -675,7 +677,10 @@ a {
} }
.layer-label{ .layer-label{
width:150px; width:140px;
display: inline-block;
line-height: 50px;
margin-left: 20px;
} }
.auth-label{ .auth-label{
width:75px; width:75px;