diff --git a/src/utils/tools.js b/src/utils/tools.js index edab016a..8f0017ac 100644 --- a/src/utils/tools.js +++ b/src/utils/tools.js @@ -950,8 +950,10 @@ export async function combinDrilldownTableWithUserConfig () { tableConfig.hiddenColumns = newTableConfig.hiddenColumns tableConfig.tabs.forEach(tab => { const newTab = newTableConfig.tabs.find(newTab => newTab.name === tab.name) - tab.hiddenDrilldownTabs = newTab.hiddenDrilldownTabs - tab.checked = newTab.checked + if (newTab) { + tab.hiddenDrilldownTabs = newTab.hiddenDrilldownTabs + tab.checked = newTab.checked + } }) } }) diff --git a/src/views/charts2/charts/options/echartOption.js b/src/views/charts2/charts/options/echartOption.js index 24acc21f..8afc3cce 100644 --- a/src/views/charts2/charts/options/echartOption.js +++ b/src/views/charts2/charts/options/echartOption.js @@ -186,7 +186,7 @@ export const stackedLineChartOption = { xAxis: [ { type: 'time', - splitNumber: 12 + splitNumber: 8 // axisLabel: { // formatter: function (value) { // const data = new Date(value) @@ -243,7 +243,7 @@ export const linkTrafficLineChartOption = { xAxis: [ { type: 'time', - splitNumber: 12 + splitNumber: 8 // axisLabel: { // formatter: function (value) { // const data = new Date(value) @@ -406,7 +406,7 @@ export const trafficLineChartOption = { xAxis: [ { type: 'time', - splitNumber: 12 + splitNumber: 8 // axisLabel: { // formatter: function (value) { // const data = new Date(value) @@ -496,7 +496,7 @@ export const stackedBarChartOption = { xAxis: { type: 'time', boundaryGap: ['1%', '3%'], - splitNumber: 12, + splitNumber: 8, axisLine: { show: false },