admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flx:优化

Browse Source
This commit is contained in:
Rain_ 2025-12-11 14:30:32 +08:00
parent b40a45e907
commit bfec64932c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/projectFront/weldingManage/equipmentMonitor.vue
View File

@ -265,7 +265,7 @@ export default {
devSn: row.devSn, devSn: row.devSn,
}).then((res) => { }).then((res) => {
if (res.code == 200) { if (res.code == 200) {
const resultList = res.result instanceof Array ? res.result : []; const resultList = res.result instanceof Array ? res.result.reverse() : [];
const result = { const result = {
series: [ series: [
{ {

8
src/views/projectFront/weldingManage/weldingRecord.vue
View File

@ -6,9 +6,9 @@
<el-select v-model="searchForm.equipmentName" placeholder="请选择"> <el-select v-model="searchForm.equipmentName" placeholder="请选择">
<el-option <el-option
v-for="item in weldingDevList" v-for="item in weldingDevList"
:key="item.devName" :key="item.devSn"
:label="item.devName" :label="item.devName"
:value="item.devName" :value="item.devSn"
> >
</el-option> </el-option>
</el-select> </el-select>
@ -1158,11 +1158,11 @@ export default {
pageSize: this.pagInfo.pageSize, pageSize: this.pagInfo.pageSize,
projectSn: this.$store.state.projectSn, projectSn: this.$store.state.projectSn,
devSn: this.searchForm.devSn, devSn: this.searchForm.devSn,
equipmentName: this.searchForm.equipmentName, eqDevSn: this.searchForm.equipmentName,
operatorName: this.searchForm.operatorName, operatorName: this.searchForm.operatorName,
weldBead: this.searchForm.weldBead, weldBead: this.searchForm.weldBead,
dataSource: this.searchForm.dataSource, dataSource: this.searchForm.dataSource,
duration: this.searchForm.duration ? this.searchForm.duration : "", duration_begin: this.searchForm.duration ? this.searchForm.duration : "",
endWeldingTime_begin: endWeldingTime_begin:
this.searchForm.dateRangeArr instanceof Array && this.searchForm.dateRangeArr[0] this.searchForm.dateRangeArr instanceof Array && this.searchForm.dateRangeArr[0]
? this.searchForm.dateRangeArr[0] ? this.searchForm.dateRangeArr[0]