From 754f9b186f9ce43c730d2a80728daba74951e0bf Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Fri, 16 Jan 2026 16:15:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/detectionCountermeasure/detectionRange/index.vue | 41 +++++++++++++++++++----------------------
1 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/applications/drone-command/src/views/detectionCountermeasure/detectionRange/index.vue b/applications/drone-command/src/views/detectionCountermeasure/detectionRange/index.vue
index f6bbaab..dcb3507 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/detectionRange/index.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/detectionRange/index.vue
@@ -1,7 +1,7 @@
<template>
<basic-container>
<el-form ref="queryParamsRef" :model="searchParams" class="ztzf-page-history-search">
- <el-form-item label="名称" prop="deviceName">
+ <el-form-item label="设备名称" prop="deviceName">
<el-input
class="ztzf-data-cockpit-search-input"
v-model="searchParams.deviceName"
@@ -11,7 +11,7 @@
/>
</el-form-item>
- <el-form-item label="类型" prop="deviceType">
+ <el-form-item label="设备类型" prop="deviceType">
<el-select
class="ztzf-data-cockpit-select"
popper-class="ztzf-data-cockpit-select-popper"
@@ -55,7 +55,7 @@
</template>
</el-table-column>
<el-table-column prop="deviceModel" show-overflow-tooltip label="型号" />
- <el-table-column show-overflow-tooltip label="覆盖范围">
+ <el-table-column show-overflow-tooltip label="覆盖范围(m)">
<template v-slot="{ row }">
{{ formatRange(row) }}
</template>
@@ -87,7 +87,7 @@
</div>
</div>
- <DetectionRangeDialog ref="dialogRef" @success="getList" />
+ <DetectionRangeDialog ref="dialogRef" @success="getList" v-model="visible" v-if="visible" />
</basic-container>
</template>
<script setup>
@@ -115,7 +115,7 @@
const dictObj = ref({
deviceType: [], // 设备类型
})
-
+const visible = ref(false)
provide('dictObj', dictObj)
// 获取列表
@@ -145,17 +145,26 @@
// 新增
function handleAdd() {
- dialogRef.value?.open({ mode: 'add' })
+ visible.value = true
+ nextTick(() => {
+ dialogRef.value?.open({ mode: 'add' })
+ })
}
// 查看
function handleView(row) {
- dialogRef.value?.open({ mode: 'view', row: { ...row } })
+ visible.value = true
+ nextTick(() => {
+ dialogRef.value?.open({ mode: 'view', row: { ...row } })
+ })
}
// 编辑
function handleEdit(row) {
- dialogRef.value?.open({ mode: 'edit', row: { ...row } })
+ visible.value = true
+ nextTick(() => {
+ dialogRef.value?.open({ mode: 'edit', row: { ...row } })
+ })
}
// 删除
@@ -179,20 +188,8 @@
}
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 '-'
+ if (!row.longitude || !row.latitude) return ''
+ return `${row.longitude}, ${row.latitude}`
}
function formatRange(row) {
--
Gitblit v1.9.3