Merge remote-tracking branch 'origin/master'

张含笑

2026-01-30 c67c65b01d5a275cd86b70596f2fa11cb10fe15d

 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"
@@ -165,7 +165,7 @@
import { AREA_TYPE_STYLE_MAP, BUFFER_LEVEL_STYLES, DEFAULT_AREA_STYLE } from '@ztzf/constants'

const initForm = () => ({
   sceneName: '', // 场景配置名称
   sceneName: '', // 配置名称
   sceneType: '', // 场景类型
   deviceMode: '', // 设备模式
   areaDivideIds: '', // 关联区域ID