|
|
|
@ -2582,7 +2582,7 @@ |
|
|
|
getEamPropertiesItemByItemNo(params).then(({data}) => { |
|
|
|
if (data.code === 0) { |
|
|
|
let itemData = data.itemData |
|
|
|
console.log("this", itemData); |
|
|
|
console.log("this", itemData,row); |
|
|
|
console.log("itemData.colss)",itemData.collectionFlag == 'Y' && itemData.collectionMethod.includes('thickness')); |
|
|
|
|
|
|
|
|
|
|
|
@ -2593,15 +2593,24 @@ |
|
|
|
bu: row.buNo, |
|
|
|
itemNo: row.itemNo, |
|
|
|
inspectionNo: row.inspectionNo, |
|
|
|
order: row.orderNo, |
|
|
|
} |
|
|
|
getCollectorDataByItem(param).then(({data}) => { |
|
|
|
if (data.code === 0 && data.rows.length > 0) { |
|
|
|
this.changeMyString(data.rows) |
|
|
|
if(data.abnormal){ |
|
|
|
this.$message({ |
|
|
|
message: '数据采集成功，且存在异常数据，请注意查看', |
|
|
|
type: 'warning', |
|
|
|
duration: 1500 |
|
|
|
}) |
|
|
|
}else{ |
|
|
|
this.$message({ |
|
|
|
message: '数据采集成功', |
|
|
|
type: 'success', |
|
|
|
duration: 1500 |
|
|
|
}) |
|
|
|
} |
|
|
|
} else { |
|
|
|
this.$message({ |
|
|
|
message: data.msg||'未采集到数据', |
|
|
|
|
