From ec7f131c5b542f0d385b73ba96e89b0d9af04844 Mon Sep 17 00:00:00 2001 From: minuk926 Date: Wed, 15 Jun 2022 14:47:47 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20mpower=20=EC=A0=81=EC=9A=A9=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apis/board2.js | 3 ++- src/menu-items/admin.js | 8 ++++++++ src/routes/MainRoutes.js | 3 ++- src/utils/locales/ko.json | 1 + src/views/biz/admin/judge/ModalJudgeResult.jsx | 13 ------------- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/apis/board2.js b/src/apis/board2.js index f53ae95..224dff6 100644 --- a/src/apis/board2.js +++ b/src/apis/board2.js @@ -9,8 +9,9 @@ import { setRowId } from './common'; // eslint-disable-next-line import/prefer-default-export export async function findBoards2(params) { const res = await axios.get(GET_BOARD_LIST2, { params }); + console.log(res); if (res.success) { - res.data = res.data.resultList.map((d, idx) => ({ ...d, rowId: setRowId(params, idx) })); + res.data = res.data.map((d, idx) => ({ ...d, rowId: setRowId(params, idx) })); return res; } return res; diff --git a/src/menu-items/admin.js b/src/menu-items/admin.js index 86ef0b3..60a9d2b 100644 --- a/src/menu-items/admin.js +++ b/src/menu-items/admin.js @@ -166,6 +166,14 @@ const admin = { type: 'item', url: '/board', icon: icons.IconClipboardList + }, + { + /* 게시판 관리 */ + id: 'admin-8', + title: , + type: 'item', + url: '/board2', + icon: icons.IconClipboardList } ] }; diff --git a/src/routes/MainRoutes.js b/src/routes/MainRoutes.js index 283a0e6..222d2a6 100755 --- a/src/routes/MainRoutes.js +++ b/src/routes/MainRoutes.js @@ -4,7 +4,6 @@ import { lazy } from 'react'; import MainLayout from 'layout/MainLayout'; import Loadable from 'ui-component/Loadable'; import AuthGuard from 'utils/route-guard/AuthGuard'; -import Board2 from '../views/biz/board/Board2'; // sample page routing const SamplePage = Loadable(lazy(() => import('views/sample-page'))); @@ -14,6 +13,8 @@ const Dashboard = Loadable(lazy(() => import('views/dashboard'))); const PublicBoard = Loadable(lazy(() => import('views/biz/pboard/PublicBoard'))); const Board = Loadable(lazy(() => import('views/biz/board/Board'))); +const Board2 = Loadable(lazy(() => import('views/biz/board/Board2'))); + // parking const ParkingRegister = Loadable(lazy(() => import('views/biz/admin/parking/ParkingRegister'))); const ParkingUserByJudgeReview = Loadable(lazy(() => import('views/biz/judge/ParkingJudgeByUserReview'))); diff --git a/src/utils/locales/ko.json b/src/utils/locales/ko.json index 418e89d..8107fe1 100755 --- a/src/utils/locales/ko.json +++ b/src/utils/locales/ko.json @@ -11,6 +11,7 @@ "admin-5-2": "심사위원 평가", "admin-6": "SMS 관리", "admin-7": "게시판 관리", + "admin-8": "게시판 관리2", "judge": "의견 진술 관리[심사자]", "judge-1": "공지 사항", diff --git a/src/views/biz/admin/judge/ModalJudgeResult.jsx b/src/views/biz/admin/judge/ModalJudgeResult.jsx index 1e629c3..335722a 100644 --- a/src/views/biz/admin/judge/ModalJudgeResult.jsx +++ b/src/views/biz/admin/judge/ModalJudgeResult.jsx @@ -30,9 +30,6 @@ const StyledTableCell = styled(TableCell)(({ theme }) => ({ borderRight: '1px solid #525a73 !important', borderBottom: '1px solid #525a73 !important', padding: '8px' - // border: '1px solid #525a73', // #525a73; - // overflow: 'initial', - // borderWidth: '0px 1px 1px 0px' } })); @@ -46,16 +43,6 @@ const StyledTableRow = styled(TableRow)(({ theme }) => ({ } })); -// const StyledTableHead = styled(TableHead)(({ theme }) => ({ -// [`&.${tableCellClasses.head}`]: { -// backgroundColor: theme.palette.common.black, -// color: theme.palette.common.white -// }, -// [`&.${tableCellClasses.body}`]: { -// // fontSize: 14 -// } -// })); - const totLabel = ['부과', '서손', '미부과', '계']; const ModalJudgeResult = ({ totJudgeUsers, totJudgeUserData, judgeCars, judgeUserData, selectedRow, judgeTeam, judgeData, dataGb }) => {