diff --git a/src/components/LineWithKPI.jsx b/src/components/LineWithKPI.jsx index 3eb4294..77191bf 100644 --- a/src/components/LineWithKPI.jsx +++ b/src/components/LineWithKPI.jsx @@ -57,7 +57,10 @@ export default observer((props) => { name: ele, value: ele, marker: { symbol: ele.includes(' ') ? 'hyphen' : 'circle', style: { fill: colorSets[ele], stroke: colorSets[ele?.split(' ')?.[0]], r: 3, lineWidth: 2, color: colorSets[ele] } }, - })), + })).sort(sortBy('name')), + }, + tooltip: { + customItems: (items) => items.sort(sortBy('name')), }, // annotations: [ // // 低于 0 颜色变化 diff --git a/src/views/Home.jsx b/src/views/Home.jsx index 1ecb837..65a5105 100644 --- a/src/views/Home.jsx +++ b/src/views/Home.jsx @@ -54,6 +54,7 @@ export default observer(() => { const groupType = _overviewFlag ? 'overview' : 'dept'; queryData.groupType = groupType; setGroupTypeVal(groupType); + setDiffGroupKey('overview'); TradeStore.resetData(); TradeStore.fetchSummaryData(Object.assign({}, queryData, { groupType })); TradeStore.fetchTradeDataByDate(queryData); @@ -169,7 +170,7 @@ export default observer(() => { }; const [diffGroupKey, setDiffGroupKey] = useState(groupKey); const handleChangeDiffType = ({ target: { value } }) => { - console.log('diffGroupKey', diffGroupKey, value); + // console.log('diffGroupKey', diffGroupKey, value); setDiffGroupKey(value); TradeStore.setGroupKey(value); if (!isEmpty(TradeStore.searchPayloadHome)) {