From 74f276af46a56a25ff2a21415f9be56160f4568f Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Fri, 10 Oct 2025 14:39:35 +0800
Subject: [PATCH] feat:更新飞行日志功能

---
 src/views/tickets/orderLog.vue      |    2 +-
 src/views/monitor/log/flightLog.vue |    8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/monitor/log/flightLog.vue b/src/views/monitor/log/flightLog.vue
index 278a44b..e762b6c 100644
--- a/src/views/monitor/log/flightLog.vue
+++ b/src/views/monitor/log/flightLog.vue
@@ -40,8 +40,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) }}
@@ -52,6 +52,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>-->
@@ -85,10 +86,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>
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index fea6da2..0b87bb0 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -1286,7 +1286,7 @@
           let result = _.round((maxItem.drone_height + this.form.rth_altitude), 2)
 
           if (this.lastHeight > result) {
-            this.$confirm(`安全返航真高${result}米低于航线返航点高度${this.lastHeight}米,为确保返航路径安全,建议您进行调整后再发布`, '提示', {
+            this.$confirm(`安全返航高度${result}米低于航线返航点高度${this.lastHeight}米为确保返航路径安全,建议您进行调整后再发布`, '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
               type: 'warning'

--
Gitblit v1.9.3