From a8b8b40b8b849def3a02cd3d655bdfd449d1c44f Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sat, 31 Jan 2026 17:21:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/index.vue | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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..c5635fb 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"
@@ -65,7 +65,7 @@
<el-table-column prop="deviceModel" show-overflow-tooltip label="设备型号" />
<el-table-column prop="deviceName" show-overflow-tooltip label="设备名称" />
<el-table-column prop="deviceSn" show-overflow-tooltip label="设备编码" />
- <el-table-column prop="deviceStatus" show-overflow-tooltip label="设备状态">
+ <el-table-column prop="deviceStatus" show-overflow-tooltip width="96" label="设备状态">
<template v-slot="{ row }">
{{ getDictLabel(row.status, dictObj.deviceStatus) }}
</template>
@@ -76,7 +76,7 @@
</template>
</el-table-column>
<el-table-column prop="manufacturer" show-overflow-tooltip label="厂商" />
- <el-table-column prop="contactPhone" show-overflow-tooltip label="联系方式" />
+ <el-table-column prop="contactPhone" show-overflow-tooltip width="112" label="联系方式" />
<el-table-column prop="sceneName" show-overflow-tooltip label="所属场景" />
<el-table-column label="操作" class-name="operation-btns">
<template v-slot="{ row }">
@@ -124,7 +124,7 @@
const initSearchParams = () => ({
deviceName: '', // 设备名称
deviceType: '', // 设备类型
- deviceStatus: '', // 设备状态
+ status: '', // 设备状态
current: 1, // 当前页
size: 10, // 每页大小
})
@@ -151,7 +151,10 @@
async function getList() {
loading.value = true
try {
- const res = await fwDevicePageApi(searchParams.value)
+ const res = await fwDevicePageApi({
+ ...searchParams.value,
+ deviceStatusList: '0,1,2'
+ })
list.value = res?.data?.data?.records ?? []
total.value = res?.data?.data?.total ?? 0
} finally {
@@ -176,6 +179,7 @@
function getDictList() {
getDictionaryByCode('deviceType,deviceStatus,deviceAtt').then(res => {
dictObj.value = res.data.data
+ dictObj.value.deviceStatus = dictObj.value.deviceStatus.filter(item => item.dictKey != 3)
})
}
--
Gitblit v1.9.3