projects/mes-test #132

Manually merged
gtz217 merged 281 commits from projects/mes-test into projects/mes 2023-11-30 09:11:34 +08:00
3 changed files with 44 additions and 23 deletions
Showing only changes of commit 9ed4c944c5 - Show all commits

View File

@ -63,8 +63,7 @@ export default {
],
},
yAxis: {
// todo
name: '产线TT',
name: ['设备CT', '设备TT', '产线CT', '产线TT'][this.activeIndex],
nameLocation: 'end',
nameGap: 28,
nameTextStyle: {
@ -136,7 +135,11 @@ export default {
symbolSize: 8,
data: this.getListFromTableRow(row, '_eq_ct'),
}));
this.chart.setOption({ ...this.templateOption, series: eqCt });
this.chart.setOption({
...this.templateOption,
yAxis: { ...this.templateOption.yAxis, name: '设备CT' },
series: eqCt,
});
break;
case 1:
const eqTt = this.tableData.map((row) => ({
@ -146,7 +149,11 @@ export default {
symbolSize: 8,
data: this.getListFromTableRow(row, '_eq_tt'),
}));
this.chart.setOption({ ...this.templateOption, series: eqTt });
this.chart.setOption({
...this.templateOption,
yAxis: { ...this.templateOption.yAxis, name: '设备TT' },
series: eqTt,
});
break;
case 2:
const plCt = this.tableData.map((row) => ({
@ -156,7 +163,11 @@ export default {
symbolSize: 8,
data: this.getListFromTableRow(row, '_pl_ct'),
}));
this.chart.setOption({ ...this.templateOption, series: plCt });
this.chart.setOption({
...this.templateOption,
yAxis: { ...this.templateOption.yAxis, name: '产线CT' },
series: plCt,
});
break;
case 3:
const plTt = this.tableData.map((row) => ({
@ -166,7 +177,11 @@ export default {
symbolSize: 8,
data: this.getListFromTableRow(row, '_pl_tt'),
}));
this.chart.setOption({ ...this.templateOption, series: plTt });
this.chart.setOption({
...this.templateOption,
yAxis: { ...this.templateOption.yAxis, name: '产线TT' },
series: plTt,
});
break;
default:
const eqCt2 = this.tableData.map((row) => ({
@ -176,7 +191,11 @@ export default {
symbolSize: 8,
data: this.getListFromTableRow(row, '_eq_ct'),
}));
this.chart.setOption({ ...this.templateOption, series: eqCt2 });
this.chart.setOption({
...this.templateOption,
yAxis: { ...this.templateOption.yAxis, name: '设备CT' },
series: eqCt2,
});
}
},
},

View File

@ -80,6 +80,8 @@
<el-select
v-if="open"
style="width: 100%"
filterable
clearable
v-model="queryParams.equipmentId"
placeholder="请选择一个设备">
<el-option

View File

@ -115,12 +115,12 @@ export default {
vm.$set(
vm.searchBarFormConfig[0],
'defaultSelect',
to.params.equipmentCode
to.params.equipmentName
);
vm.$set(
vm.searchBarFormConfig[1],
'defaultSelect',
to.params.equipmentName
to.params.equipmentCode
);
vm.handleQuery();
});