From 7b8789643b13dba1f2190f3bde92a7e4fa8eaafc Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 20 Jan 2026 15:24:59 +0800
Subject: [PATCH] feat:场景类型字典值显示调整
---
applications/drone-command/src/views/areaManage/defenseZone/FormDiaLog.vue | 4 ++--
applications/drone-command/src/views/areaManage/areaStatistics/FormDiaLog.vue | 2 +-
applications/drone-command/src/views/areaManage/areaStatistics/index.vue | 6 +++---
applications/drone-command/src/views/areaManage/sceneConfig/index.vue | 6 +++---
applications/drone-command/src/views/areaManage/defenseZone/index.vue | 2 +-
applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/applications/drone-command/src/views/areaManage/areaStatistics/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/areaStatistics/FormDiaLog.vue
index fbc44b3..c3ec2e5 100644
--- a/applications/drone-command/src/views/areaManage/areaStatistics/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/areaStatistics/FormDiaLog.vue
@@ -17,7 +17,7 @@
</el-col>
<el-col :span="12">
<div class="label">场景类型</div>
- <div class="val">{{ getDictLabel(formData.sceneType, dictObj.sceneType) }}</div>
+ <div class="val">{{ getDictLabel(formData.sceneType, dictObj.CommandSceneType) }}</div>
</el-col>
<el-col :span="12">
<div class="label">设备数量</div>
diff --git a/applications/drone-command/src/views/areaManage/areaStatistics/index.vue b/applications/drone-command/src/views/areaManage/areaStatistics/index.vue
index 733d3a9..79bfc7d 100644
--- a/applications/drone-command/src/views/areaManage/areaStatistics/index.vue
+++ b/applications/drone-command/src/views/areaManage/areaStatistics/index.vue
@@ -17,7 +17,7 @@
<el-form-item label="场景类型" prop="sceneType">
<el-select class="command-select" popper-class="command-select-popper"
v-model="searchParams.sceneType" placeholder="请选择" clearable @change="handleSearch">
- <el-option v-for="item in dictObj.sceneType" :key="item.dictKey" :label="item.dictValue"
+ <el-option v-for="item in dictObj.CommandSceneType" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey" />
</el-select>
</el-form-item>
@@ -41,7 +41,7 @@
<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.sceneType) }}
+ {{ getDictLabel(row.sceneType, dictObj.CommandSceneType) }}
</template>
</el-table-column>
<el-table-column prop="deviceCount" show-overflow-tooltip label="设备数量" />
@@ -126,7 +126,7 @@
// 获取字典
function getDictList () {
- getDictionaryByCode('areaType,sceneType').then(res => {
+ getDictionaryByCode('areaType,CommandSceneType').then(res => {
dictObj.value = res.data.data
})
}
diff --git a/applications/drone-command/src/views/areaManage/defenseZone/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/defenseZone/FormDiaLog.vue
index 3496880..49adb35 100644
--- a/applications/drone-command/src/views/areaManage/defenseZone/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/defenseZone/FormDiaLog.vue
@@ -40,7 +40,7 @@
<el-table-column prop="sceneName" label="场景名称" />
<el-table-column prop="sceneType" label="场景类型">
<template v-slot="{ row }">
- {{ getDictLabel(row.sceneType, dictObj.sceneType) }}
+ {{ getDictLabel(row.sceneType, dictObj.CommandSceneType) }}
</template>
</el-table-column>
</el-table>
@@ -76,7 +76,7 @@
<el-table-column prop="sceneName" label="场景名称" />
<el-table-column prop="sceneType" label="场景类型">
<template v-slot="{ row }">
- {{ getDictLabel(row.sceneType, dictObj.sceneType) }}
+ {{ getDictLabel(row.sceneType, dictObj.CommandSceneType) }}
</template>
</el-table-column>
</el-table>
diff --git a/applications/drone-command/src/views/areaManage/defenseZone/index.vue b/applications/drone-command/src/views/areaManage/defenseZone/index.vue
index 1837517..57791e1 100644
--- a/applications/drone-command/src/views/areaManage/defenseZone/index.vue
+++ b/applications/drone-command/src/views/areaManage/defenseZone/index.vue
@@ -127,7 +127,7 @@
// 获取字典
function getDictList () {
- getDictionaryByCode('areaType,sceneType').then(res => {
+ getDictionaryByCode('areaType,CommandSceneType').then(res => {
dictObj.value = res.data.data
})
}
diff --git a/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
index e3d8a06..e883151 100644
--- a/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
@@ -32,7 +32,7 @@
</el-col>
<el-col :span="24">
<div class="label">场景类型</div>
- <div class="val">{{ getDictLabel(formData.sceneType, dictObj.sceneType) }}</div>
+ <div class="val">{{ getDictLabel(formData.sceneType, dictObj.CommandSceneType) }}</div>
</el-col>
<el-col :span="24">
<div class="label">负责人</div>
@@ -79,7 +79,7 @@
<el-form-item label="场景类型" prop="sceneType">
<el-select class="command-select" popper-class="command-select-popper"
v-model="formData.sceneType" placeholder="请选择" clearable>
- <el-option v-for="item in dictObj.sceneType" :key="item.dictKey" :label="item.dictValue"
+ <el-option v-for="item in dictObj.CommandSceneType" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey" />
</el-select>
</el-form-item>
diff --git a/applications/drone-command/src/views/areaManage/sceneConfig/index.vue b/applications/drone-command/src/views/areaManage/sceneConfig/index.vue
index 61f0e21..fc69f9f 100644
--- a/applications/drone-command/src/views/areaManage/sceneConfig/index.vue
+++ b/applications/drone-command/src/views/areaManage/sceneConfig/index.vue
@@ -21,7 +21,7 @@
@change="handleSearch"
>
<el-option
- v-for="item in dictObj.sceneType"
+ v-for="item in dictObj.CommandSceneType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
@@ -67,7 +67,7 @@
<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.sceneType) }}
+ {{ getDictLabel(row.sceneType, dictObj.CommandSceneType) }}
</template>
</el-table-column>
<el-table-column show-overflow-tooltip label="指挥点位置">
@@ -193,7 +193,7 @@
// 获取字典
function getDictList() {
- getDictionaryByCode('sceneType,deviceMode,areaType,sceneStatus').then(res => {
+ getDictionaryByCode('CommandSceneType,deviceMode,areaType,sceneStatus').then(res => {
dictObj.value = res.data.data
})
}
--
Gitblit v1.9.3