From 40c2702c3da24d9d9fda6bd63894c3206779f812 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Sat, 17 Jan 2026 16:46:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/monitor/log/flightLog.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/applications/drone-command/src/views/monitor/log/flightLog.vue b/applications/drone-command/src/views/monitor/log/flightLog.vue
index 51593b2..c9bc594 100644
--- a/applications/drone-command/src/views/monitor/log/flightLog.vue
+++ b/applications/drone-command/src/views/monitor/log/flightLog.vue
@@ -1,7 +1,7 @@
<!-- 飞行日志 -->
<template>
<div class="flight">
- <div class="ztzf-form-search">
+ <div class="command-form-search">
<el-form :model="params" inline>
<el-row :gutter="24">
<el-col :span="4">
@@ -84,13 +84,13 @@
</div>
<div class="pagination">
- <el-pagination class="ztzf-pagination" popper-class="custom-pagination-dropdown" background
+ <el-pagination class="command-pagination" popper-class="custom-pagination-dropdown" background
:page-sizes="[10, 20, 30, 40, 50, 100]" :size="size" v-model:current-page="params.page"
v-model:page-size="params.page_size" layout="total, sizes, prev, pager, next, jumper" :total="total"
@size-change="handleSizeChange" @current-change="handleCurrentChange" />
</div>
</div>
- <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-dialog class="command-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>
@@ -102,15 +102,15 @@
</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
+ <el-pagination class="command-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">
- <div id="flyMap" class="ztzf-cesium"></div>
+ <el-dialog class="command-dialog-mange" append-to-body v-model="isShowFlyMapView" title="查看" :width="pxToRem(1000)" :close-on-click-modal="false" :destroy-on-close="true">
+ <div id="flyMap" class="command-cesium"></div>
</el-dialog>
</template>
<script setup>
@@ -468,7 +468,7 @@
background: center center no-repeat none !important;
color: #8eb8ea !important;
}
- :deep(.ztzf-select){
+ :deep(.command-select){
.el-select__selection {
width: 200px;
}
--
Gitblit v1.9.3