From 194db7300a3e50d7bd0bb61f8ff6d34d22b72f55 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 17 Jan 2026 16:37:00 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/drone-command/src/views/permissionManage/permissionRole/RolePermissionDialog.vue | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/applications/drone-command/src/views/permissionManage/permissionRole/RolePermissionDialog.vue b/applications/drone-command/src/views/permissionManage/permissionRole/RolePermissionDialog.vue
index 95fdd9c..4df6303 100644
--- a/applications/drone-command/src/views/permissionManage/permissionRole/RolePermissionDialog.vue
+++ b/applications/drone-command/src/views/permissionManage/permissionRole/RolePermissionDialog.vue
@@ -48,6 +48,16 @@
:props="treeProps"
/>
</el-tab-pane>
+ <el-tab-pane label="任务工单">
+ <el-tree
+ ref="workRef"
+ :data="menuGrantListWord"
+ show-checkbox
+ node-key="id"
+ :default-checked-keys="menuTreeObjWork"
+ :props="treeProps"
+ />
+ </el-tab-pane>
<el-tab-pane label="大屏菜单">
<el-tree
ref="treeMenuWebOld"
@@ -81,16 +91,19 @@
const menuGrantListOld = ref([])
const menuGrantListNew = ref([])
const menuGrantListDroneControl = ref([])
+const menuGrantListWord = ref([])
const menuTreeObj = ref([])
const menuTreeObjApp = ref([])
const menuTreeObjOld = ref([])
const menuTreeObjNew = ref([])
const droneControlMenuTreeObj = ref([])
+const menuTreeObjWork = ref([])
const treeMenu = ref(null)
const treeMenuApp = ref(null)
const treeMenuWebOld = ref(null)
const treeMenuWebNew = ref(null)
+const workRef = ref(null)
const droneControl = ref(null)
const emit = defineEmits(['success'])
@@ -101,11 +114,13 @@
menuGrantListOld.value = []
menuGrantListNew.value = []
menuGrantListDroneControl.value = []
+ menuGrantListWord.value = []
menuTreeObj.value = []
menuTreeObjApp.value = []
menuTreeObjOld.value = []
menuTreeObjNew.value = []
droneControlMenuTreeObj.value = []
+ menuTreeObjWork.value = []
}
async function loadGrantTree(sysType, setter, keysSetter) {
@@ -124,6 +139,7 @@
loadGrantTree(3, menuGrantListApp, menuTreeObjApp),
loadGrantTree(4, menuGrantListNew, menuTreeObjNew),
loadGrantTree(5, menuGrantListDroneControl, droneControlMenuTreeObj),
+ loadGrantTree(6, menuGrantListWord, menuTreeObjWork),
loadGrantTree(2, menuGrantListOld, menuTreeObjOld),
])
}
@@ -132,15 +148,15 @@
const menuList = treeMenu.value?.getCheckedKeys?.() ?? []
const menuListApp = treeMenuApp.value?.getCheckedKeys?.() ?? []
const menuListWebNew = treeMenuWebNew.value?.getCheckedKeys?.() ?? []
+ const menuListWebWork = workRef.value?.getCheckedKeys?.() ?? []
const menuListDroneControl = droneControl.value?.getCheckedKeys?.() ?? []
const menuListWebOld = treeMenuWebOld.value?.getCheckedKeys?.() ?? []
- grant([roleId.value], [
- ...menuList,
- ...menuListApp,
- ...menuListWebNew,
- ...menuListDroneControl,
- ...menuListWebOld,
- ], [], []).then(() => {
+ grant(
+ [roleId.value],
+ [...menuList, ...menuListApp, ...menuListWebNew, ...menuListDroneControl, ...menuListWebOld, ...menuListWebWork],
+ [],
+ []
+ ).then(() => {
visible.value = false
emit('success')
})
--
Gitblit v1.9.3