Merge branch 'iipbs/fo/dev' into iipbs/sn/dev
This commit is contained in:
@@ -17,7 +17,7 @@ export type { TableUpperProps };
|
||||
export type RdiProps = {
|
||||
bscFctCd : string,
|
||||
sido : string,
|
||||
sigungo : string,
|
||||
gugun : string,
|
||||
bscFctNm : string,
|
||||
lclgvrnmntNm : string,
|
||||
daddr : string,
|
||||
@@ -40,7 +40,7 @@ export type RdiProps = {
|
||||
export interface RdiInterface {
|
||||
bscFctCd : string,
|
||||
sido : string,
|
||||
sigungo : string,
|
||||
gugun : string,
|
||||
bscFctNm : string,
|
||||
lclgvrnmntNm : string,
|
||||
daddr : string,
|
||||
@@ -103,7 +103,7 @@ export interface ExcelType {
|
||||
const upHeadList1:TableUpperProps[] = [
|
||||
{ id: "A", title: "행정구역", row:0, colSpan:2 },
|
||||
{ id: "sido", title: "시도", row:1, widthPercent: 6 },
|
||||
{ id: "sigungo", title: "시군구", row:1, widthPercent: 6 },
|
||||
{ id: "gugun", title: "시군구", row:1, widthPercent: 6 },
|
||||
{ id: "bscFctNm", title: "시설명", row:0, rowSpan:2, widthPercent: 7 },
|
||||
{ id: "daddr", title: "주소", row:0, rowSpan:2 },
|
||||
{ id: "fctCpc", title: "시설용량\n(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 7 },
|
||||
@@ -147,7 +147,7 @@ const upHeadList3:TableUpperProps[] = [
|
||||
{ id: "rgnNm", title: "환경청", row:0, rowSpan:2, widthPercent: 6 },
|
||||
{ id: "B", title: "행정구역", row:0, colSpan:2 },
|
||||
{ id: "sido", title: "시도", upName:"upChangeRe2", upSequnce:1, row:1, widthPercent: 4 },
|
||||
{ id: "sigungo", title: "시군구", upName:"upChangeRe2",upSequnce:2, row:1, widthPercent: 4 },
|
||||
{ id: "gugun", title: "시군구", upName:"upChangeRe2",upSequnce:2, row:1, widthPercent: 4 },
|
||||
{ id: "bscFctNm", title: "시설명", row:0, rowSpan:2, widthPercent: 6 },
|
||||
{ id: "daddr", title: "주소", row:0, rowSpan:2 },
|
||||
{ id: "fctCpc", title: "시설용량\n(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 5 },
|
||||
@@ -185,9 +185,9 @@ const fetchRdiList = async (pageNo: number, pageSize: number, searchYear: string
|
||||
item.infoRnDay = '';
|
||||
item.properYn = '';
|
||||
// item.sido = item.lclgvrnmntNm.split(' ')[0]?.toString() || '';
|
||||
// item.sigungo = item.lclgvrnmntNm.split(' ')[1]?.toString() || '';
|
||||
// item.gugun = item.lclgvrnmntNm.split(' ')[1]?.toString() || '';
|
||||
item.sido = item.sido;
|
||||
item.sigungo = item.gugun;
|
||||
item.gugun = item.gugun;
|
||||
});
|
||||
return { data: res.data, count: res.count }
|
||||
}catch(error){
|
||||
@@ -310,9 +310,9 @@ export const rdiReducer:(set:SetStateFunction)=>RdiActions=(set: SetStateFunctio
|
||||
return {
|
||||
...item,
|
||||
//sido: item.lclgvrnmntNm.split(' ')[0]?.toString() || '',
|
||||
//sigungo: item.lclgvrnmntNm.split(' ')[1]?.toString() || '',
|
||||
//gugun: item.lclgvrnmntNm.split(' ')[1]?.toString() || '',
|
||||
sido: item.sido,
|
||||
sigungo : item.gugun,
|
||||
gugun : item.gugun,
|
||||
inflAmnt: item.inflAmnt?Number(item.inflAmnt).toFixed(1): '' // 유입유량 (강우량)
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user