Merge branch 'develop' of http://s16s652780.51mypc.cn:49896/r/yskj/iot_dron...

husq

2023-09-13 ebb52b334e8a4f5051076ebf96c07811fb256609

Merge branch 'develop' of http://s16s652780.51mypc.cn:49896/r/yskj/iot_drone_web into develop

 src/api/wayline.ts

@@ -3,12 +3,12 @@
import { TaskType, TaskStatus, OutOfControlAction } from '/@/types/task'
import { WaylineType } from '/@/types/wayline'

const HTTP_PREFIX = 'drone/waylineFile'
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
}

@@ -36,21 +36,35 @@
  return result.data
}

export interface CreatePlan {
  name: string,
  file_id: string,
  dock_sn: string,
  task_type: TaskType, // 任务类型
  wayline_type: WaylineType, // 航线类型
  task_days?: number[] // 执行任务的日期（秒）
  task_periods?: number[][] // 执行任务的时间点（秒）
  rth_altitude: number // 相对机场返航高度 20 - 500
  out_of_control_action: OutOfControlAction // 失控动作
export interface waylineJob {
  name: string
  fileId: string
  waylineId:string
  dockSn: string
  workspaceId: string
  taskType: number
  executeSingleTime?: string
  repeatExecuteTimeArr?: string[]
  executeStartTime?: string
  executeEndTime?: string
  executeRepeatTime?: string[]
  frequencyValue?: number
  frequencyType?: number
  repeatRuleType?: number
  repeatRuleValueDay?: number[]
  repeatRuleValueWeek?: number[]
  startPower: number
  rthAltitude: number
  outOfControl: number
  finishAction: number
  breakContinue: number
}

// Create Wayline Job
export const createPlan = async function (workspaceId: string, plan: CreatePlan): Promise<IWorkspaceResponse<any>> {
  const url = `${HTTP_PREFIX}/workspaces/${workspaceId}/flight-tasks`


// 新增计划
export const createPlan = async function (plan:any): Promise<IWorkspaceResponse<any>> {
  const url = `${HTTP_PREFIX}/waylineJob/add`
  const result = await request.post(url, plan)
  return result.data
}
@@ -80,10 +94,10 @@
  uploaded_count: number // 已上传媒体数量
}

// Get Wayline Jobs
// 获取计划列表（分页）
export const getWaylineJobs = async function (workspaceId: string, page: IPage): Promise<IListWorkspaceResponse<Task>> {
  const url = `${HTTP_PREFIX}/workspaces/${workspaceId}/jobs?page=${page.page}&page_size=${page.page_size}`
  const result = await request.get(url)
  const url = `${HTTP_PREFIX}/waylineJob/getPage`
  const result = await request.get(url,{params:{workspaceId}})
  return result.data
}

@@ -120,8 +134,11 @@

// Upload Wayline file
export const importKmzFile = async function (workspaceId: string, file: {}): Promise<IWorkspaceResponse<any>> {
  const url = `api/${HTTP_PREFIX}/upload`
  const url = `${HTTP_PREFIX}/waylineFile/upload`
  const result = await request.post(url, file, {
    params:{
      projectId: workspaceId
    },
    headers: {
      'Content-Type': 'multipart/form-data',
    }

 src/components/task/CreatePlan.vue

@@ -1,37 +1,49 @@
<template>
  <div class="create-plan-wrapper">
    <div class="header">
      Create Plan
      新建计划
    </div>
    <div class="content">
      <a-form ref="valueRef" layout="horizontal" :hideRequiredMark="true" :rules="rules" :model="planBody" labelAlign="left">
        <a-form-item label="Plan Name" name="name" :labelCol="{span: 23}">
          <a-input style="background: black;"  placeholder="Please enter plan name" v-model:value="planBody.name"/>
      <a-form ref="valueRef" layout="horizontal" :hideRequiredMark="true" :rules="rules" :model="planForm"
              labelAlign="left">
        <a-form-item label="计划名称" name="name" :labelCol="{span: 23}">
          <a-input style="background: black;" placeholder="请输入计划名称" v-model:value="planForm.name"/>
        </a-form-item>

        <!-- 航线 -->
        <a-form-item label="Flight Route" :wrapperCol="{offset: 7}" name="file_id">
        <a-form-item label="执行航线" :wrapperCol="{offset: 12}" name="fileId">
          <router-link
            :to="{name: 'select-plan'}"
            @click="selectRoute"
              :to="{name: 'select-plan'}"
              @click="selectRoute"
          >
          Select Route
            选择航线
          </router-link>
        </a-form-item>
        <a-form-item v-if="planBody.file_id" style="margin-top: -15px;">

        <a-form-item v-if="planForm.fileId" style="margin-top: -15px;">
          <div class="wayline-panel" style="padding-top: 5px;">
            <div class="title">
              <a-tooltip :title="wayline.name">
                <div class="pr10" style="width: 120px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden;">{{ wayline.name }}</div>
                <div class="pr10" style="width: 120px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden;">
                  {{ wayline.name }}
                </div>
              </a-tooltip>
              <div class="ml10"><UserOutlined /></div>
              <div class="ml10">
                <UserOutlined/>
              </div>
              <a-tooltip :title="wayline.user_name">
                <div class="ml5 pr10" style="width: 80px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden;">{{ wayline.user_name }}</div>
                <div class="ml5 pr10"
                     style="width: 80px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden;">
                  {{ wayline.user_name }}
                </div>
              </a-tooltip>
            </div>
            <div class="ml10 mt5" style="color: hsla(0,0%,100%,0.65);">
              <span><RocketOutlined /></span>
              <span class="ml5">{{ Object.keys(EDeviceType)[Object.values(EDeviceType).indexOf(wayline.drone_model_key)] }}</span>
              <span class="ml10"><CameraFilled style="border-top: 1px solid; padding-top: -3px;" /></span>
              <span><RocketOutlined/></span>
              <span class="ml5">{{
                  Object.keys(EDeviceType)[Object.values(EDeviceType).indexOf(wayline.drone_model_key)]
                }}</span>
              <span class="ml10"><CameraFilled style="border-top: 1px solid; padding-top: -3px;"/></span>
              <span class="ml5" v-for="payload in wayline.payload_model_keys" :key="payload.id">
                {{ Object.keys(EDeviceType)[Object.values(EDeviceType).indexOf(payload)] }}
              </span>
@@ -41,100 +53,322 @@
            </div>
          </div>
        </a-form-item>

        <!-- 设备 -->
        <a-form-item label="Device" :wrapperCol="{offset: 10}" v-model:value="planBody.dock_sn" name="dock_sn">
        <a-form-item label="执行设备" :wrapperCol="{offset: 12}" v-model:value="planForm.dockSn" name="dockSn">
          <router-link
            :to="{name: 'select-plan'}"
            @click="selectDevice"
          >Select Device</router-link>
              :to="{name: 'select-plan'}"
              @click="selectDevice"
          >选择设备
          </router-link>
        </a-form-item>
        <a-form-item v-if="planBody.dock_sn" style="margin-top: -15px;">
        <a-form-item v-if="planForm.dockSn" style="margin-top: -15px;">
          <div class="panel" style="padding-top: 5px;" @click="selectDock(dock)">
            <div class="title">
              <a-tooltip :title="dock.nickname">
                <div class="pr10" style="width: 120px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden;">{{ dock.nickname }}</div>
                <div class="pr10" style="width: 120px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden;">
                  {{ dock.nickname }}
                </div>
              </a-tooltip>
            </div>
            <div class="ml10 mt5" style="color: hsla(0,0%,100%,0.65);">
              <span><RocketOutlined /></span>
              <span><RocketOutlined/></span>
              <span class="ml5">{{ dock.children?.nickname ?? 'No drone' }}</span>
            </div>
          </div>
        </a-form-item>
        <!-- 任务类型 -->
        <a-form-item label="Plan Timer" class="plan-timer-form-item" :labelCol="{span: 23}">

        <!-- 任务策略 -->
        <a-form-item label="任务策略" name="taskType" class="plan-timer-form-item" :labelCol="{span: 23}" >
          <div style="white-space: nowrap;">
            <a-radio-group v-model:value="planBody.task_type" button-style="solid">
              <a-radio-button v-for="type in TaskTypeOptions" :value="type.value" :key="type.value">{{ type.label }}</a-radio-button>
            <a-radio-group v-model:value="planForm.taskType" button-style="solid" @change="taskTypeChange">
              <a-radio-button v-for="type in TaskTypeOptions" :value="type.value" :key="type.value">{{
                  type.label
                }}
              </a-radio-button>
            </a-radio-group>

          </div>

        </a-form-item>

        <!-- 单次定时- -->
        <a-form-item label="执行时间" v-if="planForm.taskType === TaskType.Timed" name="executeSingleTime"
                     :labelCol="{span: 23}">
          <a-date-picker
              v-model:value="planForm.executeSingleTime"
              format="YYYY-MM-DD HH:mm"
              valueFormat="YYYY-MM-DD HH:mm"
              show-time
              placeholder="请选择日期"
          />
        </a-form-item>

        <!--重复定时-->
        <!--执行日期-->
        <a-form-item v-if="planForm.taskType === TaskType.RepeatTimed || planForm.taskType === TaskType.Continuous"
                     label="执行日期" name="repeatExecuteTimeArr" :labelCol="{span: 23}">
          <a-range-picker v-model:value="planForm.repeatExecuteTimeArr" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD"
                          :placeholder="['开始日期','结束日期']"/>
        </a-form-item>

        <!--执行时间-->
        <a-form-item v-if="planForm.taskType ===TaskType.RepeatTimed" label="执行时间" name="repeatTimeArr"
                     :labelCol="{span: 23}">
          <div v-for="(item ,index) in repeatTimeArr" :key="index">
            <a-time-picker style="background: black" v-model:value="item.value" placeholder="请选择时间"
                           format="HH:mm" valueFormat="HH:mm"/>

            <a-button @click="addTime" type="default" shape="circle" :size="btnSize">
              <template #icon>
                <PlusCircleOutlined/>
              </template>
            </a-button>

            <a-button @click="deleteTime(item)" type="default" shape="circle" :size="btnSize">
              <template #icon>
                <MinusCircleOutlined/>
              </template>
            </a-button>
          </div>
        </a-form-item>
        <!-- 执行时间 -->
        <a-form-item label="Start Time" v-if="planBody.task_type === TaskType.Timed" name="select_execute_time" :labelCol="{span: 23}">
          <a-date-picker
            v-model:value="planBody.select_execute_time"
            format="YYYY-MM-DD HH:mm:ss"
              show-time
            placeholder="Select Time"
            />
        <a-form-item v-if="planForm.taskType ===TaskType.Continuous" label="执行时间" name="repeatTimeArr"
                     :labelCol="{span: 23}">
          <div v-for="(item ,index) in repeatTimeArr" :key="index">
            <a-time-picker style="background: black" v-model:value="item.value[0]" placeholder="请选择时间"
                           format="HH:mm" valueFormat="HH:mm"/>
            <div style="color: white">-</div>
            <a-time-picker style="background: black" v-model:value="item.value[1]" placeholder="请选择时间"
                           format="HH:mm"  valueFormat="HH:mm"/>

            <a-button @click="addTime" type="default" shape="circle" :size="btnSize">
              <template #icon>
                <PlusCircleOutlined/>
              </template>
            </a-button>

            <a-button @click="deleteTime(item)" type="default" shape="circle" :size="btnSize">
              <template #icon>
                <MinusCircleOutlined/>
              </template>
            </a-button>
          </div>
        </a-form-item>
        <!-- RTH Altitude Relative to Dock -->
        <a-form-item label="RTH Altitude Relative to Dock (m)" :labelCol="{span: 23}" name="rth_altitude">
          <a-input-number v-model:value="planBody.rth_altitude" :min="20" :max="1500" class="width-100" required>
          </a-input-number>

        <!-- 任务开始执行的电量 -->
        <a-form-item v-if="planForm.taskType === TaskType.Continuous" label="任务开始执行的电量" :labelCol="{span: 23}"
                     name="startPower">
          <a-input style="background: black;" placeholder="请输入计划名称" v-model:value="planForm.startPower"/>

        </a-form-item>

        <!--重复频率-->
        <a-form-item v-if="planForm.taskType === TaskType.RepeatTimed || planForm.taskType === TaskType.Continuous"
                     label="重复频率" name="frequencyValue" :labelCol="{span: 23}">
          <div>
            <div style="color: white">每</div>
            <a-input style="background-color: black;" placeholder="请输入计划名称"
                     v-model:value="planForm.frequencyValue"/>
            <a-select v-model:value="planForm.frequencyType" style="width: 200px"
                      :options="FrequencyTypeOptions"></a-select>
          </div>
        </a-form-item>

        <!--重复规则-->
        <a-form-item v-if="planForm.taskType === TaskType.RepeatTimed || planForm.taskType === TaskType.Continuous"
                     label="重复规则" name="repeatRuleType" :labelCol="{span: 23}">
          <div>
            <a-select v-model:value="planForm.repeatRuleType" style="background-color:black;width: 200px"
                      @change="repeatRuleTypeChange" :options="RepeatRuleTypeOptions"></a-select>
          </div>

          <div v-if="planForm.repeatRuleType === RepeatRuleType.day">
            <a-button class="btn" :class="[item.checked?'btn-selected':'btn-unselected'] "
                      v-for="(item,index) in dayNumArr" :key="index" size="small" @click="selectBtn(item)">
              {{ item.value }}
            </a-button>
          </div>

          <div v-if="planForm.repeatRuleType===RepeatRuleType.week">
            <a-select v-model:value="planForm.repeatRuleValueWeek[0]" style="width: 200px"
                      :options="WhichWeekOptions"></a-select>
            <a-select v-model:value="planForm.repeatRuleValueWeek[1]" style="width: 200px"
                      :options="WhichDayOptions"></a-select>
          </div>

        </a-form-item>

        <!-- 相对机场返航高度 -->
        <a-form-item label="相对机场返航高度（ALT）" :labelCol="{span: 23}" name="rthAltitude">
          <div class="form-alt">
            <a-button class="alt-btn" type="primary" size="small" :disabled="calculateDisabled('-',100)" @click="calculate('-',100)">-100</a-button>
            <a-button class="alt-btn" type="primary" size="small" :disabled="calculateDisabled('-',10)" @click="calculate('-',10)">-10</a-button>
            <a-button class="alt-btn" type="primary" size="small" :disabled="calculateDisabled('-',1)" @click="calculate('-',1)">-1</a-button>

            <a-input class="alt-input" v-model:value="planForm.rthAltitude" :min="20" :max="1500"  required/>

            <a-button class="alt-btn" type="primary" size="small" :disabled="calculateDisabled('+',1)" @click="calculate('+',1)">+1</a-button>
            <a-button class="alt-btn" type="primary" size="small" :disabled="calculateDisabled('+',10)" @click="calculate('+',10)">+10</a-button>
            <a-button class="alt-btn" type="primary" size="small" :disabled="calculateDisabled('+',100)" @click="calculate('+',100)"> +100</a-button>
          </div>

        </a-form-item>

        <!-- Lost Action -->
        <a-form-item label="Lost Action" :labelCol="{span: 23}" name="out_of_control_action">
          <div style="white-space: nowrap;">
            <a-radio-group v-model:value="planBody.out_of_control_action" button-style="solid">
        <a-form-item label="航线飞行中失联" :labelCol="{span: 23}" name="outOfControl">
          <div class="form-outOfControl" style="white-space: nowrap;">
            <a-radio-group v-model:value="planForm.outOfControl" button-style="solid">
              <a-radio-button v-for="action in OutOfControlActionOptions" :value="action.value" :key="action.value">
                {{ action.label }}
              </a-radio-button>
            </a-radio-group>
          </div>
        </a-form-item>

        <!--完成动作-->
        <a-form-item label="完成动作" :labelCol="{span: 23}" name="finishAction">
          <a-select disabled v-model:value="planForm.finishAction" style="width: 200px"
                    :options="FinishActionOptions"></a-select>
        </a-form-item>

        <!--断点续飞-->
        <a-form-item label="自动断点续飞" :labelCol="{span: 20}" name="breakContinue">
          <a-switch v-model:checked="planForm.breakContinue" :checkedValue="1" :unCheckedValue="2"/>
        </a-form-item>

        <!--提交，取消按钮-->
        <a-form-item class="width-100" style="margin-bottom: 40px;">
          <div class="footer">
            <a-button class="mr10" style="background: #3c3c3c;" @click="closePlan">Cancel
            <a-button class="mr10" style="background: #3c3c3c;" @click="closePlan">取消
            </a-button>
            <a-button type="primary" @click="onSubmit" :disabled="disabled">OK
            <a-button type="primary" @click="onSubmit" :disabled="disabled">确定
            </a-button>
          </div>
        </a-form-item>
      </a-form>
    </div>
  </div>
  <div v-if="drawerVisible" style="position: absolute; left: 335px; width: 280px; height: 100vh; float: right; top: 0; z-index: 1000; color: white; background: #282828;">
  <div v-if="drawerVisible"
       style="position: absolute; left: 335px; width: 280px; height: 100vh; float: right; top: 0; z-index: 1000; color: white; background: #282828;">
    <div>
      <router-view :name="routeName"/>
    </div>
    <div style="position: absolute; top: 15px; right: 10px;">
      <a style="color: white;" @click="closePanel"><CloseOutlined /></a>
      <a style="color: white;" @click="closePanel">
        <CloseOutlined/>
      </a>
    </div>
  </div>
</template>

<script lang="ts" setup>
import { computed, onMounted, onUnmounted, reactive, ref, toRaw, UnwrapRef } from 'vue'
import { CloseOutlined, RocketOutlined, CameraFilled, UserOutlined, PlusCircleOutlined, MinusCircleOutlined } from '@ant-design/icons-vue'
import {
  CloseOutlined,
  RocketOutlined,
  CameraFilled,
  UserOutlined,
  PlusCircleOutlined,
  MinusCircleOutlined
} from '@ant-design/icons-vue'
import { ELocalStorageKey, ERouterName } from '/@/types'
import { useMyStore } from '/@/store'
import { WaylineType, WaylineFile } from '/@/types/wayline'
import { Device, EDeviceType } from '/@/types/device'
import { createPlan, CreatePlan } from '/@/api/wayline'
import { createPlan, waylineJob } from '/@/api/wayline'
import { getRoot } from '/@/root'
import { TaskType, OutOfControlActionOptions, OutOfControlAction, TaskTypeOptions } from '/@/types/task'
import {
  TaskType,
  OutOfControlActionOptions,
  OutOfControlAction,
  TaskTypeOptions,
  FrequencyTypeOptions,
  RepeatRuleTypeOptions,
  RepeatRuleType,
  WhichWeekOptions, WhichDayOptions, FinishActionOptions, FrequencyType
} from '/@/types/task'
import moment, { Moment } from 'moment'
import { RuleObject } from 'ant-design-vue/es/form/interface'

const btnSize = 'size'
const root = getRoot()
const store = useMyStore()

const workspaceId = localStorage.getItem(ELocalStorageKey.WorkspaceId)!

const wayline = computed<WaylineFile>(() => {
  return store.state.waylineInfo
})

const calculateDisabled = computed(() => {
  return function (a: string, b: number) {
    return a === '-' ? planForm.rthAltitude - b < 20 : planForm.rthAltitude + b > 1500
  }
})

// 表单对象

const planForm = reactive<waylineJob>({
  name: '新建计划',
  fileId: '',
  dockSn: '',
  workspaceId: '',
  waylineId: '',
  taskType: TaskType.Immediate,

  executeSingleTime: '',
  repeatExecuteTimeArr: [],
  executeStartTime: '',
  executeEndTime: '',
  executeRepeatTime: [],
  frequencyValue: 1,
  frequencyType: FrequencyType.month,
  repeatRuleType: RepeatRuleType.day,
  repeatRuleValueWeek: [1, 1],
  startPower: 90,
  rthAltitude: 20,
  outOfControl: 0,
  finishAction: 1,
  breakContinue: 2,
})

interface commonObj {
  index: number
  value: any
  checked?: boolean
}

const dayNumArr = ref<commonObj[]>([])

initDayNumArr()

function initDayNumArr () {
  dayNumArr.value = []
  for (let i = 0; i < 31; i++) {
    dayNumArr.value.push({
      index: i + 1,
      value: i + 1,
      checked: false
    })
  }
}

// 重复定时的执行时间
const repeatTimeArr = ref<commonObj[]>([
  { index: 0, value: '' },
])

function taskTypeChange (e: any) {
  if (e.target.value === TaskType.Continuous) {
    repeatTimeArr.value = [
      { index: 0, value: [] }
    ]
  } else if (e.target.value === TaskType.RepeatTimed) {
    repeatTimeArr.value = [
      { index: 0, value: '' }
    ]
  }
}

const repeatRuleValue = ref([] as string[])

const dock = computed<Device>(() => {
  return store.state.dockInfo
@@ -143,27 +377,18 @@
const disabled = ref(false)

const routeName = ref('')
const planBody = reactive({
  name: '',
  file_id: computed(() => store.state.waylineInfo.id),
  dock_sn: computed(() => store.state.dockInfo.device_sn),
  task_type: TaskType.Immediate,
  select_execute_time: undefined as Moment| undefined,
  rth_altitude: '',
  out_of_control_action: OutOfControlAction.ReturnToHome,
})

const drawerVisible = ref(false)
const valueRef = ref()
const rules = {
  name: [
    { required: true, message: 'Please enter plan name.' },
    { max: 20, message: 'Length should be 1 to 20', trigger: 'blur' }
    { required: true, message: '请输入计划名称' },
    { max: 20, message: '长度不能超过20个字符', trigger: 'blur' }
  ],
  file_id: [{ required: true, message: 'Select Route' }],
  dock_sn: [{ required: true, message: 'Select Device' }],
  select_execute_time: [{ required: true, message: 'Select start time' }],
  rth_altitude: [
  // fileId: [{ required: true, message: 'Select Route' }],
  // dockSn: [{ required: true, message: 'Select Device' }],
  // select_execute_time: [{ required: true, message: 'Select start time' }],
  rthAltitude: [
    {
      validator: async (rule: RuleObject, value: string) => {
        if (!/^[0-9]{1,}$/.test(value)) {
@@ -172,31 +397,74 @@
      },
    }
  ],
  out_of_control_action: [{ required: true, message: 'Select Lost Action' }],
  outOfControl: [{ required: true, message: 'Select Lost Action' }],
}

function onSubmit () {
  valueRef.value.validate().then(() => {
    disabled.value = true
    const createPlanBody = { ...planBody } as unknown as CreatePlan
    if (planBody.select_execute_time) {
      createPlanBody.task_days = [moment(planBody.select_execute_time).unix()]
      createPlanBody.task_periods = [createPlanBody.task_days]
    }
    createPlanBody.rth_altitude = Number(createPlanBody.rth_altitude)
    if (wayline.value && wayline.value.template_types && wayline.value.template_types.length > 0) {
      createPlanBody.wayline_type = wayline.value.template_types[0]
    }
    // console.log('planBody', createPlanBody)
    createPlan(workspaceId, createPlanBody)
      .then(res => {
        disabled.value = false
      }).finally(() => {
        closePlan()
      })
    const form = buildForm()
    createPlan(form).then(res => {
      disabled.value = false
    }).finally(() => {
      closePlan()
    })
  }).catch((e: any) => {
    console.log('validate err', e)
  })
}

// 构建表单
function buildForm () {
  const form :any = {}

  // 公共字段
  form.name = planForm.name
  form.workspaceId = store.state.common.projectId
  form.waylineId = planForm.waylineId
  form.dockSn = planForm.dockSn
  form.taskType = planForm.taskType
  form.rthAltitude = planForm.rthAltitude
  form.outOfControl = planForm.outOfControl
  form.breakContinue = planForm.breakContinue
  form.finishAction = planForm.finishAction

  // 根据不同任务策略给form添加不同字段
  if (planForm.taskType === TaskType.Timed) {
    form.executeSingleTime = planForm.executeSingleTime
  } else if (planForm.taskType === TaskType.RepeatTimed) {
    form.executeStartTime = planForm.repeatExecuteTimeArr[0]
    form.executeEndTime = planForm.repeatExecuteTimeArr[1]

    form.executeRepeatTime = repeatTimeArr.value.map(e => e.value)

    form.frequencyType = planForm.frequencyType
    form.frequencyValue = planForm.frequencyValue
    form.repeatRuleType = planForm.repeatRuleType
    if (planForm.repeatRuleType === 1) {
      form.repeatRuleValue = planForm.repeatRuleValueDay
    } else {
      form.repeatRuleValue = planForm.repeatRuleValueWeek
    }
  } else if (planForm.taskType === TaskType.Continuous) {
    form.executeStartTime = planForm.repeatExecuteTimeArr[0]
    form.executeEndTime = planForm.repeatExecuteTimeArr[1]
    form.executeRepeatTime = planForm.executeRepeatTime
    form.frequencyType = planForm.frequencyType
    form.frequencyValue = planForm.frequencyValue
    form.startPower = planForm.startPower

    form.executeRepeatTime = repeatTimeArr.value.map(e => e.value)
    form.repeatRuleType = planForm.repeatRuleType
    if (planForm.repeatRuleType === 1) {
      form.repeatRuleValue = planForm.repeatRuleValueDay
    } else {
      form.repeatRuleValue = planForm.repeatRuleValueWeek
    }
  }

  console.log('表单：', form)
  return form
}

function closePlan () {
@@ -217,6 +485,50 @@
  drawerVisible.value = true
  routeName.value = 'DockPanel'
}

// 重复定时添加执行时间
function addTime () {
  const index = repeatTimeArr.value[repeatTimeArr.value.length - 1].index
  if (planForm.taskType === TaskType.RepeatTimed) {
    repeatTimeArr.value.push({
      index: index + 1,
      value: ''
    })
  } else if (planForm.taskType === TaskType.Continuous) {
    repeatTimeArr.value.push({
      index: index + 1,
      value: []
    })
  }
}

// 重复定时删除执行时间
function deleteTime (item: commonObj) {
  repeatTimeArr.value = repeatTimeArr.value.filter(e => e.index !== item.index)
}

// 重复规则变更
function repeatRuleTypeChange (value: any, option: any) {

}

// 计算高度
function calculate (operator: string, num: number) {
  if (operator === '+') {
    planForm.rthAltitude = planForm.rthAltitude + num
  } else {
    planForm.rthAltitude = planForm.rthAltitude - num
  }
}

function selectBtn (item: commonObj) {
  console.log(item, '++++++++++++++++++++++')
  item.checked = !item.checked
  planForm.repeatRuleValueDay = dayNumArr.value.filter(e => e.checked).map(e => e.value)
  console.log('dayNumArr', dayNumArr.value)
  console.log('重复规则值：', planForm.repeatRuleValueDay)
}

</script>

<style lang="scss">
@@ -227,7 +539,7 @@
  height: 100vh;
  display: flex;
  flex-direction: column;
  width: 285px;
  width: 320px;

  .header {
    height: 52px;
@@ -263,12 +575,13 @@

    .plan-timer-form-item {

      .ant-radio-button-wrapper{
      .ant-radio-button-wrapper {
        background-color: #232323;
        color: #fff;
        width: 80%;
        width: 23%;
        text-align: center;
        &.ant-radio-button-wrapper-checked{

        &.ant-radio-button-wrapper-checked {
          background-color: #1890ff;
        }
      }
@@ -277,11 +590,11 @@

  .footer {
    display: flex;
    padding:10px 0;
    padding: 10px 0;

    button {
      width: 45%;
      color: #fff ;
      color: #fff;
      border: 0;
    }
  }
@@ -297,6 +610,7 @@
  font-size: 13px;
  border-radius: 2px;
  cursor: pointer;

  .title {
    display: flex;
    color: white;
@@ -318,6 +632,7 @@
  font-size: 13px;
  border-radius: 2px;
  cursor: pointer;

  .title {
    display: flex;
    color: white;
@@ -328,4 +643,28 @@
    margin: 0px 10px 0 10px;
  }
}

.form-alt{
  display: flex;
  align-items: center;

  .alt-btn{
    margin: 0 2px 0 2px ;
    width: 45px;
  }

  .alt-input{
    width: 50px;
  }
}

.btn-selected{
  background: #2d8cf0 !important;
  color:white !important;
}

.btn-unselected {
  background: #3c3c3c !important;
  color:white !important;
}
</style>

 src/components/task/TaskPanel.vue

@@ -113,7 +113,7 @@
import { ExclamationCircleOutlined, UploadOutlined } from '@ant-design/icons-vue'

const store = useMyStore()
const workspaceId = localStorage.getItem(ELocalStorageKey.WorkspaceId)!
const workspaceId = store.state.common.projectId

const body: IPage = {
  page: 1,
@@ -131,63 +131,52 @@

const columns = [
  {
    title: 'Planned/Actual Time',
    title: '计划|实际时间',
    dataIndex: 'duration',
    width: 200,
    slots: { customRender: 'duration' },
  },
  {
    title: 'Status',
    title: '执行状态',
    key: 'status',
    width: 150,
    slots: { customRender: 'status' }
  },
  {
    title: 'Plan Name',
    dataIndex: 'job_name',
    width: 100,
  },
  {
    title: 'Type',
    title: '类型',
    dataIndex: 'taskType',
    width: 100,
    slots: { customRender: 'taskType' },
  },
  {
    title: 'Flight Route Name',
    dataIndex: 'file_name',
    title: '计划名称',
    dataIndex: 'name',
    width: 100,
  },
  {
    title: 'Dock Name',
    dataIndex: 'dock_name',
    title: '航线名称',
    dataIndex: 'fileName',
    width: 100,
  },
  {
    title: '设备名称',
    dataIndex: 'dockName',
    width: 100,
    ellipsis: true
  },
  {
    title: 'RTH Altitude Relative to Dock (m)',
    dataIndex: 'rth_altitude',
    width: 120,
  },
  {
    title: 'Lost Action',
    dataIndex: 'out_of_control_action',
    width: 120,
    slots: { customRender: 'lostAction' },
  },
  {
    title: 'Creator',
    title: '创建人',
    dataIndex: 'username',
    width: 120,
  },
  {
    title: 'Media File Upload',
    title: '媒体上传',
    key: 'media_upload',
    width: 160,
    slots: { customRender: 'media_upload' }
  },
  {
    title: 'Action',
    title: '操作',
    width: 120,
    slots: { customRender: 'action' }
  }
@@ -264,12 +253,15 @@

function getPlans () {
  getWaylineJobs(workspaceId, body).then(res => {
    if (res.code !== 0) {
    console.log('计划数据', res)
    const data = res.data

    if (res.code !== 5000) {
      return
    }
    plansData.data = res.data.list
    paginationProp.total = res.data.pagination.total
    paginationProp.current = res.data.pagination.page
    plansData.data = data.records
    paginationProp.total = data.records.total
    paginationProp.current = data.records.current
  })
}


 src/pages/page-web/projects/wayline.vue

@@ -138,17 +138,18 @@
    return
  }
  canRefresh.value = false
  getWaylineFiles(workspaceId, {
    page: pagination.page,
    page_size: pagination.page_size,
    order_by: 'update_time desc'
  getWaylineFiles({
    workspaceId: projectId,
  }).then(res => {
    if (res.code !== 0) {
    console.log(res, '+++++++++++++++++++++++++++++++++++++')

    if (res.code !== 5000) {
      return
    }
    waylinesData.data = [...waylinesData.data, ...res.data.list]
    pagination.total = res.data.pagination.total
    pagination.page = res.data.pagination.page

    const data = res.data

    waylinesData.data = [...waylinesData.data, ...data]
  }).finally(() => {
    canRefresh.value = true
  })

 src/types/task.ts

@@ -2,37 +2,103 @@

// 任务类型
export enum TaskType {
  Immediate = 0, // 立即执行
  Timed = 1, // 单次定时任务
  Immediate = 1, // 立即执行
  Timed = 2, // 单次定时任务
  RepeatTimed = 3, // 重复定时任务
  Continuous//连续执行
}

export const TaskTypeMap = {
  [TaskType.Immediate]: 'Immediate',
  [TaskType.Timed]: 'Timed',
  [TaskType.Immediate]: '立即',
  [TaskType.Timed]: '单次定时',
  [TaskType.RepeatTimed]: '重复定时',
  [TaskType.Continuous]: '连续执行',
}

export const TaskTypeOptions = [
  { value: TaskType.Immediate, label: TaskTypeMap[TaskType.Immediate] },
  { value: TaskType.Timed, label: TaskTypeMap[TaskType.Timed] },
  { value: TaskType.RepeatTimed, label: TaskTypeMap[TaskType.RepeatTimed] },
  { value: TaskType.Continuous, label: TaskTypeMap[TaskType.Continuous] },
]

//频率类型
export enum FrequencyType {
  day = 1, // 日
  week = 2, // 周
  month = 3, // 月
}

export const FrequencyTypeMap = {
  [FrequencyType.day]: '日',
  [FrequencyType.week]: '周',
  [FrequencyType.month]: '月',
}


export const FrequencyTypeOptions = [
  { value: FrequencyType.month, label: FrequencyTypeMap[FrequencyType.month]},
  { value: FrequencyType.week, label: FrequencyTypeMap[FrequencyType.week] },
  { value: FrequencyType.day, label: FrequencyTypeMap[FrequencyType.day] },
]

// 重复规则时间类型
export enum RepeatRuleType {
  day = 1, // 按日期
  week = 2, // 按星期
}

export const RepeatRuleTypeMap = {
  [RepeatRuleType.day]: '按日期',
  [RepeatRuleType.week]: '按星期',
}

export const RepeatRuleTypeOptions=[
  { value: RepeatRuleType.day, label: RepeatRuleTypeMap[RepeatRuleType.day] },
  { value: RepeatRuleType.week, label: RepeatRuleTypeMap[RepeatRuleType.week] },
]

export const WhichWeekOptions = [
  {value: 1, label: '第一个'},
  {value: 2, label: '第二个'},
  {value: 3, label: '第三个'},
  {value: 4, label: '第四个'},
]
export const WhichDayOptions = [
  {value: 7, label: '周日'},
  {value: 1, label: '周一'},
  {value: 2, label: '周二'},
  {value: 3, label: '周三'},
  {value: 4, label: '周四'},
  {value: 5, label: '周五'},
  {value: 6, label: '周六'},
]


// 失控动作
export enum OutOfControlAction {
  ReturnToHome = 0,
  Hover = 1,
  Land = 2,
  ReturnToHome = 0, //返航
  Hover = 1, //盘旋
  Land = 2, //降落
  Continue//继续执行
}

export const OutOfControlActionMap = {
  [OutOfControlAction.ReturnToHome]: 'Return to Home',
  [OutOfControlAction.Hover]: 'Hover',
  [OutOfControlAction.Land]: 'Land',
  [OutOfControlAction.ReturnToHome]: '返航',
  [OutOfControlAction.Hover]: '盘旋',
  [OutOfControlAction.Land]: '降落',
  [OutOfControlAction.Continue]: '继续执行'
}

export const OutOfControlActionOptions = [
  { value: OutOfControlAction.ReturnToHome, label: OutOfControlActionMap[OutOfControlAction.ReturnToHome] },
  { value: OutOfControlAction.Hover, label: OutOfControlActionMap[OutOfControlAction.Hover] },
  { value: OutOfControlAction.Land, label: OutOfControlActionMap[OutOfControlAction.Land] },
  // { value: OutOfControlAction.Hover, label: OutOfControlActionMap[OutOfControlAction.Hover] },
  // { value: OutOfControlAction.Land, label: OutOfControlActionMap[OutOfControlAction.Land] },
  { value: OutOfControlAction.Continue, label: OutOfControlActionMap[OutOfControlAction.Continue] },
]

export const FinishActionOptions = [
  {value:1,label:"自动返航"}
]

// 任务状态