From 251946d17463638ee7b9d38f81800dfd922032f0 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 03 Nov 2025 10:43:57 +0800
Subject: [PATCH] Merge branch 'feature/v7.0/7.0.3' into prod
---
src/views/tickets/orderLog.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 276faf2..1ed72d7 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -988,12 +988,13 @@
return this.$message.warning('任务时间不能小于当前时间')
}
}
- const maxItem = this.device_sns.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 checkedList = this.device_sns.filter(item => this.form.device_sns.includes(item.device_sn));
+ 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 resultHeight = this.lastHeight - maxItem.drone_height
let resultH = _.round(resultHeight, 2)
@@ -1187,7 +1188,7 @@
}
// 更新机巢列表
- this.device_sns = data.device_list
+ this.device_sns = data.device_map_infos;// data.device_list;
this.permission &&
(this.permission.order_log_review || this.permission.order_log_recall) &&
(data.status == 1 ||
--
Gitblit v1.9.3