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
: <>>
}
-
-
저장
-
취소
+
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/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}
-