From 233e4fc4f35bd00a36ee34a7fbf5e47b41db26db Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Mon, 17 Nov 2025 09:54:44 +0800
Subject: [PATCH] feat：更新初始化地形
---
src/views/monitor/log/flightLog.vue | 125 ++++++++++++++++++++++-------------------
1 files changed, 66 insertions(+), 59 deletions(-)
diff --git a/src/views/monitor/log/flightLog.vue b/src/views/monitor/log/flightLog.vue
index 1f92f8c..93b3bae 100644
--- a/src/views/monitor/log/flightLog.vue
+++ b/src/views/monitor/log/flightLog.vue
@@ -1,47 +1,51 @@
<!-- 飞行日志 -->
<template>
<div class="flight">
- <div class="ztzf-search-mange">
+ <div class="ztzf-form-search">
<el-form :model="params" inline>
- <div class="search-contain">
- <div>
- <el-form-item label="任务名称:">
- <el-input v-model="params.jobName" placeholder="请输入任务名称" clearable />
- </el-form-item>
- <el-form-item label="任务编号:">
- <el-input v-model="params.jobInfoNum" placeholder="请输入任务编号" clearable />
- </el-form-item>
- <el-form-item label="日期:">
- <el-date-picker
- v-model="rangTime"
- type="daterange"
- range-separator="至"
- start-placeholder="开始日期"
- end-placeholder="结束日期"
- clearable
- @change="changeselect"
- />
- </el-form-item>
- </div>
- <div class="btns">
- <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
- <el-button @click="cancelSearch" :icon="Delete">清空</el-button>
- </div>
- </div>
+ <el-row :gutter="24">
+ <el-col :span="4">
+ <el-form-item label="任务名称:">
+ <el-input v-model="params.jobName" placeholder="请输入任务名称" clearable />
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="任务编号:">
+ <el-input v-model="params.jobInfoNum" placeholder="请输入任务编号" clearable />
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="选择日期:">
+ <el-date-picker
+ v-model="rangTime"
+ type="daterange"
+ range-separator="至"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
+ clearable
+ @change="changeselect"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
+ <el-button @click="cancelSearch" :icon="Delete">清空</el-button>
+ </el-col>
+ </el-row>
</el-form>
</div>
<div class="mange-table">
-<!-- <el-tabs v-model="tabType" class="demo-tabs" @tab-click="handleTabClick">-->
-<!-- <el-tab-pane label="全部" name="全部"></el-tab-pane>-->
-<!-- <el-tab-pane label="我的收藏" name="收藏"></el-tab-pane>-->
-<!-- -->
-<!-- </el-tabs>-->
+ <!-- <el-tabs v-model="tabType" class="demo-tabs" @tab-click="handleTabClick">-->
+ <!-- <el-tab-pane label="全部" name="全部"></el-tab-pane>-->
+ <!-- <el-tab-pane label="我的收藏" name="收藏"></el-tab-pane>-->
+ <!-- -->
+ <!-- </el-tabs>-->
<el-table border :data="tableList" class="custom-header">
<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,26 +56,27 @@
{{ timeFormatConvert(scope.row.end_time) }}
</template>
</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>-->
-<!-- <el-option-->
-<!-- v-for="item in tagList"-->
-<!-- :key="item.id"-->
-<!-- :label="item.label_name"-->
-<!-- :value="item.id"-->
-<!-- ></el-option>-->
-<!-- </el-select>-->
-<!-- </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>-->
+ <!-- <el-option-->
+ <!-- v-for="item in tagList"-->
+ <!-- :key="item.id"-->
+ <!-- :label="item.label_name"-->
+ <!-- :value="item.id"-->
+ <!-- ></el-option>-->
+ <!-- </el-select>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column label="操作" width="300" align="center">
<template #default="scope">
<el-button icon="el-icon-view" type="text" @click="handleDetail(scope.row)">查看</el-button>
<el-button icon="el-icon-view" type="text" @click="handleLineTrajectory(scope.row)">轨迹</el-button>
<el-button icon="el-icon-delete" type="text" @click="handleDelete(scope.row)">删除</el-button>
-<!-- <el-button type="text" @click="handleStar(scope.row)">-->
-<!-- <el-icon><Star /></el-icon>-->
-<!-- {{ scope.row.is_favorite ? '取消收藏':'收藏' }}</el-button>-->
+ <!-- <el-button type="text" @click="handleStar(scope.row)">-->
+ <!-- <el-icon><Star /></el-icon>-->
+ <!-- {{ scope.row.is_favorite ? '取消收藏':'收藏' }}</el-button>-->
<el-button type="text" @click="handleExport(scope.row)"><el-icon><Download /></el-icon>导出</el-button>
</template>
</el-table-column>
@@ -85,22 +90,23 @@
@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>
<el-table-column prop="elevation" label="实时真高" align="center"></el-table-column>
</el-table>
<template #footer>
- <div class="pagination dialog-footer" style="display: flex;justify-content: end;margin-top: 10px;">
- <el-pagination class="ztzf-pagination" popper-class="custom-pagination-dropdown" background
- :page-sizes="[10, 20, 30, 40, 50, 100]" :size="size" v-model:current-page="detailParams.current"
- v-model:page-size="detailParams.size" layout="total, sizes, prev, pager, next, jumper" :total="detailTotal"
- @size-change="handleSizeChangeDetails" @current-change="handleCurrentChangeDetails" />
- </div>
+ <div class="pagination dialog-footer" style="display: flex;justify-content: end;margin-top: 10px;">
+ <el-pagination class="ztzf-pagination" popper-class="custom-pagination-dropdown" background
+ :page-sizes="[10, 20, 30, 40, 50, 100]" :size="size" v-model:current-page="detailParams.current"
+ v-model:page-size="detailParams.size" layout="total, sizes, prev, pager, next, jumper" :total="detailTotal"
+ @size-change="handleSizeChangeDetails" @current-change="handleCurrentChangeDetails" />
+ </div>
</template>
</el-dialog>
<el-dialog class="ztzf-dialog-mange" append-to-body v-model="isShowFlyMapView" title="查看" :width="pxToRem(1000)" :close-on-click-modal="false" :destroy-on-close="true">
@@ -108,7 +114,7 @@
</el-dialog>
</template>
<script setup>
-import { getHistoryTrack, cancelStar, addStar, updateDroneFlight, droneFlightLogInfoPage } from '@/api/logs';
+import { getHistoryTrack, cancelStar, addStar, updateDroneFlight, deleteDroneFlight, droneFlightLogInfoPage } from '@/api/logs';
// import { flightLogPage } from '@/api/airspace/airspace';
import { downloadXls } from '@/utils/util';
import { exportBlob } from '@/api/common'
@@ -307,7 +313,8 @@
Number(i.height)
]),
viewer,
- multiple: 10
+ multiple: 4.6,
+ pitch: -60
});
} else {
console.warn('No valid positions data');
@@ -376,7 +383,7 @@
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
- updateDroneFlight({ is_deleted: 1, id: row.id }).then(res => {
+ deleteDroneFlight({ id: row.id }).then(res => {
ElMessage.success('删除成功')
getList()
})
@@ -449,7 +456,7 @@
.mange-table {
height: 0;
flex: 1;
- margin-top: 18px;
+ //margin-top: 18px;
overflow: auto;
}
:deep(.el-pagination) {
--
Gitblit v1.9.3