From 54cbf1d3129c9393681a0af187d34d6db10c4c19 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 27 Jan 2026 15:26:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/permissionManage/permissionRole/index.vue | 4 ++--
applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue
index 0b2786e..835df4f 100644
--- a/applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue
@@ -410,7 +410,7 @@
// 获取设备列表
async function getDeviceList () {
if (deviceOptions.value.length) return
- const res = await fwDeviceListApi({ isAreaSelect: 1, areaId: formData.value.id })
+ const res = await fwDeviceListApi({ isAreaSelect: 1, areaId: formData.value.id, isTrack: 1 })
deviceOptions.value = res?.data?.data ?? []
if (dialogMode.value === 'view') {
deviceOptions.value = deviceOptions.value.filter(item => formData.value.deviceIds.includes(item.id))
diff --git a/applications/drone-command/src/views/permissionManage/permissionRole/index.vue b/applications/drone-command/src/views/permissionManage/permissionRole/index.vue
index 726ec3c..421ff3d 100644
--- a/applications/drone-command/src/views/permissionManage/permissionRole/index.vue
+++ b/applications/drone-command/src/views/permissionManage/permissionRole/index.vue
@@ -36,7 +36,7 @@
color="#1A2652"
type="primary"
:disabled="selectedIds.length !== 1"
- v-if="userInfo.role_name?.includes('admin')"
+ v-if="permission.permissionRole_set"
@click="handleRole"
>
权限设置
@@ -113,7 +113,7 @@
const dialogRef = ref(null)
const roleDialogRef = ref(null)
const store = useStore()
-const userInfo = computed(() => store.getters.userInfo || {})
+const permission = computed(() => store.getters.permission || {})
const route = useRoute()
async function loadList() {
--
Gitblit v1.9.3