fix: 버튼 && 간격 조정

main
minuk926 3 years ago
parent f8be92b919
commit 5454e36dda

@ -11,7 +11,8 @@ import {
GET_JUDGE_LIST, GET_JUDGE_LIST,
SAVE_JUDGE_TARGET_LIST, SAVE_JUDGE_TARGET_LIST,
GET_JUDGE_RESULT_LIST, GET_JUDGE_RESULT_LIST,
GET_PARKING_JUDGE_RESULT_LIST GET_PARKING_JUDGE_RESULT_LIST,
REMOVE_JUDGE
} from 'commons/ApiUrl'; } from 'commons/ApiUrl';
import { setRowId } from './common'; import { setRowId } from './common';
@ -107,3 +108,8 @@ export async function saveJudgeTargets(params) {
// eslint-disable-next-line no-return-await // eslint-disable-next-line no-return-await
return await axios.post(SAVE_JUDGE_TARGET_LIST, params); return await axios.post(SAVE_JUDGE_TARGET_LIST, params);
} }
export async function removeJudge(params) {
// eslint-disable-next-line no-return-await
return await axios.post(REMOVE_JUDGE, params);
}

@ -3,7 +3,7 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
import axios from 'utils/axios'; import axios from 'utils/axios';
import { GET_PARKING_JUDGE_TARGET_LIST, GET_PARKING_LIST, SAVE_PARKING_JUDGE_TARGET_LIST } from 'commons/ApiUrl'; import { GET_PARKING_JUDGE_TARGET_LIST, GET_PARKING_LIST, REMOVE_PARKING_JUDGE, SAVE_PARKING_JUDGE_TARGET_LIST } from 'commons/ApiUrl';
import { setRowId } from './common'; import { setRowId } from './common';
// eslint-disable-next-line no-return-await // eslint-disable-next-line no-return-await
@ -26,9 +26,11 @@ export async function findParkingJudgeTargets(params) {
} }
export async function saveParkingJudgeTargets(params) { export async function saveParkingJudgeTargets(params) {
const res = await axios.post(SAVE_PARKING_JUDGE_TARGET_LIST, params); // eslint-disable-next-line no-return-await
if (res.success) { return await axios.post(SAVE_PARKING_JUDGE_TARGET_LIST, params);
return res; }
}
return res; export async function removeParkingJudge(params) {
// eslint-disable-next-line no-return-await
return await axios.post(REMOVE_PARKING_JUDGE, params);
} }

@ -22,6 +22,7 @@ export const GET_PARKING_LIST = '/api/v1/ctgy/parking';
export const GET_PARKING_JUDGE_RESULT_LIST = '/api/v1/ctgy/parking/result'; export const GET_PARKING_JUDGE_RESULT_LIST = '/api/v1/ctgy/parking/result';
export const GET_PARKING_JUDGE_TARGET_LIST = '/api/v1/ctgy/parking/target'; export const GET_PARKING_JUDGE_TARGET_LIST = '/api/v1/ctgy/parking/target';
export const SAVE_PARKING_JUDGE_TARGET_LIST = '/api/v1/ctgy/parking/target'; export const SAVE_PARKING_JUDGE_TARGET_LIST = '/api/v1/ctgy/parking/target';
export const REMOVE_PARKING_JUDGE = '/api/v1/ctgy/parking/remove';
// 거주자/장애인 의견 진술 // 거주자/장애인 의견 진술
export const GET_JUDGE_DATA_LIST = '/api/v1/ctgy/judge/data'; export const GET_JUDGE_DATA_LIST = '/api/v1/ctgy/judge/data';
@ -31,6 +32,7 @@ export const GET_JUDGE_LIST = '/api/v1/ctgy/judge';
export const GET_JUDGE_RESULT_LIST = '/api/v1/ctgy/judge/result'; export const GET_JUDGE_RESULT_LIST = '/api/v1/ctgy/judge/result';
export const GET_JUDGE_TARGET_LIST = '/api/v1/ctgy/judge/target'; export const GET_JUDGE_TARGET_LIST = '/api/v1/ctgy/judge/target';
export const SAVE_JUDGE_TARGET_LIST = '/api/v1/ctgy/judge/target'; export const SAVE_JUDGE_TARGET_LIST = '/api/v1/ctgy/judge/target';
export const REMOVE_JUDGE = '/api/v1/ctgy/judge/remove';
// 사용자 관리 // 사용자 관리
export const GET_USER_LIST = '/api/v1/ctgy/user'; export const GET_USER_LIST = '/api/v1/ctgy/user';

@ -1,6 +1,5 @@
const combo = { const combo = {
teams: [ teams: [
{ code: '', value: '-- 선택 --' },
{ code: '001', value: '1팀' }, { code: '001', value: '1팀' },
{ code: '002', value: '2팀' }, { code: '002', value: '2팀' },
{ code: '003', value: '3팀' }, { code: '003', value: '3팀' },

@ -70,7 +70,7 @@ const Board = () => {
{ headerName: '작성자ID', headerAlign: 'center', field: 'ciId', hide: true }, { headerName: '작성자ID', headerAlign: 'center', field: 'ciId', hide: true },
{ headerName: '등록시간', headerAlign: 'center', field: 'ciTime', hide: true }, { headerName: '등록시간', headerAlign: 'center', field: 'ciTime', hide: true },
{ headerName: 'ref', headerAlign: 'center', field: 'ciRef', hide: true }, { headerName: 'ref', headerAlign: 'center', field: 'ciRef', hide: true },
{ headerName: 'step', headerAlign: 'center', field: 'ciStep', hide: false }, { headerName: 'step', headerAlign: 'center', field: 'ciStep', hide: true },
{ headerName: '비번', headerAlign: 'center', field: 'ciPass', hide: true }, { headerName: '비번', headerAlign: 'center', field: 'ciPass', hide: true },
{ headerName: '내용', headerAlign: 'center', field: 'ciContents', hide: true }, { headerName: '내용', headerAlign: 'center', field: 'ciContents', hide: true },
{ headerName: 'IP', headerAlign: 'center', field: `ciIp`, hide: true }, { headerName: 'IP', headerAlign: 'center', field: `ciIp`, hide: true },

@ -1,4 +1,4 @@
import { useCallback, useEffect, useState } from 'react'; import { useState } from 'react';
// material-ui // material-ui
import { Button, Divider, FormControl, FormControlLabel, FormLabel, Grid, Radio, RadioGroup, TextField } from '@mui/material'; import { Button, Divider, FormControl, FormControlLabel, FormLabel, Grid, Radio, RadioGroup, TextField } from '@mui/material';
@ -55,7 +55,7 @@ const JudgeRegistReview = ({ scDatagb, menuName }) => {
{ headerName: '접수방법', headerAlign: 'center', field: 'scIngbNm', align: 'center', width: 120 } { headerName: '접수방법', headerAlign: 'center', field: 'scIngbNm', align: 'center', width: 120 }
]; ];
const search = useCallback(() => { const search = () => {
const params = { const params = {
scDatagb, // scDatagb, //
scTransfer, scTransfer,
@ -70,7 +70,7 @@ const JudgeRegistReview = ({ scDatagb, menuName }) => {
setRowsState((prevRows) => ({ ...prevRows, rows: response.data })); setRowsState((prevRows) => ({ ...prevRows, rows: response.data }));
} }
}); });
}, [rowsState.page, rowsState.pageSize, scDatagb]); };
const handleSave = () => { const handleSave = () => {
if (selectionModel.length === 0) { if (selectionModel.length === 0) {
@ -106,10 +106,6 @@ const JudgeRegistReview = ({ scDatagb, menuName }) => {
} }
}; };
useEffect(() => {
search();
}, [search]);
const handleOnKeyDown = (event) => { const handleOnKeyDown = (event) => {
if (event.type === 'keydown' && event.key === 'Enter' && scSeq1 && scSeq2) { if (event.type === 'keydown' && event.key === 'Enter' && scSeq1 && scSeq2) {
search(); search();

@ -14,9 +14,8 @@ import MainCard from 'ui-component/cards/MainCard';
// project imports // project imports
import MuiDataGrid from 'views/cmm/MuiDataGrid'; import MuiDataGrid from 'views/cmm/MuiDataGrid';
import xitCmm from 'commons/XitCmm';
import InputLabel from 'ui-component/extended/Form/InputLabel'; import InputLabel from 'ui-component/extended/Form/InputLabel';
import { findJudgeResults, findJudges } from 'apis/judge'; import { findJudgeResults, findJudges, removeJudge } from 'apis/judge';
import CmmModal from 'views/cmm/CmmModal'; import CmmModal from 'views/cmm/CmmModal';
import ModalJudgeResult from './ModalJudgeResult'; import ModalJudgeResult from './ModalJudgeResult';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
@ -49,13 +48,36 @@ const JudgeReview = ({ msDatagb, menuName }) => {
judgeTeam: '' judgeTeam: ''
}); });
const removeJudge = useCallback( const search = useCallback(() => {
const params = {
msDatagb,
page: rowsState.page,
size: rowsState.pageSize
};
findJudges({ ...params, msYear: selectedYear, msChasu: searchTxt }).then((response) => {
if (response && response.data) {
setTotalCount(response.count);
setRowsState((prevState) => ({ ...prevState, rows: response.data }));
// apiRef.current.forceUpdate(); // .updateRowData([]);
// apiRef.current.updateRowData([]);
}
});
}, [msDatagb, rowsState.page, rowsState.pageSize, selectedYear, searchTxt]);
const deleteJudge = useCallback(
(row) => () => { (row) => () => {
// setTimeout(() => { removeJudge(row).then((response) => {
// setRowsState((prevRows) => prevRows.filter((row) => row.rowId !== rowId)); if (response && response.success) {
// }); setRowsState({
xitCmm.alertParam(`삭제대상<br>${JSON.stringify(row)}`); ...rowsState,
console.log(row); page: 0
});
search();
} else {
alert.show(response.message);
}
});
}, },
[] []
); );
@ -103,28 +125,11 @@ const JudgeReview = ({ msDatagb, menuName }) => {
field: 'actions', field: 'actions',
type: 'actions', type: 'actions',
width: 80, width: 80,
getActions: (params) => [<GridActionsCellItem icon={<DeleteIcon />} label="Delete" onClick={removeJudge(params.row)} />], getActions: (params) => [<GridActionsCellItem icon={<DeleteIcon />} label="Delete" onClick={deleteJudge(params.row)} />],
align: 'center' align: 'center'
} }
]; ];
const search = useCallback(() => {
const params = {
msDatagb,
page: rowsState.page,
size: rowsState.pageSize
};
findJudges({ ...params, msYear: selectedYear, msChasu: searchTxt }).then((response) => {
if (response && response.data) {
setTotalCount(response.count);
setRowsState((prevState) => ({ ...prevState, rows: response.data }));
// apiRef.current.forceUpdate(); // .updateRowData([]);
// apiRef.current.updateRowData([]);
}
});
}, [msDatagb, rowsState.page, rowsState.pageSize, selectedYear, searchTxt]);
const handleSearch = async (event) => { const handleSearch = async (event) => {
if (!selectedYear) return; if (!selectedYear) return;

@ -16,18 +16,19 @@ import MainCard from 'ui-component/cards/MainCard';
// project imports // project imports
import MuiDataGrid from 'views/cmm/MuiDataGrid'; import MuiDataGrid from 'views/cmm/MuiDataGrid';
import xitCmm from 'commons/XitCmm'; import { findParkings, removeParkingJudge } from 'apis/parking';
import { findParkings } from 'apis/parking';
import { findJudgeResults } from 'apis/judge'; import { findJudgeResults } from 'apis/judge';
import InputLabel from '../../../ui-component/extended/Form/InputLabel'; import InputLabel from '../../../ui-component/extended/Form/InputLabel';
import ModalJudgeResult from 'views/biz/judge/ModalJudgeResult'; import ModalJudgeResult from 'views/biz/judge/ModalJudgeResult';
import CmmModal from 'views/cmm/CmmModal'; import CmmModal from 'views/cmm/CmmModal';
import { useAlert } from 'react-alert';
const ParkingReview = () => { const ParkingReview = () => {
const isInit = useRef(true); const isInit = useRef(true);
const year = getYear(new Date()); const year = getYear(new Date());
const years = _.range(year, year - 14, -1); const years = _.range(year, year - 14, -1);
const alert = useAlert();
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
const [title, setTitle] = useState(); const [title, setTitle] = useState();
@ -49,13 +50,35 @@ const ParkingReview = () => {
judgeTeam: '' judgeTeam: ''
}); });
const search = useCallback(() => {
const params = {
page: rowsState.page,
size: rowsState.pageSize
};
findParkings({ ...params, msYear: selectedYear, msChasu: searchTxt }).then((response) => {
if (response && response.data) {
setTotalCount(response.count);
setRowsState((prevState) => ({ ...prevState, rows: response.data }));
// apiRef.current.forceUpdate(); // .updateRowData([]);
// apiRef.current.updateRowData([]);
}
});
}, [rowsState.page, rowsState.pageSize, selectedYear, searchTxt]);
const removeJudge = useCallback( const removeJudge = useCallback(
(row) => () => { (row) => () => {
// setTimeout(() => { removeParkingJudge(row).then((response) => {
// setRowsState((prevRows) => prevRows.filter((row) => row.rowId !== rowId)); if (response && response.success) {
// }); setRowsState({
xitCmm.alertParam(`삭제대상<br>${JSON.stringify(row)}`); ...rowsState,
console.log(row); page: 0
});
search();
} else {
alert.show(response.message);
}
});
}, },
[] []
); );
@ -108,22 +131,6 @@ const ParkingReview = () => {
} }
]; ];
const search = useCallback(() => {
const params = {
page: rowsState.page,
size: rowsState.pageSize
};
findParkings({ ...params, msYear: selectedYear, msChasu: searchTxt }).then((response) => {
if (response && response.data) {
setTotalCount(response.count);
setRowsState((prevState) => ({ ...prevState, rows: response.data }));
// apiRef.current.forceUpdate(); // .updateRowData([]);
// apiRef.current.updateRowData([]);
}
});
}, [rowsState.page, rowsState.pageSize, selectedYear, searchTxt]);
const handleSearch = async (event) => { const handleSearch = async (event) => {
if (!selectedYear) return; if (!selectedYear) return;

@ -13,7 +13,6 @@ import PropTypes from 'prop-types';
const UserManagementForm = (props) => { const UserManagementForm = (props) => {
// eslint-disable-next-line react/prop-types // eslint-disable-next-line react/prop-types
const { create, setOpen, handleModalSave, teams = [], accesstypes = [], rowData = {} } = props; const { create, setOpen, handleModalSave, teams = [], accesstypes = [], rowData = {} } = props;
console.log(rowData);
const [userid, setUserid] = useState(rowData?.userid || ''); const [userid, setUserid] = useState(rowData?.userid || '');
const [passwd, setPasswd] = useState(rowData?.passwd || ''); const [passwd, setPasswd] = useState(rowData?.passwd || '');
const [accesstype, setAccesstype] = useState(rowData?.accesstype || '001'); const [accesstype, setAccesstype] = useState(rowData?.accesstype || '001');

Loading…
Cancel
Save