diff --git a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/config.ts b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/config.ts index bd7b419..045e252 100644 --- a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/config.ts +++ b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/config.ts @@ -3,9 +3,44 @@ import { CreateComponentType } from '@/packages/index.d' import { EnergyOverviewConfig } from './index' import cloneDeep from 'lodash/cloneDeep' import { chartInitConfig } from '@/settings/designSetting' + //导入数据 +import costIcon from './assets/cost.svg' import dataJson from './data.json' +const otherOption = { + gridItems: [ + { + icon: costIcon, + label: '费用', + field: 'cost', + unit: '单位', + valueClass: 'value-cost' + }, + { + icon: costIcon, + label: '市电', + field: 'mainsElectricity', + unit: '单位', + valueClass: 'value-electricity' + }, + { + icon: costIcon, + label: '供水', + field: 'waterSupply', + unit: '单位', + valueClass: 'value-water' + }, + { + icon: costIcon, + label: '燃气', + field: 'gasSupply', + unit: '单位', + valueClass: 'value-gas' + } + ] +} export const option = { + ...otherOption, dataset: dataJson } @@ -13,5 +48,5 @@ export default class Config extends PublicConfigClass implements CreateComponent public key = EnergyOverviewConfig.key public chartConfig = cloneDeep(EnergyOverviewConfig) public option = cloneDeep(option) - public attr = { ...chartInitConfig, x: 0, y: 0, w: 1000, h: 240, zIndex: 1 } + public attr = { ...chartInitConfig, x: 0, y: 0, w: 889, h: 267, zIndex: 1 } } diff --git a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/data.json b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/data.json index 855d1a2..f2aa49a 100644 --- a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/data.json +++ b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/data.json @@ -1,6 +1,6 @@ { - "cost":1000, - "mainsElectricity":1000, - "waterSupply":1000, - "gasSupply":1000 + "cost": 1000, + "mainsElectricity": 1000, + "waterSupply": 1000, + "gasSupply": 1000 } \ No newline at end of file diff --git a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/index.vue b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/index.vue index 5abf40f..4aaf997 100644 --- a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/index.vue +++ b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/index.vue @@ -1,59 +1,48 @@ -