From 5dc1eb8074f52b2fdc03216b62ae4e2d82acbe0f Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 03 Nov 2025 08:45:21 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v7.0/7.0.4' into 图层管理
---
src/views/tickets/orderLog.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 312767f..18bc903 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -1327,7 +1327,8 @@
return this.$message.warning('任务时间不能小于当前时间');
}
}
- const maxItem = this.form.device_map_infos.reduce((max, item) => {
+ 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, '高度');
@@ -1526,7 +1527,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