Merge remote-tracking branch 'origin/master'

张含笑

2026-01-30 c67c65b01d5a275cd86b70596f2fa11cb10fe15d

 applications/drone-command/src/views/areaManage/sceneConfig/index.vue

@@ -1,7 +1,7 @@
<template>
   <basic-container>
      <el-form ref="queryParamsRef" :model="searchParams" class="command-page-history-search">
         <el-form-item label="场景配置名称" prop="sceneName">
         <el-form-item label="配置名称" prop="sceneName">
            <el-input
               class="command-input"
               v-model="searchParams.sceneName"
@@ -36,7 +36,7 @@
      </el-form>

      <div class="command-table-toolbar">
         <el-button :icon="Plus" color="#284FE3" type="primary" @click="openForm('add')">新增</el-button>
         <el-button :icon="Plus" color="#284FE3" type="primary" @click="openForm('add')">新增配置</el-button>
         <el-button :icon="Delete" color="#1A2652" :disabled="!selectedIds.length" @click="handleDelete()">删除</el-button>
      </div>

@@ -46,7 +46,7 @@
               <el-table-column type="selection" width="46" />
               <el-table-column type="index" show-overflow-tooltip width="64" label="序号" />

               <el-table-column prop="sceneName" show-overflow-tooltip label="场景配置名称" />
               <el-table-column prop="sceneName" show-overflow-tooltip label="配置名称" />
               <el-table-column prop="sceneType" show-overflow-tooltip label="场景类型">
                  <template v-slot="{ row }">
                     {{ getDictLabel(row.sceneType, dictObj.CommandSceneType) }}
@@ -93,7 +93,7 @@
import { useRoute } from 'vue-router'

const initSearchParams = () => ({
   sceneName: '', // 场景配置名称
   sceneName: '', // 配置名称
   sceneType: '', // 场景类型
   current: 1, // 当前页
   size: 10, // 每页大小