Compare commits

..

No commits in common. "64fd0f0cd389c4ee5f9855c5672b598b37b5c163" and "90baee67dcc30b3423e04d4b6deda3a767400dea" have entirely different histories.

3 changed files with 48 additions and 53 deletions

View File

@ -32,7 +32,6 @@ import { useEvent } from '@/hooks/useEvent'
import { compasDegAtom } from '@/store/orientationAtom' import { compasDegAtom } from '@/store/orientationAtom'
import { hotkeyStore } from '@/store/hotkeyAtom' import { hotkeyStore } from '@/store/hotkeyAtom'
import { usePopup } from '@/hooks/usePopup' import { usePopup } from '@/hooks/usePopup'
import { outerLinePointsState } from '@/store/outerLineAtom'
export default function CanvasFrame() { export default function CanvasFrame() {
const canvasRef = useRef(null) const canvasRef = useRef(null)
@ -46,7 +45,6 @@ export default function CanvasFrame() {
const totalDisplay = useRecoilValue(totalDisplaySelector) // const totalDisplay = useRecoilValue(totalDisplaySelector) //
const { setIsGlobalLoading } = useContext(QcastContext) const { setIsGlobalLoading } = useContext(QcastContext)
const resetModuleStatisticsState = useResetRecoilState(moduleStatisticsState) const resetModuleStatisticsState = useResetRecoilState(moduleStatisticsState)
const resetOuterLinePoints = useResetRecoilState(outerLinePointsState)
const resetMakersState = useResetRecoilState(makersState) const resetMakersState = useResetRecoilState(makersState)
const resetSelectedMakerState = useResetRecoilState(selectedMakerState) const resetSelectedMakerState = useResetRecoilState(selectedMakerState)
const resetSeriesState = useResetRecoilState(seriesState) const resetSeriesState = useResetRecoilState(seriesState)
@ -139,7 +137,6 @@ export default function CanvasFrame() {
const resetRecoilData = () => { const resetRecoilData = () => {
// resetModuleStatisticsState() // resetModuleStatisticsState()
resetOuterLinePoints()
resetMakersState() resetMakersState()
resetSelectedMakerState() resetSelectedMakerState()
resetSeriesState() resetSeriesState()

View File

@ -264,6 +264,7 @@ export default function Simulator() {
style={{ width: '30%' }} style={{ width: '30%' }}
className="select-light" className="select-light"
value={pwrGnrSimType} value={pwrGnrSimType}
defaultValue={`D`}
onChange={(e) => { onChange={(e) => {
handleChartChangeData(e.target.value) handleChartChangeData(e.target.value)
setPwrGnrSimType(e.target.value) setPwrGnrSimType(e.target.value)
@ -333,31 +334,33 @@ export default function Simulator() {
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{moduleInfoList.length > 0 ? ( {moduleInfoList.length > 0 ? (
moduleInfoList.map((moduleInfo) => { moduleInfoList.map((moduleInfo) => {
return ( return (
<tr key={moduleInfo.itemId}> <>
{/* 지붕면 */} <tr key={moduleInfo.itemId}>
<td>{moduleInfo.roofSurface}</td> {/* 지붕면 */}
{/* 경사각 */} <td>{moduleInfo.roofSurface}</td>
<td> {/* 경사각 */}
{convertNumberToPriceDecimal(moduleInfo.slopeAngle)} <td>
{moduleInfo.classType == 0 ? '寸' : 'º'} {convertNumberToPriceDecimal(moduleInfo.slopeAngle)}
</td> {moduleInfo.classType == 0 ? '寸' : 'º'}
{/* 방위각(도) */} </td>
<td>{convertNumberToPriceDecimal(moduleInfo.azimuth)}</td> {/* 방위각(도) */}
{/* 태양전지모듈 */} <td>{convertNumberToPriceDecimal(moduleInfo.azimuth)}</td>
<td> {/* 태양전지모듈 */}
<div className="overflow-lab">{moduleInfo.itemNo}</div> <td>
</td> <div className="overflow-lab">{moduleInfo.itemNo}</div>
{/* 매수 */} </td>
<td>{convertNumberToPriceDecimal(moduleInfo.amount)}</td> {/* 매수 */}
</tr> <td>{convertNumberToPriceDecimal(moduleInfo.amount)}</td>
) </tr>
}) </>
) : ( )
<tr> })
<td colSpan={5}>{getMessage('common.message.no.data')}</td> ) : (
<tr>
<td colSpan={5}>{getMessage('common.message.no.data')}</td>
</tr> </tr>
)} )}
</tbody> </tbody>
@ -382,23 +385,25 @@ export default function Simulator() {
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{pcsInfoList.length > 0 ? ( {pcsInfoList.length > 0 ? (
pcsInfoList.map((pcsInfo) => { pcsInfoList.map((pcsInfo) => {
return ( return (
<tr key={pcsInfo.itemId}> <>
{/* 파워컨디셔너 */} <tr key={pcsInfo.itemId}>
<td className="al-l"> {/* 파워컨디셔너 */}
<div className="overflow-lab">{pcsInfo.itemNo}</div> <td className="al-l">
</td> <div className="overflow-lab">{pcsInfo.itemNo}</div>
{/* 대 */} </td>
<td>{convertNumberToPriceDecimal(pcsInfo.amount)}</td> {/* 대 */}
</tr> <td>{convertNumberToPriceDecimal(pcsInfo.amount)}</td>
) </tr>
}) </>
) : ( )
<tr> })
<td colSpan={2}>{getMessage('common.message.no.data')}</td> ) : (
</tr> <tr>
<td colSpan={2}>{getMessage('common.message.no.data')}</td>
</tr>
)} )}
</tbody> </tbody>
</table> </table>

View File

@ -374,18 +374,11 @@ export function useRoofAllocationSetting(id) {
setBasicSetting((prev) => { setBasicSetting((prev) => {
return { ...prev, selectedRoofMaterial: newRoofList.find((roof) => roof.selected) } return { ...prev, selectedRoofMaterial: newRoofList.find((roof) => roof.selected) }
}) })
const selectedRoofMaterial = newRoofList.find((roof) => roof.selected)
const roofs = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF && obj.roofMaterial?.index === selectedRoofMaterial.index)
roofs.forEach((roof) => {
setSurfaceShapePattern(roof, roofDisplay.column, false, { ...selectedRoofMaterial }, true)
drawDirectionArrow(roof)
})
setRoofList(newRoofList) setRoofList(newRoofList)
setRoofMaterials(newRoofList) setRoofMaterials(newRoofList)
setRoofsStore(newRoofList) setRoofsStore(newRoofList)
const selectedRoofMaterial = newRoofList.find((roof) => roof.selected)
setSurfaceShapePattern(currentObject, roofDisplay.column, false, selectedRoofMaterial, true) setSurfaceShapePattern(currentObject, roofDisplay.column, false, selectedRoofMaterial, true)
drawDirectionArrow(currentObject) drawDirectionArrow(currentObject)
modifyModuleSelectionData() modifyModuleSelectionData()