pav
/
pav-fe-kac
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

pull/2/head
김지은 11 months ago
parent
5a9a385c3c 43dc3a8359
commit
ee3c6a9d4b
3 changed files with 65 additions and 130 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/components/laanc/LaancGrid.js
  2. 6
      src/components/map/mapbox/draw/LaancDrawControl.js
  3. 184
      src/views/laanc/LaancAreaMap.js

5
src/components/laanc/LaancGrid.js
Unescape View File

@ -47,6 +47,7 @@ function LaancGrid() {
selector: row => row.planSno,
minWidth: '170px',
sortable: true,
center: true,
cell: row => {
return row.planSno;
}
@ -66,6 +67,7 @@ function LaancGrid() {
selector: row => row.schFltStDt,
minWidth: '160px',
sortable: true,
center: true,
cell: row => {
return moment(row.schFltStDt).format('YYYY-MM-DD HH:mm');
}
@ -76,6 +78,7 @@ function LaancGrid() {
selector: row => row.schFltEndDt,
minWidth: '160px',
sortable: true,
center: true,
cell: row => {
return moment(row.schFltEndDt).format('YYYY-MM-DD HH:mm');
}
@ -86,6 +89,7 @@ function LaancGrid() {
selector: row => row.aprvlYn,
minWidth: '110px',
sortable: true,
center: true,
cell: row => {
return row.aprvlYn;
}
@ -95,6 +99,7 @@ function LaancGrid() {
selector: row => row.arcrftWght,
minWidth: '260px',
sortable: true,
center: true,
cell: row => {
return row.arcrftWght;
}

6
src/components/map/mapbox/draw/LaancDrawControl.js
Unescape View File

@ -47,10 +47,6 @@ export const LaancDrawControl = props => {
// if (areaType !== drawType) drawInit();
}, [mapControl.drawType]);
// useEffect(() => {
// console.log(props.areaCoordList[0], '-----------');
// }, [props.areaCoordList]);
useEffect(() => {
if (mapObject) {
mapObject.on('draw.update', handlerUpdateSetting);
@ -331,6 +327,7 @@ export const LaancDrawControl = props => {
const obj = drawObj
.getAll()
.features.filter(obj => obj.properties.id !== 'BUFFER');
props.setViewCoordObj(obj);
if (obj.length > 1) {
props.handlerAddChange('overAdd', true);
} else {
@ -473,6 +470,7 @@ export const LaancDrawControl = props => {
props.handlerAddChange('isAddable', false);
props.handlerAddChange('isViewAdd', false);
props.handlerAddChange('overAdd', false);
props.setViewCoordObj([]);
drawObj.deleteAll();
handlerRemoveAllMarker();
return;

184
src/views/laanc/LaancAreaMap.js
Unescape View File

@ -319,7 +319,46 @@ export default function LaancAreaMap({
<div style={{ position: 'relative' }}>
<LaancMapSearch mapObject={mapObject} />
<div className='d-flex coords-wrap'>
{mapObject ? (
{mapObject && viewCoordObj.length > 0 ? (
<div className='coords-box'>
{viewCoordObj?.map((obj, i) => {
const coord =
obj.properties.id === 'LINE'
? obj.geometry.coordinates
: obj.geometry.coordinates[0];
// console.log(coord, '>>>>>>>>>.');
return (
<div>
<h6 className='ti'>비행구역 {i + 1}</h6>
<div className='coords-box-scroll'>
{coord?.map((co, idx) => {
if (idx + 1 < coord.length) {
const fCoord = FormattingCoord(co);
const current = fCoord.join(', ');
const next = FormattingCoord(
coord[idx + 1].join(', ')
);
// console.log(coord[idx + 1], '---next');
return (
<div className='coords-box-list'>
<span key={idx}>
<span>{current}</span>
<span className='etc'>/</span>
<span>{next}</span>
</span>
</div>
);
}
})}
</div>
</div>
);
})}
</div>
) : null}
{/* {mapObject ? (
<div className='coords-box'>
{drawObj.getAll().features.length > 1
? drawObj
@ -335,140 +374,33 @@ export default function LaancAreaMap({
<div>
<h6 className='ti'>비행구역 {i + 1}</h6>
<div className='coords-box-scroll'>
<div className='coords-box-list'>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
<span className='etc'>/</span>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
</div>
<div className='coords-box-list'>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
<span className='etc'>/</span>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
</div>
<div className='coords-box-list'>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
<span className='etc'>/</span>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
</div>
<div className='coords-box-list'>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
<span className='etc'>/</span>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
</div>
<div className='coords-box-list'>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
<span className='etc'>/</span>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
</div>
<div className='coords-box-list'>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
<span className='etc'>/</span>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
</div>
<div className='coords-box-list'>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
<span className='etc'>/</span>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
</div>
<div className='coords-box-list'>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
<span className='etc'>/</span>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
</div>
<div className='coords-box-list'>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
<span className='etc'>/</span>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
</div>
<div className='coords-box-list'>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
<span className='etc'>/</span>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
</div>
<div className='coords-box-list'>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
<span className='etc'>/</span>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
</div>
<div className='coords-box-list'>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
<span className='etc'>/</span>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
</div>
<div className='coords-box-list'>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
<span className='etc'>/</span>
<span>
<span>12,55557778</span>,{''}<span> 34,55557778</span>
</span>
</div>
{/* {coord?.map(co => {
const fCoord = FormattingCoord(co);
if (fCoord) {
{coord?.map((co, idx) => {
if (idx + 1 < coord.length) {
const fCoord = FormattingCoord(co);
const current = fCoord.join(', ');
const next = FormattingCoord(
coord[idx + 1]
).join(', ');
return (
<span>
<span>{fCoord[0]}, {fCoord[1]}</span>
</span>
<div className='coords-box-list'>
<span key={idx}>
<span>{current}</span>
<span className='etc'>/</span>
<span>{next}</span>
</span>
</div>
);
}
})} */}
return null;
})}
</div>
</div>
);
})
: null}
</div>
) : null}
) : null} */}
</div>
<div
id='detail'

Write Preview
Loading…
Cancel
Save