From 9340a488daf184891780bc7d474cfd1a5c1cf85d Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Thu, 05 Mar 2026 14:14:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/permissionManage/permissionDept/index.vue | 14 +++++++-------
applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue | 3 ++-
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/applications/drone-command/src/views/permissionManage/permissionDept/index.vue b/applications/drone-command/src/views/permissionManage/permissionDept/index.vue
index afaa520..3c06305 100644
--- a/applications/drone-command/src/views/permissionManage/permissionDept/index.vue
+++ b/applications/drone-command/src/views/permissionManage/permissionDept/index.vue
@@ -27,12 +27,12 @@
</el-form-item>
</el-form>
-<!-- <div class="command-table-toolbar">-->
-<!-- <el-button :icon="Plus" color="#284FE3" type="primary" @click="handleAdd">新增</el-button>-->
-<!-- <el-button :icon="Delete" color="#1A2652" type="primary" :disabled="!selectedIds.length" @click="handleDelete()">-->
-<!-- 删除-->
-<!-- </el-button>-->
-<!-- </div>-->
+ <div class="command-table-toolbar">
+ <el-button v-if="permission.permissionDept_add" :icon="Plus" color="#284FE3" type="primary" @click="handleAdd">新增</el-button>
+ <el-button v-if="permission.permissionDept_remove" :icon="Delete" color="#1A2652" type="primary" :disabled="!selectedIds.length" @click="handleDelete()">
+ 删除
+ </el-button>
+ </div>
<div class="command-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
<div class="command-table-content command-table-content-bg">
@@ -66,7 +66,7 @@
<el-table-column label="操作" class-name="operation-btns">
<template v-slot="{ row }">
<el-link @click="handleView(row)">查看</el-link>
-<!-- <el-link @click="handleEdit(row)">编辑</el-link>-->
+ <el-link v-if="permission.permissionDept_edit" @click="handleEdit(row)">编辑</el-link>
<!-- <el-link @click="handleAddChild(row)">新增子项</el-link>-->
<!-- <el-link type="danger" @click="handleDelete(row)">删除</el-link>-->
<el-link type="danger" @click="handleShare(row)" v-if="hasSharing">共享</el-link>
diff --git a/applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue b/applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue
index c11cb95..c188525 100644
--- a/applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue
+++ b/applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue
@@ -142,7 +142,7 @@
width: 4,
positions: positions,
material: arrowLineMaterialProperty,
- clampToGround: false,
+ clampToGround: true,
},
})
startDroneEntity && geometricSource.entities.remove(startDroneEntity)
@@ -153,6 +153,7 @@
width: 40,
height: 40,
verticalOrigin: Cesium.VerticalOrigin.CENTER,
+ heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
},
})
viewer.flyTo(droneLineEntity, { duration: 0 })
--
Gitblit v1.9.3