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/components/task/CreatePlan.vue | 565 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 466 insertions(+), 99 deletions(-)
diff --git a/src/components/task/CreatePlan.vue b/src/components/task/CreatePlan.vue
index becc1be..473e0f3 100644
--- a/src/components/task/CreatePlan.vue
+++ b/src/components/task/CreatePlan.vue
@@ -1,37 +1,52 @@
<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">
- <a-form-item label="Plan Name" name="name" :labelCol="{span: 24}">
- <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">
- <router-link
- :to="{name: 'select-plan'}"
- @click="selectRoute"
- >
- Select Route
+ <a-form-item label="执行航线" :wrapperCol="{ offset: 12 }" name="fileId">
+ <router-link :to="{ name: 'select-plan' }" @click="selectRoute">
+ 选择航线
</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,102 +56,329 @@
</div>
</div>
</a-form-item>
+
<!-- 设备 -->
- <a-form-item label="Device" :wrapperCol="{offset: 10}" v-model:value="planBody.dock_sn" name="dock_sn">
- <router-link
- :to="{name: 'select-plan'}"
- @click="selectDevice"
- >Select Device</router-link>
+ <a-form-item label="执行设备" :wrapperCol="{ offset: 12 }" v-model:value="planForm.dockSn" name="dockSn">
+ <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">
+
+ <!-- 任务策略 -->
+ <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 :value="TaskType.Immediate">Immediate</a-radio-button>
- <a-radio-button :value="TaskType.Single">Timed&One-Time</a-radio-button>
+ <a-radio-group class="group_radio" 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.Single" name="select_execute_time">
- <a-date-picker
- v-model:value="planBody.select_execute_time"
- format="YYYY-MM-DD HH:mm:ss"
- show-time
- placeholder="Select Time"
- style="width: 280px;"
- />
+ <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: 24}" name="rth_altitude">
- <a-input v-model:value="planBody.rth_altitude" style="background: black !important;">
- </a-input>
+
+ <!-- 任务开始执行的电量 -->
+ <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: 24}" 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-radio-button v-for="action in OutOfControlActionOptions" :value="action.value" :key="action.value">
+ <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, acIndex) in OutOfControlActionOptions " :value="action.value"
+ :key="action.value" :style="{ marginRight: ( acIndex === 0 ? '10px' : '0px' ) }">
{{ action.label }}
</a-radio-button>
</a-radio-group>
</div>
</a-form-item>
- <a-form-item style="width: 280px;">
+
+ <!--完成动作-->
+ <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: 330px; width: 280px; height: 100vh; float: right; top: 0; z-index: 1000; color: white; background: #282828;">
+ <div v-if="drawerVisible"
+ style="position: absolute; left: 370px; width: 280px; height: 100vh; float: right; top: 0; z-index: 1000; color: white; background: #282828;">
<div>
- <router-view :name="routeName"/>
+ <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 } from '@ant-design/icons-vue'
+import { computed, onMounted, onUnmounted, reactive, ref, toRaw, UnwrapRef, watch } from '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 } 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'
+import { clickPoint, pointCenter } from '/@/hooks/use-center-point'
+const btnSize = 'size'
const root = getRoot()
const store = useMyStore()
-
const workspaceId = localStorage.getItem(ELocalStorageKey.WorkspaceId)!
-
const wayline = computed<WaylineFile>(() => {
return store.state.waylineInfo
})
+watch(() => wayline, (newVal) => {
+ if (newVal.value.id) {
+ planForm.fileId = newVal.value.id
+ }
+}, {
+ deep: true
+})
+
+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 dock = computed<Device>(() => {
return store.state.dockInfo
@@ -145,27 +387,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)) {
@@ -174,33 +407,75 @@
},
}
],
- 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 => {
- setTimeout(() => {
- disabled.value = false
- }, 1500)
- }).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.fileId = planForm.fileId
+ 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.status = 1
+
+ // 根据不同任务策略给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 () {
@@ -221,6 +496,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">
@@ -231,6 +550,7 @@
height: 100vh;
display: flex;
flex-direction: column;
+ width: 320px;
.header {
height: 52px;
@@ -242,6 +562,10 @@
align-items: center;
}
+ ::-webkit-scrollbar {
+ display: none;
+ }
+
.content {
height: calc(100% - 54px);
overflow-y: auto;
@@ -250,7 +574,13 @@
margin: 10px;
}
- form label, input {
+ form label,
+ input,
+ .ant-input,
+ .ant-calendar-range-picker-separator,
+ .ant-input:hover,
+ .ant-time-picker .anticon,
+ .ant-calendar-picker .anticon {
background-color: #232323;
color: #fff;
}
@@ -260,26 +590,34 @@
}
.plan-timer-form-item {
- // flex-direction: column;
- .ant-radio-button-wrapper{
+ .ant-radio-button-wrapper {
background-color: #232323;
color: #fff;
+ width: 23%;
+ text-align: center;
+ padding: 0;
- &.ant-radio-button-wrapper-checked{
+ &.ant-radio-button-wrapper-checked {
background-color: #1890ff;
}
+ }
+
+ .group_radio {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
}
}
}
.footer {
display: flex;
- padding:10px 0;
+ padding: 10px 0;
button {
width: 45%;
- color: #fff ;
+ color: #fff;
border: 0;
}
}
@@ -295,6 +633,7 @@
font-size: 13px;
border-radius: 2px;
cursor: pointer;
+
.title {
display: flex;
color: white;
@@ -316,6 +655,7 @@
font-size: 13px;
border-radius: 2px;
cursor: pointer;
+
.title {
display: flex;
color: white;
@@ -326,4 +666,31 @@
margin: 0px 10px 0 10px;
}
}
+
+.form-alt {
+ display: flex;
+ align-items: center;
+
+ .alt-btn {
+ margin: 0 2px 0 2px;
+ width: 45px;
+ padding: 0 4px;
+ }
+
+ .alt-input {
+ width: 50px;
+ padding: 0;
+ text-align: center;
+ }
+}
+
+.btn-selected {
+ background: #2d8cf0 !important;
+ color: white !important;
+}
+
+.btn-unselected {
+ background: #3c3c3c !important;
+ color: white !important;
+}
</style>
--
Gitblit v1.9.3