From 6c7cdb644f765cdb4ad923095a36550b7d46e91d Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Tue, 27 Jan 2026 18:02:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/areaManage/partition/index.vue | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/applications/drone-command/src/views/areaManage/partition/index.vue b/applications/drone-command/src/views/areaManage/partition/index.vue
index c066bba..bd3f8ae 100644
--- a/applications/drone-command/src/views/areaManage/partition/index.vue
+++ b/applications/drone-command/src/views/areaManage/partition/index.vue
@@ -42,7 +42,11 @@
{{ getDictLabel(row.areaType, dictObj.areaType) }}
</template>
</el-table-column>
- <el-table-column prop="triggerCondition" show-overflow-tooltip width="130" label="触发条件" />
+ <el-table-column prop="triggerCondition" show-overflow-tooltip width="130" label="触发条件">
+ <template v-slot="{ row }">
+ {{ getDictLabel(row.triggerCondition, dictObj.triggeringCondition) }}
+ </template>
+ </el-table-column>
<el-table-column prop="responseMechanism" show-overflow-tooltip width="130" label="响应机制" />
<el-table-column prop="controlLevel" show-overflow-tooltip width="120" label="管控级别">
<template v-slot="{ row }">
@@ -168,13 +172,14 @@
const dictObj = ref({
areaType: [], //区域类型
controlLevel: [], //管控级别
+ triggeringCondition: [], //触发条件
deviceType: [],
})
provide('dictObj', dictObj)
// 获取字典
function getDictList() {
- getDictionaryByCode('areaType,controlLevel,deviceType').then(res => {
+ getDictionaryByCode('areaType,controlLevel,deviceType,triggeringCondition').then(res => {
dictObj.value = res.data.data
})
}
--
Gitblit v1.9.3