ONAANDALL/frontend
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- 2021년 이전은 ()로 cod안내

Browse Source 
- 오수전환율 90%로 변경
This commit is contained in:
mind-one003
2025-08-18 15:56:10 +09:00
parent d155714d51
commit 95007191ea
3 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/fo/app/store/facilityWaterQlty/index.tsx
+4 -2
View File
@@ -449,6 +449,8 @@ export const facilityWaterQltyReducer = (set: (fn: (state: FacilityWaterQltyType
item.fctCpc = parseFloat(item.fctCpc.toString().replace(/,/g, ''));
item.sidoNm = item.lclgvrnmntNm.split(' ')[0]?.toString() || '';
item.sggNm = item.lclgvrnmntNm.split(' ')[1]?.toString() || '';
item.inflAssctAftWqltToc = Number(searchYear)<2021? "("+item.inflAssctAftWqltToc+")" : item.inflAssctAftWqltToc;
item.inflAssctBfrWqltToc = Number(searchYear)<2021? "("+item.inflAssctBfrWqltToc+")" : item.inflAssctBfrWqltToc;
excelDownList.push({
시설코드: item.bscFctCd,
권역: item.rvbsn,
@@ -478,6 +480,8 @@ export const facilityWaterQltyReducer = (set: (fn: (state: FacilityWaterQltyType
item.fctCpc = parseFloat(item.fctCpc.toString().replace(/,/g, ''));
item.sidoNm = item.lclgvrnmntNm.split(' ')[0]?.toString() || '';
item.sggNm = item.lclgvrnmntNm.split(' ')[1]?.toString() || '';
item.inflAssctAftWqltToc = Number(searchYear)<2021? "("+item.inflAssctAftWqltToc+")" : item.inflAssctAftWqltToc;
item.inflAssctBfrWqltToc = Number(searchYear)<2021? "("+item.inflAssctBfrWqltToc+")" : item.inflAssctBfrWqltToc;
});
}
set((state: FacilityWaterQltyType) => ({
@@ -620,7 +624,6 @@ export const facilityWaterQltyReducer = (set: (fn: (state: FacilityWaterQltyType
if(item.efflWqltTn){
item.efflWqltTn = Number(Math.round(Number(item.efflWqltTn) * 1000)/1000).toFixed(3);
}
if(item.inflAssctBfrWqltTp){
item.inflAssctBfrWqltTp = Number(Math.round(Number(item.inflAssctBfrWqltTp) * 1000)/1000).toFixed(3);
}
@@ -657,7 +660,6 @@ export const facilityWaterQltyReducer = (set: (fn: (state: FacilityWaterQltyType
}else{
item.tpInflWqltBod = '';
}
if(item.tpInflWqltTp){
item.tpInflWqltTp = item.tpInflWqltTp?Number(Math.round(Number(item.tpInflWqltTp) * 1000)/1000).toFixed(3): Number(item.tpInflWqltTp)===0?'0.000':'';
}else{
apps/fo/app/store/sewageOccur/index.tsx
+9 -9
View File
@@ -225,7 +225,7 @@ export const sewageOccurReducer:(set:any)=>SewageOccurActions=(set: any) => {
item.sidoNm = item.lclgvrnmntNm.split(' ')[0]?.toString() || '';
item.sggNm = item.lclgvrnmntNm.split(' ')[1]?.toString() || '';
item.fctCpc = parseFloat(item.fctCpc.toString().replace(/,/g, ''));
item.swageChangePercent = 80;
item.swageChangePercent = 90;
const bscFctCd = item.bscFctCd;
const res2 = await getFetch('fo', '/fclt/flow/' + bscFctCd + '/' + searchYear) as FlowResponse;
@@ -372,8 +372,8 @@ export const sewageOccurReducer:(set:any)=>SewageOccurActions=(set: any) => {
tableData.push({
msrDt: item.yr+'-'+(index+1>=10?String(index+1):'0'+(index+1)),
waterUsage: Math.round(item.usege*100) /100,
swageChangePercent: (Math.round((item.usege/item.usege*0.8) * 100) / 100) * 100,
estimationSewage: Math.round(item.usege*0.8 * 100) / 100
swageChangePercent: (Math.round((item.usege/item.usege*0.9) * 100) / 100) * 100,
estimationSewage: Math.round(item.usege*0.9 * 100) / 100
})
if (item.usege > maxWaterUsage) {
maxWaterUsage = item.usege;
@@ -390,20 +390,20 @@ export const sewageOccurReducer:(set:any)=>SewageOccurActions=(set: any) => {
{
msrDt: '평균',
waterUsage: Math.round(avgWaterUsage*100) /100,
swageChangePercent: 80,
estimationSewage: Math.round(avgWaterUsage*0.8*100) /100,
swageChangePercent: 90,
estimationSewage: Math.round(avgWaterUsage*0.9*100) /100,
},
{
msrDt: '최대',
waterUsage: Math.round(maxWaterUsage*100) /100,
swageChangePercent: 80,
estimationSewage: Math.round(maxWaterUsage*0.8*100) /100,
swageChangePercent: 90,
estimationSewage: Math.round(maxWaterUsage*0.9*100) /100,
},
{
msrDt: '최소',
waterUsage: Math.round(minWaterUsage*100) /100,
swageChangePercent: 80,
estimationSewage: Math.round(minWaterUsage*0.8*100) /100,
swageChangePercent: 90,
estimationSewage: Math.round(minWaterUsage*0.9*100) /100,
},
...tableData
]
apps/fo/app/store/underWaterInput/index.tsx
+11 -11
View File
@@ -367,9 +367,9 @@ export const underWaterReducer:(set:(fn: (state: UnderWaterType) => UnderWaterTy
console.log('usage : ', usage, 'summerUsage : ', summerUsage, 'winterUsage : ', winterUsage);
}
item.underWaterInputYear = Math.round((usage-(usage*0.65*0.8)) * 100) / 100;
item.underWaterInputSummer = Math.round((summerUsage-(summerUsage*0.65*0.8)) * 100) / 100;
item.underWaterInputWinter = Math.round((winterUsage-(winterUsage*0.65*0.8)) * 100) / 100;
item.underWaterInputYear = Math.round((usage-(usage*0.65*0.9)) * 100) / 100;
item.underWaterInputSummer = Math.round((summerUsage-(summerUsage*0.65*0.9)) * 100) / 100;
item.underWaterInputWinter = Math.round((winterUsage-(winterUsage*0.65*0.9)) * 100) / 100;
return item;
}));
@@ -456,8 +456,8 @@ export const underWaterReducer:(set:(fn: (state: UnderWaterType) => UnderWaterTy
tableData.push({
msrDt: item.yr+'-'+(index+1>=10?String(index+1):'0'+(index+1)),
realSewageInput:Math.round(item.usege*100) /100,
sewageOccur:Math.round(item.usege*0.65*0.8 * 100) / 100,
underWaterInput:Math.round((item.usege-(item.usege*0.65*0.8)) * 100) / 100,
sewageOccur:Math.round(item.usege*0.65*0.9 * 100) / 100,
underWaterInput:Math.round((item.usege-(item.usege*0.65*0.9)) * 100) / 100,
})
if (item.usege > maxWaterUsage) {
maxWaterUsage = item.usege;
@@ -475,21 +475,21 @@ export const underWaterReducer:(set:(fn: (state: UnderWaterType) => UnderWaterTy
{
msrDt: '평균',
realSewageInput:Math.round(avgWaterUsage*100) /100,
sewageOccur:Math.round(avgWaterUsage*0.65*0.8 * 100) / 100,
underWaterInput: Math.round((avgWaterUsage-(avgWaterUsage*0.65*0.8)) * 100) / 100
sewageOccur:Math.round(avgWaterUsage*0.65*0.9 * 100) / 100,
underWaterInput: Math.round((avgWaterUsage-(avgWaterUsage*0.65*0.9)) * 100) / 100
//underWaterInput:Math.round((avgWaterUsage-(avgWaterUsage*0.65*0.8)) * 100) / 100,
},
{
msrDt: '최대',
realSewageInput: Math.round(maxWaterUsage*100) /100,
sewageOccur: Math.round(maxWaterUsage*0.65*0.8 * 100) / 100,
underWaterInput: Math.round((maxWaterUsage-(maxWaterUsage*0.65*0.8)) * 100) / 100,
sewageOccur: Math.round(maxWaterUsage*0.65*0.9 * 100) / 100,
underWaterInput: Math.round((maxWaterUsage-(maxWaterUsage*0.65*0.9)) * 100) / 100,
},
{
msrDt: '최소',
realSewageInput: Math.round(minWaterUsage*100) /100,
sewageOccur: Math.round(minWaterUsage*0.65*0.8 * 100) / 100,
underWaterInput: Math.round((minWaterUsage-(minWaterUsage*0.65*0.8)) * 100) / 100,
sewageOccur: Math.round(minWaterUsage*0.65*0.9 * 100) / 100,
underWaterInput: Math.round((minWaterUsage-(minWaterUsage*0.65*0.9)) * 100) / 100,
},
...tableData
]