From 39be97455312fe3c347d6aeaa103d7e695a40cd2 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 09 Oct 2023 10:16:32 +0800
Subject: [PATCH] 隐藏重复定时和连续执行
---
src/types/task.ts | 4 ++--
src/components/task/CreatePlan.vue | 7 ++++++-
src/api/wayline.ts | 6 ++++++
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/api/wayline.ts b/src/api/wayline.ts
index 8021fa3..b6170f4 100644
--- a/src/api/wayline.ts
+++ b/src/api/wayline.ts
@@ -76,8 +76,14 @@
rth_altitude: number // 相对机场返航高度 20 - 500
out_of_control_action: OutOfControlAction // 失控动作
+
+ //重复频率类型
+ rep_fre_type?:number
+ //重复频率值
+ rep_fre_val?:number
// 重复规则值
rep_rule_val?:[]
+ rep_rule_type?:number
}
// 新增计划
export const createPlan = async function (workspaceId: string, plan: CreatePlan): Promise<IWorkspaceResponse<any>> {
diff --git a/src/components/task/CreatePlan.vue b/src/components/task/CreatePlan.vue
index 963df79..b53d588 100644
--- a/src/components/task/CreatePlan.vue
+++ b/src/components/task/CreatePlan.vue
@@ -283,6 +283,7 @@
} from '/@/types/task'
import moment, { Moment } from 'moment'
import { RuleObject } from 'ant-design-vue/es/form/interface'
+import { getFlyTimeList } from '/@/utils/jobTime'
const root = getRoot()
const store = useMyStore()
@@ -317,7 +318,6 @@
rep_fre_val: 1,
rep_fre_type: 3,
rep_rule_type: 1,
-
})
const executeTimeRepeatArr = ref([
@@ -379,6 +379,8 @@
validator: async (rule: RuleObject, value: string) => {
if (!/^[0-9]{1,}$/.test(value)) {
throw new Error('相对机场返航高度需为数字类型')
+ } else if (Number(value) < 20 || Number(value) > 500) {
+ throw new Error('返航高度需在20-500米之间')
}
},
}
@@ -496,6 +498,9 @@
if (wayline.value && wayline.value.template_types && wayline.value.template_types.length > 0) {
createPlanBody.wayline_type = wayline.value.template_types[0]
}
+
+ // getFlyTimeList(createPlanBody)
+
createPlan(workspaceId, createPlanBody)
.then(res => {
disabled.value = false
diff --git a/src/types/task.ts b/src/types/task.ts
index 4639db0..fd0ff1a 100644
--- a/src/types/task.ts
+++ b/src/types/task.ts
@@ -18,8 +18,8 @@
export const TaskTypeOptions = [
{ value: TaskType.Immediate, label: TaskTypeMap[TaskType.Immediate] },
{ value: TaskType.Timed, label: TaskTypeMap[TaskType.Timed] },
- { value: TaskType.Repeat, label: TaskTypeMap[TaskType.Repeat] },
- { value: TaskType.Continuous, label: TaskTypeMap[TaskType.Continuous] },
+ // { value: TaskType.Repeat, label: TaskTypeMap[TaskType.Repeat] },
+ // { value: TaskType.Continuous, label: TaskTypeMap[TaskType.Continuous] },
]
// 频率类型
--
Gitblit v1.9.3