From 40e229e76c1f9d7482ec32921b748b17a2ca67ac Mon Sep 17 00:00:00 2001 From: kimjh2369 Date: Wed, 21 Sep 2022 15:54:46 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EB=B9=84=ED=96=89=20=EC=8B=9C=EB=AC=BC?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=85=98=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20ind?= =?UTF-8?q?exOf=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analysis/simulation/AnalysimuationInfo.js | 106 +++++++++--------- .../simulator/AnalysisSimulationContainer.js | 18 +-- 2 files changed, 60 insertions(+), 64 deletions(-) diff --git a/src/components/analysis/simulation/AnalysimuationInfo.js b/src/components/analysis/simulation/AnalysimuationInfo.js index 441aca0..a3f928e 100644 --- a/src/components/analysis/simulation/AnalysimuationInfo.js +++ b/src/components/analysis/simulation/AnalysimuationInfo.js @@ -1,64 +1,60 @@ import moment from 'moment'; import { useEffect } from 'react'; - export const AnalysimuationInfo = props => { - useEffect(()=>{ - //console.log(props.data); - },[props.data]) - return( + return (
- {props.count === 0 ? ( -
표시할 데이터가 없습니다.
- ) : ( - props.data?.map(item => { - // console.log( - // item.idntfNum, - // ':::', - // item.idntfNum.indexOf(props.filterId) - // ); - // console.log(item.idntfNum.indexOf(props.filterId)); - if (item.idntfNum && item.idntfNum.indexOf(props.searchText) != -1) { - return ( -
props.handlerDetail(item.cntrlId)} - key={Math.random()} - > -
-
-
식별번호
-
{item.idntfNum}
-
-
-
일자
-
- {moment(item.cntrlStDt).format('YYYY년MM월DD일')} -
-
-
-
시작 위치
-
{item.stArea}
-
-
-
시작/종료 시간
-
- {moment(item.cntrlStDt).format('HH:mm')} - {' '}/{' '} - {moment(item.cntrlEndDt).format('HH:mm')} -
-
- {/*
+ {props.count === 0 ? ( +
표시할 데이터가 없습니다.
+ ) : ( + props.data?.map(item => { + // console.log( + // item.idntfNum, + // ':::', + // item.idntfNum.indexOf(props.filterId) + // ); + // console.log(item.idntfNum.indexOf(props.filterId)); + + if (item.idntfNum) { + return ( +
props.handlerDetail(item.cntrlId)} + key={Math.random()} + > +
+
+
식별번호
+
{item.idntfNum}
+
+
+
일자
+
+ {moment(item.cntrlStDt).format('YYYY년MM월DD일')} +
+
+
+
시작 위치
+
{item.stArea}
+
+
+
시작/종료 시간
+
+ {moment(item.cntrlStDt).format('HH:mm')} + {' '}/{' '} + {moment(item.cntrlEndDt).format('HH:mm')} +
+
+ {/*
총 비행거리/시간
ddd
*/} -
-
- ); - } - }) - )} +
+
+ ); + } + }) + )}
- ) -} - + ); +}; diff --git a/src/containers/analysis/simulator/AnalysisSimulationContainer.js b/src/containers/analysis/simulator/AnalysisSimulationContainer.js index 5a62585..e4e629c 100644 --- a/src/containers/analysis/simulator/AnalysisSimulationContainer.js +++ b/src/containers/analysis/simulator/AnalysisSimulationContainer.js @@ -4,7 +4,7 @@ import { useDispatch, useSelector } from 'react-redux'; import { AnalysisSimulationDetail } from '../../../components/analysis/simulation/AnalysisSimulationDetail'; import { AnalysisSimulationMenu } from '../../../components/analysis/simulation/AnalysisSimulationMenu'; import { AnalysisSimulationReport } from '../../../components/analysis/simulation/AnalysisSimulationReport'; -import { AnalysimuationInfo } from '../../../components/analysis/simulation/AnalysimuationInfo' +import { AnalysimuationInfo } from '../../../components/analysis/simulation/AnalysimuationInfo'; import { NMap } from '../../../components/map/nhn/NMap'; import { NMapMarker } from '../../../components/map/nhn/NMapMarker'; import { NMapPolyline } from '../../../components/map/nhn/NMapPolyline'; @@ -43,7 +43,6 @@ export const AnalysisSimulationContainer = props => { const dispatch = useDispatch(); - const [params, setParams] = useState({ stDate: moment().subtract(1, 'day').format('YYYY-MM-DD'), endDate: moment().subtract(-1, 'day').format('YYYY-MM-DD'), @@ -81,11 +80,11 @@ export const AnalysisSimulationContainer = props => { setParams({ stDate: searchParams.stDate, endDate: searchParams.endDate, - search1: filterId + search1: searchText }); } -//handlerSearch(); + //handlerSearch(); } }, [oepnReportList]); @@ -124,10 +123,10 @@ export const AnalysisSimulationContainer = props => { // console.log('minDate :::', minDate, 'maxDate :: ', maxDate); }, [log]); - const handlerSearch = (search1) => { - setSearchText(search1) + const handlerSearch = search1 => { + setSearchText(search1); - dispatch(Actions.list.request({ searchParams: {...params, search1} })); + dispatch(Actions.list.request({ searchParams: { ...params, search1 } })); }; const handlerDetailSearch = id => { @@ -180,10 +179,11 @@ export const AnalysisSimulationContainer = props => { + handlerLogout={handlerLogout} + /> {oepnReportList ? ( -
+
Date: Wed, 21 Sep 2022 16:03:27 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=ED=9A=8C=EC=9B=90=ED=83=88=ED=87=B4=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/custom.css | 2 +- src/components/account/mypage/AccountMypageForm.js | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/assets/css/custom.css b/src/assets/css/custom.css index ba47e55..a06a9b3 100644 --- a/src/assets/css/custom.css +++ b/src/assets/css/custom.css @@ -785,4 +785,4 @@ background-size: 75% auto; .search-result .address{font-size:13px;color:#343D55} .pal-modal-body{padding:0;} -.pal-modal-body .pal-card-box + .pal-card-box{margin-top:0;} \ No newline at end of file +.pal-modal-body .pal-card-box + .pal-card-box{margin-top:0;} diff --git a/src/components/account/mypage/AccountMypageForm.js b/src/components/account/mypage/AccountMypageForm.js index c656051..990f6e2 100644 --- a/src/components/account/mypage/AccountMypageForm.js +++ b/src/components/account/mypage/AccountMypageForm.js @@ -171,9 +171,14 @@ const AccountMypageForm = ({ userInfo,handlerSmsSend,isCrtfy,seconds_Counter,han : <> }
-
- 저장 - 취소 +
+
+ 저장 + 취소 +
+
+ 회원탈퇴 +
From b0dbbcf727d86d18b2f6375ed897763f1fc88813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?= Date: Wed, 21 Sep 2022 17:08:55 +0900 Subject: [PATCH 3/3] =?UTF-8?q?ConfirmModal=20=EC=83=89=EC=83=81=20props?= =?UTF-8?q?=EB=A1=9C=20=EB=B0=9B=EC=95=84=EC=98=A4=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/basis/group/BaisGroupForm.js | 46 +++---------------- src/components/modal/ConfirmModal.js | 6 ++- .../group/BasisGroupApprovalContainer.js | 2 + .../basis/group/BasisGroupContainer.js | 1 + .../basis/group/BasisGroupDetailContainer.js | 30 ++++++++++-- .../group/BasisGroupDetailJoinContainer.js | 4 +- .../basis/group/BasisGroupUsersContainer.js | 8 +++- .../system/auth/SystemAuthContainer.js | 6 +-- .../system/code/SystemCodeContainer.js | 5 +- .../system/menu/SystemMenuContainer.js | 5 +- .../system/user/SystemUserContainer.js | 6 +-- 11 files changed, 57 insertions(+), 62 deletions(-) diff --git a/src/components/basis/group/BaisGroupForm.js b/src/components/basis/group/BaisGroupForm.js index 6b76812..1dd73a7 100644 --- a/src/components/basis/group/BaisGroupForm.js +++ b/src/components/basis/group/BaisGroupForm.js @@ -59,7 +59,7 @@ export const BasisGroupForm = props => { name='groupId' bsSize='sm' readOnly={true} - value={props.groupData.groupId || ""} + value={props.groupData.groupId || ''} placeholder='' /> @@ -75,7 +75,7 @@ export const BasisGroupForm = props => { name='groupNm' bsSize='sm' onChange={props.handlerInput} - value={props.groupData.groupNm || ""} + value={props.groupData.groupNm || ''} placeholder='' /> @@ -112,53 +112,19 @@ export const BasisGroupForm = props => { {/* 목록 */} - {props.groupData.type != 'create'?( + {props.groupData.type != 'create' ? ( props.setConfirmModal(!props.confirmModal)} + onClick={() => props.handlerWidthrow()} > 삭제 - ) - : - ( + ) : ( <> - ) - } + )}
- -
- props.setConfirmModal(!props.confirmModal)} - modalClassName='modal-danger' - className='modal-dialog-centered' - > - props.setConfirmModal(!props.confirmModal)} - > - 삭제 확인 - - 해당 그룹을 삭제 하시겠습니까? - - - - - - -
diff --git a/src/components/modal/ConfirmModal.js b/src/components/modal/ConfirmModal.js index 5873a8c..95715ea 100644 --- a/src/components/modal/ConfirmModal.js +++ b/src/components/modal/ConfirmModal.js @@ -12,7 +12,8 @@ export const ConfirmModal = props => { toggle={() => props.setModal({ ...props.modal, isOpen: !props.modal.isOpen }) } - modalClassName='modal-danger' + // modalClassName='modal-primary' + modalClassName={'modal-' + `${props.color}`} className='modal-dialog-centered' > { {props.modal.desc} - diff --git a/src/containers/basis/group/BasisGroupApprovalContainer.js b/src/containers/basis/group/BasisGroupApprovalContainer.js index 092c9b9..33472fc 100644 --- a/src/containers/basis/group/BasisGroupApprovalContainer.js +++ b/src/containers/basis/group/BasisGroupApprovalContainer.js @@ -215,11 +215,13 @@ export const BasisGroupApprovalContainer = props => { modal={modal} setModal={setModal} handlerConfirm={handlerAprvSave} + color='primary' /> ); diff --git a/src/containers/basis/group/BasisGroupContainer.js b/src/containers/basis/group/BasisGroupContainer.js index 9d62904..d00d15c 100644 --- a/src/containers/basis/group/BasisGroupContainer.js +++ b/src/containers/basis/group/BasisGroupContainer.js @@ -206,6 +206,7 @@ export const BasisGroupContainer = props => { modal={modal} setModal={setModal} handlerConfirm={handlerWidthrowConfirm} + color='danger' /> ); diff --git a/src/containers/basis/group/BasisGroupDetailContainer.js b/src/containers/basis/group/BasisGroupDetailContainer.js index f1f14e5..d9d96e2 100644 --- a/src/containers/basis/group/BasisGroupDetailContainer.js +++ b/src/containers/basis/group/BasisGroupDetailContainer.js @@ -3,6 +3,7 @@ import { useDispatch, useSelector } from 'react-redux'; import { useParams } from 'react-router-dom'; import { BasisGroupForm } from '../../../components/basis/group/BaisGroupForm'; import { CustomDetailLayout } from '../../../components/layout/CustomDetailLayout'; +import { ConfirmModal } from '../../../components/modal/ConfirmModal'; import * as Actions from '../../../modules/basis/group/actions/basisGroupAction'; export const BasisGroupDetailContainer = () => { @@ -16,12 +17,17 @@ export const BasisGroupDetailContainer = () => { groupNm: '', groupTypeCd: '' }); + + const [modal, setModal] = useState({ + isOpen: false, + title: '', + desc: '' + }); + const dispatch = useDispatch(); const { id } = useParams(); const titleName = '그룹 관리'; - const [confirmModal, setConfirmModal] = useState(false) - useEffect(() => { if (id) { handlerSearch(); @@ -63,10 +69,18 @@ export const BasisGroupDetailContainer = () => { dispatch(Actions.GROUP_UPDATE.request(groupData)); }; const handlerDelete = () => { - setConfirmModal(!confirmModal); dispatch(Actions.GROUP_DELETE.request(groupData.groupId)); }; + const handlerWidthrow = () => { + setModal({ + isOpen: true, + title: '삭제 확인', + desc: '해당 그룹을 삭제 하시겠습니까?' + }); + return; + }; + const handlerInput = e => { const { name, value } = e.target; setGroupData({ @@ -85,8 +99,14 @@ export const BasisGroupDetailContainer = () => { } handlerDelete={handlerDelete} handlerInput={handlerInput} - confirmModal={confirmModal} - setConfirmModal={setConfirmModal} + handlerWidthrow={handlerWidthrow} + /> + + ); diff --git a/src/containers/basis/group/BasisGroupDetailJoinContainer.js b/src/containers/basis/group/BasisGroupDetailJoinContainer.js index b1804af..827278f 100644 --- a/src/containers/basis/group/BasisGroupDetailJoinContainer.js +++ b/src/containers/basis/group/BasisGroupDetailJoinContainer.js @@ -54,8 +54,7 @@ export const BasisGroupDetailJoinContainer = props => { ); } }, [user]); - useEffect(() => { - }, [params]); + useEffect(() => {}, [params]); const handlerJoin = groupId => { setJoinData({ @@ -184,6 +183,7 @@ export const BasisGroupDetailJoinContainer = props => { modal={modal} setModal={setModal} handlerConfirm={handlerConfirm} + color='primary' /> ); diff --git a/src/containers/basis/group/BasisGroupUsersContainer.js b/src/containers/basis/group/BasisGroupUsersContainer.js index 51653e3..67f4e25 100644 --- a/src/containers/basis/group/BasisGroupUsersContainer.js +++ b/src/containers/basis/group/BasisGroupUsersContainer.js @@ -144,7 +144,12 @@ export const BasisGroupUsersContainer = props => { }, []); const handlerSearch = () => { - dispatch(Actions.USER_LIST.request({ searchParams: params , cstmrSno: user?.cstmrSno})); + dispatch( + Actions.USER_LIST.request({ + searchParams: params, + cstmrSno: user?.cstmrSno + }) + ); }; const handlerAdminConfirm = cstmrGroupSno => { @@ -214,6 +219,7 @@ export const BasisGroupUsersContainer = props => { modal={modal} setModal={setModal} handlerConfirm={handlerAuthSave} + color='primary' /> ); diff --git a/src/containers/system/auth/SystemAuthContainer.js b/src/containers/system/auth/SystemAuthContainer.js index 289d223..3655067 100644 --- a/src/containers/system/auth/SystemAuthContainer.js +++ b/src/containers/system/auth/SystemAuthContainer.js @@ -71,8 +71,7 @@ export const SystemAuthContainer = props => { handlerSearch(); }, []); - useEffect(() => { - }, [params]); + useEffect(() => {}, [params]); const handlerSearch = () => { // dispatch(Actions.list.request({ searchParams: params })); }; @@ -91,7 +90,7 @@ export const SystemAuthContainer = props => { }; const handlerWidthrowConfirm = () => { - // console.log('탈퇴!!!'); + // console.log('탈퇴!!!'); }; const handlerGroupJoin = () => { @@ -268,6 +267,7 @@ export const SystemAuthContainer = props => { modal={modal} setModal={setModal} handlerConfirm={handlerWidthrowConfirm} + color='primary' /> ); diff --git a/src/containers/system/code/SystemCodeContainer.js b/src/containers/system/code/SystemCodeContainer.js index 5ef3523..836d7fe 100644 --- a/src/containers/system/code/SystemCodeContainer.js +++ b/src/containers/system/code/SystemCodeContainer.js @@ -72,8 +72,7 @@ export const SystemCodeContainer = props => { handlerSearch(); }, []); - useEffect(() => { - }, [params]); + useEffect(() => {}, [params]); const handlerSearch = () => { // dispatch(Actions.list.request({ searchParams: params })); }; @@ -227,7 +226,7 @@ export const SystemCodeContainer = props => { /> - + ); }; diff --git a/src/containers/system/menu/SystemMenuContainer.js b/src/containers/system/menu/SystemMenuContainer.js index 20d23fe..b1aeae6 100644 --- a/src/containers/system/menu/SystemMenuContainer.js +++ b/src/containers/system/menu/SystemMenuContainer.js @@ -72,8 +72,7 @@ export const SystemMenuContainer = props => { handlerSearch(); }, []); - useEffect(() => { - }, [params]); + useEffect(() => {}, [params]); const handlerSearch = () => { // dispatch(Actions.list.request({ searchParams: params })); }; @@ -227,7 +226,7 @@ export const SystemMenuContainer = props => { /> - + ); }; diff --git a/src/containers/system/user/SystemUserContainer.js b/src/containers/system/user/SystemUserContainer.js index 8174aee..a2b9d84 100644 --- a/src/containers/system/user/SystemUserContainer.js +++ b/src/containers/system/user/SystemUserContainer.js @@ -73,8 +73,7 @@ export const SystemUserContainer = props => { handlerSearch(); }, []); - useEffect(() => { - }, [params]); + useEffect(() => {}, [params]); const handlerSearch = () => { // dispatch(Actions.list.request({ searchParams: params })); }; @@ -93,7 +92,7 @@ export const SystemUserContainer = props => { }; const handlerWidthrowConfirm = () => { - // console.log('탈퇴!!!'); + // console.log('탈퇴!!!'); }; const handlerGroupJoin = () => { @@ -270,6 +269,7 @@ export const SystemUserContainer = props => { modal={modal} setModal={setModal} handlerConfirm={handlerWidthrowConfirm} + color='primary' /> );