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

충돌수정

Browse Source
This commit is contained in:
com02 2021-11-18 19:04:59 +09:00
parent 8bb88d789f
commit 6399bd81dc
3 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp
View File

@ -39,6 +39,7 @@ function fn_getMemberCard() {
<div class="search-wrap"> <div class="search-wrap">
<h2 class="blind">검색</h2> <h2 class="blind">검색</h2>
<div class="search-close"><button type="button"></button></div>
<form id="searchHeaderForm" name="searchHeaderForm" method="post" action="/search/searchList.do"> <form id="searchHeaderForm" name="searchHeaderForm" method="post" action="/search/searchList.do">
<input type="hidden" name="filter_mylist"> <input type="hidden" name="filter_mylist">
<fieldset> <fieldset>
@ -46,7 +47,6 @@ function fn_getMemberCard() {
<div class="search-input"> <div class="search-input">
<input type="text" placeholder="" title="검색어 입력" name="query" id="top_query" class="ark_query" value="" autocomplete="off"><label for="top_query" style="display:none">검색어</label> <input type="text" placeholder="" title="검색어 입력" name="query" id="top_query" class="ark_query" value="" autocomplete="off"><label for="top_query" style="display:none">검색어</label>
<button type="button" class="btn-search" id="searchHeaderButton" onclick="goSearch();"><span>검색</span></button> <button type="button" class="btn-search" id="searchHeaderButton" onclick="goSearch();"><span>검색</span></button>
<!-- <button type="button" class="btn-search-detail" id="btn-search-detail-cl" onclick="javascript:fn_layerPop('${pageContext.request.contextPath}/search/getDetailedSearchFormPopup.do');">상세검색</button> -->
<button type="button" class="btn-search-detail" id="btn-search-detail-cl">상세<span>검색</span></button> <button type="button" class="btn-search-detail" id="btn-search-detail-cl">상세<span>검색</span></button>
</div> </div>
<div class="condition_sear"> <div class="condition_sear">

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

@ -47,8 +47,8 @@
<body> <body>
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
//로그 //로그
$.ajax({ $.ajax({
type: "post", type: "post",
url: "/search/InsertDataInquiryLog.ajax", url: "/search/InsertDataInquiryLog.ajax",
data: {"masterId" : '<c:out value="${result.masterId}"/>'} data: {"masterId" : '<c:out value="${result.masterId}"/>'}
@ -71,7 +71,7 @@ function goList(){
} }
</script> </script>
<div class="wrap sub"> <div class="wrap">
<!-- 소장자료 상세페이지 섹션 --> <!-- 소장자료 상세페이지 섹션 -->
<div class="data detail"> <div class="data detail">
<form id="referenceDetailForm" name="referenceDetailForm" method="post"> <form id="referenceDetailForm" name="referenceDetailForm" method="post">
@ -105,16 +105,16 @@ function goList(){
<div class="left"> <div class="left">
<div class="cla"> <div class="cla">
<div class="con-1"> <div class="con-1">
<c:if test="${(!empty result.openDivCd) && (result.openDivCd ne '3') }"> <c:if test="${!empty result.openDivCd && result.openDivCd ne '3' && result.operReadRangeCd eq '01' && result.digitalReadYn eq 'Y'}">
<span class="online">온라인열람</span> <span class="online">온라인열람</span>
</c:if> </c:if>
<c:if test="${(!empty result.operOutRangeCd) && (result.operOutRangeCd ne '02')}"> <c:if test="${!empty result.openDivCd && result.openDivCd ne '3' && !empty result.operOutRangeCd && result.operOutRangeCd ne '02'}">
<span class="loan">대출</span> <span class="loan">대출</span>
</c:if> </c:if>
<c:if test="${(!empty result.operReadRangeCd) && (result.operReadRangeCd ne '03')}"> <c:if test="${!empty result.openDivCd && result.openDivCd ne '3' && !empty result.operReadRangeCd && result.operReadRangeCd ne '03'}">
<span class="visit">방문열람</span> <span class="visit">방문열람</span>
</c:if> </c:if>
<c:if test="${!((!empty result.openDivCd) && (result.openDivCd ne '3')) && !((!empty result.operOutRangeCd) && (result.operOutRangeCd ne '02')) && !((!empty result.operReadRangeCd) && (result.operReadRangeCd ne '03')) }"> <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') }">
<span class="etc">기타</span> <span class="etc">기타</span>
</c:if> </c:if>
</div> </div>
@ -234,11 +234,11 @@ function goList(){
<button type="button" class="btn btn-orange" onclick="fn_addRentCart('${result.masterId}', '${result.useStatus}')">카트담기</button> <button type="button" class="btn btn-orange" onclick="fn_addRentCart('${result.masterId}', '${result.useStatus}')">카트담기</button>
</div> </div>
<c:if test="${fn:length(keywordList) > 0 }"> <c:if test="${fn:length(keywordList) > 0 }">
<div class="keyword"> <div class="keyword">
<span class="first">키워드</span> <span class="first">키워드</span>
<c:forEach var="keyword" items="${keywordList }"> <c:forEach var="keyword" items="${keywordList }">
<span><c:out value="${keyword}"/></span> <span><c:out value="${keyword}"/></span>
</c:forEach> </c:forEach>
</div> </div>
</c:if> </c:if>
</div> </div>

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

@ -187,6 +187,7 @@ function goSearchNculture() {
//탭 이동 //탭 이동
function fnTabMoveSch(collection){ function fnTabMoveSch(collection){
$("#collection").val(collection); $("#collection").val(collection);
$("#pageIndex").val(1);
fnFilterSch(); fnFilterSch();
} }
function fnFilterSch(){ function fnFilterSch(){
@ -457,19 +458,18 @@ function fn_search_article(pageIndex) {
</sec:authorize> </sec:authorize>
</div> </div>
<div class="type"> <div class="type">
<c:if test="${(!empty result.openDivCd) && (result.openDivCd ne '3') }"> <c:if test="${!empty result.openDivCd && result.openDivCd ne '3' && result.operReadRangeCd eq '01' && result.digitalReadYn eq 'Y'}">
<span class="online">온라인열람</span> <span class="online">온라인열람</span>
</c:if> </c:if>
<c:if test="${(!empty result.operOutRangeCd) && (result.operOutRangeCd ne '02')}"> <c:if test="${!empty result.openDivCd && result.openDivCd ne '3' && !empty result.operOutRangeCd && result.operOutRangeCd ne '02'}">
<span class="loan">대출</span> <span class="loan">대출</span>
</c:if> </c:if>
<c:if test="${(!empty result.operReadRangeCd) && (result.operReadRangeCd ne '03')}"> <c:if test="${!empty result.openDivCd && result.openDivCd ne '3' && !empty result.operReadRangeCd && result.operReadRangeCd ne '03'}">
<span class="visit">방문열람</span> <span class="visit">방문열람</span>
</c:if> </c:if>
<c:if test="${!((!empty result.openDivCd) && (result.openDivCd ne '3')) && !((!empty result.operOutRangeCd) && (result.operOutRangeCd ne '02')) && !((!empty result.operReadRangeCd) && (result.operReadRangeCd ne '03')) }"> <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') }">
<span class="etc">기타</span> <span class="etc">기타</span>
</c:if> </c:if>
</div> </div>
<div class="title"><a href="javascript:void(0)" onclick="goDetail('${result.masterId}');"><c:out value="${result.title}"/></a></div> <div class="title"><a href="javascript:void(0)" onclick="goDetail('${result.masterId}');"><c:out value="${result.title}"/></a></div>
<div class="code"><c:out value="${result.mngtNo}"/></div> <div class="code"><c:out value="${result.mngtNo}"/></div>
@ -483,11 +483,11 @@ function fn_search_article(pageIndex) {
<div class="t-btn nomagin"> <div class="t-btn nomagin">
<c:choose> <c:choose>
<c:when test="${(!empty result.operOutRangeNm) && (!empty result.operReadRangeNm)}"> <c:when test="${(!empty result.operOutRangeNm) && (!empty result.operReadRangeNm)}">
<p>${result.operOutRangeNm}<br>${result.operReadRangeNm}</p> <p><span>${result.operOutRangeNm}</span><br><span>${result.operReadRangeNm}</span></p>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<c:if test="${(!empty result.operOutRangeNm) || (!empty result.operReadRangeNm) }"> <c:if test="${(!empty result.operOutRangeNm) || (!empty result.operReadRangeNm) }">
<p>${result.operOutRangeNm}${result.operReadRangeNm}</p> <p><span>${result.operOutRangeNm}</span><span>${result.operReadRangeNm}</span></p>
</c:if> </c:if>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>