소스충돌 조정

This commit is contained in:
KNKIM 2021-11-12 15:11:58 +09:00
parent 8193cfbff2
commit f470947000
2 changed files with 842 additions and 758 deletions

View File

@ -98,6 +98,9 @@ window.onload = function() {
reference_filterClk();
//필터삭제
reference_filterDel();
//필터삭제(상세검색에 추가된부분)
reference_detailFilterDel();
fnLabel_reference();
//초기화
reference_filterReset();
@ -173,6 +176,7 @@ function fn_search_article(pageIndex) {
<input type="hidden" id="createEndDate" name="createEndDate" value="<c:out value='${searchVO.createEndDate}'/>"/>
<input type="hidden" id="ageCode" name="ageCode" value="<c:out value='${searchVO.ageCode}'/>"/>
<input type="hidden" id="collectionList" name="collectionList" value="<c:out value='${searchVO.collectionList}'/>"/>
<input type="hidden" id="realQuery" name="realQuery" value="<c:out value='${searchVO.realQuery}'/>"/>
<div class="location data">
<h2 class="blind">소장자료 섹션영역</h2>
<div class="inner">
@ -363,7 +367,7 @@ function fn_search_article(pageIndex) {
<c:forEach var="result" items="${searchVO.resultList}"> <!-- 리스트 출력 시작 -->
<div class="list">
<div class="t-data">
<div class="img"><a href="javascript:void(0)"><img src="${result.rprsThumbUrl }" alt="" width="60" height="91" title="상세보기" onclick="goDetail('${result.masterId}');"></a>
<div class="img"><a href="javascript:void(0)"><img src="${result.rprsThumbUrlWithDefault }" alt="" width="60" height="91" title="상세보기" onclick="goDetail('${result.masterId}');"></a>
<sec:authorize access="isAuthenticated()">
<c:if test='${result.MUseYn == "Y"}'>
<span id="favorites_${result.masterId}" class="favorites" onclick="fn_changeInterest('${result.masterId }', 'off')" title="관심자료에서 삭제합니다.">
@ -423,7 +427,7 @@ function fn_search_article(pageIndex) {
</c:otherwise>
</c:choose>
<c:if test="${(!empty result.openDivCd) && (result.openDivCd ne '3') && (!empty result.interfaceId)}">
<button type="button" class="btn-color" onclick="docView('${pdfUri }','${result.interfaceId}')";>원문보기</button>
<button type="button" class="btn-color" onclick="gfn_showDocPdf('${result.interfaceId}')";>원문보기</button>
</c:if>
<button type="button" class="btn-gray" onclick="risShow('${result.masterId}')";>RIS</button>
</div>

View File

@ -188,6 +188,38 @@ function reference_filterDel(){
});
}
//reference 결과 필터 del 클릭(상세검색에 추가된 부분)
function reference_detailFilterDel(){
$(document).on("click","#referencelistForm .detailFilter",function(){
var filter_mylist = "";
var deleteFilterId = "";
filter_mylist = $('#filter_mylist').val();
deleteFilterId = $(this).attr('name').substring($(this).attr('name').indexOf("_",0)+1);
if($(this).attr('name') == "search_ageCode" && $(this).attr('name') == "search_collectionList")
{
if($("input[name="+$(this).attr('name')+"]").length == 1)
{
filter_mylist = filter_mylist.replace($(this).attr('name')+",",'');
}
var deleteFilterArr = $("#" + deleteFilterId).val().split(",");
$("#" + deleteFilterId).val(deleteFilterArr[0]);
for(var i=1; i < deleteFilterArr.length ; i++){
if($(this).val() != deleteFilterArr[i])
{
$("#" + deleteFilterId).val(",",deleteFilterArr[i]);
}
}
}else
{
filter_mylist = filter_mylist.replace($(this).attr('name')+",",'');
$("#" + deleteFilterId).val($("#" + deleteFilterId).val().replace($(this).val(),''));
}
fnFilterSch();
});
}
function fnLabel_reference(){
var mylist_arr = $("#referencelistForm [name=filter_mylist]").val().split(",");
var comparisonData;
@ -248,12 +280,60 @@ function fnLabel_reference(){
$("#reference_fillter_append").append("<li>생산년도 &#62; " + $("#creatYyyyStart").val() + "~" + $("#creatYyyyEnd").val() +"<button type=\"button\" class=\"btn-del-filter\" id=\""+second_cate_id+"\">삭제</button></li>").text();
}else if(mylist_arr[j].indexOf("agency") >= 0){
var second_cate_nm = mylist_arr[j].substring(mylist_arr[j].indexOf("_")+1);
$("#reference_fillter_append").append("<li>생산기관 &#62; "+ second_cate_nm + "<button type=\"button\" class=\"btn-del-filter\" id=\"\" name=\"first_agency_del\" value=\""+second_cate_nm+"\">삭제</button></li>").text();
}
$("#reference_fillter_append").append("<li>생산기관 &#62; "+ second_cate_nm + "<button type=\"button\" class=\"btn-del-filter\" id=\"\" name=\"first_agency_del\" >삭제</button></li>").text();
}else if(mylist_arr[j].indexOf("search_query") >= 0){
$("#reference_fillter_append").append("<li>검색어 &#62; "+ $("#realQuery").val() + "<button type=\"button\" class=\"btn-del-filter detailFilter\" id=\"\" name=\"search_query\">삭제</button></li>").text();
}else if(mylist_arr[j].indexOf("search_bookIndex") >= 0){
$("#reference_fillter_append").append("<li>목차 &#62; "+ $("#bookIndex").val() + "<button type=\"button\" class=\"btn-del-filter detailFilter\" id=\"\" name=\"search_bookIndex\">삭제</button></li>").text();
}else if(mylist_arr[j].indexOf("search_mngtNo") >= 0){
$("#reference_fillter_append").append("<li>관리번호 &#62; "+ $("#mngtNo").val() + "<button type=\"button\" class=\"btn-del-filter detailFilter\" id=\"\" name=\"search_mngtNo\">삭제</button></li>").text();
}else if(mylist_arr[j].indexOf("search_era") >= 0){
$("#reference_fillter_append").append("<li>연대 &#62; "+ $("#createStartDate").val() + "~" + $("#createEndDate").val() + "<button type=\"button\" class=\"btn-del-filter detailFilter\" id=\"\" name=\"search_era\">삭제</button></li>").text();
}else if(mylist_arr[j].indexOf("search_ageCode") >= 0){
var ageCode_arr = $("#referencelistForm [name=ageCode]").val().split(",");
for(var i=0; i < ageCode_arr.length ; i++)
{
$("#reference_fillter_append").append("<li>시대 &#62; "+ ageCodeNm(ageCode_arr[i]) + "<button type=\"button\" class=\"btn-del-filter detailFilter\" id=\"\" name=\"search_ageCode\" value=\"" + ageCode_arr[i] + "\">삭제</button></li>").text();
}
}else if(mylist_arr[j].indexOf("search_collectionList") >= 0){
var collectionList_arr = $("#referencelistForm [name=collectionList]").val().split(",");
for(var i=0; i < collectionList_arr.length ; i++)
{
$("#reference_fillter_append").append("<li>이용구분 &#62; "+ collectionNm(collectionList_arr[i]) + "<button type=\"button\" class=\"btn-del-filter detailFilter\" id=\"\" name=\"search_collectionList\" value=\"" + collectionList_arr[i] + "\">삭제</button></li>").text();
}
}
} //for end
}
function ageCodeNm(ageCode){
if(ageCode == null)
{
return ageCode;
}
if(ageCode == "03") return "선사";
if(ageCode == "04|05|06") return "고대";
if(ageCode == "07") return "고려";
if(ageCode == "08") return "조선";
if(ageCode == "11|12") return "근대";
if(ageCode == "13|14") return "현대";
if(ageCode == "02") return "시대미상";
return ageCode;
}
function collectionNm(collection){
if(collection == null)
{
return collection;
}
if(collection == "lib_online") return "온라인열람";
if(collection == "lib_loan") return "대출";
if(collection == "lib_offline") return "열람";
if(collection == "lib_etc") return "기타";
return collection;
}
function fnLabel_reference_detail(){
$('#referencelistForm input[name=sojang_council]').prop("checked",false);
$('#referencelistForm input[name=sido_name]').prop("checked",false);