From 55f422498987b53af281370767a6057fb6416684 Mon Sep 17 00:00:00 2001 From: junh_eee Date: Mon, 19 Sep 2022 18:37:17 +0900 Subject: [PATCH 01/10] . --- src/components/analysis/history/AnalysisHistorySearch.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/analysis/history/AnalysisHistorySearch.js b/src/components/analysis/history/AnalysisHistorySearch.js index 5c17c20..30d23c1 100644 --- a/src/components/analysis/history/AnalysisHistorySearch.js +++ b/src/components/analysis/history/AnalysisHistorySearch.js @@ -31,7 +31,8 @@ export const AnalysisHistorySearch = props => { return ( -
+ //
+
From b57cbe7dae78de20243878bc566583485af70430 Mon Sep 17 00:00:00 2001 From: kimjh2369 Date: Mon, 19 Sep 2022 18:37:37 +0900 Subject: [PATCH 02/10] =?UTF-8?q?=EB=B9=84=ED=96=89=20=EA=B3=84=ED=9A=8D?= =?UTF-8?q?=20=EC=8A=B9=EC=9D=B8=20reset?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basis/flight/aprv/FlightPlanAprvContainer.js | 8 +++++--- src/modules/basis/flight/reducers/basisFlightReducer.ts | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js index 6d299bf..4dfcac1 100644 --- a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js +++ b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js @@ -29,9 +29,11 @@ const FlightPlanAprvContainer = () => { const history = useHistory(); const [searchData, setSearchData] = useState(initSearchData); const [selPlanSnoList, setSelPlanSnoList] = useState([]); - const { aprvList, aprvProc, selectGroup } = useSelector( - state => state.flightState - ); + const { + list: aprvList, + aprvProc, + selectGroup + } = useSelector(state => state.flightState); const { joinList, joinListCount } = useSelector(state => state.groupState); const { user } = useSelector(state => state.authState, shallowEqual); const [modal, setModal] = useState({ diff --git a/src/modules/basis/flight/reducers/basisFlightReducer.ts b/src/modules/basis/flight/reducers/basisFlightReducer.ts index 3667bfd..61eda00 100644 --- a/src/modules/basis/flight/reducers/basisFlightReducer.ts +++ b/src/modules/basis/flight/reducers/basisFlightReducer.ts @@ -28,7 +28,7 @@ export const flightReducer = createReducer( .handleAction(Actions.FLIGHT_PLAN_LIST.success, (state, action) => produce(state, draft => { const data = action.payload; - draft.aprvList = data; + draft.list = data; }) ) // 상세 From f860874ca446fc222fdc387aec97dbd06de67681 Mon Sep 17 00:00:00 2001 From: junh_eee Date: Mon, 19 Sep 2022 18:40:38 +0900 Subject: [PATCH 03/10] . --- .../analysis/history/AnalysisHistoryGrid.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/components/analysis/history/AnalysisHistoryGrid.js b/src/components/analysis/history/AnalysisHistoryGrid.js index 84863de..f311323 100644 --- a/src/components/analysis/history/AnalysisHistoryGrid.js +++ b/src/components/analysis/history/AnalysisHistoryGrid.js @@ -23,10 +23,11 @@ import { ExcelExportButton } from '../../crud/excel/ExcelExportButton'; export const AnalysisHistoryGrid = props => { return ( -
- - -
+ //
+ // + // + <> +

{props.title} 목록

검색결과 총 {props.count}건 @@ -55,8 +56,9 @@ export const AnalysisHistoryGrid = props => {
- - -
+ + // + // + //
); }; From 2d1e6e73e758d9a9b48a246833ffeadbae93c70c Mon Sep 17 00:00:00 2001 From: kimjh2369 Date: Mon, 19 Sep 2022 18:55:46 +0900 Subject: [PATCH 04/10] =?UTF-8?q?=EB=B9=84=ED=96=89=20=EA=B3=84=ED=9A=8D?= =?UTF-8?q?=20=EC=8A=B9=EC=9D=B8=20=EA=B2=80=EC=83=89=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/basis/flight/reducers/basisFlightReducer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/basis/flight/reducers/basisFlightReducer.ts b/src/modules/basis/flight/reducers/basisFlightReducer.ts index 61eda00..fb16452 100644 --- a/src/modules/basis/flight/reducers/basisFlightReducer.ts +++ b/src/modules/basis/flight/reducers/basisFlightReducer.ts @@ -120,7 +120,7 @@ export const flightReducer = createReducer( .handleAction(Actions.FLIGHT_APRV_LIST.success, (state, action) => produce(state, draft => { const data = action.payload; - draft.aprvList = data; + draft.list = data; }) ) // 비행계획서 승인처리 From d78fed8bf57711357f19d14fb4a9bc7e3e8d5d61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?hagjoon=28=EC=9D=B4=ED=95=99=EC=A4=80=29?= Date: Tue, 20 Sep 2022 09:45:02 +0900 Subject: [PATCH 05/10] =?UTF-8?q?=EB=B9=84=ED=96=89=EA=B3=84=ED=9A=8D?= =?UTF-8?q?=EC=84=9C=20=EC=BD=98=EC=86=94=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/containers/basis/flight/aprv/FlightPlanAprvContainer.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js index 4dfcac1..9a033a0 100644 --- a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js +++ b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js @@ -219,7 +219,6 @@ const FlightPlanAprvContainer = () => { {selectGroup.cstmrSno !== 0 ? ( <> - {console.log(searchData)} Date: Tue, 20 Sep 2022 10:06:44 +0900 Subject: [PATCH 06/10] =?UTF-8?q?[=EA=B8=B0=EC=B2=B4=EA=B4=80=EB=A6=AC]=20?= =?UTF-8?q?=EC=BD=98=EC=86=94=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/containers/basis/dron/BasisDronContainer.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/containers/basis/dron/BasisDronContainer.js b/src/containers/basis/dron/BasisDronContainer.js index 77856c5..685b187 100644 --- a/src/containers/basis/dron/BasisDronContainer.js +++ b/src/containers/basis/dron/BasisDronContainer.js @@ -168,7 +168,6 @@ export const BasisDronContainer = props => { }; const handlerDetail = (groupId, groupNm, groupAuthCd,aprvlYn) => { - console.log(aprvlYn); if (groupAuthCd === 'CREATER' || (aprvlYn==='Y' && groupAuthCd === 'ADMIN')) { dispatch(Actions.SELECT({ groupId: groupId, groupNm: groupNm })); setParams({ From 896cd8875308a89a0c90c678b2517e1be744c082 Mon Sep 17 00:00:00 2001 From: kimjh2369 Date: Tue, 20 Sep 2022 10:19:42 +0900 Subject: [PATCH 07/10] =?UTF-8?q?=EC=A7=80=EB=8F=84=20=EA=B2=80=EC=83=89?= =?UTF-8?q?=20=EB=AC=B8=EB=B2=95=20=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basis/flight/plan/FlightPlanAreaMap.js | 69 ++++++++++--------- 1 file changed, 38 insertions(+), 31 deletions(-) diff --git a/src/components/basis/flight/plan/FlightPlanAreaMap.js b/src/components/basis/flight/plan/FlightPlanAreaMap.js index 3def08b..d813404 100644 --- a/src/components/basis/flight/plan/FlightPlanAreaMap.js +++ b/src/components/basis/flight/plan/FlightPlanAreaMap.js @@ -1,6 +1,17 @@ import React, { useEffect, useState } from 'react'; -import { Card, CardBody, Button, Input, Row, Col, InputGroup, InputGroupAddon, InputGroupText, FormGroup } from 'reactstrap'; -import { Search } from 'react-feather' +import { + Card, + CardBody, + Button, + Input, + Row, + Col, + InputGroup, + InputGroupAddon, + InputGroupText, + FormGroup +} from 'reactstrap'; +import { Key, Search } from 'react-feather'; import { useDispatch, useSelector } from 'react-redux'; import { FeatureAirZone } from '../../../map/naver/feature/FeatureAirZone'; import { @@ -146,7 +157,7 @@ const FlightPlanAreaMap = props => { }; const handleSearch = async () => { - const res = await flightPlanAPI.searchArea({query: query}); + const res = await flightPlanAPI.searchArea({ query: query }); setIsSearch(true); setSearchRes(res.data.items); }; @@ -160,17 +171,19 @@ const FlightPlanAreaMap = props => { }; const handleCoord = (mapx, mapy) => { - let utmk = naver.maps.TransCoord.fromTM128ToUTMK(naver.maps.Point(mapx, mapy)); + let utmk = naver.maps.TransCoord.fromTM128ToUTMK( + naver.maps.Point(mapx, mapy) + ); let latlng = naver.maps.TransCoord.fromUTMKToLatLng(utmk); setIsSearch(false); - + let options = { duration: 800, easing: 'easeOutCubic' - } - map.morph(latlng, 16, options) - } + }; + map.morph(latlng, 16, options); + }; const handleEnter = e => { if (e.key == 'Enter') { @@ -209,10 +222,7 @@ const FlightPlanAreaMap = props => { - + { id='searchInput' name='searchInput' bsSize='sm' - autocomplete='off' + autoComplete='off' placeholder='검색명을 입력하세요.' onChange={handleChange} onKeyPress={handleEnter} @@ -228,15 +238,16 @@ const FlightPlanAreaMap = props => {
    - {searchRes?.length!=0 && isSearch? ( - - searchRes?.map((prev, idx) => { - let title = prev.title.replaceAll('',''); - title = title.replaceAll('',''); - - return ( - <> -
  • handleCoord(prev.mapx, prev.mapy)}> + {searchRes?.length !== 0 && isSearch ? ( + searchRes?.map((prev, idx) => { + let title = prev.title.replaceAll('', ''); + title = title.replaceAll('', ''); + + return ( +
  • handleCoord(prev.mapx, prev.mapy)} + >
    • - - ) - - }) - ):( - <> - )} + ); + }) + ) : ( + <> + )}
@@ -282,8 +291,6 @@ const FlightPlanAreaMap = props => { 검색
*/} - -
From 11544552b19341c6520d9ede91a20ceefd48b5b7 Mon Sep 17 00:00:00 2001 From: kimjh2369 Date: Tue, 20 Sep 2022 10:26:42 +0900 Subject: [PATCH 08/10] =?UTF-8?q?=EC=A7=80=EB=8F=84=20=EA=B2=80=EC=83=89?= =?UTF-8?q?=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20key=EA=B0=92=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/basis/flight/plan/FlightPlanAreaMap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/basis/flight/plan/FlightPlanAreaMap.js b/src/components/basis/flight/plan/FlightPlanAreaMap.js index d813404..5468f39 100644 --- a/src/components/basis/flight/plan/FlightPlanAreaMap.js +++ b/src/components/basis/flight/plan/FlightPlanAreaMap.js @@ -245,7 +245,7 @@ const FlightPlanAreaMap = props => { return (
  • handleCoord(prev.mapx, prev.mapy)} > From aa5010a8b22386636add41519c2bf67bbb8d9d5b Mon Sep 17 00:00:00 2001 From: junh_eee Date: Tue, 20 Sep 2022 11:42:59 +0900 Subject: [PATCH 09/10] =?UTF-8?q?modal=20=EC=98=A4=ED=83=80=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/find/AccountFindPassword.js | 10 ++--- .../account/find/AccountFindUserId.js | 10 ++--- src/components/account/login/AccountLogin.js | 4 +- .../account/mypage/AccountMypageForm.js | 2 +- .../account/mypage/AccountMypagePwForm.js | 6 +-- .../register/AccountRegisterComplete.js | 2 +- .../account/register/AccountRegisterForm.js | 42 +++++++++---------- .../simulation/AnalysisSimulationDetail.js | 2 +- .../simulation/AnalysisSimulationReport.js | 2 +- .../basis/flight/plan/FlightPlanArcrft.js | 2 +- src/configs/constants.js | 6 +-- .../basis/dron/BasisDronContainer.js | 2 +- .../basis/dron/BasisIdntfContainer.js | 10 ++--- .../flight/aprv/FlightPlanAprvContainer.js | 4 +- .../flight/plan/FlightPlanAreaContainer.js | 2 +- .../flight/plan/FlightPlanDetailContainer.js | 22 +++++----- src/modules/account/login/sagas/authSaga.ts | 8 ++-- src/modules/basis/dron/sagas/basisDronSaga.ts | 4 +- .../basis/group/sagas/basisGroupSaga.ts | 6 +-- src/modules/main/dash/sagas/mainDashSaga.ts | 8 ++-- src/modules/utils/customAxiosUtil.ts | 6 +-- src/views/design/DesignPassword.js | 2 +- src/views/design/DesignRegister3.js | 2 +- src/views/design/mypage/group/DesignGroup8.js | 2 +- src/views/design/mypage/group/DesignGroup9.js | 2 +- .../design/mypage/myinfo/DesignMyInfo.js | 2 +- .../steps-with-validation/AccountDetails.js | 2 +- 27 files changed, 86 insertions(+), 86 deletions(-) diff --git a/src/components/account/find/AccountFindPassword.js b/src/components/account/find/AccountFindPassword.js index 21f481a..be85065 100644 --- a/src/components/account/find/AccountFindPassword.js +++ b/src/components/account/find/AccountFindPassword.js @@ -80,7 +80,7 @@ export const AccountFindPassword = props => { setModal({ isOpen: true, title: '인증번호 발송', - desc: '인증번호가 발송은 3회 까지만 가능합니다.', + desc: '인증번호가 발송은 3회까지만 가능합니다.', color: 'modal-danger' }) return; @@ -92,7 +92,7 @@ export const AccountFindPassword = props => { setModal({ isOpen: true, title: '인증번호 발송', - desc: '가입되지 않은 회원 정보입니다. 다시 확인해 주세요.', + desc: '가입되지 않은 회원정보입니다. 다시 확인해 주세요.', color: 'modal-danger' }) } else if(res?.data.code === 0) { @@ -188,7 +188,7 @@ export const AccountFindPassword = props => { setModal({ isOpen: true, title: '인증번호 인증', - desc: '인증번호가 잘못 되었습니다.', + desc: '인증번호가 잘못되었습니다.', color: 'modal-danger' }); return; @@ -393,7 +393,7 @@ export const AccountFindPassword = props => { setConfirmModal(!confirmModal)} className='modal-dialog-centered user-search-modal'> setConfirmModal(!confirmModal)}>비밀번호 확인 - 새로운 비밀번호로 변경해주세요. + 새로운 비밀번호로 변경해 주세요. @@ -447,7 +447,7 @@ export const AccountFindPassword = props => { 비밀번호 변경 - 변경이 완료되었습니다. 다시 로그인 해주세요. + 변경이 완료되었습니다. 다시 로그인해 주세요.