From 3cedfede6934fcdabe7394d8a88d1826e72e78e2 Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期五, 13 十二月 2024 17:14:09 +0800
Subject: [PATCH] Merge branch 'test' of http://47.103.154.90:83/r/WI/Web.Admin.V1.0 into test
---
src/views/project/yw/dataManage/workFlowMgr/WorkFlowIndex.vue | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/views/project/yw/dataManage/workFlowMgr/WorkFlowIndex.vue b/src/views/project/yw/dataManage/workFlowMgr/WorkFlowIndex.vue
index 5f87df1..5fd21c1 100644
--- a/src/views/project/yw/dataManage/workFlowMgr/WorkFlowIndex.vue
+++ b/src/views/project/yw/dataManage/workFlowMgr/WorkFlowIndex.vue
@@ -194,12 +194,14 @@
};
// 鏇存柊鏍戝舰缁撴瀯鍜屽伐浣滄祦鍒楄〃
const updateSampleListsAndGroupNames = (tree_Data, work_Data) => {
+ console.log('馃殌 ~ work_Data:', work_Data);
let new_tree_Data = [];
tree_Data.forEach((node, index) => {
if (node.group_type == OptClassificationMap[classificationEnum.Knowledge]) {
new_tree_Data.push(node);
}
});
+ console.log('馃殌 ~ new_tree_Data:', new_tree_Data);
// 涓烘瘡涓妭鐐瑰叧鑱斿伐浣滄祦鏁版嵁
new_tree_Data.forEach((node) => {
node.sampleList = work_Data
@@ -227,7 +229,9 @@
// 鍚堝苟瀛愯妭鐐圭殑宸ヤ綔娴佸垪琛紝骞舵洿鏂扮粍鍚�
byParentData.forEach((item) => {
if (item.children && item.children.length > 0) {
- item.sampleList = item.children.reduce((acc, child_node) => acc.concat(child_node.sampleList), []);
+ item.children.forEach((child_node) => {
+ item.sampleList = item.sampleList.concat(child_node.sampleList);
+ });
}
// 绉婚櫎鏃х殑璁℃暟骞舵坊鍔犳柊鐨勮鏁�
item.group_name = item.group_name.replace(/ \([^)]*\)$/, '') + ` (${item.sampleList.length})`;
--
Gitblit v1.9.3