From f4354c5a98c6a3bdb4f355b107e2421848f1426b Mon Sep 17 00:00:00 2001 From: wujingjing <gersonwu@qq.com> Date: 星期三, 13 十一月 2024 17:31:52 +0800 Subject: [PATCH] Merge branches 'test' and 'test' of http://47.103.154.90:83/r/WI/Web.Admin.V1.0 into test --- src/views/project/yw/systemManage/metricAgentMgr/MetricAgentMgr.vue | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/views/project/yw/systemManage/metricAgentMgr/MetricAgentMgr.vue b/src/views/project/yw/systemManage/metricAgentMgr/MetricAgentMgr.vue index 04038e9..c866b04 100644 --- a/src/views/project/yw/systemManage/metricAgentMgr/MetricAgentMgr.vue +++ b/src/views/project/yw/systemManage/metricAgentMgr/MetricAgentMgr.vue @@ -36,13 +36,11 @@ <el-form-item> <el-button icon="ele-Refresh" @click="resetQuery">閲嶇疆 </el-button> </el-form-item> - </el-form> </template> <template #main> <div class="w100 h100"> - <div class="h-full" > - + <div class="h-full"> <el-table v-loading="tableLoading" ref="draggableTableRef" @@ -129,10 +127,10 @@ import LeftTreeByMgr from '/@/components/tree/leftTreeByMgr.vue'; import { useQueryTable } from '/@/hooks/useQueryTable'; import { useSearch } from '/@/hooks/useSearch'; -import { useCompRef } from '/@/utils/types'; -import { convertListToTree, debounce } from '/@/utils/util'; -import { OptClassificationMap, classificationEnum } from '/@/views/types/metrics'; import { gotoRoute } from '/@/utils/route'; +import { useCompRef } from '/@/utils/types'; +import { convertListToTree, debounce, travelTree } from '/@/utils/util'; +import { OptClassificationMap, classificationEnum } from '/@/views/types/metrics'; //#region ====================== 宸︿晶鏍戞暟鎹紝tree init ====================== const leftTreeRef = useCompRef(LeftTreeByMgr); const treeLoading = ref(false); @@ -181,6 +179,10 @@ const isDragStatus = ref(false); const metricStatus = ref(false); const allTableData = ref(null); +const getLenById = (data: any[], id: string, value: any) => { + return data.filter((item) => item.agent_group === id || value.children?.some((treeItem) => treeItem.group_id === item.agent_group)) + .length; +}; const getTableData = async () => { if (!allTableData.value) { const res = await metricApi.getMetricAgentListByPost(); @@ -188,6 +190,10 @@ item.create_time = item.create_time?.slice(0, 10); return item; }); + travelTree(listTreeData.value, (value, index, array, parent) => { + const len = getLenById(allTableData.value, value.group_id, value); + value.group_name = `${value.group_name} (${len})`; + }); } tableData.value = allTableData.value; }; -- Gitblit v1.9.3