From 46f71f1985eabbf84926d6416659370f1e8c8c3e Mon Sep 17 00:00:00 2001 From: 张含笑 <zhx18749296735@163.com> Date: Wed, 14 Jan 2026 11:39:14 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue b/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue index 1ac9a90..836cb79 100644 --- a/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue +++ b/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue @@ -1,7 +1,7 @@ <template> <el-dialog class="ztzf-data-cockpit-dialog" append-to-body v-model="visibleModel" :title="dialogTitle" :close-on-click-modal="false" :destroy-on-close="true"> - <el-form ref="queryParamsRef" :model="searchParams" class="history-search"> + <el-form ref="queryParamsRef" :model="searchParams" class="ztzf-dialog-history-search"> <el-row :gutter="12"> <el-col :span="4"> <el-form-item label="关键字" prop="keyword"> @@ -19,8 +19,9 @@ </el-col> <el-col :span="4"> <el-form-item label="区域" prop="area"> - <el-tree-select class="ztzf-data-cockpit-select" popper-class="ztzf-tree-cockpit-select-popper" v-model="searchParams.area" :data="areaTree" :props="areaTreeProps" - node-key="value" check-strictly clearable placeholder="请选择" @change="handleSearch" /> + <el-tree-select class="ztzf-data-cockpit-select" popper-class="ztzf-tree-cockpit-select-popper" + v-model="searchParams.area" :data="areaTree" :props="areaTreeProps" node-key="value" + check-strictly clearable placeholder="请选择" @change="handleSearch" /> </el-form-item> </el-col> <el-col :span="5"> @@ -32,17 +33,16 @@ </el-select> </el-form-item> </el-col> - <el-col :span="6" class="history-search-actions"> - <el-form-item> - <el-button :icon="RefreshRight" @click="resetForm"></el-button> - <el-button :icon="Search" @click="handleSearch"></el-button> - </el-form-item> - </el-col> + + <el-form-item class="history-search-actions"> + <el-button :icon="RefreshRight" @click="resetForm"></el-button> + <el-button :icon="Search" @click="handleSearch"></el-button> + </el-form-item> </el-row> </el-form> - <div class="table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)"> - <div class="table-content"> + <div class="ztzf-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)"> + <div class="ztzf-table-content"> <el-table class="ztzf-data-cockpit-table" :data="list"> <el-table-column type="index" width="60" label="序号" /> <el-table-column prop="droneName" label="无人机名称" min-width="120" /> @@ -68,11 +68,11 @@ </el-table-column> </el-table> </div> - - <div class="table-pagination"> - <el-pagination popper-class="ztzf-data-cockpit-select-popper" v-model:current-page="searchParams.current" v-model:page-size="searchParams.size" - layout="total, prev, pager, next, sizes" - :total="total" @change="getList" /> + + <div class="ztzf-table-pagination"> + <el-pagination popper-class="ztzf-data-cockpit-select-popper" + v-model:current-page="searchParams.current" v-model:page-size="searchParams.size" + layout="total, prev, pager, next, sizes" :total="total" @change="getList" /> </div> </div> </el-dialog> -- Gitblit v1.9.3