From 8421b9fcf0852cff3c9f7fd264a25368e8ddd07b Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 14 Jan 2026 11:21:42 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/drone-command/src/views/areaManage/sceneConfig/index.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/applications/drone-command/src/views/areaManage/sceneConfig/index.vue b/applications/drone-command/src/views/areaManage/sceneConfig/index.vue
index c7b68fe..23fcc99 100644
--- a/applications/drone-command/src/views/areaManage/sceneConfig/index.vue
+++ b/applications/drone-command/src/views/areaManage/sceneConfig/index.vue
@@ -37,14 +37,14 @@
<el-table class="ztzf-data-cockpit-table" :data="list" @selection-change="handleSelectionChange">
<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="130" label="设备名称" />
+
<el-table-column prop="sceneName" show-overflow-tooltip width="130" label="场景名称" />
<el-table-column prop="sceneType" show-overflow-tooltip width="120" label="场景类型">
<template v-slot="{ row }">
{{ getDictLabel(row.sceneType, dictObj.sceneType) }}
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip width="150" label="指挥点位">
+ <el-table-column show-overflow-tooltip width="150" label="指挥点位置">
<template v-slot="{ row }">
{{ formatLocation(row) }}
</template>
--
Gitblit v1.9.3