Merge branch 'master' of http://192.168.0.157:3000/DBNT/GGWEB
commit
e2a69d1433
|
|
@ -16,170 +16,163 @@
|
|||
<div class="section_content">
|
||||
<input type="hidden" id="layers" name="layers"/>
|
||||
<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> 신청자</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">
|
||||
<thead>
|
||||
<h5 class=""> 담당자</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>
|
||||
</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>
|
||||
<table class="detail_table">
|
||||
<tbody>
|
||||
<tr>
|
||||
<th style="background-color: #f8f8f8" 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>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><label>지하구조물</label></th>
|
||||
<td>
|
||||
<div class="structure">
|
||||
<c:forEach var="item" items="${layersVO}" varStatus="status">
|
||||
<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}"
|
||||
<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>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><label>지반</label></th>
|
||||
<td>
|
||||
<div class="ground">
|
||||
<c:forEach var="item" items="${layersVO}" varStatus="status">
|
||||
<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}"
|
||||
<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>
|
||||
</c:forEach>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
<th rowspan="3">레이어</th>
|
||||
<%-- <td colspan="3">--%>
|
||||
<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>--%>
|
||||
</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 'structure'}">
|
||||
<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>--%>
|
||||
</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>
|
||||
<th colspan="2">요청 내용</th>
|
||||
<td><c:out value='${useRequestVO.user_msg}'/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th colspan="2">요청 내용</th>
|
||||
<td style="text-align: center"><c:out value='${useRequestVO.user_msg}'/></td>
|
||||
</tr>
|
||||
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
<c:choose>
|
||||
<c:when test="${useRequestVO.status eq '99'}">
|
||||
<table class="detail_table mx-3">
|
||||
<table class="detail_table" style="margin-right: 1em">
|
||||
<tbody>
|
||||
<tr>
|
||||
<th>전달 메세지</th>
|
||||
<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>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<input type="hidden" name="status" id="status"/>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="row justify-content-between bg-white mx-3 py-2">
|
||||
<div class="section_btn">
|
||||
<p class="search_p1">
|
||||
<input class="btn btn-secondary" type="button" value="닫기" data-bs-dismiss="modal"/>
|
||||
</p>
|
||||
<p class="search_p2">
|
||||
<input class="btn btn-danger" type="button" value="거절"
|
||||
onclick="confirmReqBtn('-1'); return false;"/>
|
||||
<input class="btn btn-success" type="button" value="승인"
|
||||
onclick="confirmReqBtn('0'); return false;"/>
|
||||
</p>
|
||||
</div>
|
||||
<div class="section_btn">
|
||||
<p class="search_p1">
|
||||
<input class="btn btn-secondary" type="button" value="닫기" data-bs-dismiss="modal"/>
|
||||
</p>
|
||||
<p class="search_p2">
|
||||
<input class="btn btn-danger" type="button" value="거절"
|
||||
onclick="confirmReqBtn('-1'); return false;"/>
|
||||
<input class="btn btn-success" type="button" value="승인"
|
||||
onclick="confirmReqBtn('0'); return false;"/>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
|
||||
<table class="detail_table bg">
|
||||
<table class="detail_table">
|
||||
<tbody>
|
||||
<tr>
|
||||
<th>전달 메세지</th>
|
||||
|
|
@ -187,16 +180,17 @@
|
|||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="section_btn">
|
||||
<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>
|
||||
</div>
|
||||
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</form:form>
|
||||
|
||||
|
||||
</div>
|
||||
|
|
@ -160,7 +160,8 @@
|
|||
<th rowspan="3">레이어</th>
|
||||
<td colspan="3">
|
||||
<label>지하시설물</label>
|
||||
<div class="setting_content2" class="facility">
|
||||
<div class="setting_content2" class="facility">
|
||||
|
||||
<c:forEach var="item" items="${layersVO}" varStatus="status">
|
||||
<c:if test="${item.code eq 'facility'}">
|
||||
<c:set var="faciltySize" value="${faciltySize+1}" />
|
||||
|
|
|
|||
|
|
@ -10,81 +10,83 @@
|
|||
<!-- <p>현장 지원 시스템</p> -->
|
||||
</div>
|
||||
<div class="section_content">
|
||||
<input type="hidden" id="layers" name="layers"/>
|
||||
<input type="hidden" id="places" name="places"/>
|
||||
|
||||
<table class="detail_table">
|
||||
<tbody>
|
||||
<tr>
|
||||
<th colspan="2">작업명</th>
|
||||
<td><input type="text" class="form-control" id="title" name="title" autocomplete="off"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th colspan="2">기간</th>
|
||||
<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="endDate" name="e_date" onchange="dateChange('end');">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th colspan="2">장소</th>
|
||||
<td id="area_select_td">
|
||||
<div>
|
||||
<select id="city" name="city" onchange="changeAreaList(this.value, this.name)" class="form-control input-area-select">
|
||||
<option value="0">::시/도::</option>
|
||||
<c:forEach var="item" items="${cityList}" varStatus="status">
|
||||
<option value="${item.code}"><c:out value="${item.area}"/></option>
|
||||
</c:forEach>
|
||||
</select>
|
||||
<select id="county" name="county" onchange="changeAreaList(this.value, this.name);" class="form-control input-area-select">
|
||||
<option value="0">::선택::</option>
|
||||
</select>
|
||||
<select id="town" name="town" class="form-control input-area-select">
|
||||
<option value="0">::선택::</option>
|
||||
</select>
|
||||
<span class="btn btn-outline-primary" onclick="addAreaBtn();">추가</span>
|
||||
</div>
|
||||
<div id="addedArea" class="addedArea">
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th rowspan="3">레이어</th>
|
||||
<th><label>지하시설물</label></th>
|
||||
<td>
|
||||
<c:forEach var="item" items="${layersVO}" varStatus="status">
|
||||
<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>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><label>지하구조물</label></th>
|
||||
<td>
|
||||
<c:forEach var="item" items="${layersVO}" varStatus="status">
|
||||
<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>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><label>지반</label></th>
|
||||
<td>
|
||||
<c:forEach var="item" items="${layersVO}" varStatus="status">
|
||||
<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>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th colspan="2">요청 내용</th>
|
||||
<td><textarea class="form-control" rows="3" style="resize:none;" name=user_msg></textarea></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
<tbody>
|
||||
<tr>
|
||||
<th colspan="2">작업명</th>
|
||||
<td><input type="text" class="form-control" id="title" name="title" autocomplete="off"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th colspan="2">기간</th>
|
||||
<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="endDate" name="e_date" onchange="dateChange('end');">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th colspan="2">장소</th>
|
||||
<td id="area_select_td">
|
||||
<div>
|
||||
<select id="city" name="city" onchange="changeAreaList(this.value, this.name)" class="form-control input-area-select">
|
||||
<option value="0">::시/도::</option>
|
||||
<c:forEach var="item" items="${cityList}" varStatus="status">
|
||||
<option value="${item.code}"><c:out value="${item.area}"/></option>
|
||||
</c:forEach>
|
||||
</select>
|
||||
<select id="county" name="county" onchange="changeAreaList(this.value, this.name);" class="form-control input-area-select">
|
||||
<option value="0">::선택::</option>
|
||||
</select>
|
||||
<select id="town" name="town" class="form-control input-area-select">
|
||||
<option value="0">::선택::</option>
|
||||
</select>
|
||||
<span class="btn btn-outline-primary" onclick="addAreaBtn();">추가</span>
|
||||
</div>
|
||||
<div id="addedArea" class="addedArea">
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th rowspan="3">레이어</th>
|
||||
<th><label>지하시설물</label></th>
|
||||
<td>
|
||||
<c:forEach var="item" items="${layersVO}" varStatus="status">
|
||||
<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>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><label>지하구조물</label></th>
|
||||
<td>
|
||||
<c:forEach var="item" items="${layersVO}" varStatus="status">
|
||||
<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>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><label>지반</label></th>
|
||||
<td>
|
||||
<c:forEach var="item" items="${layersVO}" varStatus="status">
|
||||
<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>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th colspan="2">요청 내용</th>
|
||||
<td><textarea class="form-control" rows="3" style="resize:none;" name=user_msg></textarea></td>
|
||||
</tr>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<input type="hidden" id="layers" name="layers"/>
|
||||
|
||||
<input type="hidden" id="places" name="places"/>
|
||||
<div class="section_btn">
|
||||
<p class="search_p1">
|
||||
<input class="btn btn-secondary" type="button" value="닫기" data-bs-dismiss="modal"/>
|
||||
|
|
|
|||
|
|
@ -2468,6 +2468,7 @@ textarea.form-control-lg {
|
|||
.form-check .form-check-input {
|
||||
float: left;
|
||||
margin-left: -1.5em;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.form-check-input {
|
||||
|
|
|
|||
|
|
@ -249,6 +249,7 @@ a {
|
|||
width: 80%;
|
||||
margin: 0 auto;
|
||||
margin-top: 10px;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.setting_sub_title {
|
||||
|
|
@ -639,6 +640,7 @@ a {
|
|||
.detail_table{
|
||||
width:100%;
|
||||
margin-top: 20px;
|
||||
margin-outside: 5px;
|
||||
}
|
||||
|
||||
.detail_table > tbody> tr >th {
|
||||
|
|
@ -675,7 +677,10 @@ a {
|
|||
}
|
||||
|
||||
.layer-label{
|
||||
width:150px;
|
||||
width:140px;
|
||||
display: inline-block;
|
||||
line-height: 50px;
|
||||
margin-left: 20px;
|
||||
}
|
||||
.auth-label{
|
||||
width:75px;
|
||||
|
|
|
|||
Loading…
Reference in New Issue