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

결함수정중

Browse Source
This commit is contained in:
Your Name
2025-07-26 19:57:09 +09:00
parent 55de8cc31e
commit 2fc4f9512f
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/fo/app/pages/sewageOccur/modal/page.tsx
+3 -3
View File
@@ -14,8 +14,8 @@ export default function SewageOccurModal(props: { fcltyName: string; facilityCd
// searchYear 유효성 검사 및 기본값 설정
const validSearchYear = props.searchYear && /^\d{4}$/.test(props.searchYear) ? props.searchYear : new Date().getFullYear().toString();
const [startYearMonth, setStartYearMonth] = useState(props.searchYear+'01');
const [endYearMonth, setEndYearMonth] = useState(props.searchYear+'12');
const [startYearMonth, setStartYearMonth] = useState(validSearchYear+'01');
const [endYearMonth, setEndYearMonth] = useState(validSearchYear+'12');
const [detailList, setDetailList] = useState<modalTableType[]>([]);
const {
upHeadListSewageOccurDetail,
@@ -73,7 +73,7 @@ export default function SewageOccurModal(props: { fcltyName: string; facilityCd
})(),
onChange: (value: string) => {
if (value && /^\d{6}$/.test(value)) {
setEndYearMonth(value.substring(0, 4)+value.substring(4, 6));
setEndYearMonth(value);
}
}
}}
apps/fo/app/store/dashboard/index.tsx
+1 -1
View File
@@ -1120,7 +1120,7 @@ export const dashBoardReducer:(set:(fn: (state: DashBoardType) => DashBoardType)
const summerUsage = sumSummerChungcunFlow / sumSummerChungcunDay;
const winterUsage = sumWinterChungcunFlow / sumWinterChungcunDay;
operationalStatusList[0].groundWaterAvg = Math.round((usage-(usage*0.65*0.8)) * 100) / 100,
operationalStatusList[0].groundWaterAvg = Math.round((usage-(usage*0.65*0.8)) * 100) / 100;
operationalStatusList[0].groundWaterSummer = Math.round((summerUsage-(summerUsage*0.65*0.8)) * 100) / 100;
operationalStatusList[0].groundWaterWinter = Math.round((winterUsage-(winterUsage*0.65*0.8)) * 100) / 100;
apps/fo/app/store/store.tsx
+1 -1
View File
@@ -59,7 +59,7 @@ export const StoreZus =
}
) => {
return createStore<FoStore>()((set) => {
LoginApi.login({userId: "admin1gmail", password: "test1234!"})
LoginApi.login({userId: "CLEANWATER", password: "gktneh12!@"})
return {
...initState,
...CommonReducer(set),
apps/fo/app/store/underWaterInput/index.tsx
+8 -2
View File
@@ -286,7 +286,13 @@ export const calRainEffectDay = (data: FlowDataItem[], weather: string) => {
}
let rtnData : FlowDataItem[] = [];
weather === 'ALL' ? rtnData = data : weather === 'SUNNY' ? rtnData = data.filter((item: FlowDataItem) => item.rainEffectDay === 0) : rtnData = data.filter((item: FlowDataItem) => item.rainEffectDay === 1);
if (weather === 'ALL') {
rtnData = data;
} else if (weather === 'SUNNY') {
rtnData = data.filter((item: FlowDataItem) => item.rainEffectDay === 0);
} else {
rtnData = data.filter((item: FlowDataItem) => item.rainEffectDay === 1);
}
return rtnData;
}
@@ -327,7 +333,7 @@ export const underWaterReducer:(set:(fn: (state: UnderWaterType) => UnderWaterTy
const summerUsage = sumSummerChungcunFlow / sumSummerChungcunDay;
const winterUsage = sumWinterChungcunFlow / sumWinterChungcunDay;
item.underWaterInputYear = Math.round((usage-(usage*0.65*0.8)) * 100) / 100,
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;