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/detectionCountermeasure/detectionRange.vue | 190 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 185 insertions(+), 5 deletions(-)
diff --git a/applications/drone-command/src/views/detectionCountermeasure/detectionRange.vue b/applications/drone-command/src/views/detectionCountermeasure/detectionRange.vue
index a9bcb54..d90fb99 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/detectionRange.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/detectionRange.vue
@@ -1,9 +1,189 @@
<template>
- <basic-container>
- 侦测范围管理
- </basic-container>
+ <basic-container>
+ <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 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>
+
+ <div class="ztzf-table-toolbar">
+ <el-button :icon="Plus" color="#284FE3" type="primary" @click="handleAdd">新增</el-button>
+ </div>
+
+ <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" show-overflow-tooltip width="64" label="序号" />
+ <el-table-column prop="deviceName" show-overflow-tooltip width="140" 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 show-overflow-tooltip width="160" label="部署位置">
+ <template v-slot="{ row }">
+ {{ formatDeployLocation(row) }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="deviceModel" show-overflow-tooltip width="110" label="型号" />
+ <el-table-column show-overflow-tooltip width="120" label="覆盖范围">
+ <template v-slot="{ row }">
+ {{ formatRange(row) }}
+ </template>
+ </el-table-column>
+ <el-table-column show-overflow-tooltip width="150" label="设备编码">
+ <template v-slot="{ row }">
+ {{ formatDeviceCode(row) }}
+ </template>
+ </el-table-column>
+ <el-table-column label="操作" class-name="operation-btns">
+ <template v-slot="{ row }">
+ <el-link @click="handleView(row)">查看</el-link>
+ <el-link @click="handleEdit(row)">编辑</el-link>
+ <el-link @click="handleDelete(row)">删除</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>
+
+ <DetectionRangeDialog ref="dialogRef" @success="getList" />
+ </basic-container>
</template>
<script setup>
+import { Search, RefreshRight, Plus } from '@element-plus/icons-vue'
+import { onMounted, ref, provide } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { getDictionaryByCode } from '@/api/system/dictbiz'
+import { getDictLabel } from '@ztzf/utils'
+import { detectionRangePageApi, detectionRangeSubmitApi } from '@/api/detectionCountermeasure/detectionRange'
+import DetectionRangeDialog from './components/DetectionRangeDialog.vue'
+
+const initSearchParams = () => ({
+ deviceName: '', // 设备名称
+ deviceType: '', // 设备类型
+ effectiveRangeKmIsNotNull: 1, // 1-不为空
+ current: 1, // 当前页
+ size: 10, // 每页大小
+})
+const searchParams = ref(initSearchParams()) // 查询参数
+const loading = ref(false) // 列表加载中
+const list = ref([]) // 列表数据
+const total = ref(0) // 总数
+const queryParamsRef = ref(null) // 查询表单实例
+const dialogRef = ref(null) // 弹框实例
+const dictObj = ref({
+ deviceType: [], // 设备类型
+})
+
+provide('dictObj', dictObj)
+
+// 获取列表
+async function getList () {
+ loading.value = true
+ try {
+ const res = await detectionRangePageApi(searchParams.value)
+ list.value = res?.data?.data?.records ?? []
+ total.value = res?.data?.data?.total ?? 0
+ } finally {
+ loading.value = false
+ }
+}
+
+// 查询
+function handleSearch () {
+ searchParams.value.current = 1
+ getList()
+}
+
+// 重置查询
+function resetForm () {
+ queryParamsRef.value?.resetFields()
+ searchParams.value.current = 1
+ getList()
+}
+
+// 新增
+function handleAdd () {
+ dialogRef.value?.open({ mode: 'add' })
+}
+
+// 查看
+function handleView (row) {
+ dialogRef.value?.open({ mode: 'view', row: { ...row } })
+}
+
+// 编辑
+function handleEdit (row) {
+ dialogRef.value?.open({ mode: 'edit', row: { ...row } })
+}
+
+// 删除
+async function handleDelete (row) {
+ await ElMessageBox.confirm('确认删除该条数据吗？', '提示', { type: 'warning' })
+ await detectionRangeSubmitApi({ id: row.id, effectiveRangeKm: 0 })
+ ElMessage.success('删除成功')
+ getList()
+}
+
+// 获取字典
+function getDictList () {
+ getDictionaryByCode('deviceType').then(res => {
+ dictObj.value = res.data.data
+ })
+}
+
+function formatDeployLocation (row) {
+ if (!row) return '-'
+ const location = row.deployLocation ?? row.address ?? row.location ?? row.deployAddress
+ if (Array.isArray(location) && location.length) {
+ return location.filter(value => value !== null && value !== undefined).join(',')
+ }
+ if (typeof location === 'string' && location.trim()) {
+ return location
+ }
+ const longitude = row.deployLongitude ?? row.longitude
+ const latitude = row.deployLatitude ?? row.latitude
+ if (longitude != null || latitude != null) {
+ return `${longitude ?? '-'},${latitude ?? '-'}`
+ }
+ return '-'
+}
+
+function formatRange (row) {
+ if (!row) return '-'
+ const value = row.effectiveRangeKm ?? row.range
+ return value === null || value === undefined || value === '' ? '-' : value
+}
+
+function formatDeviceCode (row) {
+ if (!row) return '-'
+ return row.deviceCode || row.deviceSn || row.deviceNo || '-'
+}
+
+onMounted(() => {
+ getList()
+ getDictList()
+})
</script>
-<style scoped lang="scss">
-</style>
+<style scoped lang="scss"></style>
--
Gitblit v1.9.3