From b5e2aaaba43d7456ab6ffedefa16c97a22cbe479 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 21 Nov 2025 18:40:01 +0800
Subject: [PATCH] Merge branch 'feature/v8.0/8.0.2' into prod
---
src/views/tickets/orderLog.vue | 93 ++++++++++++++++++++++++++++++++--------------
1 files changed, 64 insertions(+), 29 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 35344b8..fe17d06 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -194,7 +194,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="安全返航真高" prop="rth_altitude" class="safe-height">
- <el-input-number v-model="form.rth_altitude" :min="50" :max="300"></el-input-number>
+ <el-input-number v-model="form.rth_altitude" :min="50" :max="500"></el-input-number>
</el-form-item>
</el-col>
</el-row>
@@ -229,15 +229,15 @@
</el-form-item>
</el-col>
- <el-col :span="8">
+ <el-col :span="7">
<el-form-item label="周期频次" prop="date_range">
<el-date-picker v-model="form.date_range" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" :disabled-date="disabledDate" />
</el-form-item>
</el-col>
- <el-col :span="4">
+ <el-col :span="5">
<div class="flex">
- <div class="flex-1">
+ <div class="flex-1 flex-3">
<el-select v-model="form.rep_fre_type" placeholder="请选择频次">
<el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
</el-select>
@@ -325,7 +325,7 @@
<el-col :span="6">
<el-form-item label="安全返航真高" prop="rth_altitude" class="safe-height">
<el-input-number :disabled="detailTitle === '工单详情'" v-model="form.rth_altitude" :min="50"
- :max="300"></el-input-number>
+ :max="500"></el-input-number>
</el-form-item>
</el-col>
</el-row>
@@ -359,25 +359,35 @@
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="7">
<el-form-item label="周期频次" prop="date_range">
<el-date-picker v-model="form.date_range" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" :disabled-date="disabledDate" :disabled="detailTitle === '工单详情'" />
</el-form-item>
</el-col>
- <el-col :span="3">
+ <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-col>
-
- <el-col :span="3">
- <el-time-picker class="timeStyle" :style="{ width: pxToRem(140) }" v-model="form.deal_time" prop="deal_time"
+ </div>
+ <div class="flex-1">
+ <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-row>
<el-row :gutter="20">
@@ -465,7 +475,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="安全返航真高" prop="rth_altitude" class="safe-height">
- <el-input-number :disabled="true" v-model="form.rth_altitude" :min="50" :max="300"></el-input-number>
+ <el-input-number :disabled="true" v-model="form.rth_altitude" :min="50" :max="500"></el-input-number>
</el-form-item>
</el-col>
</el-row>
@@ -500,24 +510,34 @@
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="7">
<el-form-item label="周期频次" prop="date_range">
<el-date-picker v-model="form.date_range" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" :disabled="true" />
</el-form-item>
</el-col>
- <el-col :span="3">
+ <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-col>
-
- <el-col :span="3">
+ </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="{
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-row>
<el-row :gutter="20">
@@ -570,7 +590,8 @@
orderLogExport,
jobStatusNum,
userPublish,
- deleteOrderLog
+ deleteOrderLog,
+ getWaylineMaxTerrainHeight
} from '@/api/tickets/orderLog'
import { getTicketInfo } from '@/api/tickets/ticket'
import { getDictionaryByCode } from '@/api/system/dictbiz'
@@ -825,9 +846,13 @@
return CircleClose
},
...mapGetters(['userInfo', 'permission']),
- lastHeight () {
- const height = this.$store.state.common.lastHeight
- return Number(height) || 0 // 确保是数字类型
+ safeHeight () {
+ const safeHeight = this.$store.state.common.safeHeight
+ return Number(safeHeight) || 0 // 确保是数字类型
+ },
+ positionsArr () {
+ const positionsArr = this.$store.state.common.positionsArr
+ return positionsArr || [] // 确保是数字类型
},
filteredTabs () {
// rejection_and_draft 权限控制“已驳回”和“草稿”tab
@@ -1007,15 +1032,22 @@
const maxItem = checkedList.reduce((max, item) => {
return item.drone_height > max.drone_height ? item : max;
});
- console.log(maxItem.drone_height, '高度');
- console.log(this.lastHeight, '最后一点高度');
- let result = _.round((maxItem.drone_height + this.form.rth_altitude), 2);
+ // 返航绝对高度
+ let backHeight = this.form.rth_altitude // + maxItem.drone_height
+ console.log(backHeight,'backHeight')
+ // 安全起飞高度
+ let positions = this.positionsArr
+ 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
+ await getWaylineMaxTerrainHeight(positions).then(res => {
+ resultHeight = this.safeHeight > (res.data.data + 30) ? this.safeHeight : (res.data.data + 30)
+ })
+ let valueHeight = _.round(backHeight - resultHeight, 2)
+ console.log('打印比较值', valueHeight)
- let resultHeight = this.lastHeight - maxItem.drone_height
- let resultH = _.round(resultHeight, 2)
-
- if (this.lastHeight > result) {
- this.$confirm(`当前返航高度存在安全隐患，建议调整为${resultH}米以上后进行发布`, '提示', {
+ if (valueHeight < 0) {
+ this.$confirm(`当前返航高度存在安全隐患，建议调整为${resultHeight}米以上后进行发布`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@@ -1668,4 +1700,7 @@
width: 100% !important;
}
}
+.flex-3 {
+ margin-right: 4px;
+}
</style>
--
Gitblit v1.9.3