This commit is contained in:
helloDy
2024-04-26 10:36:29 +08:00
parent 0349f3cde0
commit 6adac714f0
2 changed files with 71 additions and 31 deletions

View File

@@ -1,7 +1,7 @@
<!--
* @Author: Do not edit
* @Date: 2024-04-22 15:49:56
* @LastEditTime: 2024-04-26 10:14:50
* @LastEditTime: 2024-04-26 10:32:29
* @LastEditors: DY
* @Description:
-->
@@ -43,12 +43,16 @@
</el-button>
</el-form>
<base-table
ref="productionDataMonthTable11"
id="productionDataMonthTable1"
:table-props="tableProps"
:table-data="tableData"
:span-method="objectSpanMethod1"
@emitFun="handleEmitFun"
:max-height="tableH" />
<base-table
ref="productionDataMonthTable22"
id="productionDataMonthTable2"
:table-props="tableProps1"
:table-data="tableData1"
:span-method="objectSpanMethod1"
@@ -119,13 +123,15 @@ export default {
prop: 'lineName',
label: '',
fixed: true,
width: 150,
width: 120,
'show-overflow-tooltip': true
},
{
prop: 'paramsName',
label: '',
fixed: true,
width: 150,
width: 120,
'show-overflow-tooltip': true
},
{
prop: 'xc',
@@ -140,13 +146,15 @@ export default {
prop: 'lineName',
label: '',
fixed: true,
width: 150,
width: 120,
'show-overflow-tooltip': true
},
{
prop: 'paramsName',
label: '',
fixed: true,
width: 150,
width: 120,
'show-overflow-tooltip': true,
},
{
prop: 'xc1',
@@ -215,6 +223,9 @@ export default {
}
this.tableData1 = tempData;
this.getSpanArr1(this.tableData1);
this.$nextTick(() => {
this.reTable1();
});
},
// 设置表格数据
buildTableData(data) {
@@ -250,6 +261,15 @@ export default {
}
this.tableData = tempData;
this.getSpanArr(this.tableData);
this.$nextTick(() => {
this.reTable();
});
},
reTable() {
this.$refs.productionDataMonthTable11.doLayout('productionDataMonthTable1');
},
reTable1() {
this.$refs.productionDataMonthTable22.doLayout('productionDataMonthTable2');
},
getSpanArr1(data) {
this.span2 = [];