fix: 修复台站文件解析中查找Q文件存在的问题
This commit is contained in:
parent
71dabdaed5
commit
1b4fd2a65a
|
@ -78,6 +78,11 @@ export class PHDParser {
|
|||
*/
|
||||
isSample = false
|
||||
|
||||
/**
|
||||
* 台站名
|
||||
*/
|
||||
stationName = ''
|
||||
|
||||
/**
|
||||
* 构造函数
|
||||
* @param {string} text
|
||||
|
@ -109,6 +114,7 @@ export class PHDParser {
|
|||
} else {
|
||||
this.sampleFilePrefix = this.getGammaFilePrefix(headerInfo[2])
|
||||
}
|
||||
this.stationName = this.sampleFilePrefix.slice(0, this.sampleFilePrefix.indexOf('-'))
|
||||
} else {
|
||||
const filePrefixes = this.getFilePrefixes(headerInfo[2])
|
||||
this.sampleFilePrefix = filePrefixes.splice(0, 1)[0]
|
||||
|
|
|
@ -422,6 +422,14 @@ export default {
|
|||
return
|
||||
}
|
||||
|
||||
// 清空该行
|
||||
Object.assign(record, {
|
||||
sampleFileName: undefined,
|
||||
gasFileName: undefined,
|
||||
detFileName: undefined,
|
||||
qcFileName: undefined,
|
||||
})
|
||||
|
||||
const { sampleFilePrefix, otherFilePrefixes, qualify, liveTime } = phdParser
|
||||
const fileName = `${sampleFilePrefix}S_${qualify}_${liveTime}.PHD`
|
||||
record.sampleFileName = {
|
||||
|
@ -473,14 +481,16 @@ export default {
|
|||
file: undefined,
|
||||
fileName: `${sampleFilePrefix}Q.PHD`,
|
||||
}
|
||||
const qcFileList = fileList.filter((file) => file.name.includes('_Q_'))
|
||||
const qcFileList = fileList.filter((file) => {
|
||||
const fileName = file.name
|
||||
return fileName.startsWith(phdParser.stationName) && fileName.includes('_Q_')
|
||||
})
|
||||
for (const qcFile of qcFileList) {
|
||||
if (qcFile.name.slice(0, 23) <= sampleFilePrefix) {
|
||||
qcFileInfo = {
|
||||
file: qcFile,
|
||||
fileName: qcFile.name,
|
||||
}
|
||||
} else {
|
||||
break
|
||||
}
|
||||
}
|
||||
|
@ -528,14 +538,16 @@ export default {
|
|||
file: undefined,
|
||||
fileName: `${sampleFilePrefix}Q.PHD`,
|
||||
}
|
||||
const qcFileList = fileList.filter((file) => file.name.includes('_Q_'))
|
||||
const qcFileList = fileList.filter((file) => {
|
||||
const fileName = file.name
|
||||
return fileName.startsWith(phdParser.stationName) && fileName.includes('_Q_')
|
||||
})
|
||||
for (const qcFile of qcFileList) {
|
||||
if (qcFile.name.slice(0, 23) <= sampleFilePrefix) {
|
||||
qcFileInfo = {
|
||||
file: qcFile,
|
||||
fileName: qcFile.name,
|
||||
}
|
||||
} else {
|
||||
break
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user