diff --git a/src/packages/components/Charts/IntegratedEnergy/LineGradients/config.ts b/src/packages/components/Charts/IntegratedEnergy/CarbonEmission/config.ts similarity index 77% rename from src/packages/components/Charts/IntegratedEnergy/LineGradients/config.ts rename to src/packages/components/Charts/IntegratedEnergy/CarbonEmission/config.ts index 1aa7f5e..026dbb4 100644 --- a/src/packages/components/Charts/IntegratedEnergy/LineGradients/config.ts +++ b/src/packages/components/Charts/IntegratedEnergy/CarbonEmission/config.ts @@ -1,39 +1,52 @@ 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' import cloneDeep from 'lodash/cloneDeep' import dataJson from './data.json' +import { fontStyle } from 'html2canvas/dist/types/css/property-descriptors/font-style' -export const includes = [ 'xAxis', 'yAxis', 'grid'] +export const includes = ['xAxis', 'yAxis'] const option = { + grid: { + left: '3%', + right: '4%', + bottom: '3%', + top: '15%', + containLabel: true + }, legend: { show: true, - top:'20', - right:'50', - itemStyle:{ + top: '20', + right: '50', + itemStyle: { borderType: 'dotted' }, lineStyle: { - type:'dashed', - cap:'round', - opacity:0.9, + type: 'dashed', + cap: 'round', + opacity: 0.9, }, // icon: 'rect', - data:[{ + data: [{ name: '电', // 强制设置图形为圆。 icon: 'rect', - itemStyle:{ + itemStyle: { color: 'rgba(12, 109, 196,1)' + }, textStyle: { + color: '#eee' }, - },{ + }, { name: '燃气', + textStyle: { + color: '#eee' + }, // 强制设置图形为圆。 icon: 'rect', - itemStyle:{ + itemStyle: { color: 'rgba(48, 189, 104,1)' }, }], @@ -53,21 +66,22 @@ const option = { show: true, type: 'value', name: '单位:万/kwh', - nameGap:30, - axisLine:{ + nameGap: 30, + axisLine: { show: false }, - splitLine:{ + splitLine: { show: true, - lineStyle:{ + lineStyle: { type: 'dashed', - opacity:0.5 + opacity: 0.5 } } }, dataset: { ...dataJson }, series: [ { + type: 'line', smooth: true, symbolSize: 0, //设定实心点的大小 @@ -131,8 +145,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) } diff --git a/src/packages/components/Charts/IntegratedEnergy/CarbonEmission/config.vue b/src/packages/components/Charts/IntegratedEnergy/CarbonEmission/config.vue new file mode 100644 index 0000000..736d3ab --- /dev/null +++ b/src/packages/components/Charts/IntegratedEnergy/CarbonEmission/config.vue @@ -0,0 +1,63 @@ + + + diff --git a/src/packages/components/Charts/IntegratedEnergy/LineGradients/data.json b/src/packages/components/Charts/IntegratedEnergy/CarbonEmission/data.json similarity index 100% rename from src/packages/components/Charts/IntegratedEnergy/LineGradients/data.json rename to src/packages/components/Charts/IntegratedEnergy/CarbonEmission/data.json diff --git a/src/packages/components/Charts/IntegratedEnergy/LineGradients/index.ts b/src/packages/components/Charts/IntegratedEnergy/CarbonEmission/index.ts similarity index 68% rename from src/packages/components/Charts/IntegratedEnergy/LineGradients/index.ts rename to src/packages/components/Charts/IntegratedEnergy/CarbonEmission/index.ts index 0c33b64..2e6e750 100644 --- a/src/packages/components/Charts/IntegratedEnergy/LineGradients/index.ts +++ b/src/packages/components/Charts/IntegratedEnergy/CarbonEmission/index.ts @@ -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' } diff --git a/src/packages/components/Charts/IntegratedEnergy/LineGradients/index.vue b/src/packages/components/Charts/IntegratedEnergy/CarbonEmission/index.vue similarity index 100% rename from src/packages/components/Charts/IntegratedEnergy/LineGradients/index.vue rename to src/packages/components/Charts/IntegratedEnergy/CarbonEmission/index.vue diff --git a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/assets/cost.png b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/assets/cost.png new file mode 100644 index 0000000..2966772 Binary files /dev/null and b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/assets/cost.png differ diff --git a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/assets/cost.svg b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/assets/cost.svg deleted file mode 100644 index ff1efa1..0000000 --- a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/assets/cost.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/assets/gasSupply.png b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/assets/gasSupply.png new file mode 100644 index 0000000..41d7853 Binary files /dev/null and b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/assets/gasSupply.png differ diff --git a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/assets/gasSupply.svg b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/assets/gasSupply.svg deleted file mode 100644 index ff1efa1..0000000 --- a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/assets/gasSupply.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/assets/mainsElectricity.png b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/assets/mainsElectricity.png new file mode 100644 index 0000000..88ef871 Binary files /dev/null and b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/assets/mainsElectricity.png differ diff --git a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/assets/mainsElectricity.svg b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/assets/mainsElectricity.svg deleted file mode 100644 index ff1efa1..0000000 --- a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/assets/mainsElectricity.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/assets/waterSupply.png b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/assets/waterSupply.png new file mode 100644 index 0000000..916e8c2 Binary files /dev/null and b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/assets/waterSupply.png differ diff --git a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/assets/waterSupply.svg b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/assets/waterSupply.svg deleted file mode 100644 index ff1efa1..0000000 --- a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/assets/waterSupply.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/config.ts b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/config.ts index 60120be..5a121cd 100644 --- a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/config.ts +++ b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/config.ts @@ -5,7 +5,10 @@ import cloneDeep from 'lodash/cloneDeep' import { chartInitConfig } from '@/settings/designSetting' //导入数据 -import costIcon from './assets/cost.svg' +import costIcon from './assets/cost.png' +import gasIcon from './assets/gasSupply.png' +import EleIcon from './assets/mainsElectricity.png' +import watIcon from './assets/waterSupply.png' import dataJson from './data.json' const otherOption = { sceneCode: '', @@ -19,21 +22,21 @@ const otherOption = { valueClass: 'value-cost' }, { - icon: costIcon, + icon: EleIcon, label: '市电', field: 'mainsElectricity', unit: '单位', valueClass: 'value-electricity' }, { - icon: costIcon, + icon: watIcon, label: '供水', field: 'waterSupply', unit: '单位', valueClass: 'value-water' }, { - icon: costIcon, + icon: gasIcon, label: '燃气', field: 'gasSupply', unit: '单位', @@ -50,5 +53,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: 889, h: 267, zIndex: 1 } + public attr = { ...chartInitConfig, x: 0, y: 0, w: 900, h: 310, zIndex: 1 } } diff --git a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/index.vue b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/index.vue index 4aaf997..ddc1c7b 100644 --- a/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/index.vue +++ b/src/packages/components/Charts/IntegratedEnergy/EnergyOverview/index.vue @@ -1,7 +1,7 @@ diff --git a/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/config.ts b/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/config.ts new file mode 100644 index 0000000..dac61b7 --- /dev/null +++ b/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/config.ts @@ -0,0 +1,27 @@ +import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public'; +import { PowerConsumptionRankingSystemConfig } from './index'; +import { CreateComponentType } from '@/packages/index.d'; +import cloneDeep from 'lodash/cloneDeep'; +import { chartInitConfig } from '@/settings/designSetting'; +import dataJson from './data.json' + +export const option = { + // 进行时效果 + processing: true, + // 渐变颜色 + color: '#23ffe2', + color2: '#0f86eb', + // 轨道颜色 + railColor: '#09222e', + railBorderColor: '#0d5f68', + borderRadius: 50, + railWidth: 60, + dataset: dataJson +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = PowerConsumptionRankingSystemConfig.key + public attr = { ...chartInitConfig, w: 450, h: 320, zIndex: 1 } + public chartConfig = cloneDeep(PowerConsumptionRankingSystemConfig) + public option = cloneDeep(option) +} \ No newline at end of file diff --git a/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/config.vue b/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/config.vue new file mode 100644 index 0000000..7d63c81 --- /dev/null +++ b/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/config.vue @@ -0,0 +1,42 @@ + + + diff --git a/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/data.json b/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/data.json new file mode 100644 index 0000000..aef3fae --- /dev/null +++ b/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/data.json @@ -0,0 +1,33 @@ +[ + { + "name": "产线名称1", + "value": 40000, + "percentage": 60, + "unit":"/kwh" + }, + { + "name": "产线名称2", + "value": 34000, + "percentage": 40, + "unit":"/kwh" + + }, + { + "name": "产线名称3", + "value": 30000, + "percentage": 60, + "unit":"/kwh" + }, + { + "name": "产线名称4", + "value": 28000, + "percentage": 50, + "unit":"/kwh" + }, + { + "name": "产线名称5", + "value": 25000, + "percentage": 60, + "unit":"/kwh" + } +] diff --git a/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/images/左3条_03.png b/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/images/左3条_03.png new file mode 100644 index 0000000..ca996af Binary files /dev/null and b/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/images/左3条_03.png differ diff --git a/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/images/排行底1_03.png b/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/images/排行底1_03.png new file mode 100644 index 0000000..68e58e8 Binary files /dev/null and b/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/images/排行底1_03.png differ diff --git a/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/images/排行底2_03.png b/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/images/排行底2_03.png new file mode 100644 index 0000000..412d043 Binary files /dev/null and b/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/images/排行底2_03.png differ diff --git a/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/images/背景框_03.png b/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/images/背景框_03.png new file mode 100644 index 0000000..50fd403 Binary files /dev/null and b/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/images/背景框_03.png differ diff --git a/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/index.ts b/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/index.ts new file mode 100644 index 0000000..11ca656 --- /dev/null +++ b/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/index.ts @@ -0,0 +1,22 @@ +// 公共类型声明 +import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' +// 当前[信息模块]分类声明 +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' + +export const PowerConsumptionRankingSystemConfig: ConfigType = { + // 唯一key + key: 'PowerConsumptionRankingSystem', + // 图表组件渲染 Components 格式: V + key + chartKey: 'VPowerConsumptionRankingSystem', + // 配置组件渲染 Components 格式: VC + key + conKey: 'VCPowerConsumptionRankingSystem', + // 名称 + title: '用电量排行', + // 子分类目录 + category: ChatCategoryEnum.IntegratedEnergy, + categoryName: ChatCategoryEnumName.IntegratedEnergy, + // 包分类 + package: PackagesCategoryEnum.CHARTS, + // 图片 + image: 'PowerConsumptionRankingSystem.png' +} \ No newline at end of file diff --git a/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/index.vue b/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/index.vue new file mode 100644 index 0000000..1fb721b --- /dev/null +++ b/src/packages/components/Charts/IntegratedEnergy/PowerConsumptionRankingSystem/index.vue @@ -0,0 +1,245 @@ + + + + + \ No newline at end of file diff --git a/src/packages/components/Charts/IntegratedEnergy/index.ts b/src/packages/components/Charts/IntegratedEnergy/index.ts index 14d753f..7c7429d 100644 --- a/src/packages/components/Charts/IntegratedEnergy/index.ts +++ b/src/packages/components/Charts/IntegratedEnergy/index.ts @@ -6,12 +6,12 @@ import { WaterSupplySystemConfig } from "./WaterSupplySystem" import { AirSupplySystemConfig } from './AirSupplySystem' import { PowerSupplySystemConfig } from './PowerSupplySystem' import { GasSystemConfig } from './GasSystem' -import { LineGradientsConfig } from './LineGradients' -import { ConstructionIndexConfig } from './ConstructionIndex' +import { ConstructionIndexConfig } from './ConstructionIndex' +import { CarbonEmissionConfig } from './CarbonEmission' export default [ - EnergyOverviewConfig, EnergyConsumptionTrendConfig, - ConsumptionProportionConfig, - FeeOverviewConfig, - WaterSupplySystemConfig, AirSupplySystemConfig, PowerSupplySystemConfig, - GasSystemConfig, LineGradientsConfig, ConstructionIndexConfig + EnergyOverviewConfig, EnergyConsumptionTrendConfig, + ConsumptionProportionConfig, + FeeOverviewConfig, + WaterSupplySystemConfig, AirSupplySystemConfig, PowerSupplySystemConfig, + GasSystemConfig,CarbonEmissionConfig,ConstructionIndexConfig ]