qcast3/qcast-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#961) from dev into dev-deploy

Browse Source 
Reviewed-on: #961
This commit is contained in:
ysCha 2026-07-10 12:28:54 +09:00
commit 4771a46a47
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/simulator/Simulator.jsx
View File

@ -226,7 +226,7 @@ export default function Simulator() {
{/* 연간예측발전량 */} {/* 연간예측발전량 */}
<div className="estimate-box"> <div className="estimate-box">
<div className="estimate-tit">{getMessage('simulator.title.sub4')}</div> <div className="estimate-tit">{getMessage('simulator.title.sub4')}</div>
<div className="estimate-name">{chartData[chartData.length - 1]}</div> <div className="estimate-name">{chartData[chartData.length - 1] != null ? `${chartData[chartData.length - 1]} kWh` : ''}</div>
</div> </div>
</div> </div>
<div className="estimate-list-wrap"> <div className="estimate-list-wrap">

2
src/hooks/module/useTrestle.js
View File

@ -3291,6 +3291,7 @@ export const useTrestle = () => {
// 가대 설치 완료 전,후 모든 surface의 isComplete를 변경 // 가대 설치 완료 전,후 모든 surface의 isComplete를 변경
const setAllModuleSurfaceIsComplete = (bool) => { const setAllModuleSurfaceIsComplete = (bool) => {
if (!canvas) return
const surfaces = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE) const surfaces = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE)
surfaces.forEach((surface) => { surfaces.forEach((surface) => {
surface.isComplete = bool surface.isComplete = bool
@ -3299,6 +3300,7 @@ export const useTrestle = () => {
// 배치면 전체에 가대 설치 여부 // 배치면 전체에 가대 설치 여부
const isAllComplete = () => { const isAllComplete = () => {
if (!canvas) return false
const surfaces = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE) const surfaces = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE)
if (surfaces.length === 0) { if (surfaces.length === 0) {
return false return false