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

dev #92

Merged
ysCha merged 2 commits from dev into dev-deploy 2025-06-02 14:01:05 +09:00
Conversation 0 Commits 2 Files Changed 2 +4 -3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/floor-plan/modal/basic/step/Trestle.jsx
View File

@ -236,7 +236,7 @@ const Trestle = forwardRef((props, ref) => {
illuminationTp: managementState?.surfaceTypeValue ?? '', illuminationTp: managementState?.surfaceTypeValue ?? '',
instHt: managementState?.installHeight ?? '', instHt: managementState?.installHeight ?? '',
stdWindSpeed: managementState?.standardWindSpeedId ?? '', stdWindSpeed: managementState?.standardWindSpeedId ?? '',
stdSnowLd: +managementState?.verticalSnowCover ?? '', stdSnowLd: managementState?.verticalSnowCover ?? '',
inclCd: selectedRoof?.pitch ?? 0, inclCd: selectedRoof?.pitch ?? 0,
roofPitch: Math.round(hajebichi ?? 0), roofPitch: Math.round(hajebichi ?? 0),
constTp: constructionList[index].constTp, constTp: constructionList[index].constTp,
@ -304,6 +304,7 @@ const Trestle = forwardRef((props, ref) => {
kerabaMargin, kerabaMargin,
roofIndex: roof.index, roofIndex: roof.index,
raft: selectedRaftBase?.clCode, raft: selectedRaftBase?.clCode,
hajebichi: hajebichi,
trestle: { trestle: {
length: lengthBase, length: lengthBase,
hajebichi: hajebichi, hajebichi: hajebichi,

4
src/hooks/module/useModuleTrestle.js
View File

@ -209,7 +209,7 @@ export function useModuleTrestle(props) {
stdSnowLd: trestleState.stdSnowLd ?? '', stdSnowLd: trestleState.stdSnowLd ?? '',
inclCd: trestleState.inclCd ?? '', inclCd: trestleState.inclCd ?? '',
raftBaseCd: trestleState.raft ?? '', raftBaseCd: trestleState.raft ?? '',
roofPitch: Math.round(trestleState.roofPitch) ?? '', roofPitch: trestleState.hajebichi ? trestleState.hajebichi : (trestleState.roofPitch ?? ''),
}) })
.then((res) => { .then((res) => {
if (res?.data) setConstructionList(res.data) if (res?.data) setConstructionList(res.data)
@ -236,7 +236,7 @@ export function useModuleTrestle(props) {
inclCd: trestleState.inclCd ?? '', inclCd: trestleState.inclCd ?? '',
constTp: trestleState.constTp ?? '', constTp: trestleState.constTp ?? '',
mixMatlNo: trestleState.mixMatlNo ?? '', mixMatlNo: trestleState.mixMatlNo ?? '',
roofPitch: trestleState.roofPitch ?? '', roofPitch: trestleState.hajebichi ? trestleState.hajebichi : (trestleState.roofPitch ?? ''),
// workingWidth: trestleState.length ?? '', // workingWidth: trestleState.length ?? '',
workingWidth: lengthBase ?? '', workingWidth: lengthBase ?? '',
}, },