diff --git a/src/app/canvas/page.jsx b/src/app/canvas/page.jsx
index f013432..5a83290 100644
--- a/src/app/canvas/page.jsx
+++ b/src/app/canvas/page.jsx
@@ -34,6 +34,7 @@ import Penal01 from '@/components/canvas/penal/Penal01'
import Header from '@/components/layout/Header'
import { modalState } from '@/store/modalAtom'
import '@/styles/contents.scss'
+import '@/styles/grid.scss'
import { useState } from 'react'
import { useRecoilValue } from 'recoil'
import Penal03 from '@/components/canvas/penal/Penal03'
@@ -130,7 +131,7 @@ export default function CanvasPage() {
{/* */}
{/* 오브젝트 배치*/}
-
+ {/* */}
{/* 표시변겅 */}
{/* */}
@@ -153,7 +154,7 @@ export default function CanvasPage() {
{/* */}
{/* 회로 및 가대설정 */}
- {/* */}
+
{/* 모듈 부가기능 */}
diff --git a/src/components/canvas/CanvasEstimate.jsx b/src/components/canvas/CanvasEstimate.jsx
index 6709db6..cb3a84b 100644
--- a/src/components/canvas/CanvasEstimate.jsx
+++ b/src/components/canvas/CanvasEstimate.jsx
@@ -1,9 +1,30 @@
+'use client'
+
+import { useState } from "react";
import SingleDatePicker from "../common/datepicker/SingleDatePicker";
import Footer from "../layout/Footer";
import FileDownOptionPop from "./estimatepop/FileDownOptionPop";
import ProductFeaturesPop from "./estimatepop/ProductFeaturesPop";
+import QGrid from "../common/grid/QGrid";
export default function CanvasEstimate() {
+ const [gridProps, setGridProps] = useState({
+ gridData: [
+ { status: "受付", designRequestNumber: "1000000002", salesAgentID: "", salesAgentName: "", projectName: "名古屋支店テスト", prefecture: "愛知県", installedHouses:"복수곳", clientName: "", submissionDate:"2023.07.02 10:00:00"},
+ ],
+ gridColumns:[
+ { headerName: "状態 ", field: "status", width: 100, cellStyle: { textAlign: "center" } },
+ { headerName: "設計依頼番号", field: "designRequestNumber", cellStyle: { textAlign: "center" } },
+ { headerName: "販売代理店ID", field: "salesAgentID" },
+ { headerName: "販売代理店名", field: "salesAgentName" },
+ { headerName: "案件名", field: "projectName" },
+ { headerName: "都道府県", field: "prefecture" },
+ { headerName: "設置家屋数 ", field: "installedHouses", cellStyle: { textAlign: "center" } },
+ { headerName: "依頼者名 ", field: "clientName", cellStyle: { textAlign: "center" } },
+ { headerName: "設計依頼提出日 ", field: "submissionDate", cellStyle: { textAlign: "center" } },
+ ],
+ isPageable: true,
+ })
return(
@@ -403,16 +424,19 @@ export default function CanvasEstimate() {
+
+
+
{/* 제품 특이사항 */}
-
+ {/* */}
{/* 문서 다운로드 옵션 */}
-
+ {/* */}
)
}
\ No newline at end of file
diff --git a/src/styles/_grid-detail.scss b/src/styles/_grid-detail.scss
index 35e39be..3bc3f7c 100644
--- a/src/styles/_grid-detail.scss
+++ b/src/styles/_grid-detail.scss
@@ -1,5 +1,5 @@
.q-grid{
- height: fit-content;
+ position: relative;
.ag-theme-quartz {
outline: none;
border: none;
diff --git a/src/styles/_modal.scss b/src/styles/_modal.scss
index 287bcb9..7034b8a 100644
--- a/src/styles/_modal.scss
+++ b/src/styles/_modal.scss
@@ -1427,7 +1427,7 @@ $alert-color: #101010;
}
.circuit-overflow{
- max-height: 560px;
+ max-height: 400px;
overflow-y: auto;
margin-bottom: 15px;
&::-webkit-scrollbar {