Merge branch 'master' of http://119.45.132.149:3000/security/go-view-fetch
This commit is contained in:
commit
e407f06c66
@ -1,5 +1,5 @@
|
||||
import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public'
|
||||
import { LineGradientsConfig } from './index'
|
||||
import { CarbonEmissionConfig } from './index'
|
||||
import { CreateComponentType } from '@/packages/index.d'
|
||||
import { graphic } from 'echarts/core'
|
||||
import { defaultTheme, chartColorsSearch } from '@/settings/chartThemes/index'
|
||||
@ -131,8 +131,8 @@ const option = {
|
||||
}
|
||||
|
||||
export default class Config extends PublicConfigClass implements CreateComponentType {
|
||||
public key: string = LineGradientsConfig.key
|
||||
public chartConfig = cloneDeep(LineGradientsConfig)
|
||||
public key: string = CarbonEmissionConfig.key
|
||||
public chartConfig = cloneDeep(CarbonEmissionConfig)
|
||||
// 图表配置项
|
||||
public option = echartOptionProfixHandle(option, includes)
|
||||
}
|
@ -1,14 +1,14 @@
|
||||
import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
|
||||
import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
|
||||
|
||||
export const LineGradientsConfig: ConfigType = {
|
||||
key: 'LineGradients',
|
||||
chartKey: 'VLineGradients',
|
||||
conKey: 'VCLineGradients',
|
||||
export const CarbonEmissionConfig: ConfigType = {
|
||||
key: 'CarbonEmission',
|
||||
chartKey: 'VCarbonEmission',
|
||||
conKey: 'VCCarbonEmission',
|
||||
title: '碳排放',
|
||||
category: ChatCategoryEnum.IntegratedEnergy,
|
||||
categoryName: ChatCategoryEnumName.IntegratedEnergy,
|
||||
package: PackagesCategoryEnum.CHARTS,
|
||||
chartFrame: ChartFrameEnum.ECHARTS,
|
||||
image: 'line_gradient.png'
|
||||
image: 'carbon_emission.png'
|
||||
}
|
@ -6,11 +6,11 @@ import { WaterSupplySystemConfig } from "./WaterSupplySystem"
|
||||
import { AirSupplySystemConfig } from './AirSupplySystem'
|
||||
import { PowerSupplySystemConfig } from './PowerSupplySystem'
|
||||
import { GasSystemConfig } from './GasSystem'
|
||||
import { LineGradientsConfig } from './LineGradients'
|
||||
import { CarbonEmissionConfig } from './CarbonEmission'
|
||||
export default [
|
||||
EnergyOverviewConfig, EnergyConsumptionTrendConfig,
|
||||
ConsumptionProportionConfig,
|
||||
FeeOverviewConfig,
|
||||
WaterSupplySystemConfig, AirSupplySystemConfig, PowerSupplySystemConfig,
|
||||
GasSystemConfig,LineGradientsConfig
|
||||
GasSystemConfig,CarbonEmissionConfig
|
||||
]
|
||||
|
Loading…
Reference in New Issue
Block a user