diff --git a/src/packages/components/Charts/IntegratedEnergy/EnergyConsumptionTrend/config.ts b/src/packages/components/Charts/IntegratedEnergy/EnergyConsumptionTrend/config.ts index d476d39..2411932 100644 --- a/src/packages/components/Charts/IntegratedEnergy/EnergyConsumptionTrend/config.ts +++ b/src/packages/components/Charts/IntegratedEnergy/EnergyConsumptionTrend/config.ts @@ -8,6 +8,7 @@ import * as echarts from 'echarts' export const includes = [] const otherOption = { secneID: '', + titleText:'能源趋势', unit: dataJson.unit, } @@ -17,8 +18,8 @@ const option = { // 添加标题配置 title: { text: '单位:' + otherOption.unit, - left: '3%', - top: '3%', + left: '2%', + top: '2%', textStyle: { fontSize: 12, color: 'rgba(255, 255, 255, 0.7)', diff --git a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/config.ts b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/config.ts index 045e252..182fb02 100644 --- a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/config.ts +++ b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/config.ts @@ -8,6 +8,8 @@ import { chartInitConfig } from '@/settings/designSetting' import costIcon from './assets/cost.svg' import dataJson from './data.json' const otherOption = { + secneID: '', + titleText: '能源总览', gridItems: [ { icon: costIcon, @@ -41,7 +43,7 @@ const otherOption = { } export const option = { ...otherOption, - dataset: dataJson + dataset: dataJson.source } export default class Config extends PublicConfigClass implements CreateComponentType { diff --git a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/data.json b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/data.json index f2aa49a..4abe967 100644 --- a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/data.json +++ b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/data.json @@ -1,6 +1,8 @@ { - "cost": 1000, - "mainsElectricity": 1000, - "waterSupply": 1000, - "gasSupply": 1000 + "source": { + "cost": 1000, + "mainsElectricity": 1000, + "waterSupply": 1000, + "gasSupply": 1000 + } } \ No newline at end of file diff --git a/src/packages/components/Charts/IntegratedEnergy/PowerSupplySystem/config.ts b/src/packages/components/Charts/IntegratedEnergy/PowerSupplySystem/config.ts index 6a48ba0..4bd0fc1 100644 --- a/src/packages/components/Charts/IntegratedEnergy/PowerSupplySystem/config.ts +++ b/src/packages/components/Charts/IntegratedEnergy/PowerSupplySystem/config.ts @@ -17,8 +17,8 @@ const option = { // 添加标题配置 title: { text: '单位:' + otherOption.unit, - left: '3%', - top: '3%', + left: '2%', + top: '2%', textStyle: { fontSize: 12, color: 'rgba(255, 255, 255, 0.7)', diff --git a/src/packages/components/Charts/IntegratedEnergy/index.ts b/src/packages/components/Charts/IntegratedEnergy/index.ts index 93cd485..342f65f 100644 --- a/src/packages/components/Charts/IntegratedEnergy/index.ts +++ b/src/packages/components/Charts/IntegratedEnergy/index.ts @@ -5,9 +5,11 @@ import { FeeOverviewConfig } from "./FeeOverview" import { WaterSupplySystemConfig } from "./WaterSupplySystem" import { AirSupplySystemConfig } from './AirSupplySystem' import { PowerSupplySystemConfig } from './PowerSupplySystem' +import { GasSystemConfig } from './GasSystem' export default [ EnergyOverviewConfig, EnergyConsumptionTrendConfig, ConsumptionProportionConfig, FeeOverviewConfig, - WaterSupplySystemConfig, AirSupplySystemConfig, PowerSupplySystemConfig + WaterSupplySystemConfig, AirSupplySystemConfig, PowerSupplySystemConfig, + GasSystemConfig ] \ No newline at end of file