diff --git a/src/views/projectFront/weldingManage/weldingRecord.vue b/src/views/projectFront/weldingManage/weldingRecord.vue index ff3dd285..aecb686f 100644 --- a/src/views/projectFront/weldingManage/weldingRecord.vue +++ b/src/views/projectFront/weldingManage/weldingRecord.vue @@ -198,7 +198,7 @@ @size-change="SizeChange" @current-change="CurrentChange" :current-page="pagInfo.pageNo" - :page-sizes="$store.state.PAGESIZRS" + :page-sizes="[...$store.state.PAGESIZRS, 200, 500]" :page-size="pagInfo.pageSize" layout="total, sizes, prev, pager, next" :total="Number(pagInfo.total)" @@ -731,27 +731,28 @@ export default { }).then((res) => { if (res.code == 200) { this.operatingRiskDialog = true; + const resultList = res.result instanceof Array ? res.result.reverse() : []; this.$nextTick(() => { const params = { series: [ { name: "焊接电流", - data: res.result.map((item) => item.weldingCurrent), + data: resultList.map((item) => item.weldingCurrent), }, { name: "焊接电压", - data: res.result.map((item) => item.weldingVoltage), + data: resultList.map((item) => item.weldingVoltage), }, { name: "预置电压", - data: res.result.map((item) => item.presetVoltage), + data: resultList.map((item) => item.presetVoltage), }, { 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); }); @@ -1222,6 +1223,7 @@ export default { }); }, isAdd(type, obj) { + this.tableData = []; if (type == 1) { this.title = "新增"; this.close();