diff --git a/src/views/projectFront/weldingManage/equipmentMonitor.vue b/src/views/projectFront/weldingManage/equipmentMonitor.vue index 0c775bcf..da9db1c6 100644 --- a/src/views/projectFront/weldingManage/equipmentMonitor.vue +++ b/src/views/projectFront/weldingManage/equipmentMonitor.vue @@ -265,7 +265,7 @@ export default { devSn: row.devSn, }).then((res) => { if (res.code == 200) { - const resultList = res.result instanceof Array ? res.result : []; + const resultList = res.result instanceof Array ? res.result.reverse() : []; const result = { series: [ { diff --git a/src/views/projectFront/weldingManage/weldingRecord.vue b/src/views/projectFront/weldingManage/weldingRecord.vue index 819b3d4c..ff3dd285 100644 --- a/src/views/projectFront/weldingManage/weldingRecord.vue +++ b/src/views/projectFront/weldingManage/weldingRecord.vue @@ -6,9 +6,9 @@ @@ -1158,11 +1158,11 @@ export default { pageSize: this.pagInfo.pageSize, projectSn: this.$store.state.projectSn, devSn: this.searchForm.devSn, - equipmentName: this.searchForm.equipmentName, + eqDevSn: this.searchForm.equipmentName, operatorName: this.searchForm.operatorName, weldBead: this.searchForm.weldBead, dataSource: this.searchForm.dataSource, - duration: this.searchForm.duration ? this.searchForm.duration : "", + duration_begin: this.searchForm.duration ? this.searchForm.duration : "", endWeldingTime_begin: this.searchForm.dateRangeArr instanceof Array && this.searchForm.dateRangeArr[0] ? this.searchForm.dateRangeArr[0]