From 2ff4af0caeb9889a9bc7c040a591d2868740c754 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Tue, 25 Nov 2025 08:36:13 +0800
Subject: [PATCH] feat:智飞工单返航高度
---
src/views/tickets/orderLog.vue | 54 ++++++++++++++++++++++++++++--------------------------
1 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index fe17d06..825d984 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -369,25 +369,25 @@
<el-col :span="5">
<div class="flex">
<div class="flex-1 flex-3">
- <el-select v-model="form.rep_fre_type" placeholder="请选择频次" :disabled="detailTitle === '工单详情'">
- <el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
- </el-select>
+ <el-select v-model="form.rep_fre_type" placeholder="请选择频次" :disabled="detailTitle === '工单详情'">
+ <el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
+ </el-select>
</div>
<div class="flex-1">
- <el-time-picker v-model="form.deal_time" prop="deal_time"
- value-format="HH:mm" :picker-options="{
+ <el-time-picker v-model="form.deal_time" prop="deal_time"
+ value-format="HH:mm" :picker-options="{
selectableRange: '00:00 - 23:59',
}" :disabled="detailTitle === '工单详情'" />
</div>
</div>
</el-col>
-<!-- <el-col :span="3">-->
-<!-- <el-time-picker class="timeStyle" :style="{ width: pxToRem(140) }" v-model="form.deal_time" prop="deal_time"-->
-<!-- value-format="HH:mm" :picker-options="{-->
-<!-- selectableRange: '00:00 - 23:59',-->
-<!-- }" :disabled="detailTitle === '工单详情'" />-->
-<!-- </el-col>-->
+ <!-- <el-col :span="3">-->
+ <!-- <el-time-picker class="timeStyle" :style="{ width: pxToRem(140) }" v-model="form.deal_time" prop="deal_time"-->
+ <!-- value-format="HH:mm" :picker-options="{-->
+ <!-- selectableRange: '00:00 - 23:59',-->
+ <!-- }" :disabled="detailTitle === '工单详情'" />-->
+ <!-- </el-col>-->
</el-row>
<el-row :gutter="20">
@@ -519,25 +519,25 @@
<el-col :span="5">
<div class="flex">
<div class="flex-1 flex-3">
- <el-select v-model="form.rep_fre_type" placeholder="请选择频次" :disabled="true">
- <el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
- </el-select>
+ <el-select v-model="form.rep_fre_type" placeholder="请选择频次" :disabled="true">
+ <el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
+ </el-select>
</div>
<div class="flex-1">
- <el-time-picker style="width: 100px" v-model="form.deal_time" prop="deal_time" :disabled="true"
- value-format="HH:mm" :picker-options="{
+ <el-time-picker style="width: 100px" v-model="form.deal_time" prop="deal_time" :disabled="true"
+ value-format="HH:mm" :picker-options="{
selectableRange: '00:00 - 23:59',
}" />
</div>
</div>
</el-col>
-<!-- <el-col :span="3">-->
-<!-- <el-time-picker style="width: 100px" v-model="form.deal_time" prop="deal_time" :disabled="true"-->
-<!-- value-format="HH:mm" :picker-options="{-->
-<!-- selectableRange: '00:00 - 23:59',-->
-<!-- }" />-->
-<!-- </el-col>-->
+ <!-- <el-col :span="3">-->
+ <!-- <el-time-picker style="width: 100px" v-model="form.deal_time" prop="deal_time" :disabled="true"-->
+ <!-- value-format="HH:mm" :picker-options="{-->
+ <!-- selectableRange: '00:00 - 23:59',-->
+ <!-- }" />-->
+ <!-- </el-col>-->
</el-row>
<el-row :gutter="20">
@@ -1040,14 +1040,16 @@
positions.unshift({latitude: maxItem.latitude, longitude: maxItem.longitude, height:maxItem.drone_height })
positions.push({latitude: maxItem.latitude, longitude: maxItem.longitude, height:maxItem.drone_height})
let resultHeight = 0
+ let valueHeight = 0
await getWaylineMaxTerrainHeight(positions).then(res => {
- resultHeight = this.safeHeight > (res.data.data + 30) ? this.safeHeight : (res.data.data + 30)
+ resultHeight = (this.safeHeight+maxItem.drone_height) > (res.data.data + 30) ? (this.safeHeight+maxItem.drone_height) : (res.data.data + 30)
+ valueHeight = (resultHeight - maxItem.drone_height) > backHeight ? _.round(resultHeight - maxItem.drone_height) : 0
})
- let valueHeight = _.round(backHeight - resultHeight, 2)
+
console.log('打印比较值', valueHeight)
- if (valueHeight < 0) {
- this.$confirm(`当前返航高度存在安全隐患，建议调整为${resultHeight}米以上后进行发布`, '提示', {
+ if (valueHeight > 0) {
+ this.$confirm(`当前返航高度存在安全隐患，建议调整为${valueHeight}米以上后进行发布`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
--
Gitblit v1.9.3