From 9f0cc7d7e38db50daed4e8dbb04c0d66cf5aef40 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Mon, 18 May 2026 15:35:08 +0900 Subject: [PATCH] =?UTF-8?q?260518=5F02=5FENH:=20=EC=A0=84=EC=B2=B4?= =?UTF-8?q?=ED=98=84=ED=99=A9,=20=EC=95=88=EC=A0=84=EC=A0=90=EA=B2=80?= =?UTF-8?q?=EC=97=90=20=EC=A7=80=EC=97=AD=EB=B3=B8=EB=B6=80=20=ED=8F=89?= =?UTF-8?q?=EA=B7=A0=20=EB=8C=80=EB=B9=84=20row=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../(pages)/(main)/bridge-platform/page.tsx | 2 +- src/app/(pages)/(main)/ucis/page.tsx | 2 +- src/app/globals.css | 2 +- src/components/combo/TopChartTable.tsx | 2 +- .../kfpa/CustomerSatisfactionDetail.tsx | 2 +- .../kfpa/CustomerSatisfactionSummary.tsx | 29 +++++++-------- .../kfpa/CustomerSatisfactionTotal.tsx | 36 ++++++++++++------- src/components/layout/Header.tsx | 2 +- src/config/{kfpaConfig.ts => kfpa.config.ts} | 18 +++++++--- src/config/menu.data.ts | 2 +- src/const/kfpa.const.ts | 2 -- src/lib/kfpa-util.ts | 17 ++++++++- src/lib/utils.ts | 2 +- src/types/kfpa.ts | 2 +- 14 files changed, 76 insertions(+), 44 deletions(-) rename src/config/{kfpaConfig.ts => kfpa.config.ts} (96%) delete mode 100644 src/const/kfpa.const.ts diff --git a/src/app/(pages)/(main)/bridge-platform/page.tsx b/src/app/(pages)/(main)/bridge-platform/page.tsx index b1a9d93..20b20a3 100644 --- a/src/app/(pages)/(main)/bridge-platform/page.tsx +++ b/src/app/(pages)/(main)/bridge-platform/page.tsx @@ -3,7 +3,7 @@ import { useLayoutFilter } from "@/components/layout/LayoutCategoryContext"; import CustomerSatisfactionTotal from "@/components/kfpa/CustomerSatisfactionTotal"; import CustomerSatisfactionDetail from "@/components/kfpa/CustomerSatisfactionDetail"; -import { COMMENT_TABLE_TITLE } from "@/config/kfpaConfig"; +import { COMMENT_TABLE_TITLE } from "@/config/kfpa.config"; const BridgePlatformPage = () => { const { selectedDiv } = useLayoutFilter(); diff --git a/src/app/(pages)/(main)/ucis/page.tsx b/src/app/(pages)/(main)/ucis/page.tsx index 4e4ee60..edc4313 100644 --- a/src/app/(pages)/(main)/ucis/page.tsx +++ b/src/app/(pages)/(main)/ucis/page.tsx @@ -3,7 +3,7 @@ import { useLayoutFilter } from "@/components/layout/LayoutCategoryContext"; import CustomerSatisfactionTotal from "@/components/kfpa/CustomerSatisfactionTotal"; import CustomerSatisfactionDetail from "@/components/kfpa/CustomerSatisfactionDetail"; -import { COMMENT_TABLE_TITLE } from "@/config/kfpaConfig"; +import { COMMENT_TABLE_TITLE } from "@/config/kfpa.config"; const UcisPage = () => { const { selectedDiv } = useLayoutFilter(); diff --git a/src/app/globals.css b/src/app/globals.css index 3514fc1..d23f3f5 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -530,7 +530,7 @@ .kfpa-table tbody th, .kfpa-table tbody td { - padding: 7px 12px; + padding: 6px 12px; } .kfpa-table thead tr.kfpa-table__chart-row > th, diff --git a/src/components/combo/TopChartTable.tsx b/src/components/combo/TopChartTable.tsx index eb64cd0..8e7def9 100644 --- a/src/components/combo/TopChartTable.tsx +++ b/src/components/combo/TopChartTable.tsx @@ -18,7 +18,7 @@ TopChartTableSectionRow import {ChartData} from "../chart/types"; import {CHART_HEIGHTS, TABLE_DIMENSIONS} from "../chart/chart.config"; import type {DataColumn, SignStyle} from "@/components/table/types"; -import { CUSTOMER_SATISFACTION_DECIMAL_PLACES } from "@/config/kfpaConfig"; +import { CUSTOMER_SATISFACTION_DECIMAL_PLACES } from "@/config/kfpa.config"; export type TopChartTableProps = { title?: string; diff --git a/src/components/kfpa/CustomerSatisfactionDetail.tsx b/src/components/kfpa/CustomerSatisfactionDetail.tsx index 49210bc..4b3bb18 100644 --- a/src/components/kfpa/CustomerSatisfactionDetail.tsx +++ b/src/components/kfpa/CustomerSatisfactionDetail.tsx @@ -21,7 +21,7 @@ import { getDashboardRankRows, getSideMenuLabel, RANK_TABLE_TITLE, -} from "@/config/kfpaConfig"; +} from "@/config/kfpa.config"; import CustomerSatisfactionRankTable from "./CustomerSatisfactionRankTable"; import CustomerSatisfactionCommentTable from "./CustomerSatisfactionCommentTable"; import { diff --git a/src/components/kfpa/CustomerSatisfactionSummary.tsx b/src/components/kfpa/CustomerSatisfactionSummary.tsx index d6462e6..6b35f1a 100644 --- a/src/components/kfpa/CustomerSatisfactionSummary.tsx +++ b/src/components/kfpa/CustomerSatisfactionSummary.tsx @@ -6,7 +6,7 @@ import TopChartTable from "@/components/combo/TopChartTable"; import type { TopChartTableRow } from "@/components/combo/types"; import VerticalBar from "@/components/chart/VerticalBar"; import type { DataColumn } from "@/components/table/types"; -import { GAP_WORDING } from "@/const/kfpa.const"; + import { CUSTOMER_SATISFACTION_DECIMAL_PLACES, CUSTOMER_SATISFACTION_GAP_SIGN_STYLE, @@ -14,11 +14,12 @@ import { DASHBOARD_TOTAL_TITLE_BY_CATEGORY, DIV_KEYS, SUMMARY_CATEGORY_KEYS, - getDashboardTotalTableLayout, -} from "@/config/kfpaConfig"; + getDashboardTotalTableLayout, GAP_WORDING, SUMMARY_AVERAGE_GAP_WORDING, +} from "@/config/kfpa.config"; import { useLayoutFilter } from "@/components/layout/LayoutCategoryContext"; import { useCsiSummaryQuery } from "@/query/statistics"; import { + getAverageGapValue, getSummaryColumnLabel, getSummaryCsiValue, getSummaryDataKey, @@ -46,8 +47,6 @@ const CustomerSatisfactionSummary = () => { const latestWave = waves.at(-1); const selectedWaves = latestWave == null ? [] : [latestWave - 1, latestWave]; - const currentWave = selectedWaves.at(-1); - const columns: DataColumn>[] = summaryColumns.map((key) => ({ key, header: getSummaryColumnLabel(key), @@ -59,12 +58,12 @@ const CustomerSatisfactionSummary = () => { const categories = summaryColumns.map(getSummaryColumnLabel); const rows: TopChartTableRow[] = - selectedWaves.length === 0 || currentWave == null + selectedWaves.length === 0 || latestWave == undefined ? [] : [ { label: "응답건수", - values: summaryColumns.map((key) => getSummarySampleCount(data, getSummaryDataKey(key), currentWave)), + values: summaryColumns.map((key) => getSummarySampleCount(data, getSummaryDataKey(key), latestWave)), preAppendCells: [ { content: "", @@ -74,38 +73,40 @@ const CustomerSatisfactionSummary = () => { ], labelClassName: "bg-gray-300 text-center font-bold", cellClassName: "bg-gray-300", - labelWidth: 90, decimalPlaces: 0, }, { label: GAP_WORDING, values: summaryColumns.map((key) => - getSummaryGapValue(data, getSummaryDataKey(key), selectedWaves[0], currentWave) + getSummaryGapValue(data, getSummaryDataKey(key), selectedWaves[0], latestWave) ), preAppendCells: [ { content: DASHBOARD_METRIC_GROUP_LABEL_MAP.csi, - rowSpan: selectedWaves.length + 1, + rowSpan: selectedWaves.length + 2, width: 140, className: "bg-csi text-center align-middle font-bold content-text-base", }, ], labelClassName: "bg-csi text-center font-bold", - labelWidth: 80, }, ...selectedWaves.map((wave) => ({ label: getWaveLabel(wave), values: summaryColumns.map((key) => getSummaryCsiValue(data, getSummaryDataKey(key), wave)), labelClassName: "bg-csi text-center font-bold", - labelWidth: 80, })), + { + label: SUMMARY_AVERAGE_GAP_WORDING, + values: summaryColumns.map((key) => getAverageGapValue(data, getSummaryDataKey(DIV_KEYS[0]), getSummaryDataKey(key), latestWave)), + labelClassName: "bg-csi text-center font-bold", + } ]; const chartData: ChartData = { categories, series: selectedWaves.map((wave) => ({ name: getWaveLabel(wave), - data: summaryColumns.map((key) => getSummaryCsiValue(data, getSummaryDataKey(key), wave) ?? null), + data: summaryColumns.map((key) => getSummaryCsiValue(data, getSummaryDataKey(key), wave) ?? 0), })), }; @@ -148,7 +149,7 @@ const CustomerSatisfactionSummary = () => { barMaxWidth={30} showFocusLabel="all" labelOptions={{ position: "top", distance: 4 }} - grid={{ left: 0, right: 0, top: 40, bottom: 5 }} + grid={{ left: 0, right: 0, top: 20, bottom: 5 }} xAxis={{ type: "category", data: categories, diff --git a/src/components/kfpa/CustomerSatisfactionTotal.tsx b/src/components/kfpa/CustomerSatisfactionTotal.tsx index a9ffaae..f0d6772 100644 --- a/src/components/kfpa/CustomerSatisfactionTotal.tsx +++ b/src/components/kfpa/CustomerSatisfactionTotal.tsx @@ -9,7 +9,7 @@ import { useCsiDataQuery } from "@/query/statistics"; import type { DashboardMetricConfig, DashboardMetricGroup } from "@/types/kfpa"; import VerticalBar from "@/components/chart/VerticalBar"; import type { DataColumn } from "@/components/table/types"; -import { GAP_WORDING } from "@/const/kfpa.const"; + import { CUSTOMER_SATISFACTION_GAP_SIGN_STYLE, DASHBOARD_METRIC_GROUP_LABEL_MAP, @@ -17,14 +17,15 @@ import { REGION_KEY_MAP, getDashboardMetricConfigs, getDashboardTotalColumnEntries, - getDashboardTotalTableLayout, -} from "@/config/kfpaConfig"; -import type { DashboardTotalTableLayout } from "@/config/kfpaConfig"; + getDashboardTotalTableLayout, GAP_WORDING, AVERAGE_GAP_WORDING, DIV_KEYS, +} from "@/config/kfpa.config"; +import type { DashboardTotalTableLayout } from "@/config/kfpa.config"; import { useLayoutFilter } from "@/components/layout/LayoutCategoryContext"; import { + getAverageGapValue, getCsiDataByWave, getCsiMetricGapValue, - getCsiMetricValue, + getCsiMetricValue, getSummaryDataKey, getWaveLabel, } from "@/lib/kfpa-util"; @@ -95,7 +96,9 @@ const CustomerSatisfactionTotal = () => { [categoryKey] ); - const { categoryColumns, categories, rows, verticalChartData } = useMemo(() => { + const addAverageGapRow = useMemo(() => categoryKey === "2601009_A", [categoryKey]); + + const { categoryColumns, categories, rows, chartData } = useMemo(() => { const waves = Array.from( new Set( Object.values(data ?? {}) @@ -116,7 +119,7 @@ const CustomerSatisfactionTotal = () => { const categories = divisionColumns.map((div) => div.label); const rows: TopChartTableRow[] = - selectedWaves.length === 0 + selectedWaves.length === 0 || latestWave == undefined ? [] : metrics.flatMap((metric, metricIndex) => [ @@ -130,6 +133,13 @@ const CustomerSatisfactionTotal = () => { label: getWaveLabel(wave), values: divisionColumns.map((div) => getCsiMetricValue(data, div.key, wave, metric.key)), })), + ...(addAverageGapRow && metric.group === "csi" + ? [{ + label: AVERAGE_GAP_WORDING, + values: divisionColumns.map((div) => getAverageGapValue(data, DIV_KEYS[0], div.key, latestWave)), + }] + : [] + ), ].map((row, rowIndex) => ({ ...row, preAppendCells: getPreAppendCells( @@ -137,7 +147,7 @@ const CustomerSatisfactionTotal = () => { metric, metricIndex, rowIndex, - selectedWaves.length + 1, + selectedWaves.length + (addAverageGapRow && metric.group === "csi"? 2 : 1), tableLayout ), labelClassName: cn(`bg-${metric.group}`, "text-center", row.label !== GAP_WORDING && "font-bold"), @@ -145,7 +155,7 @@ const CustomerSatisfactionTotal = () => { })) ); - const verticalChartData: ChartData = { + const chartData: ChartData = { categories, series: selectedWaves.map((wave) => ({ name: getWaveLabel(wave), @@ -157,7 +167,7 @@ const CustomerSatisfactionTotal = () => { categoryColumns, categories, rows, - verticalChartData, + chartData, }; }, [data, divisionColumns, metrics, tableLayout]); @@ -197,7 +207,7 @@ const CustomerSatisfactionTotal = () => { rows={rows} sectionRows={[ { - afterRowIndex: 2, + afterRowIndex: addAverageGapRow? 3 : 2, content: "고객만족지수 세부 항목", className: "bg-gray-400 text-center font-bold", bodyClassName: "bg-gray-400 text-center", @@ -209,14 +219,14 @@ const CustomerSatisfactionTotal = () => { chartHeight={200} chart={ value.toFixed(2)} barMaxWidth={30} showFocusLabel="all" labelOptions={{ position: "top", distance: 4 }} - grid={{ left: 0, right: 0, top: 40, bottom: 5 }} + grid={{ left: 0, right: 0, top: 20, bottom: 5 }} xAxis={{ type: "category", data: categories, diff --git a/src/components/layout/Header.tsx b/src/components/layout/Header.tsx index a63c744..a9bae57 100644 --- a/src/components/layout/Header.tsx +++ b/src/components/layout/Header.tsx @@ -4,7 +4,7 @@ import Image from "next/image"; import {Button} from "@/components/ui/button"; import {LogIn, LogOut} from "lucide-react"; import {cn} from "@/lib/utils"; -import {SITE_TITLE} from "@/config/kfpaConfig"; +import {SITE_TITLE} from "@/config/kfpa.config"; import {TopMenuItem} from "@/config/menu.type"; import {usePathname} from "next/navigation"; diff --git a/src/config/kfpaConfig.ts b/src/config/kfpa.config.ts similarity index 96% rename from src/config/kfpaConfig.ts rename to src/config/kfpa.config.ts index 5baef93..7768fdf 100644 --- a/src/config/kfpaConfig.ts +++ b/src/config/kfpa.config.ts @@ -1,17 +1,25 @@ import type { TopChartTableRow } from "@/components/combo/types"; import type { SignStyle } from "@/components/table/types"; -import { GAP_WORDING } from "@/const/kfpa.const"; export const SITE_TITLE = "고객 관계 성과측정 실시간 대시보드"; -export const CUSTOMER_SATISFACTION_DECIMAL_PLACES = 2; - export const RANK_TABLE_TITLE = "물건 유형별 고객만족지수"; -export const COMMENT_TABLE_TITLE = "고객 관점의 성과분류"; +export const COMMENT_TABLE_TITLE = "고객 관점 성과 분류"; + +export const CUSTOMER_SATISFACTION_DECIMAL_PLACES = 2; + +export const VIEW_DECIMAL_POINT = 0; + +export const GAP_WORDING = "전년 대비"; + +export const SUMMARY_AVERAGE_GAP_WORDING = "지역본부 평균 대비"; + +export const AVERAGE_GAP_WORDING = "평균 대비"; export const CUSTOMER_SATISFACTION_GAP_SIGN_STYLE: SignStyle = { - rowSelector: (row) => row.label === GAP_WORDING, + rowSelector: (row) => + [GAP_WORDING, AVERAGE_GAP_WORDING, SUMMARY_AVERAGE_GAP_WORDING].includes(row.label), display: "arrow", arrowWithNumber: true, paint: "text", diff --git a/src/config/menu.data.ts b/src/config/menu.data.ts index d4e49ee..6e48691 100644 --- a/src/config/menu.data.ts +++ b/src/config/menu.data.ts @@ -4,7 +4,7 @@ import { CATEGORY_PATH_MAP, SIDE_MENU_KEY_MAP_BY_CATEGORY, SIDE_MENU_KEYS_BY_CATEGORY -} from "./kfpaConfig"; +} from "./kfpa.config"; import { Building } from 'lucide-react'; export const TOP_MENUS: TopMenuItem[] = Object.entries(CATEGORY_KEY_MAP).map( diff --git a/src/const/kfpa.const.ts b/src/const/kfpa.const.ts deleted file mode 100644 index 694cfdb..0000000 --- a/src/const/kfpa.const.ts +++ /dev/null @@ -1,2 +0,0 @@ -export const VIEW_DECIMAL_POINT = 0; -export const GAP_WORDING = "전년 대비"; \ No newline at end of file diff --git a/src/lib/kfpa-util.ts b/src/lib/kfpa-util.ts index a2bdb01..c932d72 100644 --- a/src/lib/kfpa-util.ts +++ b/src/lib/kfpa-util.ts @@ -3,7 +3,7 @@ import { DASHBOARD_COMMENT_COLUMNS, DIV_KEY_MAP, REGION_KEY_MAP, -} from "@/config/kfpaConfig"; +} from "@/config/kfpa.config"; import type { CommentColumn, CommentValue, @@ -72,6 +72,21 @@ export const getSummaryGapValue = ( return currentValue - previousValue; }; +export const getAverageGapValue = ( + dataMap: CsiSummaryMap | undefined, + averageKey: string, + key: string, + wave: number, +) => { + if(averageKey === key) return null; + + const averageValue = getSummaryCsiValue(dataMap, averageKey, wave); + const currentValue = getSummaryCsiValue(dataMap, key, wave); + + if (averageValue == null || currentValue == null) return null; + return currentValue - averageValue; +}; + export const getSelectedDetail = (data: Record | undefined, selectedDiv: string) => { if (!data) return undefined; return data[selectedDiv] ?? Object.values(data)[0]; diff --git a/src/lib/utils.ts b/src/lib/utils.ts index d71553b..9bd42b7 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -1,6 +1,6 @@ import { clsx, type ClassValue } from "clsx" import { twMerge } from "tailwind-merge" -import {VIEW_DECIMAL_POINT} from "@/const/kfpa.const"; +import {VIEW_DECIMAL_POINT} from "@/config/kfpa.config"; export function cn(...inputs: ClassValue[]) { return twMerge(clsx(inputs)) diff --git a/src/types/kfpa.ts b/src/types/kfpa.ts index e8a65b2..8326486 100644 --- a/src/types/kfpa.ts +++ b/src/types/kfpa.ts @@ -2,7 +2,7 @@ import type { CATEGORY_KEY_MAP, DASHBOARD_COMMENT_ROWS_BY_CATEGORY, DASHBOARD_METRICS_BY_CATEGORY, -} from "@/config/kfpaConfig"; +} from "@/config/kfpa.config"; export type CategoryKey = keyof typeof CATEGORY_KEY_MAP;