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 @@
-
+
@@ -20,11 +20,11 @@