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/taskSchedule/index.vue | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/applications/drone-command/src/views/detectionCountermeasure/taskSchedule/index.vue b/applications/drone-command/src/views/detectionCountermeasure/taskSchedule/index.vue
index b61784c..6998603 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/taskSchedule/index.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/taskSchedule/index.vue
@@ -15,11 +15,11 @@
</el-select>
</el-form-item>
- <el-form-item label="设备状态" prop="deviceStatus">
+ <el-form-item label="设备状态" prop="status">
<el-select
class="ztzf-data-cockpit-select"
popper-class="ztzf-data-cockpit-select-popper"
- v-model="searchParams.deviceStatus"
+ v-model="searchParams.status"
placeholder="请选择"
clearable
@clear="handleSearch"
@@ -34,7 +34,7 @@
</el-select>
</el-form-item>
- <el-form-item label="设备编号" prop="deviceSn">
+ <el-form-item label="设备编码" prop="deviceSn">
<el-input
class="ztzf-data-cockpit-search-input"
v-model="searchParams.deviceSn"
@@ -62,9 +62,9 @@
<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="deviceSn" show-overflow-tooltip width="140" label="设备编码" />
- <el-table-column prop="deviceStatus" show-overflow-tooltip width="100" label="设备状态">
+ <el-table-column prop="status" show-overflow-tooltip width="100" label="设备状态">
<template v-slot="{ row }">
- {{ getDictLabel(row.deviceStatus, dictObj.deviceStatus) }}
+ {{ formatDeployLocation(row) }}
</template>
</el-table-column>
<el-table-column prop="areaName" show-overflow-tooltip width="120" label="区域" />
@@ -127,7 +127,7 @@
// 初始化查询参数
const initSearchParams = () => ({
deviceId: '', // 设备名称
- deviceStatus: '', // 设备状态
+ status: '', // 设备状态
deviceSn: '', // 设备编号
current: 1, // 当前页
size: 10, // 每页大小
@@ -157,7 +157,10 @@
}
return row.dispatchStartTime || row.dispatchEndTime || ''
}
-
+function formatDeployLocation(row) {
+ if (!row.longitude || !row.latitude) return ''
+ return `${row.longitude}, ${row.latitude}`
+}
// 获取列表
async function getList() {
loading.value = true
--
Gitblit v1.9.3