|
|
|
|
@ -57,13 +57,13 @@ const calcSummaryRow = (data1, data2) => {
|
|
|
|
|
return xSummary;
|
|
|
|
|
};
|
|
|
|
|
const calcSummaryUniqueRow = (_data1, _data2, rawData = [[], []]) => {
|
|
|
|
|
console.log('calcSummaryRow', _data1, _data2, rawData);
|
|
|
|
|
// console.log('calcSummaryRow', _data1, _data2, rawData);
|
|
|
|
|
const uniqueKeysData1 = unique(_data1.reduce((a, r) => a.concat(r.key.split('_').reduce((a1, r1) => a1.concat(r1.split('@')[0]), [])), [])).map(x => Number(x));
|
|
|
|
|
const uniqueKeysData2 = unique(_data2.reduce((a, r) => a.concat(r.key.split('_').reduce((a1, r1) => a1.concat(r1.split('@')[0]), [])), [])).map(x => Number(x));
|
|
|
|
|
console.log(uniqueKeysData1, uniqueKeysData2);
|
|
|
|
|
// console.log(uniqueKeysData1, uniqueKeysData2);
|
|
|
|
|
const data1 = rawData[0].filterHasOld.filter(row => uniqueKeysData1.includes((row.key)));
|
|
|
|
|
const data2 = rawData[1].filterHasOld.filter(row => uniqueKeysData2.includes((row.key)));
|
|
|
|
|
console.log(data1, data2);
|
|
|
|
|
// console.log(data1, data2);
|
|
|
|
|
|
|
|
|
|
const xSummary = data1.reduce((r, v) => {
|
|
|
|
|
r.SumOrder += 1;
|
|
|
|
|
|