Merge remote-tracking branch 'origin/dev' into dev

main
donggyu97 2 years ago
commit 86d04447c9

@ -1,6 +1,6 @@
NODE_PATH=src NODE_PATH=src
REACT_APP_MODE=production REACT_APP_MODE=production
REACT_APP_VERSION = v0.0.1 REACT_APP_VERSION = v0.0.1
#REACT_APP_API_URL=http://211.119.124.9:8090 REACT_APP_API_URL=http://211.119.124.9:8090
REACT_APP_API_URL=http://localhost:8090 #REACT_APP_API_URL=http://localhost:8090
REACT_APP_SERVER_TIMEOUT=6000 REACT_APP_SERVER_TIMEOUT=6000

@ -17,7 +17,6 @@ import { findJudgeResults } from 'apis/judge';
import _ from 'lodash'; import _ from 'lodash';
import { useAlert } from 'react-alert'; import { useAlert } from 'react-alert';
import JudgeModal from './JudgeModal'; import JudgeModal from './JudgeModal';
import PerfectScrollbar from 'react-perfect-scrollbar';
const StyledTableCell = styled(TableCell)(({ theme }) => ({ const StyledTableCell = styled(TableCell)(({ theme }) => ({
[`&.${tableCellClasses.head}`]: { [`&.${tableCellClasses.head}`]: {
@ -184,7 +183,6 @@ const ModalJudgeResult = ({ totJudgeUsers, totJudgeUserData, judgeCars, judgeUse
</Grid> </Grid>
</Grid> </Grid>
<Paper sx={{ width: '100%' }}> <Paper sx={{ width: '100%' }}>
{/* <PerfectScrollbar style={{ height: '100%', maxHeight: 'calc(100vh - 205px)', overflowX: 'hidden' }}> */}
<TableContainer sx={{ maxwidth: 950, maxHeight: 700 }}> <TableContainer sx={{ maxwidth: 950, maxHeight: 700 }}>
<Table stickyHeader> <Table stickyHeader>
<TableHead> <TableHead>
@ -270,7 +268,6 @@ const ModalJudgeResult = ({ totJudgeUsers, totJudgeUserData, judgeCars, judgeUse
{/* <TableFooter>{judgeResult && `총 ${selectedRow.cnt} 건중 ${judgeResult.judgeCars.length} 건`}</TableFooter> */} {/* <TableFooter>{judgeResult && `총 ${selectedRow.cnt} 건중 ${judgeResult.judgeCars.length} 건`}</TableFooter> */}
</Table> </Table>
</TableContainer> </TableContainer>
{/* </PerfectScrollbar> */}
</Paper> </Paper>
<Box <Box
sx={{ sx={{

Loading…
Cancel
Save