Browse Source

비행 통계 상단 데이터 표출 단위 수정

pull/2/head
hhjk00 10 months ago
parent
commit
056f69e61b
  1. 7
      src/containers/statistics/FlightContainer.js
  2. 60
      src/modules/statistics/models/index.ts

7
src/containers/statistics/FlightContainer.js

@ -95,12 +95,14 @@ export default function FlightContainer() {
const addCommasToNumber = number => { const addCommasToNumber = number => {
if (number === 'noData') return 0; if (number === 'noData') return 0;
return number.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','); return parseInt(number)
.toString()
.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
}; };
// '24:35:12' -> 1일 35분 12초 // '24:35:12' -> 1일 35분 12초
const parseTime = time => { const parseTime = time => {
if (time === 'noData') return '0초'; if (time === 'noData' || time === '00:00:00') return '0초';
const [hour, minute, second] = time.split(':').map(Number); const [hour, minute, second] = time.split(':').map(Number);
@ -127,6 +129,7 @@ export default function FlightContainer() {
addCommasToNumber={addCommasToNumber} addCommasToNumber={addCommasToNumber}
/> />
<StatisticsSearch <StatisticsSearch
category={searchType.category}
searchData={flightSearch} searchData={flightSearch}
searchType={searchType} searchType={searchType}
categoryTypeOptions={categoryTypeOptions} categoryTypeOptions={categoryTypeOptions}

60
src/modules/statistics/models/index.ts

@ -9,9 +9,9 @@ export interface IStatisticsState {
export interface IStcsRs { export interface IStcsRs {
name: string; name: string;
year: string; year: number | string;
month: string; month: number | string;
day: string; day: number | string;
} }
export interface IStcsSearchRs { export interface IStcsSearchRs {
@ -33,21 +33,21 @@ export const initialState = {
flight: [ flight: [
{ {
name: '-', name: '-',
year: '0', year: '00:00:00',
month: '0', month: '00:00:00',
day: '0' day: '00:00:00'
}, },
{ {
name: '-', name: '-',
year: '0', year: 0,
month: '0', month: 0,
day: '0' day: 0
}, },
{ {
name: '-', name: '-',
year: '0', year: 0,
month: '0', month: 0,
day: '0' day: 0
} }
], ],
flightSearch: { flightSearch: {
@ -57,21 +57,21 @@ export const initialState = {
abnormal: [ abnormal: [
{ {
name: '-', name: '-',
year: '0', year: 0,
month: '0', month: 0,
day: '0' day: 0
}, },
{ {
name: '-', name: '-',
year: '0', year: 0,
month: '0', month: 0,
day: '0' day: 0
}, },
{ {
name: '-', name: '-',
year: '0', year: 0,
month: '0', month: 0,
day: '0' day: 0
} }
], ],
abnormalSearch: { abnormalSearch: {
@ -81,21 +81,21 @@ export const initialState = {
result: [ result: [
{ {
name: '-', name: '-',
year: '0', year: 0,
month: '0', month: 0,
day: '0' day: 0
}, },
{ {
name: '-', name: '-',
year: '0', year: 0,
month: '0', month: 0,
day: '0' day: 0
}, },
{ {
name: '-', name: '-',
year: '0', year: 0,
month: '0', month: 0,
day: '0' day: 0
} }
], ],
resultSearch: { resultSearch: {

Loading…
Cancel
Save