能源类型

src/views/energy/monitoring/energyReport/index.vue

@@ -56,6 +56,7 @@ const tableProps = [
 	{
 		prop: 'energyType',
 		label: '能源类型',
+		filter: publicFormatter('energy_type'),
 	},
 	{
 		prop: 'startNum',
@@ -79,6 +80,7 @@ export default {
 				{
 					type: 'select',
 					label: '能源类型',
+					labelField: 'labelName',
 					selectOptions: [],
 					param: 'energyTypeId',
 					filterable: true,