fix: 버튼 && 간격 조정

main
minuk926 3 years ago
parent 3c71453d52
commit 96c555ca3f

@ -173,11 +173,11 @@ const Board = () => {
return ( return (
<MainCard> <MainCard>
<Grid container spacing={2} alignItems="center"> <Grid container spacing={2} alignItems="center">
<Grid item xs={12} lg={6}> <Grid item xs={12}>
<Grid container spacing={1}> <Grid container spacing={1}>
<Grid item> <Grid item>
<FormControl fullWidth> <FormControl fullWidth>
<InputLabel required>소속팀</InputLabel> <InputLabel required>구분</InputLabel>
<Select size="small" id="category" name="reviewYear" defaultValue="ciTitle" onChange={(e) => setCategory(e.target.value)}> <Select size="small" id="category" name="reviewYear" defaultValue="ciTitle" onChange={(e) => setCategory(e.target.value)}>
<MenuItem key="1" value="ciTitle"> <MenuItem key="1" value="ciTitle">
제목 제목

@ -126,16 +126,13 @@ const PublicBoard = () => {
return ( return (
<MainCard> <MainCard>
<Grid container alignItems="right"> <Grid container alignItems="right">
<Grid item> <Grid item style={{ marginLeft: 'auto' }}>
<Button variant="contained" size="small" onClick={handleCreate}> <Button variant="contained" size="small" onClick={handleCreate}>
공지사항 등록 공지사항 등록
</Button> </Button>
</Grid> </Grid>
</Grid> </Grid>
<Grid item xs={12}> <Grid item xs={12} mt={1} mb={1}>
<Divider />
</Grid>
<Grid item xs={12}>
<Divider /> <Divider />
</Grid> </Grid>

@ -2,7 +2,7 @@ import { useMemo, useRef, useState } from 'react';
import { useAlert } from 'react-alert'; import { useAlert } from 'react-alert';
// material-ui // material-ui
import { Button, FormControl, Grid, MenuItem, Select, TextField } from '@mui/material'; import { Button, Divider, FormControl, Grid, MenuItem, Select, TextField } from '@mui/material';
// assets // assets
@ -160,7 +160,7 @@ const PublicBoardForm = (props) => {
<TextField size="small" disabled label="작성자" value={inName} fullWidth /> <TextField size="small" disabled label="작성자" value={inName} fullWidth />
</Grid> </Grid>
</Grid> </Grid>
<Grid container spacing={1} item xs={12} mb={1}> <Grid container spacing={1} item xs={12} mt={1}>
<Grid item xs={12} sm={3}> <Grid item xs={12} sm={3}>
<TextField size="small" disabled label="등록일" value={inNalja} fullWidth /> <TextField size="small" disabled label="등록일" value={inNalja} fullWidth />
</Grid> </Grid>
@ -171,7 +171,7 @@ const PublicBoardForm = (props) => {
<TextField size="small" disabled label="조회수" value={inHit} fullWidth /> <TextField size="small" disabled label="조회수" value={inHit} fullWidth />
</Grid> </Grid>
</Grid> </Grid>
<Grid container spacing={1} item xs={12} mb={1}> <Grid container spacing={1} item xs={12} mt={1}>
<Grid item xs={12}> <Grid item xs={12}>
<ReactQuill <ReactQuill
ref={(element) => { ref={(element) => {
@ -187,7 +187,7 @@ const PublicBoardForm = (props) => {
/> />
</Grid> </Grid>
</Grid> </Grid>
<Grid container spacing={1} item xs={12} mb={1}> <Grid container spacing={1} item xs={12}>
<Grid item sm={6}> <Grid item sm={6}>
<FileForm <FileForm
isDownload={inFilename} isDownload={inFilename}
@ -201,13 +201,18 @@ const PublicBoardForm = (props) => {
</Grid> </Grid>
</Grid> </Grid>
</Grid> </Grid>
<Grid container spacing={1} item xs={12} mt={1} mb={1}>
<Grid item xs={12}>
<Divider />
</Grid>
</Grid>
<Grid item container spacing={0.5} xs={12}> <Grid item container spacing={0.5} xs={12}>
<Grid item> <Grid item>
<Button variant="contained" size="small" startIcon={<List />} onClick={onList}> <Button variant="contained" size="small" startIcon={<List />} onClick={onList}>
목록 목록
</Button> </Button>
</Grid> </Grid>
<Grid item> <Grid item style={{ marginLeft: 'auto' }}>
<Button variant="contained" size="small" startIcon={<Save />} onClick={onSave}> <Button variant="contained" size="small" startIcon={<Save />} onClick={onSave}>
저장 저장
</Button> </Button>

@ -110,15 +110,17 @@ const JudgeDataReview = ({ scDatagb, menuName }) => {
return ( return (
<MainCard> <MainCard>
<Grid container alignItems="right"> <Grid container>
<Grid item> <Grid item style={{ marginLeft: 'auto' }}>
<Button variant="contained" size="small" onClick={handleCreate}> <Button variant="contained" size="small" onClick={handleCreate}>
{`${menuName} 의견진술 자료 등록`} {`${menuName} 의견진술 자료 등록`}
</Button> </Button>
</Grid> </Grid>
</Grid> </Grid>
<Grid item xs={12}> <Grid container spacing={1} item xs={12} mt={1}>
<Divider /> <Grid item xs={12}>
<Divider />
</Grid>
</Grid> </Grid>
<MuiDataGrid <MuiDataGrid
columns={columns} columns={columns}

@ -176,7 +176,7 @@ const JudgeRegistReview = ({ scDatagb, menuName }) => {
검색 검색
</Button> </Button>
</Grid> </Grid>
<Grid item> <Grid item style={{ marginLeft: 'auto' }}>
<Button <Button
disabled={selectionModel.length === 0} disabled={selectionModel.length === 0}
variant="contained" variant="contained"

@ -206,11 +206,10 @@ const JudgeReview = ({ msDatagb, menuName }) => {
</Grid> </Grid>
</Grid> </Grid>
</Grid> </Grid>
<Grid item xs={12}> <Grid container spacing={1} item xs={12} mt={1}>
<Divider /> <Grid item xs={12}>
</Grid> <Divider />
<Grid item xs={12}> </Grid>
<Divider />
</Grid> </Grid>
<MuiDataGrid <MuiDataGrid
columns={columns} columns={columns}

@ -95,10 +95,10 @@ const ModalJudgeResult = ({ totJudgeUsers, totJudgeUserData, judgeCars, judgeUse
return ( return (
<Box> <Box>
<Grid container spacing={1} alignItems="center"> <Grid container spacing={1} alignItems="center" mb={1}>
<Grid item xs={12}> <Grid item xs={12}>
<Grid container spacing={1}> <Grid container spacing={1}>
<Grid item sm={4}> <Grid item sm={5}>
<Typography variant="subtitle1"> <Typography variant="subtitle1">
심의차수: {selectedRow.msChasu} 심의기간: {selectedRow.msSdate} ~ {selectedRow.msEdate} 심의차수: {selectedRow.msChasu} 심의기간: {selectedRow.msSdate} ~ {selectedRow.msEdate}
</Typography> </Typography>

@ -5,7 +5,7 @@ import NumberFormat from 'react-number-format';
import { useAlert } from 'react-alert'; import { useAlert } from 'react-alert';
import format from 'date-fns/format'; import format from 'date-fns/format';
import { Grid, TextField, MenuItem, Select, FormControl, InputLabel, InputAdornment } from '@mui/material'; import { Grid, TextField, MenuItem, Select, FormControl, InputLabel, InputAdornment, Divider } from '@mui/material';
import Button from '@mui/material/Button'; import Button from '@mui/material/Button';
import { IconSearch } from '@tabler/icons'; import { IconSearch } from '@tabler/icons';
@ -423,11 +423,18 @@ const NewJudgeDataForm = ({ handleModalSave }) => {
</Grid> </Grid>
</Grid> </Grid>
</Grid> </Grid>
<Grid item sx={{ marginTop: 3 }}> <Grid container spacing={1} item xs={12} mt={1}>
{/* <Button variant="contained" color="primary" size="small" startIcon={<IconFileExport />} onClick={onSave}> */} <Grid item xs={12}>
<Button variant="contained" color="primary" size="small" onClick={onSave}> <Divider />
저장 </Grid>
</Button> </Grid>
<Grid item container spacing={0.5} xs={12} mt={1}>
<Grid item style={{ marginLeft: 'auto' }}>
{/* <Button variant="contained" color="primary" size="small" startIcon={<IconFileExport />} onClick={onSave}> */}
<Button variant="contained" color="primary" size="small" onClick={onSave}>
저장
</Button>
</Grid>
</Grid> </Grid>
</> </>
); );

@ -5,7 +5,7 @@ import format from 'date-fns/format';
import getHours from 'date-fns/getHours'; import getHours from 'date-fns/getHours';
import koLocale from 'date-fns/locale/ko'; import koLocale from 'date-fns/locale/ko';
import { Grid, TextField, MenuItem, Select, FormControl, InputLabel } from '@mui/material'; import { Grid, TextField, MenuItem, Select, FormControl, InputLabel, Divider } from '@mui/material';
import DateAdapter from '@mui/lab/AdapterDateFns'; import DateAdapter from '@mui/lab/AdapterDateFns';
import LocalizationProvider from '@mui/lab/LocalizationProvider'; import LocalizationProvider from '@mui/lab/LocalizationProvider';
import { DatePicker, TimePicker } from '@mui/lab'; import { DatePicker, TimePicker } from '@mui/lab';
@ -157,10 +157,17 @@ const SaveJudgeTargetForm = ({ handleModalSave }) => {
</LocalizationProvider> </LocalizationProvider>
</Grid> </Grid>
</Grid> </Grid>
<Grid item sx={{ marginTop: 3 }}> <Grid container spacing={1} item xs={12} mt={1}>
<Button variant="contained" color="primary" size="small" startIcon={<IconFileExport />} onClick={onSave}> <Grid item xs={12}>
저장 <Divider />
</Button> </Grid>
</Grid>
<Grid item container spacing={0.5} xs={12} mt={1}>
<Grid item style={{ marginLeft: 'auto' }}>
<Button variant="contained" color="primary" size="small" startIcon={<IconFileExport />} onClick={onSave}>
저장
</Button>
</Grid>
</Grid> </Grid>
</> </>
); );

@ -206,11 +206,10 @@ const ParkingReview = () => {
</Grid> </Grid>
</Grid> </Grid>
</Grid> </Grid>
<Grid item xs={12}> <Grid container spacing={1} item xs={12} mt={1}>
<Divider /> <Grid item xs={12}>
</Grid> <Divider />
<Grid item xs={12}> </Grid>
<Divider />
</Grid> </Grid>
<MuiDataGrid <MuiDataGrid
columns={columns} columns={columns}

@ -95,14 +95,7 @@ const ExcelDownload = ({ fileName, gridColumns, excelDatas, isDisabled = true })
}; };
return ( return (
<Button <Button disabled={isDisabled} variant="contained" size="small" startIcon={<IconFileExport />} onClick={handleExcelDownload}>
disabled={isDisabled}
variant="contained"
color="primary"
size="small"
startIcon={<IconFileExport />}
onClick={handleExcelDownload}
>
엑셀다운로드 엑셀다운로드
</Button> </Button>
); );

Loading…
Cancel
Save