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-fe-kac

pull/2/head
김장현 11 months ago
parent
c0963121c1 35cf12cca1
commit
5ba5bd6aec
5 changed files with 30 additions and 53 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. 2
      src/assets/css/custom.css
  2. 6
      src/components/cstmrService/faq/FaqForm.js
  3. 6
      src/components/cstmrService/inquiry/QnaSearchBox.js
  4. 4
      src/views/laanc/FlightArea.js
  5. 45
      src/views/laanc/LaancAreaMap.js

2
src/assets/css/custom.css
Unescape View File

@ -1078,3 +1078,5 @@ caption {overflow: hidden; line-height: 0;text-indent: -2000px;}
.pal-popover-body{font-size:0.75rem;padding:0.8rem;} .pal-popover-body{font-size:0.75rem;padding:0.8rem;}
.pal-popover-icon{margin-left:4px;margin-top:-2px} .pal-popover-icon{margin-left:4px;margin-top:-2px}
.coords-wrap{position:absolute;z-index: 99;right:20px;bottom:20px}

6
src/components/cstmrService/faq/FaqForm.js
Unescape View File

@ -41,7 +41,7 @@ export default function FaqForm({
</Label> </Label>
<Input <Input
type='select' type='select'
besize='sm' bsSize='sm'
value={formData.category} value={formData.category}
onChange={e => { onChange={e => {
const { value } = e.target; const { value } = e.target;
@ -63,7 +63,7 @@ export default function FaqForm({
<Label for='test'>생성 사용자</Label> <Label for='test'>생성 사용자</Label>
<Input <Input
type='text' type='text'
besize='sm' bsSize='sm'
placeholder='' placeholder=''
value={user?.userId} value={user?.userId}
disabled disabled
@ -120,7 +120,7 @@ export default function FaqForm({
</Label> </Label>
<Input <Input
type='text' type='text'
besize='sm' bsSize='sm'
placeholder='' placeholder=''
value={formData.title} value={formData.title}
onChange={e => { onChange={e => {

6
src/components/cstmrService/inquiry/QnaSearchBox.js
Unescape View File

@ -32,7 +32,7 @@ export default function QnaSearchBox() {
<Col className='list-input' xl='4' md='6' sm='12'> <Col className='list-input' xl='4' md='6' sm='12'>
<Input <Input
type='select' type='select'
besize='sm' bsSize='sm'
// value={formData.category} // value={formData.category}
onChange={e => { onChange={e => {
const { value } = e.target; const { value } = e.target;
@ -60,7 +60,7 @@ export default function QnaSearchBox() {
<Col className='list-input' xl='4' md='6' sm='12'> <Col className='list-input' xl='4' md='6' sm='12'>
<Input <Input
type='select' type='select'
besize='sm' bsSize='sm'
// value={formData.category} // value={formData.category}
onChange={e => { onChange={e => {
const { value } = e.target; const { value } = e.target;
@ -85,7 +85,7 @@ export default function QnaSearchBox() {
<Col className='list-input' xl='4' md='6' sm='12'> <Col className='list-input' xl='4' md='6' sm='12'>
<Input <Input
type='text' type='text'
besize='sm' bsSize='sm'
// value={formData.category} // value={formData.category}
onChange={e => { onChange={e => {
const { value } = e.target; const { value } = e.target;

4
src/views/laanc/FlightArea.js
Unescape View File

@ -641,8 +641,8 @@ export default function FlightArea({
) : null} ) : null}
</div> </div>
<div> <div>
<span style={{ marginRight: '10px' }}> <span style={{ marginRight: '300px', color: '#ff0000'}}>
※ 비행구역설정 완료를 원하시면 더블클릭해주시기 바랍니다. ※ 비행구역설정 완료를 원하시면 마지막 좌표 지점에서 더블클릭해주시기 바랍니다.
</span> </span>
<Button <Button
color='primary' color='primary'

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

@ -59,6 +59,8 @@ export default function LaancAreaMap({
const [detailLayer, setDetailLayer] = useState(); const [detailLayer, setDetailLayer] = useState();
const [coordArr, setCoordArr] = useState([]); const [coordArr, setCoordArr] = useState([]);
const [viewCoordObj, setViewCoordObj] = useState([]);
const detailGeo = useMemo(() => { const detailGeo = useMemo(() => {
return { return {
type: 'FeatureCollection', type: 'FeatureCollection',
@ -316,62 +318,34 @@ export default function LaancAreaMap({
<CardBody> <CardBody>
<div style={{ position: 'relative' }}> <div style={{ position: 'relative' }}>
<LaancMapSearch mapObject={mapObject} /> <LaancMapSearch mapObject={mapObject} />
<div <div className='d-flex coords-wrap'>
className='d-flex absolute'
style={{
position: 'relative',
zIndex: 100,
margin: '470px 10px 10px 10px'
}}
>
{mapObject ? ( {mapObject ? (
<div style={{ width: '400px' }}> <div className='coords-box'>
{drawObj.getAll().features.length > 1 {drawObj.getAll().features.length > 1
? drawObj ? drawObj
.getAll() .getAll()
.features.filter(obj => obj.properties.id !== 'BUFFER') .features.filter(obj => obj.properties.id !== 'BUFFER')
.map((obj, i) => { .map((obj, i) => {
// console.log(obj, '>>>>>>obj');
const coord = const coord =
obj.properties.id === 'LINE' obj.properties.id === 'LINE'
? obj.geometry.coordinates ? obj.geometry.coordinates
: obj.geometry.coordinates[0]; : obj.geometry.coordinates[0];
return ( return (
<div <div>
style={{ <h6 className='ti'>비행구역 {i + 1}</h6>
backgroundColor: '#fff', <div className='coords-box-scroll'>
marginBottom: '10px'
}}
>
<div>비행구역 {i + 1}</div>
{coord?.map(co => { {coord?.map(co => {
const fCoord = FormattingCoord(co); const fCoord = FormattingCoord(co);
if (fCoord) { if (fCoord) {
return ( return (
<div> <span>
{fCoord[0]}, {fCoord[1]} {fCoord[0]}, {fCoord[1]}
</div> </span>
); );
} }
})} })}
{/* {obj.geometry.coordinates.map(coord => {
if (obj.properties.id === 'LINE') {
const fCoord = FormattingCoord(coord);
return (
<div>
{fCoord[0]} , {fCoord[1]}
</div>
);
} else if(obj.properties.id === 'POLYGON') {
const fCoord = FormattingCoord(coord);
return (
<div>
{fCoord[0]} , {fCoord[1]}
</div> </div>
);
}
})} */}
</div> </div>
); );
}) })
@ -422,6 +396,7 @@ export default function LaancAreaMap({
handlerCoordinates={handlerCoordinates} handlerCoordinates={handlerCoordinates}
handlerInitCoordinates={handlerInitCoordinates} handlerInitCoordinates={handlerInitCoordinates}
setCoordArr={setCoordArr} setCoordArr={setCoordArr}
setViewCoordObj={setViewCoordObj}
/> />
<FeatureAirZone map={mapObject} mapboxgl={mapboxgl} /> <FeatureAirZone map={mapObject} mapboxgl={mapboxgl} />
{modal ? ( {modal ? (

Write Preview
Loading…
Cancel
Save