From 051a4a4c07e6128e04657f8de554482967708512 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 03 Nov 2025 10:44:31 +0800
Subject: [PATCH] Merge branch 'feature/v7.0/7.0.3' into feature/v7.0/7.0.4
---
src/views/monitor/log/flightLog.vue | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/views/monitor/log/flightLog.vue b/src/views/monitor/log/flightLog.vue
index f91b181..93b3bae 100644
--- a/src/views/monitor/log/flightLog.vue
+++ b/src/views/monitor/log/flightLog.vue
@@ -44,8 +44,8 @@
<el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column prop="job_name" label="任务名称" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="job_info_num" label="任务编号" align="center" show-overflow-tooltip></el-table-column>
- <el-table-column prop="title" label="飞行类型" align="center" show-overflow-tooltip></el-table-column>
- <el-table-column prop="device_name" label="无人机" align="center"></el-table-column>
+<!-- <el-table-column prop="title" label="飞行类型" align="center" show-overflow-tooltip></el-table-column>-->
+ <el-table-column prop="nickname" label="机巢名称" align="center"></el-table-column>
<el-table-column prop="start_time" label="开始时间" align="center">
<template #default="scope">
{{ timeFormatConvert(scope.row.start_time) }}
@@ -56,6 +56,7 @@
{{ timeFormatConvert(scope.row.end_time) }}
</template>
</el-table-column>
+ <el-table-column prop="create_name" label="创建人" align="center"></el-table-column>
<!-- <el-table-column prop="end_time" label="标签" align="center">-->
<!-- <template #default="scope">-->
<!-- <el-select v-model="scope.row.label_id" @change="handleUpdateLabel(scope.row)" clearable>-->
@@ -89,10 +90,11 @@
@size-change="handleSizeChange" @current-change="handleCurrentChange" />
</div>
</div>
- <el-dialog class="ztzf-dialog-mange" append-to-body v-model="isShowView" title="查看" :width="pxToRem(1000)" :close-on-click-modal="false" :destroy-on-close="true">
+ <el-dialog class="ztzf-dialog-mange" append-to-body v-model="isShowView" title="查看" :width="pxToRem(1200)" :close-on-click-modal="false" :destroy-on-close="true">
<el-table border :data="tableDataDetails" height="466">
<el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column prop="flight_type" label="飞行类型" align="center" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="create_time" label="飞行时间" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="longitude" label="经度" align="center"></el-table-column>
<el-table-column prop="latitude" label="纬度" align="center"></el-table-column>
<el-table-column prop="height" label="绝对高度" align="center"></el-table-column>
--
Gitblit v1.9.3