From 10ce23144da02fe1cd89b2f18670294b9c2622b5 Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 2 Sep 2024 17:41:09 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A3=BC=EC=86=8C=EB=A1=9D=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=20>=20=EC=A3=BC=EC=86=8C=EB=A1=9D=20=EB=8C=80=EB=9F=89?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=20>=20=EC=97=91=EC=85=80=EC=9E=85=EB=A0=A5?= =?UTF-8?q?=20>=20=ED=8C=8C=EC=9D=BC=20=EC=97=85=EB=A1=9C=EB=93=9C=20>=20?= =?UTF-8?q?=ED=95=B8=EB=93=9C=ED=8F=B0=20=EC=98=81=EC=97=AD=20=EC=84=A0?= =?UTF-8?q?=ED=83=9D=20->=20=EC=B9=B4=EC=9A=B4=ED=8A=B8=EC=99=80=20?= =?UTF-8?q?=EA=B2=B0=EA=B3=BC=20=ED=8C=9D=EC=97=85=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/web/addr/AddrList.jsp | 47 +++- .../jsp/web/addr/include/addrListforExcel.jsp | 12 +- .../jsp/web/msgdata/MsgDataSMLView.jsp | 44 +--- src/main/webapp/js/web/addr/event.js | 236 ++++++++++++++---- src/main/webapp/js/web/addr/init.js | 30 +++ 5 files changed, 276 insertions(+), 93 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp b/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp index 089f3a82..e17439f1 100644 --- a/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp @@ -28,6 +28,16 @@ $(document).ready(function(){ // addrMassTab(1); // 중복 휴대폰번호 버튼 노출여부 + + + // excel 오류정보 테스트 + $('#errorExcelBtn').click(function(){ + if($tableError.getDataCount()<1){ + alert('오류 정보가 없습니다.'); + return false; + } + $tableError.download("xlsx", "error_data.xlsx"); + }); }); // 메인 화면 좌측메뉴 최신화 @@ -213,7 +223,8 @@ function setAddrMassClose() { //location.reload(); listAddrGrp(); addrGroupLoadAjax(); - addrLoadAjax(); + addrLoadAjax(); + errorPopClean(); // 에러 팝업 초기화 } // 주소록 그룹 중복체크 @@ -651,6 +662,7 @@ function fn_tabToggle(tabNum){
+
@@ -694,6 +706,39 @@ function fn_tabToggle(tabNum){
+ + + + +
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/web/addr/include/addrListforExcel.jsp b/src/main/webapp/WEB-INF/jsp/web/addr/include/addrListforExcel.jsp index 69789caf..94ae5456 100644 --- a/src/main/webapp/WEB-INF/jsp/web/addr/include/addrListforExcel.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/addr/include/addrListforExcel.jsp @@ -314,6 +314,7 @@ $(document).on('drop', function (e){ //파일 드래그앤드롭 종료 function excelFileChange(file) { + errorPopClean(); // 에러 popup 초기화 if (file) { fn_loadAddActive(); var reader = new FileReader(); @@ -495,6 +496,7 @@ $(document).on("click", "#duplicationChkAll", function(e) { } */ +
@@ -549,13 +551,17 @@ $(document).on("click", "#duplicationChkAll", function(e) {

- 총 0건 / 중복 0건 + 총 0건 + / 중복 0건 + / 오류 0건 + +

+   - + -

diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp index a80e44a7..b95842f3 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp @@ -7,6 +7,8 @@ + + <% pageContext.setAttribute("newLineChar", "\r\n"); %>