From beb95fb5fc166804056abafd70fc01ac27de7621 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 26 Jan 2026 09:11:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/areaManage/sceneConfig/index.vue | 34 +++++++++++-----------------------
1 files changed, 11 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..817b481 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="指挥点位置">
@@ -114,11 +96,12 @@
import FormDiaLog from './FormDiaLog.vue'
import { getDictionaryByCode } from '@/api/system/dictbiz'
import { getDictLabel } from '@ztzf/utils'
+import { saveOperationLog } from '@ztzf/apis'
+import { useRoute } from 'vue-router'
const initSearchParams = () => ({
sceneName: '', // 场景名称
sceneType: '', // 场景类型
- status: '', // 场景状态
current: 1, // 当前页
size: 10, // 每页大小
})
@@ -131,6 +114,7 @@
const queryParamsRef = ref(null) // 查询表单实例
const dialogRef = ref(null) // 弹框实例
const dialogVisible = ref(false)
+const route = useRoute()
// 获取列表
async function getList() {
@@ -168,6 +152,11 @@
})
const ids = row ? row.id : selectedIds.value.join(',')
await fwDefenseSceneRemoveApi({ ids })
+ saveOperationLog({
+ requestUri: route.path,
+ title: `${route.name || '场景配置管理'}-删除`,
+ type: 1,
+ })
ElMessage.success('删除成功')
selectedIds.value = []
getList()
@@ -187,13 +176,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