- {/*
*/}
+
-
{
- const label = BASIC_TYPES.find((type) => type.val === basicType)?.text
- return (<>{label} 조회 결과 ({tableCount.toLocaleString('ko-KR')})건);
- })()
- }
- tableData={tableData}
- headlist={dynamicHeadlist}
- pageSize={10}
- total={tableCount}
- cellClick={handleBasicCellClick}
- onPageChange={setCurPage}
- resetPageNo={isResetPage}
- resetSelection={isResetSelection}
- curPage={curPage}
- headButton={
-
-
-
-
- }
- />
- {/* */}
+
{
+ const label = BASIC_TYPES.find((type) => type.val === basicType)?.text
+ return (<>{label} 조회 결과 ({tableCount.toLocaleString('ko-KR')})건);
+ })()
+ }
+ tableData={tableData}
+ headlist={dynamicHeadlist}
+ pageSize={10}
+ total={tableCount}
+ cellClick={handleBasicCellClick}
+ onPageChange={setCurPage}
+ resetPageNo={isResetPage}
+ resetSelection={isResetSelection}
+ curPage={curPage}
+ headButton={
+
+
+
+
+ }
+ />
)}
{/* 유지관리 정보 탭 */}
diff --git a/apps/sn/app/(map-layout)/map/searchModal/useBasicTab.ts b/apps/sn/app/(map-layout)/map/searchModal/useBasicTab.ts
index 80d3deb50..9184286ed 100644
--- a/apps/sn/app/(map-layout)/map/searchModal/useBasicTab.ts
+++ b/apps/sn/app/(map-layout)/map/searchModal/useBasicTab.ts
@@ -14,7 +14,7 @@
*/
import { downloadExcelWithKoreanHeaders } from '@common/business_components/ui';
import {
- MS_SWAGE_PPL_USE_CODES, MS_SWAGE_MHL_CODES, MS_SWAGE_MHL_USE_CODES,
+ MS_SWAGE_PPL_USE_CODES, MS_SWAGE_PPL_CODES, MS_SWAGE_PPL_SHAPE, MS_SWAGE_MHL_CODES, MS_SWAGE_MHL_USE_CODES,
MsSwagePplExcelCol, SwtrmtFcltExcelCol, SwtrmtPrcsZoneExcelCol, MsSwageMhlExcelCol, ExclnSewagePumpExcelCol, stofcbrExcelCol
} from '../components/common/table';
import { getData } from "@/components/lib/api";
@@ -46,6 +46,7 @@ export default function useBasicTab() {
} = useSearchModalStore();
const { ctpv, sgg } = useStore();
+
const fetchBasicFilteredData = async () => {
let cqlFilters: string[] = [];
const queryParams = new URLSearchParams({
@@ -79,8 +80,15 @@ export default function useBasicTab() {
if (!sggCd && code) sggCd = code.slice(0, 5);
}
- const matchedMhlCode = MS_SWAGE_MHL_CODES.find(code => code.val === item?.mqltCd?.trim());
- const matchedMhlUsgCode = MS_SWAGE_MHL_USE_CODES.find(code => code.val === item?.usgCd);
+ const matchedMqltCode = basicType === 'tb_ms_swage_ppl'
+ ? MS_SWAGE_PPL_CODES.find(code => code.val === item?.mqltCd?.trim()) // 하수관로 재질
+ : basicType === 'tb_ms_swage_mhl'
+ ? MS_SWAGE_MHL_CODES.find(code => code.val === item?.mqltCd?.trim()) // 맨홀 재질
+ : undefined;
+ const matchedMhlUsgCode = MS_SWAGE_MHL_USE_CODES.find(code => code.val === item?.usgCd); // 맨홀 용도
+ const matchedPplShpCode = MS_SWAGE_PPL_SHAPE.find(code => code.val === item?.fcltyShpCd); // 하수관로 시설물형태코드
+
+
const ctpvNm = ctpv.find(code => code.val.trim() === ctpvCd)?.text || item?.ctpvNm;
const sggNm = sgg.find(code => code.val.trim() === sggCd)?.text || item?.sggNm;
const usgCdObj = MS_SWAGE_PPL_USE_CODES.find(code => code.val === item?.usgCd?.trim());
@@ -90,15 +98,17 @@ export default function useBasicTab() {
...formattedItem,
rowNumber: (curPage - 1) * 10 + index + 1, // 1부터 시작하는 일련번호 추가
scsYn: item.scsYn === null || item.scsYn === undefined ? 'N' : item?.scsYn, // scsYn이 null이면 'N'으로 변경
- mqltCd: matchedMhlCode ? matchedMhlCode.text : item?.mqltCd,
+ mqltCd: matchedMqltCode ? matchedMqltCode.text : item?.mqltCd,
usgCd: matchedMhlUsgCode ? matchedMhlUsgCode.text : (usgCdObj ? usgCdObj.text : item?.usgCd),
ctpvNm: ctpvNm ?? '-',
sggNm: sggNm ?? '-',
swtrmt_zone_nm: item.swtrmtZoneNm || item.swtrmt_zone_nm || '-',
+ fcltyShpCd: matchedPplShpCode? matchedPplShpCode.text : item?.fcltyShpCd,
};
});
setTableData(dataWithRowNumber);
+ // console.log(tableData);
setTableCount(res.count || []);
};
@@ -150,7 +160,7 @@ export default function useBasicTab() {
// 하수관로
cqlFilters = swagePplCqlFilters()
headerMapping = MsSwagePplExcelCol;
- headerRange = "A1:M1";
+ headerRange = "A1:Q1";
break;
}
case 'tb_il_swage_prcs_fclt': {
@@ -196,6 +206,8 @@ export default function useBasicTab() {
const mhlUsgCdMap = new Map(MS_SWAGE_MHL_USE_CODES.map(code => [code.val?.trim(), code.text]));
const pplUsgCdMap = new Map(MS_SWAGE_PPL_USE_CODES.map(code => [code.val?.trim(), code.text]));
+ const pplMqltCdMap = new Map(MS_SWAGE_PPL_CODES.map(code => [code.val?.trim(), code.text]));
+ const pplShpCdMap = new Map(MS_SWAGE_PPL_SHAPE.map(code => [code.val?.trim(), code.text])); // 관로 시설물형태코드
const ctpvMap = new Map(ctpv.map(code => [code.val?.trim(), code.text]));
const sggMap = new Map(sgg.map(code => [code.val?.trim(), code.text]));
@@ -232,6 +244,10 @@ export default function useBasicTab() {
tmptMhlMngNo: formattedItem.tmptMhlMngNo ?? item.tmptMhlMngNo ?? '-',
scendDpth: formattedItem.scendDpth ?? item.scendDpth ?? '-',
scendMhlMngNo: formattedItem.scendMhlMngNo ?? item.scendMhlMngNo ?? '-',
+ vrtcLen: formattedItem.vrtcLen ?? item.vrtcLen ?? '-',
+ wdthLen: formattedItem.wdthLen ?? item.wdthLen ?? '-',
+ fcltyShpCd: pplShpCdMap.get(item?.fcltyShpCd?.trim()) || item.fcltyShpCd || formattedItem.fcltyShpCd || '-',
+ mqltCd: pplMqltCdMap.get(item?.mqltCd?.trim()) || item.mqltCd || formattedItem.mqltCd || '-',
};
}
case 'tb_il_swage_prcs_fclt': {
@@ -329,4 +345,4 @@ export default function useBasicTab() {
return { fetchBasicFilteredData, handleBasicCellClick, basicExcelDownload };
-};
\ No newline at end of file
+};
diff --git a/packages/common/business_components/src/ui/map/lib/gis.core.js b/packages/common/business_components/src/ui/map/lib/gis.core.js
index e8e05f037..2e97e8af5 100644
--- a/packages/common/business_components/src/ui/map/lib/gis.core.js
+++ b/packages/common/business_components/src/ui/map/lib/gis.core.js
@@ -172,7 +172,7 @@ GisApp.core.prototype = {
wmtsSource.setTileUrlFunction((tileCoord) => {
const [z, x, y] = tileCoord;
const matrix = matrixIds[z];
- console.log(GisApp.NGII_WMTS_URL.replace("{z}", matrix).replace("{x}", x).replace("{y}", y));
+ // console.log(GisApp.NGII_WMTS_URL.replace("{z}", matrix).replace("{x}", x).replace("{y}", y));
return GisApp.NGII_WMTS_URL
.replace("{z}", matrix)
.replace("{x}", x)