From 6e88705bd5b443a259b24c17c8a299765d059d96 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 23 Jul 2026 16:50:41 +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 | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue b/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue
index 6fdf6db..b7190b3 100644
--- a/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue
+++ b/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue
@@ -1,27 +1,28 @@
<template>
- <el-dialog class="command-data-cockpit-dialog" append-to-body v-model="visibleModel" :title="dialogTitle"
+ <el-dialog class="command-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="command-dialog-history-search">
<el-form-item label="关键字" prop="keyword">
- <el-input class="command-data-cockpit-search-input" v-model="searchParams.keyword" placeholder="名称/序列号"
- clearable @clear="handleSearch" />
+ <el-input class="command-input" v-model="searchParams.keyword" placeholder="名称/序列号" clearable
+ @clear="handleSearch" />
</el-form-item>
<el-form-item prop="dateRange">
- <el-date-picker class="command-data-cockpit-date-picker"
- popper-class="command-data-cockpit-date-picker-popper" v-model="searchParams.dateRange"
- type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
- value-format="YYYY/MM/DD" @change="handleSearch" />
+ <el-date-picker class="command-date-picker" popper-class="command-date-picker-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="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 filterable :filter-node-method="filterAreaNode" clearable placeholder="请选择" @change="handleSearch" />
+ <el-tree-select class="command-select" popper-class="command-tree-select-popper"
+ v-model="searchParams.area" :data="areaTree" :props="areaTreeProps" node-key="value" check-strictly
+ filterable :filter-node-method="filterAreaNode" clearable placeholder="请选择"
+ @change="handleSearch" />
</el-form-item>
<el-form-item label="无人机类型" prop="droneType">
- <el-select class="command-data-cockpit-select" popper-class="command-data-cockpit-select-popper"
- v-model="searchParams.droneType" placeholder="请选择" clearable @change="handleSearch">
+ <el-select class="command-select" popper-class="command-select-popper" v-model="searchParams.droneType"
+ placeholder="请选择" clearable @change="handleSearch">
<el-option v-for="item in dictObj.droneType" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey" />
</el-select>
@@ -29,13 +30,13 @@
<el-form-item class="history-search-actions">
<el-button :icon="RefreshRight" @click="resetForm"></el-button>
- <el-button :icon="Search" @click="handleSearch"></el-button>
+ <el-button class="search-btn" :icon="Search" @click="handleSearch"></el-button>
</el-form-item>
</el-form>
<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 class="command-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" />
@@ -44,8 +45,8 @@
{{ getDroneTypeText(row.droneType) }}
</template>
</el-table-column>
- <el-table-column prop="areaName" label="区域" min-width="90" />
- <el-table-column prop="deviceName" label="数据来源" min-width="110" />
+ <el-table-column prop="areaName" show-overflow-tooltip label="区域" min-width="90" />
+ <el-table-column prop="deviceName" show-overflow-tooltip label="数据来源" min-width="110" />
<el-table-column label="信号频段" min-width="100">
<template #default="{ row }">
{{ formatFrequency(row.signalFreqMhz) }}
@@ -62,9 +63,9 @@
</div>
<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" />
+ <el-pagination popper-class="command-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>
@@ -75,7 +76,7 @@
import { computed, ref, watch } from 'vue'
import { getDictionaryByCode } from '@/api/system/dictbiz'
import { alarmLogApi, areaDivideListApi } from '@/api/dataCockpit'
-import { getDictLabel } from '@ztzf/utils'
+import { getDictLabel,dateRangeFormat } from '@ztzf/utils'
const props = defineProps({
modelValue: {
@@ -154,7 +155,7 @@
total.value = 0
return
}
- const [startTime, endTime] = searchParams.value.dateRange || []
+ const [startTime, endTime] = dateRangeFormat(searchParams.value.dateRange) || []
const keyword = (searchParams.value.keyword || '').trim()
const params = {
alarmType: '2',
--
Gitblit v1.9.3