From 86c2d61ba9d33f1886cfc904dcaf17f033e4c80a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 17 Jan 2026 13:52:53 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/drone-command/src/views/detectionCountermeasure/detectionRange/index.vue | 42 +++++++++++++++---------------------------
1 files changed, 15 insertions(+), 27 deletions(-)
diff --git a/applications/drone-command/src/views/detectionCountermeasure/detectionRange/index.vue b/applications/drone-command/src/views/detectionCountermeasure/detectionRange/index.vue
index f4dea26..8800792 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/detectionRange/index.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/detectionRange/index.vue
@@ -1,9 +1,9 @@
<template>
<basic-container>
- <el-form ref="queryParamsRef" :model="searchParams" class="ztzf-page-history-search">
+ <el-form ref="queryParamsRef" :model="searchParams" class="command-page-history-search">
<el-form-item label="设备名称" prop="deviceName">
<el-input
- class="ztzf-data-cockpit-search-input"
+ class="command-data-cockpit-search-input"
v-model="searchParams.deviceName"
placeholder="请输入"
clearable
@@ -13,8 +13,8 @@
<el-form-item label="设备类型" prop="deviceType">
<el-select
- class="ztzf-data-cockpit-select"
- popper-class="ztzf-data-cockpit-select-popper"
+ class="command-data-cockpit-select"
+ popper-class="command-data-cockpit-select-popper"
v-model="searchParams.deviceType"
placeholder="请选择"
clearable
@@ -35,13 +35,13 @@
</el-form-item>
</el-form>
- <div class="ztzf-table-toolbar">
+ <div class="command-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">
+ <div class="command-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
+ <div class="command-table-content command-table-content-bg">
+ <el-table class="command-data-cockpit-table" :data="list">
<el-table-column type="index" show-overflow-tooltip width="64" label="序号" />
<el-table-column prop="deviceName" show-overflow-tooltip label="设备名称" />
<el-table-column prop="deviceType" show-overflow-tooltip label="设备类型">
@@ -75,9 +75,9 @@
</el-table>
</div>
- <div class="ztzf-table-pagination">
+ <div class="command-table-pagination">
<el-pagination
- popper-class="ztzf-data-cockpit-select-popper"
+ 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"
@@ -171,9 +171,9 @@
async function handleDelete(row) {
await ElMessageBox.confirm('确认删除该条数据吗？', '提示', {
type: 'warning',
- customClass: 'ztzf-page-view-message-box',
- confirmButtonClass: 'ztzf-message-box-confirm',
- cancelButtonClass: 'ztzf-message-box-cancel',
+ customClass: 'command-page-view-message-box',
+ confirmButtonClass: 'command-message-box-confirm',
+ cancelButtonClass: 'command-message-box-cancel',
})
await detectionRangeSubmitApi({ id: row.id, effectiveRangeKm: 0 })
ElMessage.success('删除成功')
@@ -188,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