Merge remote-tracking branch 'origin/demo' into demo

xieb

2023-11-14 9ca17378677d6969e5401188a7ff321a7e3335c6

Merge remote-tracking branch 'origin/demo' into demo

# Conflicts:
#	src/hooks/use-cesium-tsa.ts

 src/api/wayline.ts

@@ -221,8 +221,8 @@
  distance?:number
}

export const flyByArea = async function (sn:string,dockPoint:Point,areaList:any[],radius:number): Promise<IWorkspaceResponse<any>> {
  const url = `${HTTP_PREFIX}/workspaces/${sn}/jobs/flyByArea`
export const flyByArea = async function (sn:string,dockPoint:Point,areaList:any[],radius:number,deviceSn:string): Promise<IWorkspaceResponse<any>> {
  const url = `${HTTP_PREFIX}/workspaces/${sn}/jobs/${deviceSn}/flyByArea`
  const result = await request.post(url,{dockPoint:dockPoint,areaList:areaList,radius:radius})
  return result.data
}

 src/components/g-map/DroneControlPanel.vue

@@ -496,6 +496,7 @@
    lon: props.deviceInfo.dock.basic_osd.longitude,
    lat: props.deviceInfo.dock.basic_osd.latitude
  })
  const deviceSn = props.deviceInfo.dock.basic_osd.sub_device?.device_sn
  const jsonData = await parseJsonFile('../src/assets/jsonData/图斑_FeaturesToJSON(1).json')
  const sn = props.sn
  const features = jsonData.features
@@ -514,7 +515,7 @@
    list.push(areaList)
  })

  flyByArea(sn, dockPoint, list, radius).then(res => {
  flyByArea(sn, dockPoint, list, radius, deviceSn).then(res => {
    console.log(res, '----------------')
  })
}

 src/hooks/use-cesium-tsa.ts

@@ -334,9 +334,8 @@
    getEntityById,
    updateEntityPosition,
    addPolyline,
    addEllipse,
    loadGeoJson,
    removeAllDataSource
    addPolyline,
    addEllipse
  }
}