+
-
@@ -543,7 +647,7 @@ export default defineComponent({
return_home_power: str,
},
latitude: 0,
- longitude: 0,
+ longitude: 0
} as DeviceOsd
})
const shareId = computed(() => {
@@ -575,7 +679,7 @@ export default defineComponent({
return 'color: red'
})
watch(() => store.state.deviceStatusEvent,
- data => {
+ (data: any) => {
if (Object.keys(data.deviceOnline).length !== 0) {
deviceTsaUpdateHook.initMarker(data.deviceOnline.domain, data.deviceOnline.device_callsign, data.deviceOnline.sn)
store.state.deviceStatusEvent.deviceOnline = {} as DeviceStatus
@@ -629,9 +733,9 @@ export default defineComponent({
let exist = false
if (Object.keys(event.mapElementCreat).length !== 0) {
console.log(event.mapElementCreat)
- const ele = event.mapElementCreat
+ const ele: any = event.mapElementCreat
store.state.Layers.forEach(layer => {
- layer.elements.forEach(e => {
+ layer.elements.forEach((e: any) => {
if (e.id === ele.id) {
exist = true
console.log('true')
@@ -716,7 +820,7 @@ export default defineComponent({
draw(isCircle ? MapDoodleEnum.CIRCLE : MapDoodleEnum.POLYGON, true, type)
}
- function getDrawCallback ({ obj }: { obj : any }) {
+ function getDrawCallback ({ obj }: { obj: any }) {
if (state.isFlightArea) {
getDrawFlightAreaCallback(obj)
return
@@ -735,7 +839,7 @@ export default defineComponent({
break
}
}
- async function postPinPositionResource (obj) {
+ async function postPinPositionResource (obj: any) {
const req = getPinPositionResource(obj)
setLayers(req)
const coordinates = req.resource.content.geometry.coordinates
@@ -745,7 +849,7 @@ export default defineComponent({
obj.setExtData({ id: req.id, name: req.name })
store.state.coverMap[req.id] = [obj]
}
- async function postPolylineResource (obj) {
+ async function postPolylineResource (obj: any) {
const req = getPolylineResource(obj)
setLayers(req)
updateCoordinates('gcj02-wgs84', req)
@@ -753,7 +857,7 @@ export default defineComponent({
obj.setExtData({ id: req.id, name: req.name })
store.state.coverMap[req.id] = [obj]
}
- async function postPolygonResource (obj) {
+ async function postPolygonResource (obj: any) {
const req = getPoygonResource(obj)
setLayers(req)
updateCoordinates('gcj02-wgs84', req)
@@ -762,10 +866,10 @@ export default defineComponent({
store.state.coverMap[req.id] = [obj]
}
- function getPinPositionResource (obj) {
+ function getPinPositionResource (obj: any) {
const position = obj.getPosition()
const resource = generatePointContent(position)
- const name = obj._originOpts.title
+ const name = obj._originOpts.title as string
const id = uuidv4()
return {
id,
@@ -773,7 +877,7 @@ export default defineComponent({
resource
}
}
- function getPolylineResource (obj) {
+ function getPolylineResource (obj: any) {
const path = obj.getPath()
const resource = generateLineContent(path)
const { name, id } = getBaseInfo(obj._opts)
@@ -783,7 +887,7 @@ export default defineComponent({
resource
}
}
- function getPoygonResource (obj) {
+ function getPoygonResource (obj: any) {
const path = obj.getPath()
const resource = generatePolyContent(path)
const { name, id } = getBaseInfo(obj._opts)
@@ -793,8 +897,8 @@ export default defineComponent({
resource
}
}
- function getBaseInfo (obj) {
- const name = obj.title
+ function getBaseInfo (obj: any) {
+ const name = obj.title as string
const id = uuidv4()
return { name, id }
}
@@ -804,7 +908,7 @@ export default defineComponent({
// layer.id = 'private_layer' + uuidv4()
// layer?.elements.push(resource)
if (layer?.elements) {
- ;(layer?.elements as any[]).push(resource)
+ ; (layer?.elements as any[]).push(resource)
}
console.log('layers', layers)
store.commit('SET_LAYER_INFO', layers)
@@ -908,7 +1012,6 @@ export default defineComponent({
diff --git a/src/components/g-map/DroneControlPanel.vue b/src/components/g-map/DroneControlPanel.vue
index 6aa8c16..8d549f4 100644
--- a/src/components/g-map/DroneControlPanel.vue
+++ b/src/components/g-map/DroneControlPanel.vue
@@ -4,145 +4,141 @@
-
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
reset mode:
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -267,9 +243,9 @@
AIM
+
@@ -420,11 +396,11 @@ function onShowTakeoffToPointPopover () {
async function onTakeoffToPointConfirm (confirm: boolean) {
if (confirm) {
if (!takeoffToPointPopoverData.height ||
- !takeoffToPointPopoverData.latitude ||
- !takeoffToPointPopoverData.longitude ||
- !takeoffToPointPopoverData.securityTakeoffHeight ||
- !takeoffToPointPopoverData.rthAltitude ||
- !takeoffToPointPopoverData.commanderFlightHeight) {
+ !takeoffToPointPopoverData.latitude ||
+ !takeoffToPointPopoverData.longitude ||
+ !takeoffToPointPopoverData.securityTakeoffHeight ||
+ !takeoffToPointPopoverData.rthAltitude ||
+ !takeoffToPointPopoverData.commanderFlightHeight) {
message.error('Input error')
return
}
@@ -772,10 +748,10 @@ watch(() => errorInfo, (errorInfo) => {