diff --git a/src/stores/Trade.js b/src/stores/Trade.js index c1bea7d..88c0e4b 100644 --- a/src/stores/Trade.js +++ b/src/stores/Trade.js @@ -61,10 +61,9 @@ class Trade { Object.assign(queryData, { groupDateType: this.timeLineKey }); this.fetchTradeData(queryData).then((json) => { if (json.errcode === 0) { + const data = json.result1.sort(sortBy('groupDateVal')); runInAction(() => { - const data = json.result1; // 标注KPI - this.timeData.loading = false; this.timeData.dataSource = data; }); @@ -80,8 +79,8 @@ class Trade { Object.assign(queryData, { groupType: 'bu', groupDateType: 'year' }); this.fetchTradeData(queryData).then((json) => { if (json.errcode === 0) { + const data = json.result1; runInAction(() => { - const data = json.result1; // 标注KPI this.BuData.loading = false; @@ -117,14 +116,14 @@ class Trade { Object.assign(queryData, { groupType: 'bizarea', groupDateType: 'month' }); this.fetchTradeData(queryData).then((json) => { if (json.errcode === 0) { + const sortResult = json.result1.sort(sortBy('groupDateVal')); + const groupsData = sortResult.reduce((r, v) => { + if (v.groupsLabel ) { // && ['91001', '91006'].includes(v.groupsKey) + (r[v.groupsLabel] || (r[v.groupsLabel] = [])).push(v); + } + return r; + }, {}); runInAction(() => { - const sortResult = json.result1.sort(sortBy('groupDateVal')); - const groupsData = sortResult.reduce((r, v) => { - if (v.groupsLabel ) { // && ['91001', '91006'].includes(v.groupsKey) - (r[v.groupsLabel] || (r[v.groupsLabel] = [])).push(v); - } - return r; - }, {}); this.sideData.loading = false; this.sideData.dataSource = groupsData; this.sideData.monthData = sortResult;