From 6c78438d7cc8a7c9a276e098ce87399c1025afce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Fri, 11 Jul 2025 14:10:11 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EA=B0=9C=EB=B0=9C=20=EC=84=9C=EB=B2=84=20?= =?UTF-8?q?=EC=A4=80=EB=B9=84=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/main/resources/templates/home.html | 8 +- .../templates/households/households.html | 124 +++++++----------- .../templates/researcher/detail.html | 6 +- 3 files changed, 57 insertions(+), 81 deletions(-) diff --git a/admin/src/main/resources/templates/home.html b/admin/src/main/resources/templates/home.html index 8855b4da..fb321878 100644 --- a/admin/src/main/resources/templates/home.html +++ b/admin/src/main/resources/templates/home.html @@ -4,7 +4,7 @@ xmlns:sec="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org"> -
+

@@ -402,10 +402,12 @@ null ); } + const activeProfile = '[[${activeProfile}]]'; // 페이지 로드 시 호출 $(document).ready(function() { - getTotalPercentage(); - + if(activeProfile === 'local'){ + getTotalPercentage(); + } $('#usageType').change(function() { getTotalPercentage(); }); diff --git a/admin/src/main/resources/templates/households/households.html b/admin/src/main/resources/templates/households/households.html index fd5b5b5c..f0c8bab6 100644 --- a/admin/src/main/resources/templates/households/households.html +++ b/admin/src/main/resources/templates/households/households.html @@ -137,47 +137,46 @@

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+
+
+
+

+ 당일 1차 방문 +

+
+ +
+
+
+

+ 당월 2차 방문 +

+
+ +
+
+
+

+ 답례품 방문 +

+
+ +
+
+
@@ -253,10 +252,9 @@ 업종(대분류) 업종(중분류) 당월 일계부 현황 - - - - + 당월 1차 임가방문 + 당월 2차 임가방문 + 답례품 전달 조사원 조사원 휴대전화 @@ -270,12 +268,12 @@
-
+
- @@ -366,6 +364,9 @@ ${ct.regionDetailName} ${ifNullHyphen(ct.industryLargeName)} ${ifNullHyphen(ct.industryMiddleName)} + ${ifNullHyphen(ct.firstVisitDate)} + ${ifNullHyphen(ct.secondVisitDate)} + ${ct.isGiftSent ? "전달" : "미전달"} ${ct.progressPercent}% ${ifNullHyphen(ct.researcherName)} ${ifNullHyphen(ct.researcherPhone)} @@ -374,37 +375,10 @@ ); }); - - // ` - // - // - //
- // - //
- // - // ${ct.householdNum} - // ${ct.householdName} - // ${ct.householdPhone} - // ${ct.regionMainName} - // ${ct.regionSubName} - // ${ct.regionDetailName} - // ${ifNullHyphen(ct.industryLargeName)} - // ${ifNullHyphen(ct.industryMiddleName)} - // ${ct.progressPercent}% - // ${ifNullHyphen(ct.firstVisitDate)} - // ${ifNullHyphen(ct.secondVisitDate)} - // ${ct.isGiftSent ? "전달" : "미전달"} - // ${ifNullHyphen(ct.researcherName)} - // ${ifNullHyphen(ct.researcherPhone)} - // - // ` // 현재 로그인한 유저의 역할 const isResearcher = f.userRole.value === 'ROLE_RESEARCHER'; - // const colspanLength = isResearcher ? 13 : 15; - const colspanLength = isResearcher ? 10 : 12; + const colspanLength = isResearcher ? 13 : 15; // 조사원일 경우 조사원이름, 번호 칼럼 hide $('.hide-role-researcher').toggle(!isResearcher); diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html index 61ac3b8a..b2e5eebb 100644 --- a/admin/src/main/resources/templates/researcher/detail.html +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -56,7 +56,7 @@
- +