能源

src/views/energy/base/energyQuantityManual/index.vue

@@ -52,12 +52,12 @@ import { publicFormatter } from '@/utils/dict';
 import { parseTimeTable } from '@/utils/ruoyi';
 import EnergyQuantityManualAdd from './components/energyQuantityManualAdd';
 import moment from 'moment';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
 	{
-		prop: 'energyType',
+		prop: 'energyTypeLabel',
 		label: '能源类型',
 		minWidth: 110,
-		filter: publicFormatter('energy_type'),
 		showOverflowtooltip: true,
 	},
 	{
@@ -142,7 +142,6 @@ export default {
 				},
 			],
 			tableProps,
-			tableH: this.tableHeight(260),
 			// 总条数
 			total: 0,
 			// 班次基础信息列表
@@ -181,10 +180,8 @@ export default {
 		};
 	},
 	components: { EnergyQuantityManualAdd },
+	mixins: [tableHeightMixin],
 	created() {
-		window.addEventListener('resize', () => {
-			this.tableH = this.tableHeight(260);
-		});
 		let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf();
 		let start = moment(
 			moment().subtract(7, 'days').format('YYYY-MM-DD 00:00:00')
@@ -244,6 +241,11 @@ export default {
 								? item.amount.toFixed(2)
 								: ''
 							: '';
+						this.getDictDatas('energy_type').map((subItem) => {
+							if (item.energyType === subItem.value) {
+								item.energyTypeLabel = subItem.label;
+							}
+						});
 					});
 				this.list = arr;
 				this.total = response.data.total;
@@ -305,7 +307,7 @@ export default {
 		handleDelete(row) {
 			console.log(row.id);
 			this.$modal
-				.confirm('是否确认删除能源类型为"' + row.energyType + '"的数据项?')
+				.confirm('是否确认删除能源类型为"' + row.energyTypeLabel + '"的数据项?')
 				.then(function () {
 					return energyQuantityManualDelete({ id: row.id });
 				})