From 86c2d61ba9d33f1886cfc904dcaf17f033e4c80a Mon Sep 17 00:00:00 2001 From: shuishen <1109946754@qq.com> Date: Sat, 17 Jan 2026 13:52:53 +0800 Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web --- applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue b/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue index 3057b8c..a266041 100644 --- a/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue +++ b/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue @@ -1,27 +1,27 @@ <template> - <el-dialog class="ztzf-data-cockpit-dialog" append-to-body v-model="visibleModel" :title="dialogTitle" + <el-dialog class="command-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="ztzf-dialog-history-search"> + <el-form ref="queryParamsRef" :model="searchParams" class="command-dialog-history-search"> <el-form-item label="关键字" prop="keyword"> - <el-input class="ztzf-data-cockpit-search-input" v-model="searchParams.keyword" placeholder="名称/序列号" + <el-input class="command-data-cockpit-search-input" v-model="searchParams.keyword" placeholder="名称/序列号" clearable @clear="handleSearch" /> </el-form-item> <el-form-item prop="dateRange"> - <el-date-picker class="ztzf-data-cockpit-date-picker" - popper-class="ztzf-data-cockpit-tree-select-popper" v-model="searchParams.dateRange" + <el-date-picker class="command-data-cockpit-date-picker" + popper-class="command-data-cockpit-tree-select-popper" v-model="searchParams.dateRange" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY/MM/DD" @change="handleSearch" /> </el-form-item> <el-form-item label="区域" prop="area"> - <el-tree-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-tree-select-popper" + <el-tree-select class="command-data-cockpit-select" popper-class="command-data-cockpit-tree-select-popper" v-model="searchParams.area" :data="areaTree" :props="areaTreeProps" node-key="value" check-strictly clearable placeholder="请选择" @change="handleSearch" /> </el-form-item> <el-form-item label="无人机类型" prop="droneType"> - <el-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-select-popper" + <el-select class="command-data-cockpit-select" popper-class="command-data-cockpit-select-popper" v-model="searchParams.droneType" placeholder="请选择" clearable @change="handleSearch"> <el-option v-for="item in droneTypeOptions" :key="item.value" :label="item.label" :value="item.value" /> @@ -34,9 +34,9 @@ </el-form-item> </el-form> - <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"> + <div class="command-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)"> + <div class="command-table-content"> + <el-table class="command-data-cockpit-table" :data="list"> <el-table-column type="index" width="60" label="序号" /> <el-table-column prop="droneName" label="无人机名称" min-width="120" /> <el-table-column prop="droneSerialNo" label="无人机序列号" min-width="140" /> @@ -62,8 +62,8 @@ </el-table> </div> - <div class="ztzf-table-pagination"> - <el-pagination popper-class="ztzf-data-cockpit-select-popper" + <div class="command-table-pagination"> + <el-pagination popper-class="command-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> @@ -108,7 +108,7 @@ }) const searchParams = ref(initSearchParams()) const queryParamsRef = ref(null) -const loading = ref(false) +const loading = ref(true) const list = ref([]) const total = ref(0) const areaTree = ref([ -- Gitblit v1.9.3