From 063e0e0005004f80c32a1b726366d573ff05cb78 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Fri, 30 Jan 2026 11:04:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
index 16ca5b4..23b663f 100644
--- a/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
@@ -23,7 +23,7 @@
 					<div class="detail-title">场景详情</div>
 					<el-row>
 						<el-col :span="24">
-							<div class="label">场景名称</div>
+							<div class="label">场景配置名称</div>
 							<div class="val">{{ formData.sceneName }}</div>
 						</el-col>
 						<el-col :span="24">
@@ -60,7 +60,7 @@
 					:disabled="readonly"
 					label-width="96px"
 				>
-					<el-form-item label="场景名称" prop="sceneName">
+					<el-form-item label="场景配置名称" prop="sceneName">
 						<el-input
 							class="command-input"
 							v-model="formData.sceneName"
@@ -164,7 +164,7 @@
 import { useRoute } from 'vue-router'
 
 const initForm = () => ({
-	sceneName: '', // 场景名称
+	sceneName: '', // 场景配置名称
 	sceneType: '', // 场景类型
 	deviceMode: '', // 设备模式
 	areaDivideIds: '', // 关联区域ID

--
Gitblit v1.9.3