이호영 이호영 2024-12-24
Merge branch 'advc' of http://hylee@vcs.iten.co.kr:9999/hylee/mjon_git into hylee
@208502de5bb92746917a63db0609cef1ded6a412
src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp
--- src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp
@@ -628,7 +628,7 @@
 <div class="tooltip-wrap">
 	<div class="popup-com adr_layer popup02" tabindex="0" data-tooltip-con="popup02" data-focus="popup02" data-focus-prev="popup02-close" style="width: 1000px;">
 		<div class="tooltip-wrap">
-			<div class="popup-com adr_layer adr_popup14" tabindex="0" data-tooltip-con="adr_popup14" data-focus="adr_popup14" data-focus-prev="adr_popu14-close" style="width: 450px;">
+			<div class="popup-com adr_layer adr_popup14 adr_detail_result" tabindex="0" data-tooltip-con="adr_popup14" data-focus="adr_popup14" data-focus-prev="adr_popu14-close" style="width: 525px;">
 				<div class="popup_heading">
 					<p>주소록 상세 결과</p>
 					<button type="button" class="tooltip-close" data-focus="adr_popup14-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
@@ -660,7 +660,7 @@
 			<p>엑셀 불러오기</p>
 			<button type="button" class="tooltip-close" id="closeBtn" data-focus="popup02-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
 		</div>
-		<div class="layer_in" style="padding: 25px 30px;">
+		<div class="layer_in execl_upload_layer" style="padding: 25px 30px;">
 		
 			<!-- 엑셀입력 -->
 			<div class="popCont current pop_more_cont" id="popCont_1">
@@ -688,7 +688,7 @@
 					</colgroup>
 					<tbody>
 						<tr>
-							<td colspan="2" style="padding:20px 0;">
+							<td colspan="2" style="padding:10px 0;">
 								<div class="file_upload_wrap" style="width:100%;display:flex;">
 									<div class="file_add exel_upload_area">
 										<p><img src="/publish/images/content/file_add.png" alt="파일 붙여넣기">마우스로 엑셀파일을 여기에 끌어다 놓으세요</p>
@@ -710,7 +710,7 @@
 					<button type="button" class="btn_list_detail" data-tooltip="adr_popup14"><img src="/publish/images/search.png"></button>
 				</p>
 			</div>
-			<div class="adr_excel" style="margin-top: 13px; overflow-x:auto;">
+			<div class="adr_excel" style="margin-top: 10px; overflow-x:auto;">
 				<!-- thead -->
 				<div class="adr_hd select_adr_hd msg" data-group="tableExcel">
 					<div style="width: 40px;"></div>
@@ -744,7 +744,7 @@
 			</div>
 			<!--// 공통 -->     
 			
-			<div class="popup_btn_wrap2" style="margin: 0 auto 30px auto;">
+			<div class="popup_btn_wrap2">
 				<button type="button" id="btnAddrMassReg">추가</button>
 				<button type="button" id="btnAddrMassClose" class="tooltip-close" data-focus="adr_popup01-close"  data-focus-next="popup02">닫기</button>                      
 			</div>
src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
--- src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
@@ -2316,7 +2316,7 @@
 	//이미지 카운트 증가시키기
 	//imgCnt ++;
 	$("#imgCnt").val(Number(imgCnt)+1);
-	
+	$(".thumb_wrap").removeClass("none");
 	
 	//문자 내용 상단에 이미지 이름 영역 객체 추가해주기
 	var imgPath = '<img src="' + imgSrc + '" class="thumb_img '+ editYn +'" alt="thumb1"/>';
@@ -3971,13 +3971,13 @@
                                 <div class="clearfix">
                                     <div class="put_left short">
                     					<!-- 업로드한 이미지의 썸네일 영역 -->
-                                    	<ul class="thumb_wrap liOnImg"></ul>
+                                    	<ul class="thumb_wrap none liOnImg"></ul>
                    						<!-- //업로드한 이미지의 썸네일 영역 -->
                                         <label for="smsTxtArea" class="label"></label>
                                         <c:if test="${tabDision eq 'tab02'}">
                                         	<div class="ad_txt"><p>(광고)</p></div>
                                         </c:if>
-                                        <textarea id="smsTxtArea" name="smsTxtArea" class="put_text"></textarea>
+                                        <textarea id="smsTxtArea" name="smsTxtArea" class="put_text" onkeyup="fnByteString($(this').val());"></textarea>
                                         <div class="text_length">
                                         <c:if test="${tabDision eq 'tab02'}">
                                         <div class="deny_txt"><p>무료거부 0808800858</p> </div>
src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp
--- src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp
@@ -713,7 +713,7 @@
 
 <!-- 주소록 상세 결과 팝업 data-tooltip:adr_popup14 -->
 	<div class="tooltip-wrap">
-		<div class="popup-com adr_layer adr_popup14" tabindex="0" data-tooltip-con="adr_popup14" data-focus="adr_popup14" data-focus-prev="adr_popu14-close" style="width: 450px;">
+		<div class="popup-com adr_layer adr_detail_result adr_popup14" tabindex="0" data-tooltip-con="adr_popup14" data-focus="adr_popup14" data-focus-prev="adr_popu14-close" style="width: 525px;">
 			<div class="popup_heading">
 				<p>주소록 상세 결과</p>
 				<button type="button" class="tooltip-close" data-focus="adr_popup14-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
src/main/webapp/publish/css/adrbook.css
--- src/main/webapp/publish/css/adrbook.css
+++ src/main/webapp/publish/css/adrbook.css
@@ -52,6 +52,8 @@
 
 /* 오른쪽 */
 .adr1_right {width: calc(100% - 24% - 20px);}
+.adr1_right .adr_list .selType2{height:29px;margin:0;padding:0 25px 0 8px;font-size:15px;background-size:12px;background-position-y:calc(50% + 1px);}
+.adr1_right .adr_list tbody td>.addrGrpIdArea2{line-height:25px;}
 
 .search_group_top2 {background-color: #f2f2f2; padding: 13px 20px 13px 20px;border: 1px solid #ccc; border-radius: 5px; margin-bottom: 20PX; position: relative;}
 .search_group_top2 span {font-size: 17px; padding-right: 15px; vertical-align: middle;}
src/main/webapp/publish/css/content.css
--- src/main/webapp/publish/css/content.css
+++ src/main/webapp/publish/css/content.css
@@ -228,9 +228,9 @@
 .tType1 tbody tr td.putText>div {display: flex; width: 100%;}
 .tType1 tbody tr td.putText>p:last-child {color: #555; font-size: 14px; padding-top: 10px;}
 .tType1 tbody tr td.putText .put_left {float: left;width: calc(100% - 26%); min-width: 420px; padding: 0 10px; border:1px solid #f2f2f2;box-sizing: border-box; border-radius: 5px; background-color: #f2f2f2; position: relative; /*max-height: 300px;*/}
-.tType1 tbody tr td.putText .put_left .text_length {position: relative;min-height: 40px;margin:0 0 15px;border-radius: 0 0 5px 5px;}
+.tType1 tbody tr td.putText .put_left .text_length {position: relative;min-height: 28px;margin:0 0 15px;border-radius: 0 0 5px 5px;}
 .tType1 tbody tr td.putText .put_left .text_length>div:first-child {font-size: 15px; padding-left: 10px;}
-.tType1 tbody tr td.putText .put_left .text_length>div:last-child {position: absolute;bottom: 15px;right: 10px;}
+.tType1 tbody tr td.putText .put_left .text_length>div:last-child {position: absolute;bottom: 0;right: 10px;}
 .tType1 tbody tr td.putText .put_left .text_length p {display: inline-block;padding-right: 10px;}
 .tType1 tbody tr td.putText .put_right { width: 26%; max-width: 200px; position: relative;}
 .tType1 tbody tr td.putText .put_right>button {width: calc(100% - 10px); margin-left: 10px;margin-bottom: 5px;}
@@ -238,9 +238,9 @@
 .tType1 tbody tr td.putText button .qmMark {background-image: url(/publish/images/content/qmIcon_s.png); width: 19px; height: 19px; margin-left: 5px; margin-top: -2px;}
 .tType1 tbody tr td.putText .put_right .send_btnWrap {position: absolute;bottom: 0;right:0;width: calc(100% - 10px);}
 .tType1 tbody tr td.putText .put_right .send_btnWrap button {width: 48.5%;}
-.tType1 tbody tr td.putText textarea {height: 160px; border: none;margin-bottom: -3px;;border-radius: 5px 5px 0 0;outline: 0;background-color: transparent; font-size: 15px;}
+.tType1 tbody tr td.putText textarea {height: 160px; border: none;margin: 8px 0;padding:0 15px;border-radius: 5px 5px 0 0;outline: 0;background-color: transparent; font-size: 15px;}
 /* 단문 */
-.tType1 tbody tr td.putText .put_left.short textarea {height: 160px;margin:-5px 0 0;padding:0 5px;}
+.tType1 tbody tr td.putText .put_left.short textarea {height: 190px;margin:10px 0;padding:0 5px;}
 .tType1 tbody tr td.putText .put_left.short textarea::placeholder {color: #b5b5b5;}
 .tType1 tbody tr td.putText .put_left.short.on {border: 1px solid #002c9a;border-radius: 5px;background-color: #eef2f9 !important;}
 /* 장문 */
@@ -358,10 +358,11 @@
 .tType4 tbody td .cancel_date {font-size:14px; color:#666; display: block;}
 
 /* .thumb_wrap {position: absolute; margin-left: 20px; top: 20px; left: 0;} */
-.thumb_wrap {margin: 20px 0 0 10px;}
+.thumb_wrap {margin: 15px 0 0 10px;}
+.thumb_wrap.none{margin:0;}
 .thumb_wrap li {margin: 0 2px; display: inline-block; position: relative;}
 .thumb_wrap li>div {width: 80px; height: 80px; border-radius: 5px; overflow: hidden; box-sizing: border-box;}
-.thumb_wrap li>div img {width: 80px;}
+.thumb_wrap li>div img {width: 80px;height:100%;object-fit:cover;}
 .thumb_wrap li.on>div {border: 2px solid #fbc72b;}
 .thumb_wrap li button.file_close {position: absolute; top: 5px; right:5px; width: 20px; height: 20px; border: 1px solid #dbdbdb; border-radius: 50%; background-color: rgba(0,0,0,0.25); }
 .thumb_wrap li button.file_close_on {display: none;}
@@ -370,7 +371,7 @@
 .thumb_wrap li.on button.file_close_on {position: absolute; top: 5px; right:5px; display: block; }
 .thumb_wrap li.on button.file_close_on img {margin-bottom: 0;}
 /* 광고 */
-.ad_txt {margin:0 0 15px;padding:0 0 0 5px;font-weight:400;font-size:17px;}
+.ad_txt {margin:15px 0 0 0;padding:0 0 0 15px;font-weight:400;font-size:17px;}
 .ad_tit {padding-bottom: 10px;}
 .deny_receipt {padding-top: 10px;}
 
@@ -1815,6 +1816,8 @@
 .fax_content .file_right button{width: 100%; max-width: 100%; margin: 0 0 4px 0;}
 .fax_content .file_right p{width: 100%; text-align: right; margin: 20px 0 0 0;}
 .fax_content .receipt_num_input{width: calc(100% - 300px); max-width: 340px;}
+.fax_content .receipt_num_top{align-items:center;}
+.fax_content .receipt_num_top #callTo+.btnType6{margin:0 8px;} 
 .fax_content .list_body_wrap{max-height: calc(100% - 37px); overflow: auto;}
 /* .fax_content .final_wrap{display: flex; margin: 20px 0;} */
 .fax_content .final_wrap{margin: 20px 0;}
src/main/webapp/publish/css/popupLayer.css
--- src/main/webapp/publish/css/popupLayer.css
+++ src/main/webapp/publish/css/popupLayer.css
@@ -270,11 +270,18 @@
 /* .import_layer .titBox>button {height: 30px; font-size: 14px;} */
 .import_layer .titBox button.excel_btn i {background-image: url(/publish/images/content/excel_img.png); width: 17px; height: 15px; margin: 0 5px 2px 0;}
 
+.execl_upload_layer .btn_list_detail{display:inline-flex;width:24px;height:24px;margin:-2px 0 0 0;border:1px solid #a5a5a5;border-radius:5px;justify-content:center;align-items:center;}
+.execl_upload_layer .btn_list_detail img{width:calc(100% - 8px);}
 .execl_upload_layer .file_add{height:55px;}
 .execl_upload_layer .file_add img{width:23px;}
 .execl_upload_layer .file_upload_wrap .btnType.c3{height:55px;}
 .execl_upload_layer .popup_btn_wrap2{margin:0 auto !important;}
 
+/* 주소록 상세 결과 */
+.adr_layer.adr_popup14.adr_detail_result .table_top{display:flex;flex-wrap:wrap;flex-direction:column-reverse;align-items:flex-end;}
+.adr_layer.adr_popup14.adr_detail_result .table_top p{width:100%;background:#f4f5f6;padding:8px;box-sizing:border-box;border-radius:5px;margin:10px 0 0 0;}
+.adr_layer.adr_popup14.adr_detail_result .table_top p span{font-weight:bold;}
+
 /* TXT파일 불러오기 */
 .import_layer .txt_file_title p {font-size: 20px; text-align: center; margin: 30px 0;}
 .import_layer .attachedFile {text-align: center; padding: 20px 0; border-top: 1px solid #e5e5e5; border-bottom: 1px solid #e5e5e5;}
Add a comment
List