diff --git a/src/packages/components/Charts/IntegratedEnergy/CarbonEmission/config.ts b/src/packages/components/Charts/IntegratedEnergy/CarbonEmission/config.ts
index 026dbb4..6e93879 100644
--- a/src/packages/components/Charts/IntegratedEnergy/CarbonEmission/config.ts
+++ b/src/packages/components/Charts/IntegratedEnergy/CarbonEmission/config.ts
@@ -6,10 +6,17 @@ 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'
+import {chartInitConfig} from "@/settings/designSetting";
export const includes = ['xAxis', 'yAxis']
+const otherOption = {
+ sceneCode: '',
+ titleText: '碳排放',
+ unit: dataJson.unit,
+}
const option = {
+ ...otherOption,
grid: {
left: '3%',
right: '4%',
@@ -59,22 +66,50 @@ const option = {
}
},
xAxis: {
- show: true,
- type: 'category'
- },
- yAxis: {
- show: true,
- type: 'value',
- name: '单位:万/kwh',
- nameGap: 30,
+ type: 'category',
axisLine: {
+ lineStyle: {
+ color: 'rgba(255, 255, 255, 0.1)',
+ }
+ },
+ axisTick: {
show: false
},
- splitLine: {
+ //
+ axisLabel: {
+ color: '#eee',
+ interval: 0,
+ fontSize: 9,
+ margin: 20
+ }
+
+ },
+ // name: '单位:万/kwh',
+ yAxis: {
+ type: 'value',
+ min: 0,
+ interval: 25,
+ name: '单位:万/kwh',
+ nameTextStyle:{
+ color: 'rgba(255, 255, 255, 0.8)',
+ },
+ axisLine: {
show: true,
lineStyle: {
- type: 'dashed',
- opacity: 0.5
+ color: 'rgba(255, 255, 255, 0.1)',
+ }
+ },
+ axisTick: {
+ show: false
+ },
+ axisLabel: {
+ color: 'rgba(255, 255, 255, 0.8)',
+ formatter: '{value}'
+ },
+ splitLine: {
+ lineStyle: {
+ color: 'rgba(255, 255, 255, 0.1)',
+ type: 'solid'
}
}
},
@@ -149,4 +184,5 @@ export default class Config extends PublicConfigClass implements CreateComponent
public chartConfig = cloneDeep(CarbonEmissionConfig)
// 图表配置项
public option = echartOptionProfixHandle(option, includes)
+ public attr = { ...chartInitConfig, x: 0, y: 0, w: 450, h: 320, zIndex: 1 }
}
diff --git a/src/packages/components/Charts/IntegratedEnergy/CarbonEmission/data.json b/src/packages/components/Charts/IntegratedEnergy/CarbonEmission/data.json
index 8977344..3db2006 100644
--- a/src/packages/components/Charts/IntegratedEnergy/CarbonEmission/data.json
+++ b/src/packages/components/Charts/IntegratedEnergy/CarbonEmission/data.json
@@ -3,63 +3,64 @@
"source": [
{
"月份": "1月",
- "电": 120,
- "燃气": 130
+ "电": 20,
+ "燃气": 30
},
{
"月份": "2月",
- "电": 200,
- "燃气": 130
+ "电": 66,
+ "燃气": 30
},
{
"月份": "3月",
- "电": 150,
- "燃气": 312
+ "电": 50,
+ "燃气": 12
},
{
"月份": "4月",
- "电": 80,
- "燃气": 268
+ "电": 8,
+ "燃气": 68
},
{
"月份": "5月",
- "电": 70,
- "燃气": 155
+ "电": 7,
+ "燃气": 55
},
{
"月份": "6月",
- "电": 110,
- "燃气": 117
+ "电": 10,
+ "燃气": 17
},
{
"月份": "7月",
- "电": 130,
- "燃气": 160
+ "电": 30,
+ "燃气": 60
},
{
"月份": "8月",
- "电": 130,
- "燃气": 160
+ "电": 84,
+ "燃气": 60
},
{
"月份": "9月",
- "电": 130,
- "燃气": 160
+ "电": 30,
+ "燃气": 50
},
{
"月份": "10月",
- "电": 130,
- "燃气": 160
+ "电": 22,
+ "燃气": 16
},
{
"月份": "11月",
- "电": 130,
- "燃气": 160
+ "电": 45,
+ "燃气": 54
},
{
"月份": "12月",
- "电": 130,
- "燃气": 160
+ "电": 13,
+ "燃气": 16
}
- ]
+ ],
+ "unit": "万kwh"
}
diff --git a/src/packages/components/Charts/IntegratedEnergy/CarbonEmission/index.vue b/src/packages/components/Charts/IntegratedEnergy/CarbonEmission/index.vue
index ea67334..5d52fa2 100644
--- a/src/packages/components/Charts/IntegratedEnergy/CarbonEmission/index.vue
+++ b/src/packages/components/Charts/IntegratedEnergy/CarbonEmission/index.vue
@@ -1,9 +1,16 @@
-
+
+
+
+
+
+