From 777ea579ada1aa2094f2959b4789bb7723a01a50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=B0=BD=EC=88=98?= Date: Thu, 27 Feb 2025 11:30:17 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=A4=EB=B8=8C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?=EB=B0=B0=EC=B9=98=20=ED=8C=9D=EC=97=85,=20=EC=A7=80=EB=B6=95?= =?UTF-8?q?=EC=9E=AC=20=EC=B6=94=EA=B0=80=20=ED=8C=9D=EC=97=85,=20?= =?UTF-8?q?=EB=A9=B4=ED=98=95=EC=83=81=20=EB=B0=B0=EC=B9=98=20=ED=8C=9D?= =?UTF-8?q?=EC=97=85=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/images/canvas/object_img01.svg | 14 +++++----- public/static/images/canvas/object_img02.svg | 19 +++++++------- .../shape/180deg/plane_tab_180deg01.svg | 26 +++++++++++-------- .../shape/270deg/plane_tab_270deg01.svg | 26 +++++++++++-------- .../canvas/shape/90deg/plane_tab_90deg01.svg | 26 +++++++++++-------- .../canvas/shape/normal/plane_tab01.svg | 26 +++++++++++-------- .../shape/re_180deg/plane_tab_re_180deg01.svg | 26 +++++++++++-------- .../shape/re_270deg/plane_tab_re_270deg01.svg | 26 +++++++++++-------- .../shape/re_90deg/plane_tab_re_90deg01.svg | 26 +++++++++++-------- .../canvas/shape/re_normal/plane_tab_re01.svg | 26 +++++++++++-------- src/app/canvas/page.jsx | 8 +++--- .../modal/objectoption/ObjectOptionTab03.jsx | 7 ++--- .../modal/objectoption/ObjectOptionTab04.jsx | 10 ++++--- .../modal/roofallocation/RoofAllocation.jsx | 3 +-- src/components/publishpage/PublishPage.jsx | 8 +++++- src/styles/_modal.scss | 13 +++++++++- 16 files changed, 170 insertions(+), 120 deletions(-) diff --git a/public/static/images/canvas/object_img01.svg b/public/static/images/canvas/object_img01.svg index 1d72f00..0f5615a 100644 --- a/public/static/images/canvas/object_img01.svg +++ b/public/static/images/canvas/object_img01.svg @@ -1,16 +1,14 @@ - - + + + + + - - - - - - + diff --git a/public/static/images/canvas/object_img02.svg b/public/static/images/canvas/object_img02.svg index ab1e8f4..85f47ed 100644 --- a/public/static/images/canvas/object_img02.svg +++ b/public/static/images/canvas/object_img02.svg @@ -1,21 +1,22 @@ - - + + + + + - + - - - - - + + + - + diff --git a/public/static/images/canvas/shape/180deg/plane_tab_180deg01.svg b/public/static/images/canvas/shape/180deg/plane_tab_180deg01.svg index 84c2298..7669a51 100644 --- a/public/static/images/canvas/shape/180deg/plane_tab_180deg01.svg +++ b/public/static/images/canvas/shape/180deg/plane_tab_180deg01.svg @@ -1,12 +1,16 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/public/static/images/canvas/shape/270deg/plane_tab_270deg01.svg b/public/static/images/canvas/shape/270deg/plane_tab_270deg01.svg index 22b3288..3fd9d7e 100644 --- a/public/static/images/canvas/shape/270deg/plane_tab_270deg01.svg +++ b/public/static/images/canvas/shape/270deg/plane_tab_270deg01.svg @@ -1,12 +1,16 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/public/static/images/canvas/shape/90deg/plane_tab_90deg01.svg b/public/static/images/canvas/shape/90deg/plane_tab_90deg01.svg index 4647619..c41f7de 100644 --- a/public/static/images/canvas/shape/90deg/plane_tab_90deg01.svg +++ b/public/static/images/canvas/shape/90deg/plane_tab_90deg01.svg @@ -1,12 +1,16 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/public/static/images/canvas/shape/normal/plane_tab01.svg b/public/static/images/canvas/shape/normal/plane_tab01.svg index 121b702..1091f74 100644 --- a/public/static/images/canvas/shape/normal/plane_tab01.svg +++ b/public/static/images/canvas/shape/normal/plane_tab01.svg @@ -1,12 +1,16 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/public/static/images/canvas/shape/re_180deg/plane_tab_re_180deg01.svg b/public/static/images/canvas/shape/re_180deg/plane_tab_re_180deg01.svg index aab78f3..6052120 100644 --- a/public/static/images/canvas/shape/re_180deg/plane_tab_re_180deg01.svg +++ b/public/static/images/canvas/shape/re_180deg/plane_tab_re_180deg01.svg @@ -1,12 +1,16 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/public/static/images/canvas/shape/re_270deg/plane_tab_re_270deg01.svg b/public/static/images/canvas/shape/re_270deg/plane_tab_re_270deg01.svg index c225ea2..2b9f1f0 100644 --- a/public/static/images/canvas/shape/re_270deg/plane_tab_re_270deg01.svg +++ b/public/static/images/canvas/shape/re_270deg/plane_tab_re_270deg01.svg @@ -1,12 +1,16 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/public/static/images/canvas/shape/re_90deg/plane_tab_re_90deg01.svg b/public/static/images/canvas/shape/re_90deg/plane_tab_re_90deg01.svg index 36c1d46..b7cd5f4 100644 --- a/public/static/images/canvas/shape/re_90deg/plane_tab_re_90deg01.svg +++ b/public/static/images/canvas/shape/re_90deg/plane_tab_re_90deg01.svg @@ -1,12 +1,16 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/public/static/images/canvas/shape/re_normal/plane_tab_re01.svg b/public/static/images/canvas/shape/re_normal/plane_tab_re01.svg index 121b702..77db427 100644 --- a/public/static/images/canvas/shape/re_normal/plane_tab_re01.svg +++ b/public/static/images/canvas/shape/re_normal/plane_tab_re01.svg @@ -1,12 +1,16 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/src/app/canvas/page.jsx b/src/app/canvas/page.jsx index e4d5089..6bedb70 100644 --- a/src/app/canvas/page.jsx +++ b/src/app/canvas/page.jsx @@ -89,7 +89,7 @@ export default function CanvasPage() { {/* */} {/* 배치면 초기 설정 */} - + {/* */} {/* 캔버스 기본 셋팅 */} {/* {modalOption.option && } */} @@ -129,7 +129,7 @@ export default function CanvasPage() { {/* */} {/* 지붕면 할당 */} - {/* */} + {/* 경사 설정 */} {/* */} @@ -138,10 +138,10 @@ export default function CanvasPage() { {/* */} {/* 면형상 배치 */} - {/* */} + {/* 오브젝트 배치*/} - {/* */} + {/* 표시변겅 */} {/* */} diff --git a/src/components/canvas/modal/objectoption/ObjectOptionTab03.jsx b/src/components/canvas/modal/objectoption/ObjectOptionTab03.jsx index 352d59f..ea0e0f2 100644 --- a/src/components/canvas/modal/objectoption/ObjectOptionTab03.jsx +++ b/src/components/canvas/modal/objectoption/ObjectOptionTab03.jsx @@ -13,7 +13,8 @@ export default function ObjectOptionTab03(){
- 同意の深さ + ① + 棟の長さ
@@ -26,7 +27,7 @@ export default function ObjectOptionTab03(){
- 出幅 (深さ) + 棟の出幅
@@ -39,7 +40,7 @@ export default function ObjectOptionTab03(){
- 傾斜 + 勾配
diff --git a/src/components/canvas/modal/objectoption/ObjectOptionTab04.jsx b/src/components/canvas/modal/objectoption/ObjectOptionTab04.jsx index 84ee9ea..66113e2 100644 --- a/src/components/canvas/modal/objectoption/ObjectOptionTab04.jsx +++ b/src/components/canvas/modal/objectoption/ObjectOptionTab04.jsx @@ -13,7 +13,8 @@ export default function ObjectOptionTab04(){
- 同意の深さ + ① + 棟の長さ
@@ -26,7 +27,7 @@ export default function ObjectOptionTab04(){
- 出幅 (深さ) + 棟の出幅
@@ -39,6 +40,7 @@ export default function ObjectOptionTab04(){
+ ② 幅
@@ -52,7 +54,7 @@ export default function ObjectOptionTab04(){
- 出幅 (幅) + 幅の出幅
@@ -65,7 +67,7 @@ export default function ObjectOptionTab04(){
- 傾斜 + 勾配
diff --git a/src/components/canvas/modal/roofallocation/RoofAllocation.jsx b/src/components/canvas/modal/roofallocation/RoofAllocation.jsx index 30ba589..862dc42 100644 --- a/src/components/canvas/modal/roofallocation/RoofAllocation.jsx +++ b/src/components/canvas/modal/roofallocation/RoofAllocation.jsx @@ -23,11 +23,10 @@ export default function RoofAllocation() { ※配置面初期設定で保存した[基本屋根材]を変更したり、屋根材を追加して割り当てることができます。
- 屋根材の選択
- +
diff --git a/src/components/publishpage/PublishPage.jsx b/src/components/publishpage/PublishPage.jsx index a832372..6627392 100644 --- a/src/components/publishpage/PublishPage.jsx +++ b/src/components/publishpage/PublishPage.jsx @@ -266,10 +266,16 @@ export default function PublishPage() {
  • *팝업 공통 양 사이드바 추가
  • *회로설정 팝업 승압설정 영역 수정
    • */} -
      +
      • 2025-02-19
      • *배치면 선 속성 설정 팝업 버튼 추가
      +
        +
      • 2025-02-27
        • +
      • *오브젝트 배치 팝업 명칭 및 숫자 변경, 이미지 변경
        • +
      • *지붕재 추가 상단 타이틀 제거 버튼 추가
        • +
      • *면형상 배치 1번 이미지 교체
        • +
      2024-10-28 diff --git a/src/styles/_modal.scss b/src/styles/_modal.scss index fed29ab..6fed7c6 100644 --- a/src/styles/_modal.scss +++ b/src/styles/_modal.scss @@ -1232,7 +1232,6 @@ $alert-color: #101010; .object-size-wrap{ display: flex; min-height: 206px; - gap: 24px; margin-top: 14px; .object-size-img{ position: relative; @@ -1246,6 +1245,18 @@ $alert-color: #101010; transform: translate(-50%, -50%); } } + .object-size-input{ + margin-left: auto; + .eaves-keraba-th{ + position: relative; + .object-input-num{ + position: absolute; + top: 7px; + left: -20px; + font-size: 13px; + } + } + } } // 표시변경