flx:修改数据顺序
This commit is contained in:
parent
bfec64932c
commit
236ca95619
@ -198,7 +198,7 @@
|
|||||||
@size-change="SizeChange"
|
@size-change="SizeChange"
|
||||||
@current-change="CurrentChange"
|
@current-change="CurrentChange"
|
||||||
:current-page="pagInfo.pageNo"
|
:current-page="pagInfo.pageNo"
|
||||||
:page-sizes="$store.state.PAGESIZRS"
|
:page-sizes="[...$store.state.PAGESIZRS, 200, 500]"
|
||||||
:page-size="pagInfo.pageSize"
|
:page-size="pagInfo.pageSize"
|
||||||
layout="total, sizes, prev, pager, next"
|
layout="total, sizes, prev, pager, next"
|
||||||
:total="Number(pagInfo.total)"
|
:total="Number(pagInfo.total)"
|
||||||
@ -731,27 +731,28 @@ export default {
|
|||||||
}).then((res) => {
|
}).then((res) => {
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
this.operatingRiskDialog = true;
|
this.operatingRiskDialog = true;
|
||||||
|
const resultList = res.result instanceof Array ? res.result.reverse() : [];
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
const params = {
|
const params = {
|
||||||
series: [
|
series: [
|
||||||
{
|
{
|
||||||
name: "焊接电流",
|
name: "焊接电流",
|
||||||
data: res.result.map((item) => item.weldingCurrent),
|
data: resultList.map((item) => item.weldingCurrent),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "焊接电压",
|
name: "焊接电压",
|
||||||
data: res.result.map((item) => item.weldingVoltage),
|
data: resultList.map((item) => item.weldingVoltage),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "预置电压",
|
name: "预置电压",
|
||||||
data: res.result.map((item) => item.presetVoltage),
|
data: resultList.map((item) => item.presetVoltage),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "预置电流",
|
name: "预置电流",
|
||||||
data: res.result.map((item) => item.presetCurrent),
|
data: resultList.map((item) => item.presetCurrent),
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
x: res.result.map((item) => item.uploadTime),
|
x: resultList.map((item) => item.uploadTime),
|
||||||
};
|
};
|
||||||
this.riskTrendLineChartsFn(this.$refs.riskTrendLineCharts, params);
|
this.riskTrendLineChartsFn(this.$refs.riskTrendLineCharts, params);
|
||||||
});
|
});
|
||||||
@ -1222,6 +1223,7 @@ export default {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
isAdd(type, obj) {
|
isAdd(type, obj) {
|
||||||
|
this.tableData = [];
|
||||||
if (type == 1) {
|
if (type == 1) {
|
||||||
this.title = "新增";
|
this.title = "新增";
|
||||||
this.close();
|
this.close();
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user