pav
/
pav-fe-tp-pal
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://gitea.palntour.com/pav/pav-home

pull/2/head
이준희 2 years ago
parent
949342a4a4 b5dae4ba85
commit
6dcfde9cdc
2 changed files with 120 additions and 107 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 221
      src/components/basis/flight/plan/FlightPlanAreaDetailForm.js
  2. 6
      src/components/basis/flight/plan/TodayWeather.js

221
src/components/basis/flight/plan/FlightPlanAreaDetailForm.js
Unescape View File

@ -1,6 +1,11 @@
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import { TodayWeather, TomorrowWeahter, AfterTomorrowWeahter, LastwWeahter } from '../../../basis/flight/plan/TodayWeather' import {
import { FlightweatherAction } from '../../../../modules/basis/flight/actions/basisFlightAction' TodayWeather,
TomorrowWeahter,
AfterTomorrowWeahter,
LastwWeahter
} from '../../../basis/flight/plan/TodayWeather';
import { FlightweatherAction } from '../../../../modules/basis/flight/actions/basisFlightAction';
import { import {
Card, Card,
CardBody, CardBody,
@ -40,135 +45,126 @@ const FlightPlanAreaDetailForm = ({
isDone, isDone,
isDisabled isDisabled
}) => { }) => {
const [dayData, setdayData] = useState({}); const [dayData, setdayData] = useState({});
const coordList = data ? data[0].coordList : null; const coordList = data ? data[0].coordList : null;
const dispatch = useDispatch(); const dispatch = useDispatch();
const { weather } = useSelector(state => state.flightState); const { weather } = useSelector(state => state.flightState);
let now = moment(); let now = moment();
let date = moment().format('YYYYMMDD') let date = moment().format('YYYYMMDD');
let time = moment().format('HHmm') let time = moment().format('HHmm');
let plus_day1 = moment().add(1, "day").format('YYYYMMDD'); let plus_day1 = moment().add(1, 'day').format('YYYYMMDD');
let plus_day2 = moment().add(2, "day").format('YYYYMMDD'); let plus_day2 = moment().add(2, 'day').format('YYYYMMDD');
useEffect(() => { useEffect(() => {
if (weather) { if (weather) {
let wheatherobj = {}; let wheatherobj = {};
const weatherData = weather?.item; const weatherData = weather?.item;
//오늘 날씨 필터링 //오늘 날씨 필터링
const todayres = weatherData.filter(weatherData => weatherData.fcstDate == date); const todayres = weatherData.filter(
weatherData => weatherData.fcstDate == date
);
const todayData = todayres.filter(todayres => { const todayData = todayres.filter(todayres => {
switch (todayres.category) { switch (todayres.category) {
case "TMP": case 'TMP':
case "SKY": case 'SKY':
case "VEC": case 'VEC':
case "WSD": case 'WSD':
case "PTY": case 'PTY':
return { ...todayres } return { ...todayres };
} }
}); });
//내일 날씨 필터링todayres.category == ("TMP" || "SKY" || "VEC" || "WSD" || "PTY") //내일 날씨 필터링todayres.category == ("TMP" || "SKY" || "VEC" || "WSD" || "PTY")
const tomorrowres = weatherData.filter(weatherData => weatherData.fcstDate == plus_day1); const tomorrowres = weatherData.filter(
weatherData => weatherData.fcstDate == plus_day1
);
const tomorrowData = tomorrowres.filter(tomorrowres => { const tomorrowData = tomorrowres.filter(tomorrowres => {
switch (tomorrowres.category) { switch (tomorrowres.category) {
case "TMP": case 'TMP':
case "SKY": case 'SKY':
case "VEC": case 'VEC':
case "WSD": case 'WSD':
case "PTY": case 'PTY':
return { ...todayres } return { ...todayres };
} }
}); });
//모레 날씨 필터링 //모레 날씨 필터링
const afterres = weatherData.filter(weatherData => weatherData.fcstDate == plus_day2); const afterres = weatherData.filter(
weatherData => weatherData.fcstDate == plus_day2
);
const afterData = afterres.filter(afterres => { const afterData = afterres.filter(afterres => {
switch (afterres.category) { switch (afterres.category) {
case "TMP": case 'TMP':
case "SKY": case 'SKY':
case "VEC": case 'VEC':
case "WSD": case 'WSD':
case "PTY": case 'PTY':
return { ...todayres } return { ...todayres };
} }
}); });
wheatherobj = { wheatherobj = {
todayData, todayData,
tomorrowData, tomorrowData,
afterData, afterData
} };
setdayData({ ...wheatherobj }); setdayData({ ...wheatherobj });
} }
}, [weather]) }, [weather]);
useEffect(() => { useEffect(() => {
if (data[0]?.coordList[0].lat != 0 || data[0]?.coordList[0].lon != 0) { if (data[0]?.coordList[0].lat != 0 || data[0]?.coordList[0].lon != 0) {
let nx = data[0]?.coordList[0].lat; let nx = data[0]?.coordList[0].lat;
let ny = data[0]?.coordList[0].lon; let ny = data[0]?.coordList[0].lon;
const rs = dfsxyconv("toXY", nx, ny); const rs = dfsxyconv('toXY', nx, ny);
let now = new Date(); let now = new Date();
let hours = now.getHours(); let hours = now.getHours();
let minutes = now.getMinutes(); let minutes = now.getMinutes();
let basetime = "2300"; let basetime = '2300';
if ((hours >= 2 && minutes > 9) && hours <= 5) { if (hours >= 2 && minutes > 9 && hours <= 5) {
basetime = "0200"; basetime = '0200';
} } else if (hours >= 5 && minutes > 9 && hours < 8) {
else if ((hours >= 5 && minutes > 9) && hours < 8) { basetime = '0500';
basetime = "0500"; } else if (hours <= 8 && minutes < 10) {
} basetime = '0500';
else if (hours <= 8 && minutes < 10) { } else if (hours >= 8 && minutes > 9 && hours < 11) {
basetime = "0500"; basetime = '0800';
} } else if (hours <= 11 && minutes < 10) {
else if ((hours >= 8 && minutes > 9) && hours < 11) { basetime = '0800';
basetime = "0800"; } else if (hours >= 11 && minutes > 9 && hours < 14) {
} basetime = '1100';
else if (hours <= 11 && minutes < 10) { } else if (hours <= 14 && minutes < 10) {
basetime = "0800"; basetime = '1100';
} } else if (hours >= 14 && minutes > 9 && hours < 17) {
else if (((hours >= 11 && minutes > 9) && hours < 14)) { basetime = '1400';
basetime = "1100"; } else if (hours <= 17 && minutes < 10) {
} basetime = '1400';
else if (hours <= 14 && minutes < 10) { } else if (hours >= 17 && minutes > 9 && hours < 20) {
basetime = "1100"; basetime = '1700';
} } else if (hours <= 20 && minutes < 10) {
else if ((hours >= 14 && minutes > 9) && hours < 17) { basetime = '1700';
basetime = "1400"; } else if (hours >= 20 && minutes > 9 && hours < 23) {
} basetime = '2000';
else if (hours <= 17 && minutes < 10) { } else if (hours <= 23 && minutes < 10) {
basetime = "1400"; basetime = '2000';
} } else basetime = '2300';
else if ((hours >= 17 && minutes > 9) && hours < 20) {
basetime = "1700";
}
else if (hours <= 20 && minutes < 10) {
basetime = "1700";
}
else if ((hours >= 20 && minutes > 9) && hours < 23) {
basetime = "2000";
}
else if (hours <= 23 && minutes < 10) {
basetime = "2000";
}
else
basetime = "2300";
const apidata = { const apidata = {
serviceKey: "r6RMUsk3Vtama7D6uq7MiWV9dTC9MwfIIr4%2F45y0uVNw6BaYbgpKmL%2BLUDFVTfIYUmEe4K%2FaniEjdV9mg5t82Q%3D%3D", serviceKey:
'r6RMUsk3Vtama7D6uq7MiWV9dTC9MwfIIr4%2F45y0uVNw6BaYbgpKmL%2BLUDFVTfIYUmEe4K%2FaniEjdV9mg5t82Q%3D%3D',
numOfRows: 1000, numOfRows: 1000,
pageNo: 1, pageNo: 1,
dataType: "JSON", dataType: 'JSON',
base_date: date, base_date: date,
base_time: basetime, base_time: basetime,
nx: rs.x, nx: rs.x,
ny: rs.y, ny: rs.y,
nx2: nx,
} ny2: ny
};
dispatch(FlightweatherAction.request(apidata)); dispatch(FlightweatherAction.request(apidata));
} }
}, [data]) }, [data]);
const [active, setActive] = useState('active'); const [active, setActive] = useState('active');
const [activeTab, setActiveTab] = useState('1'); const [activeTab, setActiveTab] = useState('1');
@ -271,8 +267,8 @@ const FlightPlanAreaDetailForm = ({
: coordList[0].lat && : coordList[0].lat &&
data[0].areaType && data[0].areaType &&
data[0].areaType !== 'POLYGON' data[0].areaType !== 'POLYGON'
? false ? false
: true : true
} }
placeholder='반경' placeholder='반경'
value={ value={
@ -298,8 +294,8 @@ const FlightPlanAreaDetailForm = ({
: coordList[0].lat && : coordList[0].lat &&
data[0].areaType && data[0].areaType &&
data[0].areaType !== 'POLYGON' data[0].areaType !== 'POLYGON'
? false ? false
: true : true
} }
onClick={() => handleBufferList()} onClick={() => handleBufferList()}
> >
@ -402,8 +398,8 @@ const FlightPlanAreaDetailForm = ({
</Button.Ripple> </Button.Ripple>
</div> </div>
{Object.keys(dayData).length != 0 && data[0]?.coordList[0].lat != 0 ? ( {Object.keys(dayData).length != 0 &&
data[0]?.coordList[0].lat != 0 ? (
<div className='layer-content'> <div className='layer-content'>
<div className='layer-weather-box'> <div className='layer-weather-box'>
<div className='layer-weather-info'> <div className='layer-weather-info'>
@ -416,39 +412,56 @@ const FlightPlanAreaDetailForm = ({
</div> </div>
<div className='tab-menu'> <div className='tab-menu'>
<ul> <ul>
<li className={activeTab == 1 ? `active` : ''} onClick={() => toggle('1')} >오늘</li> <li
<li className={activeTab == 2 ? `active` : ''} onClick={() => toggle('2')} >내일</li> className={activeTab == 1 ? `active` : ''}
<li className={activeTab == 3 ? `active` : ''} onClick={() => toggle('3')} >모레</li> onClick={() => toggle('1')}
>
오늘
</li>
<li
className={activeTab == 2 ? `active` : ''}
onClick={() => toggle('2')}
>
내일
</li>
<li
className={activeTab == 3 ? `active` : ''}
onClick={() => toggle('3')}
>
모레
</li>
</ul> </ul>
</div> </div>
{activeTab == 1 ? {activeTab == 1 ? (
<div className='tab-content active'> <div className='tab-content active'>
<TodayWeather todayData={dayData.todayData} /> <TodayWeather todayData={dayData.todayData} />
</div> </div>
: ) : (
<></> <></>
} )}
{activeTab == 2 ? {activeTab == 2 ? (
<div className='tab-content active'> <div className='tab-content active'>
<TomorrowWeahter tomorrowData={dayData.tomorrowData} /> <TomorrowWeahter
tomorrowData={dayData.tomorrowData}
/>
</div> </div>
: ) : (
<></> <></>
} )}
{activeTab == 3 ? {activeTab == 3 ? (
<div className='tab-content active'> <div className='tab-content active'>
<AfterTomorrowWeahter afterData={dayData.afterData} /> <AfterTomorrowWeahter
afterData={dayData.afterData}
/>
</div> </div>
: ) : (
<></> <></>
} )}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
) : ) : null}
null}
</CardBody> </CardBody>
</Card> </Card>
</Col> </Col>

6
src/components/basis/flight/plan/TodayWeather.js
Unescape View File

@ -67,10 +67,10 @@ export function TodayWeather({ todayData }) {
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{groups.map((i) => { {groups.map((i, index) => {
return ( return (
<tr> <tr key={index}>
<td>{i.fcstTime.substring(0, 2)}시</td> <td >{i.fcstTime.substring(0, 2)}시</td>
{i.category[4].fcstValue == "0" ? {i.category[4].fcstValue == "0" ?
<td> <td>
{i.category[3].fcstValue == "1" ? <Sun /> : <Cloud />} {i.category[3].fcstValue == "1" ? <Sun /> : <Cloud />}

Write Preview
Loading…
Cancel
Save