Compare commits
No commits in common. "cbde82b0ab72223a4657b767cef2c05509b53e78" and "b2065e76998bde391b30566490b348d7aaccab49" have entirely different histories.
cbde82b0ab
...
b2065e7699
@ -1,3 +0,0 @@
|
||||
[일감번호] : [제목]
|
||||
|
||||
[작업내용] :
|
||||
@ -125,11 +125,6 @@ export const TRESTLE_MATERIAL = {
|
||||
BRACKET: 'bracket',
|
||||
}
|
||||
|
||||
export const MODULE_SETUP_TYPE = {
|
||||
LAYOUT: 'layout',
|
||||
AUTO: 'auto',
|
||||
}
|
||||
|
||||
export const SAVE_KEY = [
|
||||
'selectable',
|
||||
'name',
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { POLYGON_TYPE, MODULE_SETUP_TYPE } from '@/common/common'
|
||||
import { POLYGON_TYPE } from '@/common/common'
|
||||
import WithDraggable from '@/components/common/draggable/WithDraggable'
|
||||
import { Orientation } from '@/components/floor-plan/modal/basic/step/Orientation'
|
||||
import PitchPlacement from '@/components/floor-plan/modal/basic/step/pitch/PitchPlacement'
|
||||
@ -331,13 +331,10 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
|
||||
<button className={`btn-frame modal mr5 ${isManualModuleLayoutSetup ? 'act' : ''}`} onClick={handleManualModuleLayoutSetup}>
|
||||
{getMessage('modal.module.basic.setting.row.batch')}
|
||||
</button>
|
||||
<button className="btn-frame modal mr5" onClick={() => autoModuleSetup(MODULE_SETUP_TYPE.LAYOUT, layoutSetup)}>
|
||||
{getMessage('modal.module.basic.setting.auto.row.batch')}
|
||||
</button>
|
||||
<button className={`btn-frame modal mr5 ${isManualModuleSetup ? 'act' : ''}`} onClick={handleManualModuleSetup}>
|
||||
{getMessage('modal.module.basic.setting.passivity.placement')}
|
||||
</button>
|
||||
<button className="btn-frame modal act mr5" onClick={() => autoModuleSetup(MODULE_SETUP_TYPE.AUTO)}>
|
||||
<button className="btn-frame modal act" onClick={() => autoModuleSetup()}>
|
||||
{getMessage('modal.module.basic.setting.auto.placement')}
|
||||
</button>
|
||||
</>
|
||||
|
||||
@ -37,7 +37,7 @@ const Placement = forwardRef((props, refs) => {
|
||||
const resetModuleSetupOption = useResetRecoilState(moduleSetupOptionState)
|
||||
|
||||
const [colspan, setColspan] = useState(1)
|
||||
const moduleRowColArray = useRecoilValue(moduleRowColArrayState)
|
||||
const [moduleRowColArray, setModuleRowColArray] = useRecoilState(moduleRowColArrayState)
|
||||
|
||||
//모듈 배치면 생성
|
||||
useEffect(() => {
|
||||
@ -64,9 +64,9 @@ const Placement = forwardRef((props, refs) => {
|
||||
}
|
||||
}, [])
|
||||
|
||||
// useEffect(() => {
|
||||
// console.log('moduleRowColArray', moduleRowColArray)
|
||||
// }, [moduleRowColArray])
|
||||
useEffect(() => {
|
||||
console.log('moduleRowColArray', moduleRowColArray)
|
||||
}, [moduleRowColArray])
|
||||
|
||||
//최초 지입시 체크
|
||||
useEffect(() => {
|
||||
@ -330,21 +330,19 @@ const Placement = forwardRef((props, refs) => {
|
||||
<th rowSpan={2} style={{ width: '22%' }}></th>
|
||||
{selectedModules &&
|
||||
selectedModules.itemList.map((item) => (
|
||||
// <th colSpan={colspan}>
|
||||
<th>
|
||||
<th colSpan={colspan}>
|
||||
<div className="color-wrap">
|
||||
<span className="color-box" style={{ backgroundColor: item.color }}></span>
|
||||
<span className="name">{item.itemNm}</span>
|
||||
</div>
|
||||
</th>
|
||||
))}
|
||||
{colspan > 1 && <th rowSpan={2}>{getMessage('modal.module.basic.setting.module.placement.max.rows.multiple')}</th>}
|
||||
</tr>
|
||||
<tr>
|
||||
{selectedModules.itemList.map((item) => (
|
||||
<>
|
||||
<th>{getMessage('modal.module.basic.setting.module.placement.max.row')}</th>
|
||||
{/* {colspan > 1 && <th>{getMessage('modal.module.basic.setting.module.placement.max.rows.multiple')}</th>} */}
|
||||
{colspan > 1 && <th>{getMessage('modal.module.basic.setting.module.placement.max.rows.multiple')}</th>}
|
||||
</>
|
||||
))}
|
||||
</tr>
|
||||
@ -358,11 +356,10 @@ const Placement = forwardRef((props, refs) => {
|
||||
<span className="name">{item.addRoof?.roofMatlNmJp}</span>
|
||||
</div>
|
||||
</td>
|
||||
{moduleRowColArray[index]?.map((item, index2) => (
|
||||
{moduleRowColArray[index]?.map((item) => (
|
||||
<>
|
||||
<td className="al-c">{item.moduleMaxRows}</td>
|
||||
{/* {colspan > 1 && <td className="al-c">{item.mixModuleMaxRows}</td>} */}
|
||||
{colspan > 1 && index2 === moduleRowColArray[index].length - 1 && <td className="al-c">{item.maxRow}</td>}
|
||||
{colspan > 1 && <td className="al-c">{item.mixModuleMaxRows}</td>}
|
||||
</>
|
||||
))}
|
||||
</tr>
|
||||
|
||||
@ -18,7 +18,7 @@ export function useMasterController() {
|
||||
*/
|
||||
const getRoofMaterialList = async () => {
|
||||
return await get({ url: '/api/v1/master/getRoofMaterialList' }).then((res) => {
|
||||
// console.log('🚀🚀 ~ getRoofMaterialList ~ res:', res)
|
||||
console.log('🚀🚀 ~ getRoofMaterialList ~ res:', res)
|
||||
return res
|
||||
})
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -152,10 +152,9 @@
|
||||
"modal.module.basic.setting.pitch.module.column.amount": "列数",
|
||||
"modal.module.basic.setting.pitch.module.column.margin": "左右間隔",
|
||||
"modal.module.basic.setting.prev": "前に戻る",
|
||||
"modal.module.basic.setting.row.batch": "レイアウト指定",
|
||||
"modal.module.basic.setting.row.batch": "段・列数指定配置",
|
||||
"modal.module.basic.setting.passivity.placement": "手動配置",
|
||||
"modal.module.basic.setting.auto.placement": "自動配置",
|
||||
"modal.module.basic.setting.auto.row.batch": "自動レイアウト指定",
|
||||
"plan.menu.module.circuit.setting.circuit.trestle.setting": "回路設定",
|
||||
"modal.circuit.trestle.setting": "回路設定",
|
||||
"modal.circuit.trestle.setting.alloc.trestle": "架台配置",
|
||||
@ -1074,9 +1073,9 @@
|
||||
"module.layout.setup.max.count.multiple": "モジュール{0}の単体での最大段数は{1}、最大列数は{2}です。 (JA)",
|
||||
"roofAllocation.not.found": "割り当てる屋根がありません。 (JA)",
|
||||
"modal.module.basic.setting.module.placement.max.size.check": "屋根材別モジュールの単体の単体での最大段数、2種混合の段数を確認して下さい",
|
||||
"modal.module.basic.setting.module.placement.max.row": "単体で\rの最大段数",
|
||||
"modal.module.basic.setting.module.placement.max.rows.multiple": "2種混合時\rの最大段数",
|
||||
"modal.module.basic.setting.module.placement.max.row": "単体での最大段数",
|
||||
"modal.module.basic.setting.module.placement.max.rows.multiple": "2種混合時の最大段数",
|
||||
"modal.module.basic.setting.module.placement.mix.asg.yn.error": "混合インストール不可能なモジュールです。 (JA)",
|
||||
"modal.module.basic.setting.module.placement.mix.asg.yn": "混合",
|
||||
"modal.module.basic.setting.module.placement.over.max.row": "{0} 最大段数超過しました。最大段数表を参考にしてください。"
|
||||
"modal.module.basic.setting.layoutpassivity.placement": "layout配置 (JA)"
|
||||
}
|
||||
|
||||
@ -155,8 +155,7 @@
|
||||
"modal.module.basic.setting.prev": "이전",
|
||||
"modal.module.basic.setting.row.batch": "단·열수 지정 배치",
|
||||
"modal.module.basic.setting.passivity.placement": "수동 배치",
|
||||
"modal.module.basic.setting.auto.placement": "자동 배치",
|
||||
"modal.module.basic.setting.auto.row.batch": "자동 단·열수 지정 배치 ",
|
||||
"modal.module.basic.setting.auto.placement": "설정값으로 자동 배치",
|
||||
"plan.menu.module.circuit.setting.circuit.trestle.setting": "회로설정",
|
||||
"modal.circuit.trestle.setting": "회로설정",
|
||||
"modal.circuit.trestle.setting.alloc.trestle": "가대할당",
|
||||
@ -1079,5 +1078,5 @@
|
||||
"modal.module.basic.setting.module.placement.max.rows.multiple": "2종 혼합 최대단수",
|
||||
"modal.module.basic.setting.module.placement.mix.asg.yn.error": "혼합 설치 불가능한 모듈입니다.",
|
||||
"modal.module.basic.setting.module.placement.mix.asg.yn": "혼합",
|
||||
"modal.module.basic.setting.module.placement.over.max.row": "{0}의 최대단수를 초과했습니다. 최대단수표를 참고해 주세요."
|
||||
"modal.module.basic.setting.layoutpassivity.placement": "레이아웃 배치"
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user