Merge branch 'main' into iipbs/sn/dev

This commit is contained in:
2025-12-14 21:34:11 +09:00
13 changed files with 228 additions and 233 deletions
+39 -30
View File
@@ -1,4 +1,6 @@
import { client } from "@/shared/api";
import { ENDPOINT } from "@/shared/config";
import type { PageableList } from "@/shared/model";
export interface Support {
total: number;
@@ -7,38 +9,45 @@ export interface Support {
youngsang: number;
geum: number;
nakdong: number;
completed: number;
type: string;
}
export const getSupportList = async () => {
const url = `/api/proxy${ENDPOINT.IC_SERVICE.GROUPING_STATISTICS}`;
console.log("[getSupportList] API 호출 시작 (프록시, 인증 없음):", url);
try {
const response = await fetch(url, {
method: "GET",
headers: {
"Content-Type": "application/json",
accept: "application/json",
export const getSupportList = async (): Promise<PageableList<Support>> => {
const response = await client.get<Support[]>(
`${ENDPOINT.IC_SERVICE.GROUPING_STATISTICS}`,
);
const data = response.data;
console.log("getSupportList data:", data);
return {
content: data,
pageable: {
sort: {
sorted: false,
unsorted: true,
empty: true,
},
});
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
}
const data = await response.json();
console.log("[getSupportList] API 응답 성공:", data);
return data;
} catch (error: unknown) {
const err = error as
| { status?: number; message?: string; response?: { status?: number } }
| undefined;
console.error("[getBannerList] API 호출 실패:", {
url,
error: err,
status: err?.status ?? err?.response?.status,
message: err instanceof Error ? err.message : String(err),
});
throw error;
}
offset: 0,
pageNumber: 0,
pageSize: data.length,
paged: false,
unpaged: true,
},
sort: {
sorted: false,
unsorted: true,
empty: true,
},
totalPages: 1,
totalElements: data.length,
number: 0,
numberOfElements: data.length,
size: data.length,
first: true,
last: true,
empty: data.length === 0,
};
};
@@ -61,7 +61,7 @@ const FoFcltCntRt: React.FC = () => {
<h3 className="text-2xl font-medium">수계별 시설운영 개소수 및 가동률</h3>
<BasinSelect selectedBasin={selectedBasin} onValueChange={onBasinChange} />
</div>
<div className="h-60 p-4">
<div className="h-70 p-4">
<div className="flex gap-2 h-full">
{/* 왼쪽: 개소수 카드 */}
<div className="flex-1">
@@ -69,7 +69,7 @@ const FoFcltCntRt: React.FC = () => {
<div className="card-header text-foreground text-center">
<h3 className="text-l font-medium mx-auto">개소수 ({year}년도)</h3>
</div>
<div className="flex items-center justify-center flex-1">
<div className="flex items-center justify-center flex-1" style={{ height: "200px" }}>
<div style={{ fontSize: "38px", textAlign: "center", fontWeight: "600", lineHeight: "1.2", color: "#0ec58a" }}>
{displayData.facilityCount.toLocaleString()} <span style={{ fontSize: "14px", color: "#000000" }}>개소</span>
</div>
@@ -199,7 +199,7 @@ const FoWqltInflEffl: React.FC = () => {
<h3 className="text-2xl font-medium">수계별 유입ㆍ방류수질 분석</h3>
<BasinSelect selectedBasin={selectedBasin} onValueChange={onBasinChange} />
</div>
<div className="h-60">
<div style={{ width: "100%", maxWidth: 400, height: 180 }}>
<div style={{ padding: '4px', height: '100%', display: 'flex', flexDirection: 'column' }}>
{/* 탭 메뉴 */}
<div style={{ display: 'flex', gap: '20px', borderBottom: '1px solid #000000', flexShrink: 0 }}>
+2 -16
View File
@@ -14,9 +14,6 @@ import { Button } from "@common/components";
const NoticeList: React.FC = () => {
const router = useRouter();
// #region agent log
fetch('http://127.0.0.1:7242/ingest/fdf9af6c-c6f9-41cb-8b7f-640be19ecbac',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({location:'notice-list.tsx:16',message:'Router initialized',data:{routerExists:!!router},timestamp:Date.now(),sessionId:'debug-session',runId:'run1',hypothesisId:'E'})}).catch(()=>{});
// #endregion
const noticePostQuery = useQuery({
queryKey: [ENDPOINT.BOARD_SERVICE.POSTS],
queryFn: () =>
@@ -33,22 +30,11 @@ const NoticeList: React.FC = () => {
};
const handleMoreClick = () => {
// #region agent log
fetch('http://127.0.0.1:7242/ingest/fdf9af6c-c6f9-41cb-8b7f-640be19ecbac',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({location:'notice-list.tsx:32',message:'Button click handler called',data:{targetPath:'/cms/bbsnotice/7'},timestamp:Date.now(),sessionId:'debug-session',runId:'run1',hypothesisId:'A'})}).catch(()=>{});
// #endregion
try {
// #region agent log
fetch('http://127.0.0.1:7242/ingest/fdf9af6c-c6f9-41cb-8b7f-640be19ecbac',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({location:'notice-list.tsx:35',message:'Before router.push',data:{routerExists:!!router,path:'/cms/bbsnotice/7'},timestamp:Date.now(),sessionId:'debug-session',runId:'run1',hypothesisId:'B'})}).catch(()=>{});
// #endregion
router.push('/cms/bbsnotice/7');
// #region agent log
fetch('http://127.0.0.1:7242/ingest/fdf9af6c-c6f9-41cb-8b7f-640be19ecbac',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({location:'notice-list.tsx:43',message:'After router.push',data:{navigationCalled:true},timestamp:Date.now(),sessionId:'debug-session',runId:'run1',hypothesisId:'B'})}).catch(()=>{});
// #endregion
} catch (error) {
// #region agent log
fetch('http://127.0.0.1:7242/ingest/fdf9af6c-c6f9-41cb-8b7f-640be19ecbac',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({location:'notice-list.tsx:41',message:'Router.push error',data:{error:error instanceof Error?error.message:String(error)},timestamp:Date.now(),sessionId:'debug-session',runId:'run1',hypothesisId:'B'})}).catch(()=>{});
// #endregion
}
console.error("공지사항 더보기 이동 실패", error);
}
};
const { tableComponent: noticePostTableComponent } = useDataTable({
@@ -185,7 +185,7 @@ const ReuseChart: React.FC = () => {
<h3 className="text-2xl font-medium">{chartItems[activeIndex]?.title}</h3>
<Button className="h-[3.2rem]" onClick={handleMoreClick}>더보기</Button>
</div>
<div className="h-60 p-4 relative overflow-hidden">
<div className="p-4 relative overflow-hidden" style={{ width: "100%", maxWidth: 400, height: 180 }}>
<div
className="flex transition-transform duration-500 ease-in-out h-full"
style={{ transform: `translateX(-${activeIndex * 100}%)` }}
@@ -197,7 +197,7 @@ const ReuseChart: React.FC = () => {
))}
</div>
<div className="absolute bottom-4 left-1/2 -translate-x-1/2 flex space-x-2">
<div className="absolute bottom-0 left-1/2 -translate-x-1/2 flex space-x-2">
{chartItems.map((_, index) => (
<button
key={index}
@@ -40,7 +40,7 @@ const ReuseStatus: React.FC = () => {
<div className="w-full h-full flex items-center justify-center">
<table className="w-full border-collapse text-md">
<thead>
<tr>
<tr style={{ height: "35px" }}>
<th className="bg-blue-500 text-white font-bold py-1 px-3 border border-gray-300">
년도
</th>
@@ -57,7 +57,7 @@ const ReuseStatus: React.FC = () => {
</thead>
<tbody>
{reuseStatusData && reuseStatusData.length > 0 && reuseStatusData?.map((row, index) => (
<tr key={index} className="hover:bg-gray-50">
<tr key={index} className="hover:bg-gray-50" style={{ height: "35px" }}>
<td className="bg-blue-100 font-semibold text-center py-1 px-3 border border-gray-300">
{row.yr}
</td>
@@ -168,7 +168,7 @@ export default function SnOldPpl() {
<Button className="h-[3.2rem]" onClick={handleMoreClick}>더보기</Button>
</div>
<div className="h-70 p-0 flex items-center justify-center">
<div style={{ width: "100%", maxWidth: 400, height: 131 }}>
<div style={{ width: "100%", maxWidth: 400, height: 180 }}>
<Bar options={options} data={chartData} />
</div>
</div>
@@ -195,7 +195,7 @@ export default function SnPplStatus() {
<Button className="h-[3.2rem]" onClick={handleMoreClick}>더보기</Button>
</div>
<div className="h-60 p-4">
<div style={{ width: "100%", maxWidth: 400, height: 150 }}>
<div style={{ width: "100%", maxWidth: 400, height: 180 }}>
<Bar options={options} data={chartData} />
</div>
</div>
@@ -9,7 +9,7 @@ import { getSupportList } from "../api/support";
const SupportList: React.FC = () => {
const supportQuery = useQuery({
queryKey: [ENDPOINT.BOARD_SERVICE.POSTS],
queryKey: [ENDPOINT.IC_SERVICE.GROUPING_STATISTICS],
queryFn: () => getSupportList(),
});