diff --git a/src/components/entities/EntityList.vue b/src/components/entities/EntityList.vue index d8aa77a3..ea95d659 100644 --- a/src/components/entities/EntityList.vue +++ b/src/components/entities/EntityList.vue @@ -126,7 +126,8 @@ import { get } from '@/utils/http' import { api } from '@/utils/api' import * as echarts from 'echarts' -import { getChartColor, entityListLineOption } from '@/views/charts/charts/chart-options' +import { entityListLineOption } from '@/views/charts/charts/chart-options' +import { getChartColor } from '@/views/charts/charts/tools' import { legendMapping } from '@/views/charts/charts/chart-table-title' import unitConvert from '@/utils/unit-convert' import { unitTypes } from '@/utils/constants' diff --git a/src/utils/constants.js b/src/utils/constants.js index 97dd5ef9..022df4de 100644 --- a/src/utils/constants.js +++ b/src/utils/constants.js @@ -170,6 +170,11 @@ export const detectionPageType = { performanceEvent: 'performanceEvent' } +export const chartColor = ['#5370C6', '#90CC74', '#FAC858', '#EE6666', + '#73BFDE', '#3BA172', '#FC8452', '#9960B4', + '#E97CCC', '#FEA69E', '#0F8AB2', '#57CBAC', + '#5888BC', '#63B6AC', '#EDC6B2', '#D5746B'] + export const iso36112 = { [storageKey.iso36112Capital]: 'data/countriesWithCapital', [storageKey.iso36112WorldLow]: 'worldChinaLow', diff --git a/src/views/charts/charts/ChartEchartWithStatistics.vue b/src/views/charts/charts/ChartEchartWithStatistics.vue index d9991eff..a50f5b3b 100644 --- a/src/views/charts/charts/ChartEchartWithStatistics.vue +++ b/src/views/charts/charts/ChartEchartWithStatistics.vue @@ -6,14 +6,10 @@