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

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

@ -16,170 +16,163 @@
<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">
<thead>
<h5>&nbsp;신청자</h5>
</thead>
<tbody>
<tr>
<th>소속</th>
<td class="text-center"><c:out value='${userVO.company}'/></td>
<th>이름</th>
<td class="text-center"><c:out value='${userVO.name}'/></td>
<th>연락처</th>
<td class="text-center"><c:out value='${userVO.phonenum}'/></td>
<th>상태</th>
<td class="text-center">
<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 '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>
</td>
</tr>
</tbody>
</table>
<table class="table table-hover text-center"> <table class="detail_table">
<thead> <tbody>
<h5 class="">&nbsp;담당자</h5> <tr>
</thead> <th style="background-color: #f8f8f8" colspan="2">작업명</th>
<tbody> <td><c:out value='${useRequestVO.title}'/></td>
<tr> </tr>
<th>소속</th> <tr>
<td class="text-center"><c:out value='${userVO.company}'/></td> <th colspan="2">기간</th>
<th>이름</th> <td><c:out value='${useRequestVO.s_date}'/> ~ <c:out
<td class="text-center"><c:out value='${userVO.name}'/></td> value='${useRequestVO.e_date}'/></td>
<th>연락처</th> </tr>
<td class="text-center"><c:out value='${userVO.phonenum}'/></td> <tr>
<th>상태</th> <th colspan="2">장소</th>
<td class="text-center"> <td id="area_select_td">
<c:choose> <c:forEach var="item" items="${selectArea}" varStatus="status">
<c:when test="${useRequestVO.status eq '99'}"><span class="label label-warning"><c:out <div id="addedBlock<c:out value='${status.index}' />">
value='승인대기'/></span></c:when> <c:out value=''/>${item}
<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>
</td>
</tr>
</tbody>
</table>
</div>
<div class="row justify-content-between bg-white mx-3 mt-4 py-2">
<table class="table table-hover text-center">
<thead>
<h3 class="h4 m-3">지도사용 요청</h3>
</thead>
<tbody>
<tr>
<th colspan="2">작업명</th>
<td><c:out value='${useRequestVO.title}'/></td>
</tr>
<tr>
<th colspan="2">기간</th>
<td><c:out value='${useRequestVO.s_date}'/> ~ <c:out value='${useRequestVO.e_date}'/></td>
</tr>
<tr>
<th colspan="2">장소</th>
<td id="area_select_td">
<c:forEach var="item" items="${selectArea}" varStatus="status">
<div id="addedBlock<c:out value='${status.index}' />">
<c:out value=''/>${item}
</div>
</c:forEach>
</td>
</tr>
<tr>
<th style="width:7%;" rowspan="3">레이어</th>
<th><label>지하시설물</label></th>
<td>
<div class="form-check">
<c:forEach var="item" items="${layersVO}" varStatus="status">
<c:if test="${item.code eq 'facility'}">
<c:set var="faciltySize" value="${faciltySize+1}"/>
<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:if test="${item.layer eq item2}">
<c:out value='checked'/>
</c:if>
</c:forEach>
/> <c:out value='${item.name}'/>
</label>
</c:if>
</c:forEach>
</div> </div>
</td> </c:forEach>
</tr> </td>
<tr> </tr>
<th><label>지하구조물</label></th> <tr>
<td>
<div class="structure"> <th rowspan="3">레이어</th>
<c:forEach var="item" items="${layersVO}" varStatus="status"> <%-- <td colspan="3">--%>
<c:if test="${item.code eq 'structure'}"> <th><label>지하시설물</label></th>
<label class="layer-label"><input type="checkbox" name="${item.code}" id="${item.code}" <td>
disabled="disabled" value="${item.layer}" <%-- <div class="form-check">--%>
<c:forEach var="item2" items="${layers}" varStatus="status2"> <c:forEach var="item" items="${layersVO}" varStatus="status">
<c:if test="${item.layer eq item2}"> <c:if test="${item.code eq 'facility'}">
<c:out value='checked'/> <c:set var="faciltySize" value="${faciltySize+1}"/>
</c:if> <label class="layer-label"><input type="checkbox" name="${item.code}" id="${item.code}"
</c:forEach> disabled="disabled" value="${item.layer}"
/> <c:out value='${item.name}'/> <c:forEach var="item2" items="${layers}" varStatus="status2">
</label> <c:if test="${item.layer eq item2}">
</c:if> <c:out value='checked'/>
</c:forEach> </c:if>
</div> </c:forEach>
</td> /> <c:out value='${item.name}'/>
</tr> </label>
<tr> </c:if>
<th><label>지반</label></th> </c:forEach>
<td> <%-- </div>--%>
<div class="ground"> </td>
<c:forEach var="item" items="${layersVO}" varStatus="status"> </tr>
<c:if test="${item.code eq 'ground'}"> <tr>
<label class="layer-label"><input type="checkbox" name="${item.code}" id="${item.code}" <th><label>지하구조물</label></th>
disabled="disabled" value="${item.layer}" <td>
<c:forEach var="item2" items="${layers}" varStatus="status2"> <%-- <div class="form-check">--%>
<c:if test="${item.layer eq item2}"> <c:forEach var="item" items="${layersVO}" varStatus="status">
checked <c:if test="${item.code eq 'structure'}">
</c:if> <label class="layer-label">
</c:forEach> <input type="checkbox" name="${item.code}" id="${item.code}" disabled="disabled"
/> <c:out value='${item.name}'/> value="${item.layer}"
</label> <c:forEach var="item2" items="${layers}" varStatus="status2">
</c:if> <c:if test="${item.layer eq item2}">
</c:forEach> <c:out value='checked'/>
</div> </c:if>
</td> </c:forEach>
</tr> /> <c:out value='${item.name}'/>
</label>
</c:if>
</c:forEach>
<%-- </div>--%>
</td>
</tr>
<tr>
<th><label>지반</label></th>
<td>
<%-- <div class="form-check">--%>
<c:forEach var="item" items="${layersVO}" varStatus="status">
<c:if test="${item.code eq 'ground'}">
<label class="layer-label" style="display: inline-block">
<input type="checkbox" name="${item.code}" id="${item.code}" disabled="disabled"
value="${item.layer}"
<c:forEach var="item2" items="${layers}" varStatus="status2">
<c:if test="${item.layer eq item2}">
checked
</c:if>
</c:forEach>
/> <c:out value='${item.name}'/>
</label>
</c:if>
</c:forEach>
<%-- </div>--%>
</td>
</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"/> </p>
</p> <p class="search_p2">
<p class="search_p2"> <input class="btn btn-danger" type="button" value="거절"
<input class="btn btn-danger" type="button" value="거절" onclick="confirmReqBtn('-1'); return false;"/>
onclick="confirmReqBtn('-1'); return false;"/> <input class="btn btn-success" type="button" value="승인"
<input class="btn btn-success" type="button" value="승인" 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>

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

@ -160,7 +160,8 @@
<th rowspan="3">레이어</th> <th rowspan="3">레이어</th>
<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}" />

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

@ -10,81 +10,83 @@
<!-- <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>
<th colspan="2">작업명</th> <th colspan="2">작업명</th>
<td><input type="text" class="form-control" id="title" name="title" autocomplete="off"/></td> <td><input type="text" class="form-control" id="title" name="title" autocomplete="off"/></td>
</tr> </tr>
<tr> <tr>
<th colspan="2">기간</th> <th colspan="2">기간</th>
<td> <td>
<input type="text" class="form-control input-datepicker" readonly id="startDate" name= "s_date" onchange="dateChange('start');"> ~ <input type="text" class="form-control input-datepicker" readonly id="startDate" name= "s_date" onchange="dateChange('start');"> ~
<input type="text" class="form-control input-datepicker" readonly id="endDate" name="e_date" onchange="dateChange('end');"> <input type="text" class="form-control input-datepicker" readonly id="endDate" name="e_date" onchange="dateChange('end');">
</td> </td>
</tr> </tr>
<tr> <tr>
<th colspan="2">장소</th> <th colspan="2">장소</th>
<td id="area_select_td"> <td id="area_select_td">
<div> <div>
<select id="city" name="city" onchange="changeAreaList(this.value, this.name)" class="form-control input-area-select"> <select id="city" name="city" onchange="changeAreaList(this.value, this.name)" class="form-control input-area-select">
<option value="0">::시/도::</option> <option value="0">::시/도::</option>
<c:forEach var="item" items="${cityList}" varStatus="status"> <c:forEach var="item" items="${cityList}" varStatus="status">
<option value="${item.code}"><c:out value="${item.area}"/></option> <option value="${item.code}"><c:out value="${item.area}"/></option>
</c:forEach> </c:forEach>
</select> </select>
<select id="county" name="county" onchange="changeAreaList(this.value, this.name);" class="form-control input-area-select"> <select id="county" name="county" onchange="changeAreaList(this.value, this.name);" class="form-control input-area-select">
<option value="0">::선택::</option> <option value="0">::선택::</option>
</select> </select>
<select id="town" name="town" class="form-control input-area-select"> <select id="town" name="town" class="form-control input-area-select">
<option value="0">::선택::</option> <option value="0">::선택::</option>
</select> </select>
<span class="btn btn-outline-primary" onclick="addAreaBtn();">추가</span> <span class="btn btn-outline-primary" onclick="addAreaBtn();">추가</span>
</div> </div>
<div id="addedArea" class="addedArea"> <div id="addedArea" class="addedArea">
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr>
<th rowspan="3">레이어</th> <th rowspan="3">레이어</th>
<th><label>지하시설물</label></th> <th><label>지하시설물</label></th>
<td> <td>
<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'}">
<label class="layer-label"><input type="checkbox" name="${item.code}" id="${item.code}" value="${item.layer}"/> ${item.name} </label> <label class="layer-label"><input type="checkbox" name="${item.code}" id="${item.code}" value="${item.layer}"/> ${item.name} </label>
</c:if> </c:if>
</c:forEach> </c:forEach>
</td> </td>
</tr> </tr>
<tr> <tr>
<th><label>지하구조물</label></th> <th><label>지하구조물</label></th>
<td> <td>
<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}" value="${item.layer}"/> ${item.name} </label> <label class="layer-label"><input type="checkbox" name="${item.code}" id="${item.code}" value="${item.layer}"/> ${item.name} </label>
</c:if> </c:if>
</c:forEach> </c:forEach>
</td> </td>
</tr> </tr>
<tr> <tr>
<th><label>지반</label></th> <th><label>지반</label></th>
<td> <td>
<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}" value="${item.layer}"/> ${item.name} </label> <label class="layer-label"><input type="checkbox" name="${item.code}" id="${item.code}" value="${item.layer}"/> ${item.name} </label>
</c:if> </c:if>
</c:forEach> </c:forEach>
</td> </td>
</tr> </tr>
<tr> <tr>
<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;