Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
This commit is contained in:
commit
1a45961880
|
@ -111,12 +111,12 @@ export default {
|
||||||
|
|
||||||
const matchedSampleList = this.sampleList.filter((item) => item.inputFileName.includes(currStationName))
|
const matchedSampleList = this.sampleList.filter((item) => item.inputFileName.includes(currStationName))
|
||||||
matchedSampleList.forEach(
|
matchedSampleList.forEach(
|
||||||
({ dbName, sampleId, sampleFileName, gasFileName, detFileName, qcFileName, qcFileStatus }) => {
|
({ dbName, sampleId, inputFileName, sampleFileName, gasFileName, detFileName, qcFileName, qcFileStatus }) => {
|
||||||
dbNames.push(dbName || '')
|
dbNames.push(dbName || '')
|
||||||
sampleIds.push(sampleId || '')
|
sampleIds.push(sampleId || '')
|
||||||
sampleFileNames.push(sampleFileName)
|
sampleFileNames.push(sampleFileName || inputFileName || '')
|
||||||
gasFileNames.push(gasFileName)
|
gasFileNames.push(gasFileName || '')
|
||||||
detFileNames.push(detFileName)
|
detFileNames.push(detFileName || '')
|
||||||
qcFileNames.push(qcFileStatus ? qcFileName : '')
|
qcFileNames.push(qcFileStatus ? qcFileName : '')
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user