From beb95fb5fc166804056abafd70fc01ac27de7621 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 26 Jan 2026 09:11:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/index.vue |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/index.vue b/applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/index.vue
index a996a0c..ea7f4af 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/index.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/index.vue
@@ -29,11 +29,11 @@
 				</el-select>
 			</el-form-item>
 
-			<el-form-item label="设备状态" prop="deviceStatus">
+			<el-form-item label="设备状态" prop="status">
 				<el-select
 					class="command-select"
 					popper-class="command-select-popper"
-					v-model="searchParams.deviceStatus"
+					v-model="searchParams.status"
 					placeholder="请选择"
 					clearable
 					@change="handleSearch"
@@ -124,7 +124,7 @@
 const initSearchParams = () => ({
 	deviceName: '', // 设备名称
 	deviceType: '', // 设备类型
-	deviceStatus: '', // 设备状态
+	status: '', // 设备状态
 	current: 1, // 当前页
 	size: 10, // 每页大小
 })

--
Gitblit v1.9.3