diff --git a/src/utils/mergeTableRow.js b/src/utils/mergeTableRow.js index 05f7ebd..c6e2119 100644 --- a/src/utils/mergeTableRow.js +++ b/src/utils/mergeTableRow.js @@ -14,7 +14,12 @@ export function mergeTableRow (config) { mergeColNames.forEach((m) => { const mList = {} data = data.map((v, index) => { - // 区分需要合并行的key值 + // 区分需要合并行的kemergeTableRow({ + // data: this.selectArea ? list.filter(i => (i.equipment_id_equipments_id_relation?.area === this.selectArea)) : list, + // mergeColNames: ["equipment_id_equipments_id_relation.area","equipment_id_equipments_id_relation.name"], // 需要合并的列,默认合并列相同的数据 + // firstMergeColNames: ["equipment_id_equipments_id_relation.area","equipment_id_equipments_id_relation.name"], // 受影响的列,只合并以firstMerge为首的同类型数据 + // firstMerge: "equipment_id", // 以哪列为基础进行合并,一般为第一列 + // });y值 const rowVal = v[firstMerge] + '-' + v[m] // 需要合并行的第二行以及之后行会走if // m === firstMerge 判断需要合并的列是否是基准列,如果是则只满足前面的条件,如果不是则需满足前面+后面的条件 diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index abb5459..afe0fed 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -1,5 +1,9 @@