Merge remote-tracking branch 'origin/master'

张含笑

2026-01-27 54cbf1d3129c9393681a0af187d34d6db10c4c19

Merge remote-tracking branch 'origin/master'

 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))

 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() {