From da6d67b1472528675f47d4ce42fd89dab718cc8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=B0=BD=EC=88=98?= Date: Tue, 3 Dec 2024 13:38:35 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20=EB=A7=88?= =?UTF-8?q?=ED=81=AC=EC=97=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/images/canvas/ico-flx05.svg | 5 + public/static/images/canvas/return-btn.svg | 3 + src/components/canvas/CanvasEstimate.jsx | 157 ++++++++++++++------- src/components/canvas/CanvasMenu.jsx | 4 + src/components/publishpage/PublishPage.jsx | 8 +- src/styles/_contents.scss | 52 +++++++ 6 files changed, 179 insertions(+), 50 deletions(-) create mode 100644 public/static/images/canvas/ico-flx05.svg create mode 100644 public/static/images/canvas/return-btn.svg diff --git a/public/static/images/canvas/ico-flx05.svg b/public/static/images/canvas/ico-flx05.svg new file mode 100644 index 0000000..350aee0 --- /dev/null +++ b/public/static/images/canvas/ico-flx05.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/public/static/images/canvas/return-btn.svg b/public/static/images/canvas/return-btn.svg new file mode 100644 index 0000000..f33f417 --- /dev/null +++ b/public/static/images/canvas/return-btn.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/canvas/CanvasEstimate.jsx b/src/components/canvas/CanvasEstimate.jsx index aed605a..3c69ae3 100644 --- a/src/components/canvas/CanvasEstimate.jsx +++ b/src/components/canvas/CanvasEstimate.jsx @@ -206,8 +206,22 @@ export default function CanvasEstimate() {
@@ -229,95 +243,140 @@ export default function CanvasEstimate() {
-
- - +
+
+ + +
+ 共通
-
- - +
+
+ + +
+ 積上げ(YJOD)
-
- - +
+
+ + +
+ 出力制御の時 (中三電以外)
-
- - +
+
+ + +
+ 北面設置
-
- - +
+
+ + +
+ 塩害地域
-
- - +
+
+ + +
+ 積雪地域
-
- - +
+
+ + +
+ 屋根材・寸法・レイアウト
-
- - +
+
+ + +
+ 施工関連
-
- - +
+
+ + +
+ 別途費用
-
- - +
+
+ + +
+ 過積載
-
- - +
+
+ + +
+ パワコン・蓄電池   PCS
-
- - +
+
+ + +
+ 架台
-
- - +
+
+ + +
+ Q.SUPREME
-
- - +
+
+ + +
+ HEMS
- {/*
-
- - +
+
+
+ + +
+ 概算見積概算見積
-
*/} +
diff --git a/src/components/canvas/CanvasMenu.jsx b/src/components/canvas/CanvasMenu.jsx index dcc376f..5c6eb5e 100644 --- a/src/components/canvas/CanvasMenu.jsx +++ b/src/components/canvas/CanvasMenu.jsx @@ -102,6 +102,10 @@ export default function CanvasMenu({setMenuValue}) { コピー +
} diff --git a/src/components/publishpage/PublishPage.jsx b/src/components/publishpage/PublishPage.jsx index 9565647..72d9b3d 100644 --- a/src/components/publishpage/PublishPage.jsx +++ b/src/components/publishpage/PublishPage.jsx @@ -186,11 +186,17 @@ export default function PublishPage() {
  • 2024-11-19
  • *견적 복사 팝업 추가
    • -
      +
      • 2024-11-26
      • *보조선 작성 팝업 보조선 절삭 버튼 추가
      • *지붕모듈 기본설정 팝업 변경
      +
        +
      • 2024-12-03
        • +
      • *견적서 메뉴 상단버튼 추가
        • +
      • *견적서 파일 목록 복구버튼 추가
        • +
      • *견적서 체크박스 목록 html 변환
        • +
      2024-10-28 diff --git a/src/styles/_contents.scss b/src/styles/_contents.scss index e72637e..8e91163 100644 --- a/src/styles/_contents.scss +++ b/src/styles/_contents.scss @@ -139,6 +139,7 @@ &.ico02{background-image: url(../../public/static/images/canvas/ico-flx02.svg);} &.ico03{background-image: url(../../public/static/images/canvas/ico-flx03.svg);} &.ico04{background-image: url(../../public/static/images/canvas/ico-flx04.svg);} + &.ico05{background-image: url(../../public/static/images/canvas/ico-flx05.svg);} } .name{ font-size: 12px; @@ -827,6 +828,47 @@ &:last-child{ margin-bottom: 0; } + .file-item-wrap{ + display: flex; + align-items: center; + gap: 30px; + .return-wrap{ + display: flex; + align-items: center; + } + .return{ + padding: 0; + font-size: 13px; + color: #B0BCCD; + text-decoration: line-through; + } + .return-btn{ + flex: none; + position: relative; + top: 0; + left: 0; + transform: none; + display: flex; + align-items: center; + height: 24px; + padding: 0 9px; + margin-left: 10px; + background: none; + border: 1px solid #B0BCCD; + border-radius: 2px; + font-size: 12px; + color: #B0BCCD; + font-weight: 500; + .return-ico{ + display: block; + width: 14px; + height: 14px; + background: url(../../public/static/images/canvas/return-btn.svg)no-repeat center; + background-size: contain; + margin-right: 5px; + } + } + } } } } @@ -877,6 +919,16 @@ &.act{ background-color: #F7F9FA; } + .special-note-check-box{ + display: flex; + align-items: center; + .check-name{ + font-size: 13px; + color: #45576F; + cursor: default; + line-height: 1.3; + } + } } }