From 9dbc09445a9456268bde671cdff930e416595ab5 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 26 Feb 2026 15:04:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/permissionManage/permissionDept/index.vue | 18 ++++----
applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue | 8 ++--
applications/task-work-order/src/views/orderView/organizational/userMange/FormDiaLog.vue | 3 +
applications/task-work-order/src/api/system/role.js | 3 +
applications/task-work-order/src/views/orderView/organizational/userMange/index.vue | 28 +++++++-------
applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue | 3 +
applications/drone-command/src/api/system/role.js | 3 +
applications/drone-command/src/views/permissionManage/permissionUser/index.vue | 32 ++++++++--------
8 files changed, 51 insertions(+), 47 deletions(-)
diff --git a/applications/drone-command/src/api/system/role.js b/applications/drone-command/src/api/system/role.js
index 6a0954e..8d4cf7b 100644
--- a/applications/drone-command/src/api/system/role.js
+++ b/applications/drone-command/src/api/system/role.js
@@ -73,12 +73,13 @@
});
};
-export const getRoleTree = tenantId => {
+export const getRoleTree = (tenantId,sysType) => {
return request({
url: '/blade-system/role/tree',
method: 'get',
params: {
tenantId,
+ sysType
},
});
};
diff --git a/applications/drone-command/src/views/permissionManage/permissionDept/index.vue b/applications/drone-command/src/views/permissionManage/permissionDept/index.vue
index 2fea126..afaa520 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 :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-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
<div class="command-table-content command-table-content-bg">
@@ -66,9 +66,9 @@
<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 @click="handleAddChild(row)">新增子项</el-link>
- <el-link type="danger" @click="handleDelete(row)">删除</el-link>
+<!-- <el-link @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>
</template>
</el-table-column>
diff --git a/applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue b/applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue
index 304ac4c..71c1fdd 100644
--- a/applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue
+++ b/applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue
@@ -155,6 +155,7 @@
:data="deptTree"
:props="deptTreeSelectProps"
node-key="id"
+ disabled
check-strictly
clearable
placeholder="请选择"
@@ -259,7 +260,7 @@
}
async function getRoleTreeData() {
- const res = await getRoleTree('000000')
+ const res = await getRoleTree('000000',5)
roleTree.value = res.data.data
}
diff --git a/applications/drone-command/src/views/permissionManage/permissionUser/index.vue b/applications/drone-command/src/views/permissionManage/permissionUser/index.vue
index 05e59b2..e3a4c1f 100644
--- a/applications/drone-command/src/views/permissionManage/permissionUser/index.vue
+++ b/applications/drone-command/src/views/permissionManage/permissionUser/index.vue
@@ -41,21 +41,21 @@
</el-form-item>
</el-form>
- <div class="command-table-toolbar">
- <el-button v-if="permission.permissionUser_add" :icon="Plus" color="#284FE3" type="primary" @click="handleAdd">
- 新增
- </el-button>
- <el-button
- v-if="permission.permissionUser_remove"
- :icon="Delete"
- color="#1A2652"
- type="primary"
- :disabled="!selectedIds.length"
- @click="handleDelete()"
- >
- 删除
- </el-button>
- </div>
+<!-- <div class="command-table-toolbar">-->
+<!-- <el-button v-if="permission.permissionUser_add" :icon="Plus" color="#284FE3" type="primary" @click="handleAdd">-->
+<!-- 新增-->
+<!-- </el-button>-->
+<!-- <el-button-->
+<!-- v-if="permission.permissionUser_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">
@@ -71,7 +71,7 @@
<template v-slot="{ row }">
<el-link @click="handleView(row)">查看</el-link>
<el-link v-if="permission.permissionUser_edit" @click="handleEdit(row)">编辑</el-link>
- <el-link v-if="permission.permissionUser_remove" type="danger" @click="handleDelete(row)">删除</el-link>
+<!-- <el-link v-if="permission.permissionUser_remove" type="danger" @click="handleDelete(row)">删除</el-link>-->
</template>
</el-table-column>
</el-table>
diff --git a/applications/task-work-order/src/api/system/role.js b/applications/task-work-order/src/api/system/role.js
index fae7836..3508caa 100644
--- a/applications/task-work-order/src/api/system/role.js
+++ b/applications/task-work-order/src/api/system/role.js
@@ -85,12 +85,13 @@
});
};
-export const getRoleTree = tenantId => {
+export const getRoleTree = (tenantId, sysType) => {
return request({
url: '/blade-system/role/tree',
method: 'get',
params: {
tenantId,
+ sysType
},
});
};
diff --git a/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue b/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue
index d64a6f7..ece1fa9 100644
--- a/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue
+++ b/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue
@@ -39,8 +39,8 @@
</el-form>
<div class="gd-table-toolbar">
- <el-button :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">新增机构</el-button>
- <el-button :icon="Upload" @click="handleImport">机构导入</el-button>
+<!-- <el-button :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">新增机构</el-button>-->
+<!-- <el-button :icon="Upload" @click="handleImport">机构导入</el-button>-->
<el-button :icon="Download" :loading="exportLoading" :disabled="exportLoading" @click="handleExport">机构导出</el-button>
</div>
@@ -65,8 +65,8 @@
<el-table-column label="操作" class-name="operation-btns" width="200">
<template v-slot="{ row }">
<el-link type="primary" @click="openForm('view', row)">查看</el-link>
- <el-link type="primary" @click="openForm('edit', row)">编辑</el-link>
- <el-link type="primary" @click="handleDelete(row)">删除</el-link>
+<!-- <el-link type="primary" @click="openForm('edit', row)">编辑</el-link>-->
+<!-- <el-link type="primary" @click="handleDelete(row)">删除</el-link>-->
<el-link type="primary" @click="toggleStatus(row)">{{row.status === 1 ? '禁用' : '启用'}}</el-link>
</template>
</el-table-column>
diff --git a/applications/task-work-order/src/views/orderView/organizational/userMange/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/organizational/userMange/FormDiaLog.vue
index 329edb5..08c7a7f 100644
--- a/applications/task-work-order/src/views/orderView/organizational/userMange/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/organizational/userMange/FormDiaLog.vue
@@ -155,6 +155,7 @@
:data="deptTree"
:props="deptTreeSelectProps"
node-key="id"
+ disabled
check-strictly
clearable
placeholder="请选择"
@@ -259,7 +260,7 @@
}
async function getRoleTreeData() {
- const res = await getRoleTree('000000')
+ const res = await getRoleTree('000000', 6)
roleTree.value = res.data.data
}
diff --git a/applications/task-work-order/src/views/orderView/organizational/userMange/index.vue b/applications/task-work-order/src/views/orderView/organizational/userMange/index.vue
index e53f208..86d8deb 100644
--- a/applications/task-work-order/src/views/orderView/organizational/userMange/index.vue
+++ b/applications/task-work-order/src/views/orderView/organizational/userMange/index.vue
@@ -41,19 +41,19 @@
</el-form-item>
</el-form>
- <div class="gd-table-toolbar">
- <el-button v-if="permission.orderUser_add" :icon="Plus" color="#4C34FF" type="primary" @click="handleAdd">
- 新增
- </el-button>
- <el-button
- v-if="permission.orderUser_remove"
- :icon="Delete"
- :disabled="!selectedIds.length"
- @click="handleDelete()"
- >
- 删除
- </el-button>
- </div>
+<!-- <div class="gd-table-toolbar">-->
+<!-- <el-button v-if="permission.orderUser_add" :icon="Plus" color="#4C34FF" type="primary" @click="handleAdd">-->
+<!-- 新增-->
+<!-- </el-button>-->
+<!-- <el-button-->
+<!-- v-if="permission.orderUser_remove"-->
+<!-- :icon="Delete"-->
+<!-- :disabled="!selectedIds.length"-->
+<!-- @click="handleDelete()"-->
+<!-- >-->
+<!-- 删除-->
+<!-- </el-button>-->
+<!-- </div>-->
<div class="gd-table-container" v-loading="loading">
<div class="gd-table-content gd-table-content-bg">
@@ -69,7 +69,7 @@
<template v-slot="{ row }">
<el-link @click="handleView(row)">查看</el-link>
<el-link v-if="permission.orderUser_edit" @click="handleEdit(row)">编辑</el-link>
- <el-link v-if="permission.orderUser_remove" type="danger" @click="handleDelete(row)">删除</el-link>
+<!-- <el-link v-if="permission.orderUser_remove" type="danger" @click="handleDelete(row)">删除</el-link>-->
</template>
</el-table-column>
</el-table>
--
Gitblit v1.9.3