tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 4891_발송결과_속도개선

Browse Source
This commit is contained in:
hehihoho3@gmail.com 2025-02-06 16:02:30 +09:00
commit 4a899def87
3 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/webapp/publish/css/popupLayer.css
View File

@ -1218,7 +1218,12 @@
.layer_in .popup_search_type2 { background-color: #f2f2f2; padding: 9px 20px; border-radius: 5px; margin: 0 0 20px 0; display:flex; align-items:center;}
.layer_in .popup_search_type2 .title {margin:0 20px 0 10px;}
.layer_in .popup_search_type2 input.send_text {width:265px; border:solid 1px #ccc; height:36px;}
.layer_in .popup_search_type2 button { width:63px;}
.layer_in .popup_search_type2 button { width:63px; margin:0 0 0 5px;}
/* 발송화면 개선 : 발송대상 리스트 팝업 : 주소록등록 */
.layer_in .layer_tType1.style1 select{width:155px;}
.layer_in .layer_tType1.style1 input{width:190px;}
/* 주소록 대량등록 */
.file_upload_wrap{position:relative;display:flex;justify-content:space-between;align-items:center;}

4
src/main/webapp/publish/js/popupLayer.js
View File

@ -155,6 +155,10 @@ function tooltip() {
if($(this).closest(".adr_layer").is(".adr_popup14") == true){
$(".mask").addClass("on");
}else{}
// 결과상세에서 레이어팝업 2개 뜰 경우
if($(this).closest(".adr_layer").is(".rev_popup02") == true){
$(".mask").addClass("on");
}else{}
})
}

61
src/main/webapp/publish/textingmsg_2025_detail.html
View File

@ -255,7 +255,7 @@
<div class="title">수신번호</div>
<label for="" class="label">검색어입력</label>
<input type="text" class="send_text" id="" name="" value="" placeholder="3자 이상 입력하세요." onfocus="this.placeholder=''" onblur="this.placeholder='3자 이상 입력하세요.'">
<button type="button" class="btnType btnType2" style="width:63px; margin:0 0 0 5px;">검색</button>
<button type="button" class="btnType btnType2">검색</button>
</div>
<div class="list_tab_wrap2 type4">
@ -335,7 +335,7 @@
<div class="table_btn clearfix">
<div class="table_btn_left">
<button type="button" class="excel_btn btnType"><i class="downroad"></i>엑셀 다운로드</button>
<button type="button" class="btnType btnType14"><i class="add_img"></i>주소록 등록</button>
<button type="button" data-tooltip="rev_popup02" class="btnType btnType14"><i class="add_img"></i>주소록 등록</button>
</div>
</div>
@ -450,7 +450,7 @@
<div class="table_btn clearfix">
<div class="table_btn_left">
<button type="button" class="excel_btn btnType"><i class="downroad"></i>엑셀 다운로드</button>
<button type="button" class="btnType btnType14"><i class="add_img"></i>주소록 등록</button>
<button type="button" data-tooltip="rev_popup02" class="btnType btnType14"><i class="add_img"></i>주소록 등록</button>
</div>
</div>
@ -533,40 +533,47 @@
<!--// 실패 내용 -->
</div>
<div class="popup_btn_wrap2" style="margin: -40px auto 30px auto;">
<button type="button" class="tooltip-close" data-focus="adr_popup01-close" data-focus-next="popup02">닫기</button>
</div>
</div>
</div>
<!-- //발송대상 리스트 안내 팝업 -->
<!-- 그룹등록 팝업 data-tooltip:rev_popup02 -->
<!-- 주소록에 등록 팝업 -->
<div class="tooltip-wrap">
<div class="popup-com adr_layer rev_popup02" tabindex="0" data-tooltip-con="rev_popup02" data-focus="rev_popup02" data-focus-prev="rev_popup02-close" style="width: 500px;">
<div class="popup-com adr_layer rev_popup02" tabindex="0" data-tooltip-con="rev_popup02" data-focus="rev_popup02" data-focus-prev="rev_popup02-close" style="width: 510px;">
<div class="popup_heading">
<p>그룹등록</p>
<button type="button" class="tooltip-close" data-focus="rev_popup02-close"><img
src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
<p>주소록에 등록</p>
<button type="button" class="tooltip-close" data-focus="rev_popup02-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
</div>
<div class="layer_in">
<div class="gorup_join_cont">
<p class="adr_pop_title">선택된 발송내역 전화번호를 그룹으로 등록합니다.</p>
<div class="group_input" style="margin-top: 0;">
<div class="input_left">그룹이름</div>
<div class="input_right">
<label for="" class="label">새 그룹명 입력</label>
<input type="text" placeholder="새 그룹명 입력" onfocus="this.placeholder=''"
onblur="this.placeholder='새 그룹명 입력'" class="inputLight">
</div>
</div>
<div class="popup_btn_wrap2">
<button type="button">저장</button>
<button type="button" class="tooltip-close" data-focus="rev_popup02-close"
data-focus-next="rev_popup02">취소</button>
</div>
</div>
<div class="layer_in">
<table class="layer_tType1 style1">
<caption>주소록 그룹선택 표</caption>
<colgroup>
<col style="width: 80px">
<col style="width: auto">
</colgroup>
<tbody>
<tr>
<th>그룹 선택</th>
<td>
<label for="" class="label">그룹 선택</label>
<select id="addrGrpIdInfo" name="addrGrpIdInfo"><option value="NEW">그룹추가</option><option value="0">그룹미지정</option><option value="bookmark">자주보내는 번호</option> <option value="">테스트그룹</option> </select>
<label for="" class="label">그룹명 입력</label>
<input type="text" id="addrGrpNm" name="addrGrpNm" placeholder="새 그룹명을 입력해주세요." onfocus="this.placeholder=''" onblur="this.placeholder='새 그룹명을 입력해주세요.'" class="inputLight">
</td>
</tr>
</tbody>
</table>
<div class="popup_btn_wrap2">
<button type="button">등록</button>
<button type="button" class="tooltip-close" data-focus="rev_popup02-close" data-focus-next="rev_popup02">닫기</button>
</div>
</div>
</div>
</div>
<!--// 발송실패사유 팝업 -->
<!--// 주소록에 등록 팝업 -->
<!-- skip 메뉴 -->
<div class="skip_menu">