diff --git a/src/assets/scss/style.scss b/src/assets/scss/style.scss index ea9d82f..eb556f0 100755 --- a/src/assets/scss/style.scss +++ b/src/assets/scss/style.scss @@ -148,7 +148,7 @@ font-family: 'Noto Sans KR' !important; } // modal 클릭 시 그 외에 화면 어둡게 설정 -.css-79ws1d-MuiModal-root { +.MuiModal-root { position: fixed; right: 0; bottom: 0; @@ -159,95 +159,27 @@ position: absolute; } // 전체적인 버튼 높이 통일 -.css-1kmsfjc-MuiButtonBase-root-MuiButton-root{ +.MuiButtonBase-root-MuiButton-root{ height:37px; } -.css-a5rdam-MuiGrid-root{ +.MuiGrid-root{ align-items:center; } -.css-13i4rnv-MuiGrid-root>.css-9m7a0r-MuiTypography-root{ - border:1px solid red; +.MuiGrid-root>.MuiTypography-root{ + //border:1px solid red; margin:0px; padding:0px; color:#bdc8f0 !important; } //MuiPaper-root 해당 배경 디자인 변경 -.css-7uac63-MuiPaper-root-MuiCard-root{ +.MuiPaper-root-MuiCard-root{ border: 1px solid pink; background-color: #1a223f; border: none; margin-top: -22px; } -/* -.css-7uac63-MuiPaper-root-MuiCard-root { - background-color: #212946; - color: #bdc8f0; - transition: box-shadow 300ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; - border-radius: 4px; - box-shadow: none; - background-image: linear-gradient(rgba(255, 255, 255, 0), rgba(255, 255, 255, 0)); - background-image: none; - border-radius: 4px; - overflow: hidden; - border: 1px solid; - border-color: #111936; -}*/ - - - -//심의목록 텍스트 칸 배경설정 -//클릭했을 때 파란 선이 텍스트 위로 설정되어 눈에 거슬림 -.css-1kuwsse-MuiFormLabel-root-MuiInputLabel-root{ - background: #1a223f; -} -// 심의목록 모달창 셀렉터 박스 수정_01 -.MuiOutlinedInput-root>.MuiSelect-select{ - padding:10px 10px 10px 14px; -} -//심의목록 모달창 셀렉터 박스 수정_02 -.css-1ikyx9c-MuiFormLabel-root-MuiInputLabel-root.Mui-focused{ - background-color:#212946; -} -//심의목록 모달창 조회버튼 수정 -.MuiGrid-root>.css-1uxpv00-MuiGrid-root{ - margin: 0px; - position: absolute; - right: 35px; -} -// 심의 등록 체크할 때 3행과 22건 겹치길래 수정 -.MuiGrid-root > .css-9m7a0r-MuiTypography-root{ - border: 1px solid #535353; - border-width: 0px 1px 0px 0px; - margin: -2px 80px 0px 0px; - padding-right: 20px; - color: #35a6ff !important; -} - -//심의목록 모달창 스크롤 헤더 폰트 흐림문제 수정 -.css-lzdpoz-MuiPaper-root{ - border: 1px solid #525a73; - overflow: initial; - border-width: 0px 0px 2px 2px; -} -.css-1uigskc-MuiTableCell-root{ - border: 1px solid #525a73; - border-width: 5px 1px 1px 0px; - padding: 8px; - position: sticky; - top:-2px; -} -.css-t78vwc-MuiTableCell-root.MuiTableCell-body { - border-right: 1px solid #525a73 !important; - padding: 8px; -} -//심의목록 셀렉터 우측으로 정렬 -.MuiGrid-root>.css-1odrivk-MuiGrid-root{ - border:0px solid red; - margin-right: 330px; -} - diff --git a/src/views/biz/admin/judge/ModalJudgeResult.jsx b/src/views/biz/admin/judge/ModalJudgeResult.jsx index 3cca48f..58ea4ad 100644 --- a/src/views/biz/admin/judge/ModalJudgeResult.jsx +++ b/src/views/biz/admin/judge/ModalJudgeResult.jsx @@ -17,14 +17,23 @@ import { findJudgeResults } from 'apis/judge'; import _ from 'lodash'; import { useAlert } from 'react-alert'; import JudgeModal from './JudgeModal'; +import PerfectScrollbar from 'react-perfect-scrollbar'; const StyledTableCell = styled(TableCell)(({ theme }) => ({ [`&.${tableCellClasses.head}`]: { backgroundColor: theme.palette.common.black, - color: theme.palette.common.white + color: theme.palette.common.white, + border: '1px solid #525a73', // #525a73; + overflow: 'initial', + borderWidth: '3px 1px 3px 0px' }, [`&.${tableCellClasses.body}`]: { - // fontSize: 14 + borderRight: '1px solid #525a73 !important', + borderBottom: '1px solid #525a73 !important', + padding: '8px' + // border: '1px solid #525a73', // #525a73; + // overflow: 'initial', + // borderWidth: '0px 1px 1px 0px' } })); @@ -38,6 +47,16 @@ 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 }) => { @@ -130,7 +149,13 @@ const ModalJudgeResult = ({ totJudgeUsers, totJudgeUserData, judgeCars, judgeUse - setMsuTeam(e.target.value)} + size="small" + > {combo.teams.map((team, idx) => ( {team.value} @@ -158,12 +183,13 @@ const ModalJudgeResult = ({ totJudgeUsers, totJudgeUserData, judgeCars, judgeUse - + + {/* */} - +
-
+ {/*
*/}