From 1c00acc80086877ace3cd5869a2e54e224d6a567 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Sat, 17 Jan 2026 14:41:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/dataCockpit/components/RealWarning.vue | 22 ++++------------------
1 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/applications/drone-command/src/views/dataCockpit/components/RealWarning.vue b/applications/drone-command/src/views/dataCockpit/components/RealWarning.vue
index 607b94d..81df396 100644
--- a/applications/drone-command/src/views/dataCockpit/components/RealWarning.vue
+++ b/applications/drone-command/src/views/dataCockpit/components/RealWarning.vue
@@ -44,30 +44,16 @@
counter: '诱导驱离'
}
-const buildPayload = (item) => ({
- alarmRecordId: item.id,
- areaCode: item.areaCode,
- counterEffect: '',
- coverRadiusM: item.coverRadiusM,
- deployLatitude: item.latitude,
- deployLongitude: item.longitude,
- deviceCode: item.deviceCode,
+const buildPayload = (type, item) => ({
+ counterWay: type === 'signal' ? 1 : type === 'counter' ? 2 : '',
deviceId: item.deviceId,
- deviceModel: item.deviceModel,
- deviceName: item.deviceName,
- deviceType: item.deviceType,
- droneDeviceCode: item.droneSerialNo,
- droneName: item.droneName,
- droneType: item.droneType,
- findTime: item.alarmTime,
- id: item.id,
- workMode: ''
+ droneDeviceCode: item.droneDeviceCode ?? item.droneSerialNo
})
const handleAction = async (type, item) => {
const actionText = actionTextMap[type] || '操作'
try {
- const res = await interferenceAndExpulsionApi(buildPayload(item))
+ const res = await interferenceAndExpulsionApi(buildPayload(type, item))
if (res?.data?.success) {
ElMessage({ type: 'success', message: `${actionText}成功` })
} else {
--
Gitblit v1.9.3