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/index.vue | 6 +++---
applications/drone-command/src/views/areaManage/sceneManage/FormDiaLog.vue | 6 +++---
applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue | 6 +++---
3 files changed, 9 insertions(+), 9 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
diff --git a/applications/drone-command/src/views/areaManage/sceneConfig/index.vue b/applications/drone-command/src/views/areaManage/sceneConfig/index.vue
index 1d744f4..75de78d 100644
--- a/applications/drone-command/src/views/areaManage/sceneConfig/index.vue
+++ b/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"
@@ -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, // 每页大小
diff --git a/applications/drone-command/src/views/areaManage/sceneManage/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/sceneManage/FormDiaLog.vue
index efa2b16..eba09ef 100644
--- a/applications/drone-command/src/views/areaManage/sceneManage/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/sceneManage/FormDiaLog.vue
@@ -27,11 +27,11 @@
<div class="val">{{ formData.sceneName }}</div>
</el-col>
<el-col :span="24">
- <div class="label">防控负责人</div>
+ <div class="label">负责人</div>
<div class="val">{{ formData.defenseLeader }}</div>
</el-col>
<el-col :span="24">
- <div class="label">防控负责人电话</div>
+ <div class="label">负责人电话</div>
<div class="val">{{ formData.leaderPhone }}</div>
</el-col>
<el-col :span="24">
@@ -78,7 +78,7 @@
<el-option v-for="item in sceneConfigList" :key="item.id" :label="item.sceneName" :value="item.id" />
</el-select>
</el-form-item>
- <el-form-item label="防控负责人" prop="defenseLeader">
+ <el-form-item label="负责人" prop="defenseLeader">
<el-input
class="command-input"
v-model="formData.defenseLeader"
--
Gitblit v1.9.3