From a36da7c113b8d4eb9bfc2c62a02dd8187dd0597c Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 09 Apr 2026 14:39:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/permissionManage/permissionDept/index.vue | 21 ++++++++++++++++++---
applications/drone-command/src/views/areaManage/sceneManage/FormDiaLog.vue | 2 +-
applications/task-work-order/src/views/orderView/organizational/userMange/index.vue | 1 +
applications/task-work-order/src/api/system/user.js | 3 +--
4 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/applications/drone-command/src/views/areaManage/sceneManage/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/sceneManage/FormDiaLog.vue
index bccbe34..da93c62 100644
--- a/applications/drone-command/src/views/areaManage/sceneManage/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/sceneManage/FormDiaLog.vue
@@ -57,7 +57,7 @@
:model="formData"
:rules="rules"
:disabled="readonly"
- label-width="110px"
+ label-width="120px"
>
<el-form-item label="场景名称" prop="sceneName">
<el-input
diff --git a/applications/drone-command/src/views/permissionManage/permissionDept/index.vue b/applications/drone-command/src/views/permissionManage/permissionDept/index.vue
index 32313c3..8ece0a6 100644
--- a/applications/drone-command/src/views/permissionManage/permissionDept/index.vue
+++ b/applications/drone-command/src/views/permissionManage/permissionDept/index.vue
@@ -39,6 +39,7 @@
<el-table
class="command-table"
:data="list"
+ :key="tableKey"
row-key="id"
lazy
:load="loadChildren"
@@ -204,6 +205,7 @@
type: 1,
})
ElMessage.success('删除成功')
+ refreshTable()
selectedIds.value = []
selectedRows.value = []
const parentIds = Array.from(new Set(rows.map(item => item.parentId).filter(parentId => !isRootParentId(parentId))))
@@ -251,15 +253,28 @@
})
}
-function refreshChildNodes(parentId) {
+const tableKey = ref(0)
+
+function refreshTable() {
+ tableKey.value++ // 强制重新渲染整个表格
+}
+
+async function refreshChildNodes(parentId) {
const cache = treeResolveMap.get(parentId)
if (!cache?.resolve) return
+
+ // 先清空
+ cache.resolve([])
+ await nextTick()
getChildLazyTree({ parentId })
- .then(res => {
+ .then(async res => {
const children = res?.data?.data ?? []
if (cache.row) {
cache.row.hasChildren = children.length > 0
}
+ // cache.resolve(children)
+ // 重新填充
+ await nextTick()
cache.resolve(children)
})
.catch(() => {
@@ -277,7 +292,7 @@
lastActionParentRow.value.hasChildren = true
}
lastActionParentRow.value = null
- return
+ // return
}
lastActionParentRow.value = null
getList()
diff --git a/applications/task-work-order/src/api/system/user.js b/applications/task-work-order/src/api/system/user.js
index 75b3fe9..63ecdf7 100644
--- a/applications/task-work-order/src/api/system/user.js
+++ b/applications/task-work-order/src/api/system/user.js
@@ -1,6 +1,6 @@
import request from '@/axios';
-export const getList = (current, size,sysType, params, deptId) => {
+export const getList = (current, size, params, deptId) => {
return request({
url: '/blade-system/user/page',
method: 'get',
@@ -8,7 +8,6 @@
...params,
current,
size,
- sysType,
deptId,
},
});
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 99acff9..dfe73f5 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
@@ -137,6 +137,7 @@
{
account: searchParams.value.account,
realName: searchParams.value.realName,
+ sysType: searchParams.value.sysType,
},
searchParams.value.deptId
)
--
Gitblit v1.9.3