wr: 검색어 있는 경우 paging과 건축물용도
This commit is contained in:
+2
-2
@@ -16,8 +16,8 @@ NEXT_PUBLIC_LX_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver
|
||||
NEXT_PUBLIC_CS_TUS_UPLOAD = /attach-service/api/v1/tus/upload
|
||||
NEXT_PUBLIC_NGII_URL = https://map.ngii.go.kr
|
||||
NEXT_PUBLIC_NGII_PARAM = 04trYP9_xwLAfALjwZ-B8g&service=WMTS&request=GetTile&version=1.0.0&format=image/png&layer=korean_map&style=korean&tilematrixset=korean&tilematrix={z}&tilecol={x}&tilerow={y}
|
||||
# NEXT_PUBLIC_GATEWAY_URL=http://con.mind-one.co.kr:11083 # 개발 서버 API
|
||||
NEXT_PUBLIC_GATEWAY_URL=http://localhost:8883 # local
|
||||
NEXT_PUBLIC_GATEWAY_URL=http://con.mind-one.co.kr:11083 # 개발 서버 API
|
||||
# NEXT_PUBLIC_GATEWAY_URL=http://localhost:8883 # local
|
||||
CONTENTS_INTRO = 31
|
||||
CONTENTS_EXAMPLE = 32
|
||||
|
||||
|
||||
+2
-2
@@ -13,8 +13,8 @@ NEXT_PUBLIC_CS_SERVER_API_URL = http://dev.onasys.co.kr:8000
|
||||
NEXT_PUBLIC_CS_TUS_UPLOAD = /attach-service/api/v1/tus/upload
|
||||
NEXT_PUBLIC_GEOSERVER_URL = https://hasudo.geo.rsonesoft.com/geoserver
|
||||
NEXT_PUBLIC_LX_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver
|
||||
# NEXT_PUBLIC_WR_SERVER_API_URL = http://con.mind-one.co.kr:11083/reuse-service/api/v1
|
||||
NEXT_PUBLIC_WR_SERVER_API_URL = http://localhost:8883/reuse-service/api/v1
|
||||
NEXT_PUBLIC_WR_SERVER_API_URL = http://con.mind-one.co.kr:11083/reuse-service/api/v1
|
||||
# NEXT_PUBLIC_WR_SERVER_API_URL = http://localhost:8883/reuse-service/api/v1
|
||||
NEXT_PUBLIC_SEWERAGE_API_URL = http://con.mind-one.co.kr:11083/sewerage-service # 개발 서버 API
|
||||
# NEXT_PUBLIC_SEWERAGE_API_URL=http://localhost:8883/sewerage-service
|
||||
NEXT_PUBLIC_NGII_URL = https://map.ngii.go.kr
|
||||
|
||||
@@ -342,7 +342,16 @@ export default function CoSttn() {
|
||||
? objSearch.sgg
|
||||
: objSearch.city;
|
||||
setPageNation(page);
|
||||
coSttnSearch(String(page), "13", String(con));
|
||||
if (seartchTxt && seartchTxt.trim().length > 0) {
|
||||
coSttnTxtSearch(
|
||||
String(page),
|
||||
"13",
|
||||
String(con),
|
||||
seartchTxt
|
||||
);
|
||||
} else {
|
||||
coSttnSearch(String(page), "13", String(con));
|
||||
}
|
||||
}}
|
||||
resetSelection={isResetSelection}
|
||||
widthFixed={true}
|
||||
|
||||
@@ -80,7 +80,11 @@ export default function Home() {
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
getHtdflBdstData(pageNation, laeSeCd);
|
||||
if (searchTxt && searchTxt.trim().length > 0) {
|
||||
htdflNmSearch(pageNation, laeSeCd, searchTxt);
|
||||
} else {
|
||||
getHtdflBdstData(pageNation, laeSeCd);
|
||||
}
|
||||
setResetPageNo(false);
|
||||
}, [pageNation]);
|
||||
|
||||
@@ -113,7 +117,7 @@ export default function Home() {
|
||||
className={btnClass}
|
||||
onClick={() => {
|
||||
if (searchTxt && searchTxt.length > 0) {
|
||||
htdflNmSearch(String(0), searchTxt);
|
||||
htdflNmSearch(1, String(0), searchTxt);
|
||||
} else {
|
||||
initHtdflReg(String(0));
|
||||
}
|
||||
|
||||
@@ -77,6 +77,7 @@ export default function Home() {
|
||||
archArea: formatArchArea(item?.archArea, 1),
|
||||
bdstChgYn: item.chgBuilding[0]?.bdstChgNm != null ? "Y" : "N",
|
||||
frstArchPrmsnDt: item?.frstArchPrmsnDt || "확인불가",
|
||||
lawTrgtYn: item.reuseBuilding[0]?.lawTrgtYn ?? (item as any).lawTrgtYn,
|
||||
cityText: item.ctpvCd === 0 ? "세종특별자치시" : (item as any).cityText,
|
||||
sggText: (item as any).sggText === "없음" ? "-" : (item as any).sggText,
|
||||
};
|
||||
@@ -97,7 +98,11 @@ export default function Home() {
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
getRainData(pageNation, laeSeCd);
|
||||
if (searchTxt && searchTxt.trim().length > 0) {
|
||||
rainSearch(searchTxt, pageNation, laeSeCd);
|
||||
} else {
|
||||
getRainData(pageNation, laeSeCd);
|
||||
}
|
||||
setResetPageNo(false);
|
||||
}, [pageNation]);
|
||||
|
||||
|
||||
@@ -73,8 +73,9 @@ export default function Home() {
|
||||
return {
|
||||
...item,
|
||||
archArea: formatArchArea(item?.archArea, 1),
|
||||
bdstChgYn: item.chgBuilding[0]?.bdstChgNm != null ? "Y" : "N",
|
||||
chBuildingYn: item.chgBuilding[0]?.bdstChgNm != null ? "Y" : "N",
|
||||
bdstUsgCd: item.reuseBuilding[0]?.bdstUsgCd,
|
||||
instlCmptnDt: item.reuseBuilding[0]?.instlCmptnDt,
|
||||
cityText: item.ctpvCd === 0 ? "세종특별자치시" : (item as any).cityText,
|
||||
sggText: (item as any).sggText === "없음" ? "-" : (item as any).sggText,
|
||||
};
|
||||
@@ -107,7 +108,11 @@ export default function Home() {
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
getRswtBdstData(pageNation,laeSeCd);
|
||||
if (searchTxt && searchTxt.trim().length > 0) {
|
||||
rswtBdstSearch(searchTxt, pageNation, laeSeCd);
|
||||
} else {
|
||||
getRswtBdstData(pageNation,laeSeCd);
|
||||
}
|
||||
setResetPageNo(false);
|
||||
}, [pageNation]);
|
||||
|
||||
|
||||
@@ -99,7 +99,7 @@ export type htdflFacState = {
|
||||
};
|
||||
type htdflFacSActions = {
|
||||
initHtdflReg: (code: string) => void;
|
||||
htdflNmSearch: (code: string | number, fcltNm:string) => void;
|
||||
htdflNmSearch: (pageNation: number, code: string | number, fcltNm:string) => void;
|
||||
htdflBdstUpdate: (data: customHtdflBdst, code: string | number,myUUID:string) => Promise<string>;
|
||||
htdflBdstReg: (data: customHtdflBdst, code: string | number,myUUID:string) => Promise<string>;
|
||||
htdflBdstDelete: (data: customHtdflBdst, code: string | number) => Promise<string>;
|
||||
@@ -250,9 +250,9 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = (
|
||||
} finally {
|
||||
}
|
||||
},
|
||||
htdflNmSearch :async(code:string | number, fcltNm:string) =>{
|
||||
htdflNmSearch :async(pageNation: number, code:string | number, fcltNm:string) =>{
|
||||
try {
|
||||
const htdflRes = await getFetchWithCount("wr", `/drain/facilityList/1/${DEFAULT_LIST_SIZE}/${code}/${fcltNm}`);
|
||||
const htdflRes = await getFetchWithCount("wr", `/drain/facilityList/${pageNation}/${DEFAULT_LIST_SIZE}/${code}/${fcltNm}`);
|
||||
set((state: htdflFacState) => {
|
||||
return {
|
||||
...state,
|
||||
|
||||
@@ -73,7 +73,7 @@ export const upHeadList: TableUpperProps[] = [
|
||||
{ id: "sggText", title: "시군구", widthPercent: 8 },
|
||||
{ id: "bdstNm", title: "시설명", widthPercent: 15 },
|
||||
{ id: "daddr", title: "위치", widthPercent: 22 },
|
||||
{ id: "bdsgUsgText", title: "건축물용도", widthPercent: 12 },
|
||||
{ id: "bdstUsgText", title: "건축물용도", widthPercent: 12 },
|
||||
{ id: "frstArchPrmsnDt", title: "최초\n건축허가일", widthPercent: 9 },
|
||||
{ id: "archArea", title: "건축면적(㎡)", widthPercent: 9 },
|
||||
{ id: "lawTrgtYn", title: "법적의무대상여부", widthPercent: 8 },
|
||||
|
||||
@@ -16,7 +16,7 @@ export const rainSttHeadListExport: z.infer<typeof sttnHeadListType> = [
|
||||
{ id: "sggText", title: "시군구", visible: true, widthPercent: 4 },
|
||||
{ id: "bdstNm", title: "건축물명", visible: true, widthPercent: 6 },
|
||||
{ id: "daddr", title: "주소", visible: true, widthPercent: 8 },
|
||||
{ id: "bdsgUsgText", title: "건축물용도", visible: true, widthPercent: 5 },
|
||||
{ id: "bdstUsgText", title: "건축물용도", visible: true, widthPercent: 5 },
|
||||
{ id: "frstArchPrmsnDt", title: "최초건축허가일시", visible: true, widthPercent: 6 },
|
||||
{ id: "archArea", title: "건축면적", visible: true, widthPercent: 4 },
|
||||
{ id: "chBuildingYn", title: "증축・개축・재축여부", visible: true, widthPercent: 4 },
|
||||
@@ -57,7 +57,7 @@ export const rainSttNodeListExport: CommonTableProps[] = [
|
||||
// 1번째 줄 건축물정보 아래의 행으로 만들 헤더
|
||||
{ id: "bdstNm", title: "건축물명", visible: true, upName: "bdnstInfo", row: 2, rowSpan: 2, colSpan: 1, },
|
||||
{ id: "daddr", title: "주소", visible: true, upName: "bdnstInfo", row: 2, rowSpan: 2, colSpan: 1, },
|
||||
{ id: "bdsgUsgText", title: "건축물용도", upName: "bdnstInfo", visible: true, row: 2, rowSpan: 2, colSpan: 1, },
|
||||
{ id: "bdstUsgText", title: "건축물용도", upName: "bdnstInfo", visible: true, row: 2, rowSpan: 2, colSpan: 1, },
|
||||
{ id: "frstArchPrmsnDt", title: "최초건축허가일시", upName: "bdnstInfo", visible: true, row: 2, rowSpan: 2, colSpan: 1, },
|
||||
{ id: "archArea", title: "건축면적(m²)", upName: "bdnstInfo", visible: true, row: 2, rowSpan: 2, colSpan: 1, },
|
||||
{ id: "chBuildingYn", title: "증축・개축・재축여부", upName: "bdnstInfo", visible: true, row: 2, rowSpan: 2, colSpan: 1, },
|
||||
|
||||
@@ -28,7 +28,7 @@ export const rswtSttHeadListExport: z.infer<typeof sttnHeadListType> = [
|
||||
widthPercent: 8,
|
||||
},
|
||||
{
|
||||
id: "bdsgUsgText",
|
||||
id: "bdstUsgText",
|
||||
title: "건축물용도",
|
||||
visible: true,
|
||||
widthPercent: 5,
|
||||
@@ -223,7 +223,7 @@ export const rswtSttNodeListExport: CommonTableProps[] = [
|
||||
colSpan: 1,
|
||||
},
|
||||
{
|
||||
id: "bdsgUsgText",
|
||||
id: "bdstUsgText",
|
||||
title: "건축물용도",
|
||||
upName: "bdnstInfo",
|
||||
visible: true,
|
||||
|
||||
@@ -52,7 +52,7 @@ export const tableData = (data: any, code: comCodeState) => {
|
||||
(cd) => cd.val === String(item.ctpvCd).trim()
|
||||
)?.text;
|
||||
if (item?.reuseBuilding?.length > 0) {
|
||||
const bdsgUsgText = chCode?.bdstTotalUsgType?.find(
|
||||
const bdstUsgText = chCode?.bdstTotalUsgType?.find(
|
||||
(cd) => cd.val === item?.reuseBuilding[0]?.bdstUsgCd
|
||||
)?.text;
|
||||
|
||||
@@ -66,7 +66,7 @@ export const tableData = (data: any, code: comCodeState) => {
|
||||
...item,
|
||||
sggText: sggText ?? "없음",
|
||||
cityText: cityText ?? "없음",
|
||||
bdsgUsgText: bdsgUsgText, // 건물용도명
|
||||
bdstUsgText: bdstUsgText, // 건물용도명
|
||||
lawTrgtYn: lawTrgtYn, // 법정대상 여부
|
||||
grntchBdstCertGrdText: grntchBdstCertGrdText, // 녹색건축인증등급명
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user