diff --git a/src/components/simulator/Simulator.jsx b/src/components/simulator/Simulator.jsx index d9eb6f49..c909ca17 100644 --- a/src/components/simulator/Simulator.jsx +++ b/src/components/simulator/Simulator.jsx @@ -5,7 +5,7 @@ import { Bar } from 'react-chartjs-2' import dayjs from 'dayjs' import { useEffect, useState, useRef } from 'react' -import { useRecoilState, useRecoilValue } from 'recoil' +import { useRecoilValue } from 'recoil' import { floorPlanObjectState } from '@/store/floorPlanObjectAtom' import { useAxios } from '@/hooks/useAxios' @@ -13,7 +13,7 @@ import { useMessage } from '@/hooks/useMessage' import { usePlan } from '@/hooks/usePlan' import { useCanvasMenu } from '@/hooks/common/useCanvasMenu' -import { convertNumberToPriceDecimal, isEmptyArray } from '@/util/common-utils' +import { convertNumberToPriceDecimal } from '@/util/common-utils' export default function Simulator() { const { plans } = usePlan() @@ -40,13 +40,13 @@ export default function Simulator() { const { getMessage } = useMessage() // 차트 관련 - const [chartData1, setChartData1] = useState([]) + const [chartData, setChartData] = useState([]) const data = { labels: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'], datasets: [ { label: 'kWh', - data: chartData1.slice(0, 12), + data: chartData.slice(0, 12), backgroundColor: [ 'rgba(255, 99, 132, 0.2)', @@ -122,10 +122,9 @@ export default function Simulator() { const apiUrl = `/api/pwrGnrSimulation/calculations?objectNo=${objectNo}&planNo=${plan?.id}` const resultData = await get({ url: apiUrl }) if (resultData) { - console.log(resultData) setObjectDetail(resultData) if (resultData.frcPwrGnrList) { - setChartData1(resultData.frcPwrGnrList) + setChartData(resultData.frcPwrGnrList) } if (resultData.pcsList) { setPcsInfoList(resultData.pcsList) @@ -235,7 +234,17 @@ export default function Simulator() { - {chartData1.length > 0 && chartData1.map((data) => {convertNumberToPriceDecimal(data)})} + {chartData.length > 0 ? ( + + {chartData.map((data) => ( + {convertNumberToPriceDecimal(data)} + ))} + + ) : ( + + {getMessage('common.message.no.data')} + + )} diff --git a/src/locales/ja.json b/src/locales/ja.json index 6fe9444d..2d0c2871 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -870,5 +870,25 @@ "estimate.detail.docPopup.docDownload": "文書のダウンロード", "estimate.detail.save.alertMsg": "保存されている見積書で製品を変更した場合、図面や回路には反映されません.", "estimate.detail.save.requiredMsg": "ファイル添付が必須のアイテムがあります。ファイルを添付するか、後日添付をチェックしてください.", - "estimate.detail.reset.confirmMsg": "保存した見積書情報が初期化され、図面情報が反映されます。本当に初期化しますか?" + "estimate.detail.reset.confirmMsg": "保存した見積書情報が初期化され、図面情報が反映されます。本当に初期化しますか?", + "simulator.title.sub1": "物件番号", + "simulator.title.sub2": "作成日", + "simulator.title.sub3": "システム容量", + "simulator.title.sub4": "年間予測発電量", + "simulator.title.sub5": "都道府県", + "simulator.title.sub6": "日射量観測地点", + "simulator.title.sub7": "積雪条件", + "simulator.title.sub8": "風速条件", + "simulator.title.sub9": "以下", + "simulator.table.sub1": "屋根面", + "simulator.table.sub2": "傾斜角", + "simulator.table.sub3": "方位角(度)", + "simulator.table.sub4": "太陽電池モジュール", + "simulator.table.sub5": "枚数", + "simulator.table.sub6": "合計", + "simulator.table.sub7": "パワーコンディショナー", + "simulator.table.sub8": "台", + "simulator.table.sub9": "予測発電量 (kWh)", + "simulator.notice.sub1": "Hanwha Japan 年間発電量", + "simulator.notice.sub2": "シミュレーション案内事項" } diff --git a/src/locales/ko.json b/src/locales/ko.json index f8d6d28b..55e1becb 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -876,5 +876,25 @@ "estimate.detail.docPopup.docDownload": "문서 다운로드", "estimate.detail.save.alertMsg": "저장되었습니다. 견적서에서 제품을 변경할 경우, 도면 및 회로에 반영되지 않습니다.", "estimate.detail.save.requiredMsg": "파일첨부가 필수인 아이템이 있습니다. 파일을 첨부하거나 후일첨부를 체크해주십시오.", - "estimate.detail.reset.confirmMsg": "저장된 견적서 정보가 초기화되고, 도면정보가 반영됩니다. 정말로 초기화 하시겠습니까?" + "estimate.detail.reset.confirmMsg": "저장된 견적서 정보가 초기화되고, 도면정보가 반영됩니다. 정말로 초기화 하시겠습니까?", + "simulator.title.sub1": "물건번호", + "simulator.title.sub2": "작성일", + "simulator.title.sub3": "시스템 용량", + "simulator.title.sub4": "연간예측발전량", + "simulator.title.sub5": "도도부현", + "simulator.title.sub6": "일사량 관측지점", + "simulator.title.sub7": "적설조건", + "simulator.title.sub8": "풍속조건", + "simulator.title.sub9": "이하", + "simulator.table.sub1": "지붕면", + "simulator.table.sub2": "경사각", + "simulator.table.sub3": "방위각(도)", + "simulator.table.sub4": "태양전지모듈", + "simulator.table.sub5": "매수", + "simulator.table.sub6": "합계", + "simulator.table.sub7": "파워 컨디셔너", + "simulator.table.sub8": "대", + "simulator.table.sub9": "예측발전량 (kWh)", + "simulator.notice.sub1": "Hanwha Japan 연간 발전량", + "simulator.notice.sub2": "시뮬레이션 안내사항" }