somang4819/itsm_ysm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

충돌 조정

Browse Source
This commit is contained in:
KNKIM 2021-11-19 17:29:14 +09:00
parent 3967f56587
commit 81937fd479
2 changed files with 952 additions and 954 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp
View File

@ -94,16 +94,16 @@ function goList(){
<div class="left">
<div class="cla">
<div class="con-1">
<c:if test="${!empty result.openDivCd && result.openDivCd ne '3' && result.operReadRangeCd eq '01' && result.digitalReadYn eq 'Y'}">
<c:if test="${result.ableOnline eq true}">
<span class="online">온라인열람</span>
</c:if>
<c:if test="${!empty result.openDivCd && result.openDivCd ne '3' && !empty result.operOutRangeCd && result.operOutRangeCd ne '02'}">
<c:if test="${result.ableRent eq true}">
<span class="loan">대출</span>
</c:if>
<c:if test="${!empty result.openDivCd && result.openDivCd ne '3' && !empty result.operReadRangeCd && result.operReadRangeCd ne '03'}">
<c:if test="${result.ableRead eq true}">
<span class="visit">방문열람</span>
</c:if>
<c:if test="${!(!empty result.openDivCd && result.openDivCd ne '3') && !(result.operReadRangeCd eq '01' && result.digitalReadYn eq 'Y') && !(!empty result.operOutRangeCd && result.operOutRangeCd ne '02') && !(!empty result.operReadRangeCd && result.operReadRangeCd ne '03') }">
<c:if test="${result.ableOther eq true}">
<span class="etc">기타</span>
</c:if>
</div>
@ -116,7 +116,7 @@ function goList(){
</div>
<div class="right">
<div class="con-1">
<c:if test="${(!empty result.openDivCd) && (result.openDivCd ne '3') && (!empty result.interfaceId) && result.digitalReadYn eq 'Y'}">
<c:if test="${result.ableOnline eq true}">
<!-- 모바일에서만 노출되는 버튼(class='original') -->
<button type="button" class="original" onclick="gfn_showDocPdf('<c:out value="${result.interfaceId}"/>','<c:out value="${result.masterId}"/>','<c:out value="${result.typeDivCd}"/>','<c:out value="${result.dtlsTypeDivCd}"/>')";>원문보기</button>
<button type="button" class="view" onclick="gfn_showDocPdf('<c:out value="${result.interfaceId}"/>','<c:out value="${result.masterId}"/>','<c:out value="${result.typeDivCd}"/>','<c:out value="${result.dtlsTypeDivCd}"/>')";>원문보기</button>
@ -128,9 +128,7 @@ function goList(){
<c:if test='${result.MUseYn != "Y"}'>
<button type="button" class="favorit" onclick="fn_changeInterestBtn('${result.masterId }', 'on');">즐겨찾기</button>
</c:if>
<c:if test="${(!empty result.openDivCd) && (result.openDivCd ne '3') && (!empty result.interfaceId) && result.digitalReadYn eq 'Y'}">
<button type="button" class="share" data-curl="${pdfUri}<c:out value="${result.interfaceId}"/>">공유</button>
</c:if>
</div>
<div class="con-2">
<div class="de-data">
@ -220,9 +218,9 @@ function goList(){
</ul>
</div>
<div class="b-btn">
<button type="button" class="btn btn-color" onclick="gfn_rentItem('${result.mngOrgCd}', '${result.masterId}')">대출예약</button>
<button type="button" class="btn btn-green" onclick="gfn_reserveReadItem('${result.mngOrgCd}', '${result.masterId}')">방문열람신청</button>
<button type="button" class="btn btn-orange" onclick="fn_addRentCart('${result.masterId}', '${result.useStatus}')">카트담기</button>
<c:if test="${result.ableRentNow eq true }"><button type="button" class="btn btn-color" onclick="gfn_rentItem('${result.mngOrgCd}', '${result.masterId}')">대출예약</button></c:if>
<c:if test="${result.ableReadNow eq true }"><button type="button" class="btn btn-green" onclick="gfn_reserveReadItem('${result.mngOrgCd}', '${result.masterId}')">방문열람신청</button></c:if>
<c:if test="${result.ableRentNow eq true or result.ableReadNow eq true}"><button type="button" class="btn btn-orange" onclick="fn_addRentCart('${result.masterId}', '${result.useStatus}')">카트담기</button></c:if>
</div>
<c:if test="${fn:length(keywordList) > 0 }">
<div class="keyword">

10
src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp
View File

@ -448,16 +448,16 @@ function fn_search_article(pageIndex) {
</c:if>
</div>
<div class="type">
<c:if test="${!empty result.openDivCd && result.openDivCd ne '3' && result.operReadRangeCd eq '01' && result.digitalReadYn eq 'Y'}">
<c:if test="${result.ableOnline eq true}">
<span class="online">온라인열람</span>
</c:if>
<c:if test="${!empty result.openDivCd && result.openDivCd ne '3' && !empty result.operOutRangeCd && result.operOutRangeCd ne '02'}">
<c:if test="${result.ableRent eq true}">
<span class="loan">대출</span>
</c:if>
<c:if test="${!empty result.openDivCd && result.openDivCd ne '3' && !empty result.operReadRangeCd && result.operReadRangeCd ne '03'}">
<c:if test="${result.ableOnline eq true}">
<span class="visit">방문열람</span>
</c:if>
<c:if test="${!(!empty result.openDivCd && result.openDivCd ne '3') && !(result.operReadRangeCd eq '01' && result.digitalReadYn eq 'Y') && !(!empty result.operOutRangeCd && result.operOutRangeCd ne '02') && !(!empty result.operReadRangeCd && result.operReadRangeCd ne '03') }">
<c:if test="${result.ableOther eq true}">
<span class="etc">기타</span>
</c:if>
</div>
@ -481,7 +481,7 @@ function fn_search_article(pageIndex) {
</c:if>
</c:otherwise>
</c:choose>
<c:if test="${(!empty result.openDivCd) && (result.openDivCd ne '3') && (!empty result.interfaceId) && result.digitalReadYn eq 'Y'}">
<c:if test="${result.ableOnline eq true}">
<button type="button" class="btn-color" onclick="gfn_showDocPdf('${result.interfaceId}','${result.masterId}','${result.typeDivCd}','${result.dtlsTypeDivCd}')";>원문보기</button>
</c:if>
<button type="button" class="btn-gray" onclick="risShow('${result.masterId}');">RIS</button>