From 9eb8bb59b802ceef1f52d334c8e577f2bf02c90e Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 21 Jan 2026 15:12:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/areaManage/sceneConfig/index.vue | 26 +++-----------------------
1 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/applications/drone-command/src/views/areaManage/sceneConfig/index.vue b/applications/drone-command/src/views/areaManage/sceneConfig/index.vue
index 61f0e21..e0b2919 100644
--- a/applications/drone-command/src/views/areaManage/sceneConfig/index.vue
+++ b/applications/drone-command/src/views/areaManage/sceneConfig/index.vue
@@ -21,25 +21,7 @@
@change="handleSearch"
>
<el-option
- v-for="item in dictObj.sceneType"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey"
- />
- </el-select>
- </el-form-item>
-
- <el-form-item label="场景状态" prop="status">
- <el-select
- class="command-select"
- popper-class="command-select-popper"
- v-model="searchParams.status"
- placeholder="请选择"
- clearable
- @change="handleSearch"
- >
- <el-option
- v-for="item in dictObj.sceneStatus"
+ v-for="item in dictObj.CommandSceneType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
@@ -67,7 +49,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="指挥点位置">
@@ -118,7 +100,6 @@
const initSearchParams = () => ({
sceneName: '', // 场景名称
sceneType: '', // 场景类型
- status: '', // 场景状态
current: 1, // 当前页
size: 10, // 每页大小
})
@@ -187,13 +168,12 @@
sceneType: [], // 场景类型
deviceMode: [], // 设备模式
areaType: [], // 区域类型
- sceneStatus: [], // 场景状态
})
provide('dictObj', dictObj)
// 获取字典
function getDictList() {
- getDictionaryByCode('sceneType,deviceMode,areaType,sceneStatus').then(res => {
+ getDictionaryByCode('CommandSceneType,deviceMode,areaType').then(res => {
dictObj.value = res.data.data
})
}
--
Gitblit v1.9.3