From 3667807a7b7418efc090ee3fa6a6b734bc3080bf Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 13 Sep 2023 20:36:29 +0800
Subject: [PATCH] Merge branch 'develop' of http://s16s652780.51mypc.cn:49896/r/yskj/iot_drone_web into develop
---
src/api/wayline.ts | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/api/wayline.ts b/src/api/wayline.ts
index 04c017c..cb685db 100644
--- a/src/api/wayline.ts
+++ b/src/api/wayline.ts
@@ -6,9 +6,9 @@
const HTTP_PREFIX = '/api/drone'
// Get Wayline Files
-export const getWaylineFiles = async function (wid: string, body: {}): Promise<IWorkspaceResponse<any>> {
- const url = `${HTTP_PREFIX}/workspaces/${wid}/waylines?order_by=${body.order_by}&page=${body.page}&page_size=${body.page_size}`
- const result = await request.get(url)
+export const getWaylineFiles = async function (params:any): Promise<IWorkspaceResponse<any>> {
+ const url = `${HTTP_PREFIX}/waylineFile/getList`
+ const result = await request.get(url, { params })
return result.data
}
@@ -42,7 +42,7 @@
waylineId:string
dockSn: string
workspaceId: string
- taskType: number
+ taskType: TaskType
executeSingleTime?: string
repeatExecuteTimeArr?: string[]
executeStartTime?: string
@@ -59,8 +59,6 @@
finishAction: number
breakContinue: number
}
-
-
// 新增计划
export const createPlan = async function (plan:any): Promise<IWorkspaceResponse<any>> {
@@ -97,7 +95,7 @@
// 获取计划列表（分页）
export const getWaylineJobs = async function (workspaceId: string, page: IPage): Promise<IListWorkspaceResponse<Task>> {
const url = `${HTTP_PREFIX}/waylineJob/getPage`
- const result = await request.get(url,{params:{workspaceId}})
+ const result = await request.get(url, { params: { workspaceId } })
return result.data
}
@@ -136,6 +134,9 @@
export const importKmzFile = async function (workspaceId: string, file: {}): Promise<IWorkspaceResponse<any>> {
const url = `${HTTP_PREFIX}/waylineFile/upload`
const result = await request.post(url, file, {
+ params: {
+ projectId: workspaceId
+ },
headers: {
'Content-Type': 'multipart/form-data',
}
--
Gitblit v1.9.3