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/deviceAppConfig/index.vue | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/index.vue b/applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/index.vue
index b61874a..ab870aa 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/index.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/index.vue
@@ -78,17 +78,17 @@
<el-table-column prop="manufacturer" show-overflow-tooltip label="厂商" />
<el-table-column prop="contactPhone" show-overflow-tooltip label="联系方式" />
<el-table-column prop="sceneName" show-overflow-tooltip label="所属场景" />
- <el-table-column label="设置配置" class-name="operation-btns">
+ <el-table-column label="操作" class-name="operation-btns">
<template v-slot="{ row }">
<el-link @click="openForm('edit', row)" type="warning">配置接口</el-link>
</template>
</el-table-column>
- <el-table-column label="操作" class-name="operation-btns">
+ <!-- <el-table-column label="操作" class-name="operation-btns">
<template v-slot="{ row }">
<el-link @click="handleEdit(row)">编辑</el-link>
<el-link @click="handleDelete(row)" type="danger">删除</el-link>
</template>
- </el-table-column>
+ </el-table-column>-->
</el-table>
</div>
@@ -210,11 +210,8 @@
}
function formatDeployLocation(row) {
- if (!row) return ''
- const longitude = row.deployLongitude ?? row.longitude
- const latitude = row.deployLatitude ?? row.latitude
- if (longitude == null || latitude == null) return ''
- return `${longitude}, ${latitude}`
+ if (!row.longitude || !row.latitude) return ''
+ return `${row.longitude}, ${row.latitude}`
}
onMounted(() => {
--
Gitblit v1.9.3