From d63b598b6ecff9446ad020e274bdb3b7bbc0f2e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?kimjh=28=EA=B9=80=EC=9E=A5=ED=98=84=29?= Date: Mon, 26 Sep 2022 17:36:33 +0900 Subject: [PATCH 1/7] =?UTF-8?q?grid-loading=20=EC=A3=BC=EC=84=9D=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/basis/group/BasisGroupGrid.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/basis/group/BasisGroupGrid.js b/src/components/basis/group/BasisGroupGrid.js index dcead25..b721317 100644 --- a/src/components/basis/group/BasisGroupGrid.js +++ b/src/components/basis/group/BasisGroupGrid.js @@ -44,9 +44,9 @@ export const BasisGroupGrid = props => {
-
+ {/*
Loading...
-
+
*/}
Date: Tue, 27 Sep 2022 10:25:22 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20?= =?UTF-8?q?=EC=BD=98=EC=86=94=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 --- src/components/account/register/AccountRegisterForm.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/account/register/AccountRegisterForm.js b/src/components/account/register/AccountRegisterForm.js index ce99d40..dbc2c8f 100644 --- a/src/components/account/register/AccountRegisterForm.js +++ b/src/components/account/register/AccountRegisterForm.js @@ -447,10 +447,8 @@ export const AccountRegisterForm = ({ 'is-invalid': errors.clncd })} > + - {errors && errors.clncd && ( From 4536d9445d5ed51527dd8cdd48b84a78a8929f25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?kimjh=28=EA=B9=80=EC=9E=A5=ED=98=84=29?= Date: Tue, 27 Sep 2022 10:25:37 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=EB=B9=84=ED=96=89=EC=9D=B4=EB=A0=A5=20=20l?= =?UTF-8?q?oading=20spinner=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analysis/history/AnalysisHistoryGrid.js | 32 +++----- src/components/crud/grid/GridDatatable.js | 77 +++++++------------ 2 files changed, 41 insertions(+), 68 deletions(-) diff --git a/src/components/analysis/history/AnalysisHistoryGrid.js b/src/components/analysis/history/AnalysisHistoryGrid.js index ff8545f..4b7ccd2 100644 --- a/src/components/analysis/history/AnalysisHistoryGrid.js +++ b/src/components/analysis/history/AnalysisHistoryGrid.js @@ -1,27 +1,10 @@ import { GridDatabase } from '../../../components/crud/grid/GridDatatable'; -import { - Row, - Col, - Table, - Badge, - UncontrolledDropdown, - DropdownMenu, - DropdownItem, - DropdownToggle, - Card, - CardHeader, - CardBody, - CardTitle, - CardSubtitle, - ButtonGroup, - Button, - Input, - CustomInput, - FormGroup -} from 'reactstrap'; +import { Card, Spinner } from 'reactstrap'; import { ExcelExportButton } from '../../crud/excel/ExcelExportButton'; +import { useSelector } from 'react-redux'; export const AnalysisHistoryGrid = props => { + const { loading } = useSelector(state => state.loadingReducer); return ( //
// @@ -46,6 +29,15 @@ export const AnalysisHistoryGrid = props => { {/*
표시할 데이터가 없습니다.
*/} + {loading ? ( +
+
+ + Loading... +
+
+ ) : null} + { - const { loading } = useSelector(state => state.loadingReducer); +export const GridDatabase = props => { return props[`${props.handlerPageChange ? 'total' : 'count'}`] <= 0 ? (
표시할 데이터가 없습니다.
) : ( - } - className='react-dataTable pal-dateTable' - // defaultSortField='invoiceId' - // paginationDefaultPage={currentPage} - // paginationComponent={CustomPagination} - data={props.data} - paginationServer={ - props.pagination && props.handlerPageChange ? true : false - } - onSelectedRowsChange={ - props.onSelectedRowsChange ? props.onSelectedRowsChange : null - } - selectableRows={props.selectableRows} - onChangePage={props.pagination ? props.handlerPageChange : null} - paginationComponentOptions={{ - noRowsPerPage: props.handlerPageChange ? true : false - }} - progressPending={props.handlerPageChange ? loading : false} - progressComponent={ -
-
-
- - Loading... -
-
-
- } - /> + <> + } + className='react-dataTable pal-dateTable' + // defaultSortField='invoiceId' + // paginationDefaultPage={currentPage} + // paginationComponent={CustomPagination} + data={props.data} + paginationServer={ + props.pagination && props.handlerPageChange ? true : false + } + onSelectedRowsChange={ + props.onSelectedRowsChange ? props.onSelectedRowsChange : null + } + selectableRows={props.selectableRows} + onChangePage={props.pagination ? props.handlerPageChange : null} + paginationComponentOptions={{ + noRowsPerPage: props.handlerPageChange ? true : false + }} + /> + ); }; From 0f192ed55afb86a42f74bc4e9ace7bd09bf2d28d 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, 27 Sep 2022 10:33:17 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8=20,?= =?UTF-8?q?=EC=95=84=EC=9D=B4=EB=94=94=20=EC=B0=BE=EA=B8=B0=20=EC=BD=98?= =?UTF-8?q?=EC=86=94=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 --- src/components/account/find/AccountFindPassword.js | 4 +--- src/components/account/find/AccountFindUserId.js | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/components/account/find/AccountFindPassword.js b/src/components/account/find/AccountFindPassword.js index b8cda68..cbf089e 100644 --- a/src/components/account/find/AccountFindPassword.js +++ b/src/components/account/find/AccountFindPassword.js @@ -334,10 +334,8 @@ export const AccountFindPassword = props => { {/* */} + - diff --git a/src/components/account/find/AccountFindUserId.js b/src/components/account/find/AccountFindUserId.js index 38af87b..9f302ff 100644 --- a/src/components/account/find/AccountFindUserId.js +++ b/src/components/account/find/AccountFindUserId.js @@ -293,10 +293,8 @@ export const AccountFindUserId = props => { placeholder='+(국가번호)' > {/* */} + - From 5f5f4c1715fbba94bb4407c255fde44900595bd8 Mon Sep 17 00:00:00 2001 From: sanguu Date: Tue, 27 Sep 2022 10:47:00 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=EB=B9=84=ED=96=89=EA=B5=AC=EC=97=AD(consol?= =?UTF-8?q?e=EC=A0=9C=EA=B1=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/map/naver/feature/FeatureAirZone.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/map/naver/feature/FeatureAirZone.js b/src/components/map/naver/feature/FeatureAirZone.js index 854aced..99ab9f6 100644 --- a/src/components/map/naver/feature/FeatureAirZone.js +++ b/src/components/map/naver/feature/FeatureAirZone.js @@ -122,7 +122,7 @@ export const FeatureAirZone = props => { const featureAirEvent = () => { props.map.data.addListener('click', function (e) { // e.feature.setProperty('isColorful', true); - console.log(e.feature.property_name); + // console.log(e.feature.property_name); }); props.map.data.addListener('mouseover', function (e) { From dc7ff52dc5a967b484feb2dbcd987cd9c99220cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?= Date: Tue, 27 Sep 2022 10:55:02 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=EB=B9=84=EC=A0=95=EC=83=81=20=EC=95=8C?= =?UTF-8?q?=EB=A6=BC=20=EB=AA=A9=EB=A1=9D=20-=20=EC=8B=9D=EB=B3=84?= =?UTF-8?q?=EB=B2=88=ED=98=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/control/gp/apis/controlGpApi.ts | 2 +- src/modules/control/gp/models/controlGpModel.ts | 3 ++- src/views/control/alarm/ControlAlarmDetail.js | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/modules/control/gp/apis/controlGpApi.ts b/src/modules/control/gp/apis/controlGpApi.ts index 93010da..66faaf7 100644 --- a/src/modules/control/gp/apis/controlGpApi.ts +++ b/src/modules/control/gp/apis/controlGpApi.ts @@ -24,7 +24,7 @@ export const controlGpApi = { } const { data }: ResponseControlGpWarnLog = await axios.get( - `api/ctr/cntrl/warn/list/${id}` + `api/ctr/cntrl/warn/detail/${id}` ); return data; diff --git a/src/modules/control/gp/models/controlGpModel.ts b/src/modules/control/gp/models/controlGpModel.ts index 5be5c06..745e247 100644 --- a/src/modules/control/gp/models/controlGpModel.ts +++ b/src/modules/control/gp/models/controlGpModel.ts @@ -133,8 +133,9 @@ export interface ControlGpFlightPlanData { export interface ControlGpWarnLogData { warnLogSno: number; - cntrlId: String; + cntrlId: String; createDt: String; + idntfNum: String; } export interface ControlGpWarnLogList extends Array {}; diff --git a/src/views/control/alarm/ControlAlarmDetail.js b/src/views/control/alarm/ControlAlarmDetail.js index a335a85..b7c1e68 100644 --- a/src/views/control/alarm/ControlAlarmDetail.js +++ b/src/views/control/alarm/ControlAlarmDetail.js @@ -19,6 +19,7 @@ const ControlAlarmDetail = ({ historyModal, setHistoryModal, controlGpWarnLog }) + @@ -27,6 +28,7 @@ const ControlAlarmDetail = ({ historyModal, setHistoryModal, controlGpWarnLog }) return ( + From e3eb8fa4a8aa63adb320226df1a6873de9f72912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?= Date: Tue, 27 Sep 2022 14:19:03 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=EB=B9=84=ED=96=89=20=EA=B4=80=EC=A0=9C=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=20->=20=ED=91=9C=EC=B6=9C=20=ED=95=AD?= =?UTF-8?q?=EB=AA=A9=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../control/report/ControlReportDetail.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/views/control/report/ControlReportDetail.js b/src/views/control/report/ControlReportDetail.js index 5cabd15..372029a 100644 --- a/src/views/control/report/ControlReportDetail.js +++ b/src/views/control/report/ControlReportDetail.js @@ -103,7 +103,7 @@ const ControlReportDetail = props => { {GET_ARCTFT_TYPE_CD(controlDetail?.arcrftTypeCd)} -
+ {/*
배터리 잔량
{controlGpDetail?.betteryLevel} % @@ -114,7 +114,7 @@ const ControlReportDetail = props => {
{controlGpDetail?.betteryVoltage} volt
-
+ */} @@ -136,7 +136,7 @@ const ControlReportDetail = props => {
시작시간
{moment( - controlGpDetail?.controlStartDt, + controlGpDetail?.controlStDt, 'YYYYMMDDHHmmss' ).format('MM-DD HH:mm:ss')}
@@ -160,30 +160,30 @@ const ControlReportDetail = props => {
-
좌표
+
좌표(위도/경도)
- {controlGpDetail?.lat} , {controlGpDetail?.lng} + {controlGpDetail?.lat} / {controlGpDetail?.lng}
-
+ {/*
비행거리
{nullMessage(controlGpDetail?.moveDistance)}{' '} {controlGpDetail?.moveDistanceType}
-
+ */}
헤딩 방위각
{controlGpDetail?.heading} °
-
+ {/*
상태
{nullMessage(controlGpDetail?.dronStatus)}
-
+ */}
위치정보 수신 시간
번호식별번호 날짜 내용
{i + 1}{p.idntfNum} {p.createDt} {p.warnType}