From 7040e9649e51857e49261fb29f2a3a3bbf9f55e8 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 14 Jan 2026 16:24:03 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/drone-command/src/views/detectionCountermeasure/taskSchedule/index.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/applications/drone-command/src/views/detectionCountermeasure/taskSchedule/index.vue b/applications/drone-command/src/views/detectionCountermeasure/taskSchedule/index.vue
index ccae3ce..5cc07be 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/taskSchedule/index.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/taskSchedule/index.vue
@@ -30,10 +30,10 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="设备编号" prop="deviceCode">
+ <el-form-item label="设备编号" prop="deviceSn">
<el-input
class="ztzf-data-cockpit-search-input"
- v-model="searchParams.deviceCode"
+ v-model="searchParams.deviceSn"
placeholder="请输入"
clearable
@clear="handleSearch"
@@ -57,14 +57,14 @@
<el-table-column type="selection" width="46" />
<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="deviceCode" show-overflow-tooltip width="140" label="设备编码" />
- <el-table-column prop="deviceStatus" show-overflow-tooltip width="100" label="设备状态">
+ <el-table-column prop="deviceSn" show-overflow-tooltip width="140" label="设备编码" />
+ <!-- <el-table-column prop="deviceStatus" show-overflow-tooltip width="100" label="设备状态">
<template v-slot="{ row }">
{{ getDictLabel(row.deviceStatus, dictObj.deviceStatus) }}
</template>
- </el-table-column>
- <el-table-column prop="areaDivideName" show-overflow-tooltip width="120" label="区域" />
- <el-table-column prop="defenseSceneName" show-overflow-tooltip width="120" label="场景" />
+ </el-table-column>-->
+ <el-table-column prop="areaName" show-overflow-tooltip width="120" label="区域" />
+ <el-table-column prop="defenseZoneName" show-overflow-tooltip width="120" label="场景" />
<el-table-column show-overflow-tooltip width="200" label="调度位置">
<template v-slot="{ row }">{{ row.longitude }}, {{ row.latitude }}</template>
</el-table-column>
@@ -124,7 +124,7 @@
const initSearchParams = () => ({
deviceId: '', // 设备名称
deviceType: '', // 设备类型
- deviceCode: '', // 设备编号
+ deviceSn: '', // 设备编号
current: 1, // 当前页
size: 10, // 每页大小
})
--
Gitblit v1.9.3