diff --git a/src/app/canvas/page.jsx b/src/app/canvas/page.jsx index 143a162..7744025 100644 --- a/src/app/canvas/page.jsx +++ b/src/app/canvas/page.jsx @@ -89,7 +89,7 @@ export default function CanvasPage() { {/* */} {/* 배치면 초기 설정 */} - + {/* */} {/* 캔버스 기본 셋팅 */} {/* {modalOption.option && } */} @@ -106,7 +106,7 @@ export default function CanvasPage() { {/* */} {/* 지붕형상 설정 */} - + {/* */} {/* 지붕형상 수동 설정 */} {/* */} @@ -129,13 +129,13 @@ export default function CanvasPage() { {/* */} {/* 지붕면 할당 */} - {/* */} + {/* 경사 설정 */} {/* */} {/* 배치면 그리기 */} - + {/* */} {/* 면형상 배치 */} {/* */} @@ -164,7 +164,7 @@ export default function CanvasPage() { {/* */} {/* 회로 및 가대설정 */} - + {/* */} {/* 모듈 부가기능 */} diff --git a/src/components/canvas/modal/roofallocation/RoofAllocation.jsx b/src/components/canvas/modal/roofallocation/RoofAllocation.jsx index 142e041..f30b37e 100644 --- a/src/components/canvas/modal/roofallocation/RoofAllocation.jsx +++ b/src/components/canvas/modal/roofallocation/RoofAllocation.jsx @@ -37,45 +37,53 @@ export default function RoofAllocation() {
-
+
- 基本屋根材 + 基本屋根材
斜傾 -
+
- 寸(度) + 寸(度)
W -
- -
-
-
- L -
+
+ +
+
+
+
+
+ L +
-
垂木の間隔 -
+
- +
+
+ ハゼビーチ +
+ +
+
+
@@ -85,6 +93,7 @@ export default function RoofAllocation() {
+
@@ -93,157 +102,55 @@ export default function RoofAllocation() {
-
+
- 基本屋根材 + + +
斜傾 -
+
- 寸(度) + 寸(度)
W -
- -
-
-
- L -
+
+ +
+
+
+
+
+ L +
-
垂木の間隔 -
+
- -
-
- - -
-
- -
-
-
-
- - -
-
-
-
-
- -
- 基本屋根材 -
-
- 斜傾 -
- -
- 寸(度) -
-
-
-
- W -
- -
-
-
- L -
+ ハゼビーチ +
- -
-
- 垂木の間隔 -
- -
-
-
- -
-
- - -
-
- -
-
-
-
- - -
-
-
-
-
- -
- 基本屋根材 -
-
-
-
- 斜傾 -
- -
- 寸(度) -
-
-
-
- W -
- -
-
-
- L -
- -
-
-
- -
-
- 垂木の間隔 -
- -
-
-
-
diff --git a/src/components/canvas/modal/roofmoduleoption/RoofModuleOptionTab02.jsx b/src/components/canvas/modal/roofmoduleoption/RoofModuleOptionTab02.jsx index c64d796..a7e2319 100644 --- a/src/components/canvas/modal/roofmoduleoption/RoofModuleOptionTab02.jsx +++ b/src/components/canvas/modal/roofmoduleoption/RoofModuleOptionTab02.jsx @@ -52,12 +52,6 @@ export default function RoofModuleOptionTab02({setTabNum}){ 1722 440 - - - - - -
@@ -65,7 +59,6 @@ export default function RoofModuleOptionTab02({setTabNum}){
-
商品情報
@@ -212,14 +205,14 @@ export default function RoofModuleOptionTab02({setTabNum}){
-
+
- +
- +
@@ -243,15 +236,10 @@ export default function RoofModuleOptionTab02({setTabNum}){
-
-
- ※ 施工方法が選択できません。 基準風速または基準積雪量を確認してください。 -
-
- - -
-
+
+ + +
) } \ No newline at end of file diff --git a/src/components/publishpage/PublishPage.jsx b/src/components/publishpage/PublishPage.jsx index efd6381..44ed760 100644 --- a/src/components/publishpage/PublishPage.jsx +++ b/src/components/publishpage/PublishPage.jsx @@ -243,7 +243,7 @@ export default function PublishPage() {
  • 2025-01-17
  • *면형상 배치 팝업에 handle가능 공통 modal-foot 추가
  • */} -
      +
      • 2025-01-20
      • *지붕모듈 설정 팝업 title, 회로 및 가대설정 팝업title, 해당 메뉴 명칭 변경
      • *배치면 그리기 팝업 버튼명 변경경
      • @@ -255,6 +255,11 @@ export default function PublishPage() {
      • *패널 배치 집계 수정
      • *Qselect 컴포넌트 수정 및 배치면 초기설정 selelct disabled 추가
      +
        +
      • 2025-02-04
      • +
      • *지붕면 할당 팝업 클래스 및 css수정
      • +
      • *기본모듈선택 팝업 요청 수정
      • +
      2024-10-28 diff --git a/src/styles/_modal.scss b/src/styles/_modal.scss index 61f631c..7c959e8 100644 --- a/src/styles/_modal.scss +++ b/src/styles/_modal.scss @@ -259,6 +259,12 @@ $alert-color: #101010; border-bottom: 1px solid #424242; } } +.grid-check-form-block{ + display: block; + > div{ + margin-bottom: 10px; + } +} .grid-option-overflow{ max-height: 350px; overflow-y: auto; @@ -305,6 +311,25 @@ $alert-color: #101010; } .grid-option-block-form{ flex: 1; + .flex-ment{ + position: relative; + padding-right: 70px; + flex: 1 1 auto; + span{ + width: 70px; + &.absol{ + width: fit-content; + position: absolute; + top: 50%; + right: 0; + transform: translateY(-50%); + + } + } + .input-grid{ + flex: 1; + } + } } } .select-form{ @@ -312,6 +337,7 @@ $alert-color: #101010; } .grid-select{ flex: 1; + height: 30px; &.no-flx{ flex: unset; } @@ -2013,7 +2039,7 @@ $alert-color: #101010; } } .roof-module-tab2-overflow{ - max-height: 500px; + max-height: 650px; overflow-y: auto; padding-bottom: 15px; border-bottom: 1px solid #4D4D4D; @@ -2088,17 +2114,3 @@ $alert-color: #101010; justify-content: flex-end; } } - -.reset-word-wrap{ - display: flex; - align-items: center; - .grid-btn-wrap{ - margin-left: auto; - } -} -.reset-word{ - font-size: 12px; - color: #FFCACA; - font-weight: 400; - margin-top: 10px; -} \ No newline at end of file