From 04a859aa95b231c032c71d06518497a973c2f4e8 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 15 Jan 2026 17:41:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/detectionCountermeasure/countermeasureEvaluation/index.vue | 204 ++++++++++++++++++++++++++++----------------------
1 files changed, 113 insertions(+), 91 deletions(-)
diff --git a/applications/drone-command/src/views/detectionCountermeasure/countermeasureEvaluation/index.vue b/applications/drone-command/src/views/detectionCountermeasure/countermeasureEvaluation/index.vue
index a8b596a..53a0e36 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/countermeasureEvaluation/index.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/countermeasureEvaluation/index.vue
@@ -1,93 +1,114 @@
-<template>
+<template>
<basic-container>
- <el-form ref="queryParamsRef" :model="searchParams">
- <el-row :gutter="16">
- <el-col :span="4">
- <el-form-item label="设备名称" prop="deviceName">
- <el-input v-model="searchParams.deviceName" placeholder="请输入" clearable @clear="handleSearch" />
- </el-form-item>
- </el-col>
- <el-col :span="4">
- <el-form-item label="设备类型" prop="deviceType">
- <el-select v-model="searchParams.deviceType" placeholder="请选择" clearable @change="handleSearch">
- <el-option
- v-for="item in dictObj.deviceType"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey"
- />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="4">
- <el-form-item label="反制效果" prop="counterEffect">
- <el-select v-model="searchParams.counterEffect" placeholder="请选择" clearable @change="handleSearch">
- <el-option
- v-for="item in dictObj.counterEffect"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey"
- />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="4">
- <el-form-item>
- <el-button @click="resetForm">重置</el-button>
- <el-button type="primary" @click="handleSearch">查询</el-button>
- </el-form-item>
- </el-col>
- </el-row>
+ <el-form ref="queryParamsRef" :model="searchParams" class="ztzf-page-history-search">
+ <el-form-item label="设备名称" prop="deviceName">
+ <el-input
+ class="ztzf-data-cockpit-search-input"
+ v-model="searchParams.deviceName"
+ placeholder="请输入"
+ clearable
+ @clear="handleSearch"
+ />
+ </el-form-item>
+
+ <el-form-item label="设备类型" prop="deviceType">
+ <el-select
+ class="ztzf-data-cockpit-select"
+ popper-class="ztzf-data-cockpit-select-popper"
+ v-model="searchParams.deviceType"
+ placeholder="请选择"
+ clearable
+ @change="handleSearch"
+ >
+ <el-option
+ v-for="item in dictObj.deviceType"
+ :key="item.dictKey"
+ :label="item.dictValue"
+ :value="item.dictKey"
+ />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item label="反制效果" prop="counterEffect">
+ <el-select
+ class="ztzf-data-cockpit-select"
+ popper-class="ztzf-data-cockpit-select-popper"
+ v-model="searchParams.counterEffect"
+ placeholder="请选择"
+ clearable
+ @change="handleSearch"
+ >
+ <el-option
+ v-for="item in dictObj.counterEffect"
+ :key="item.dictKey"
+ :label="item.dictValue"
+ :value="item.dictKey"
+ />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item class="history-search-actions">
+ <el-button :icon="RefreshRight" @click="resetForm"></el-button>
+ <el-button class="search-btn" :icon="Search" @click="handleSearch"></el-button>
+ </el-form-item>
</el-form>
- <el-table v-loading="loading" :data="list">
- <el-table-column type="index" width="60" label="序号" />
- <el-table-column prop="droneName" label="无人机名称" />
- <el-table-column prop="droneType" label="无人机类型" />
- <el-table-column prop="droneDeviceCode" label="无人机设备编码" />
- <el-table-column prop="findTime" label="发现时间" />
- <el-table-column prop="counterEffect" label="反制效果">
- <template v-slot="{ row }">
- {{ getDictLabel(row.counterEffect, dictObj.counterEffect) }}
- </template>
- </el-table-column>
- <el-table-column prop="deviceName" label="反制设备名称" />
- <el-table-column prop="deviceModel" label="反制设备型号" />
- <el-table-column prop="deviceType" label="反制设备类型">
- <template v-slot="{ row }">
- {{ getDictLabel(row.deviceType, dictObj.deviceType) }}
- </template>
- </el-table-column>
- <el-table-column prop="deviceSn" label="反制设备编码" />
- <el-table-column prop="areaCode" label="场景" />
- <el-table-column prop="areaCode" label="区域" />
- <el-table-column label="部署位置">
- <template v-slot="{ row }">
- {{ row.deployLongitude && row.deployLatitude ? `${row.deployLongitude}, ${row.deployLatitude}` : '' }}
- </template>
- </el-table-column>
- <el-table-column prop="coverRadiusM" label="覆盖范围">
- <template v-slot="{ row }">
- {{ row.coverRadiusM ? `${row.coverRadiusM}米` : '' }}
- </template>
- </el-table-column>
- <el-table-column prop="workMode" label="工作模式">
- <template v-slot="{ row }">
- {{ getWorkModeLabel(row.workMode) }}
- </template>
- </el-table-column>
- <el-table-column label="操作" width="100">
- <template v-slot="{ row }">
- <el-link @click="openForm('view', row)" type="primary">查看</el-link>
- </template>
- </el-table-column>
- </el-table>
- <div>
- <el-pagination
- v-model:current-page="searchParams.current"
- v-model:page-size="searchParams.size"
- :total="total"
- @change="getList"
- />
+
+ <div class="ztzf-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
+ <div class="ztzf-table-content ztzf-table-content-bg">
+ <el-table class="ztzf-data-cockpit-table" :data="list">
+ <el-table-column type="index" width="64" show-overflow-tooltip label="序号" />
+ <el-table-column prop="droneName" show-overflow-tooltip width="130" label="无人机名称" />
+ <el-table-column prop="droneType" show-overflow-tooltip width="130" label="无人机类型" />
+ <el-table-column prop="droneDeviceCode" show-overflow-tooltip width="140" label="无人机设备编码" />
+ <el-table-column prop="findTime" show-overflow-tooltip width="140" label="发现时间" />
+ <el-table-column prop="counterEffect" show-overflow-tooltip width="120" label="反制效果">
+ <template v-slot="{ row }">
+ {{ getDictLabel(row.counterEffect, dictObj.counterEffect) }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="deviceName" show-overflow-tooltip width="130" label="反制设备名称" />
+ <el-table-column prop="deviceModel" show-overflow-tooltip width="120" label="反制设备型号" />
+ <el-table-column prop="deviceType" show-overflow-tooltip width="120" label="反制设备类型">
+ <template v-slot="{ row }">
+ {{ getDictLabel(row.deviceType, dictObj.deviceType) }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="deviceSn" show-overflow-tooltip width="140" label="反制设备编码" />
+ <el-table-column prop="areaCode" show-overflow-tooltip width="120" label="场景" />
+ <el-table-column prop="areaCode" show-overflow-tooltip width="120" label="区域" />
+ <el-table-column show-overflow-tooltip width="160" label="部署位置">
+ <template v-slot="{ row }">
+ {{ row.deployLongitude && row.deployLatitude ? `${row.deployLongitude}, ${row.deployLatitude}` : '' }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="coverRadiusM" show-overflow-tooltip width="120" label="覆盖范围">
+ <template v-slot="{ row }">
+ {{ row.coverRadiusM ? `${row.coverRadiusM}米` : '' }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="workMode" show-overflow-tooltip width="120" label="工作模式">
+ <template v-slot="{ row }">
+ {{ getWorkModeLabel(row.workMode) }}
+ </template>
+ </el-table-column>
+ <el-table-column label="操作" class-name="operation-btns" width="100">
+ <template v-slot="{ row }">
+ <el-link @click="openForm('view', row)" type="primary">查看</el-link>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+
+ <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>
<FormDiaLog v-if="dialogVisible" v-model="dialogVisible" ref="dialogRef" />
@@ -95,6 +116,7 @@
</template>
<script setup>
+import { RefreshRight, Search } from '@element-plus/icons-vue'
import { onMounted, ref, nextTick, provide } from 'vue'
import { fwEffectEvalPageApi } from './countermeasureEvaluationApi'
import FormDiaLog from './FormDiaLog.vue'
@@ -112,17 +134,17 @@
const searchParams = ref(initSearchParams()) // 查询参数
const total = ref(0) // 总条数
-const loading = ref(false) // 列表加载中
+const loading = ref(true) // 列表加载中
const list = ref([]) // 列表数据
const queryParamsRef = ref(null) // 查询表单实例
const dialogRef = ref(null) // 弹框实例
-const dialogVisible = ref(null) // 弹框显隐
+const dialogVisible = ref(false) // 弹框显隐
const dictObj = ref({
deviceType: [], // 设备类型
counterEffect: [], // 反制效果
})
-// 注入字典和反制效果选项供FormDiaLog使用
+// 注入字典和反制效果选项供 FormDiaLog 使用
provide('dictObj', dictObj)
// 获取列表
--
Gitblit v1.9.3