diff --git a/src/app/canvas/page.jsx b/src/app/canvas/page.jsx
index d3eb300..beb34ed 100644
--- a/src/app/canvas/page.jsx
+++ b/src/app/canvas/page.jsx
@@ -158,13 +158,13 @@ export default function CanvasPage() {
{/* */}
{/* 지붕모듈선택 */}
- {/* */}
+
{/* 육지붕모듈 선택 */}
{/* */}
{/* 회로 및 가대설정 */}
-
+ {/* */}
{/* 모듈 부가기능 */}
diff --git a/src/components/canvas/modal/roofmoduleoption/RoofModuleOptionTab02.jsx b/src/components/canvas/modal/roofmoduleoption/RoofModuleOptionTab02.jsx
index 8e508f7..154fe25 100644
--- a/src/components/canvas/modal/roofmoduleoption/RoofModuleOptionTab02.jsx
+++ b/src/components/canvas/modal/roofmoduleoption/RoofModuleOptionTab02.jsx
@@ -8,6 +8,7 @@ export default function RoofModuleOptionTab02({setTabNum}){
return(
<>
+
@@ -17,6 +18,7 @@ export default function RoofModuleOptionTab02({setTabNum}){
+
@@ -132,7 +134,7 @@ export default function RoofModuleOptionTab02({setTabNum}){
屋根材:スレーツ(4寸)
-
+ {/*
マンドンピッチ
@@ -149,6 +151,26 @@ export default function RoofModuleOptionTab02({setTabNum}){
+
*/}
+
+
@@ -218,14 +240,17 @@ export default function RoofModuleOptionTab02({setTabNum}){
{/* 설정 오류시 노출 */}
+
+
+
+
※ 施工方法が選択できません。 基準風速または基準積雪量を確認してください。
-
-
-
-
-
+
+
+
+
>
)
diff --git a/src/components/publishpage/PublishPage.jsx b/src/components/publishpage/PublishPage.jsx
index beb35c9..b9d867b 100644
--- a/src/components/publishpage/PublishPage.jsx
+++ b/src/components/publishpage/PublishPage.jsx
@@ -230,11 +230,15 @@ export default function PublishPage() {
*견적서 견적특이사항 영역 수정
*견적서 제품정보 select영역 길이 수정
-
+
- 2025-01-09
- *회로 및 가대설정 팝업 승압 설정 영역 수정
- *회로 및 가대설정 팝업 자동 설정 영역 수정
+
+ - 2025-01-10
+ - *지붕모듈선택 팝업 메뉴 2번 수정
+
2024-10-28 |
diff --git a/src/styles/_modal.scss b/src/styles/_modal.scss
index 6651921..ac0ed95 100644
--- a/src/styles/_modal.scss
+++ b/src/styles/_modal.scss
@@ -1995,6 +1995,22 @@ $alert-color: #101010;
width: 230px;
}
}
+.roof-module-tab2-overflow{
+ max-height: 500px;
+ overflow-y: auto;
+ padding-bottom: 15px;
+ border-bottom: 1px solid #4D4D4D;
+ &::-webkit-scrollbar {
+ width: 4px;
+ background-color: transparent;
+ }
+ &::-webkit-scrollbar-thumb {
+ background-color: #D9D9D9;
+ }
+ &::-webkit-scrollbar-track {
+ background-color: transparent;
+ }
+}
.module-table-flex-wrap{
&.tab2{
margin-top: 10px;
@@ -2019,8 +2035,9 @@ $alert-color: #101010;
&.non-flex{
display: flex;
flex-direction: column;
- justify-content: flex-end;
+ justify-content: flex-start;
flex: none;
+ padding-top: 27.5px;
width: 260px;
}
}
@@ -2054,11 +2071,14 @@ $alert-color: #101010;
justify-content: flex-end;
}
}
-.module-bottom{
- padding-bottom: 15px;
- border-bottom: 1px solid #4D4D4D;
-}
+.reset-word-wrap{
+ display: flex;
+ align-items: center;
+ .grid-btn-wrap{
+ margin-left: auto;
+ }
+}
.reset-word{
font-size: 12px;
color: #FFCACA;