|
|
@ -205,7 +205,7 @@ export default { |
|
|
|
let list = this.listDataAll |
|
|
|
let list = this.listDataAll |
|
|
|
let recordList = res.data.list |
|
|
|
let recordList = res.data.list |
|
|
|
list.map(n => { |
|
|
|
list.map(n => { |
|
|
|
let same = recordList.find(e => e.className == n.className) |
|
|
|
let same = recordList.find(e => e.className == n.className && e.experimentalName == n.experimentalName) |
|
|
|
if(same){ |
|
|
|
if(same){ |
|
|
|
n.reportId = same.reportId |
|
|
|
n.reportId = same.reportId |
|
|
|
} |
|
|
|
} |
|
|
@ -236,7 +236,7 @@ export default { |
|
|
|
}else if(row.status == 3){ |
|
|
|
}else if(row.status == 3){ |
|
|
|
return this.$message.warning('该实验已经结束') |
|
|
|
return this.$message.warning('该实验已经结束') |
|
|
|
}else{ |
|
|
|
}else{ |
|
|
|
this.core.toSubSystem(row.className,row.id) |
|
|
|
this.core.toSubSystem(row.className,row.id,row.classId) |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
show(row) { |
|
|
|
show(row) { |
|
|
|