xiaoguangbin/AnalysisSystemForRadionuclide_vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev

Browse Source
This commit is contained in:
xiaoguangbin 2023-10-19 19:15:53 +08:00
commit ca3b67a957
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue
View File

@ -645,7 +645,7 @@ export default {
if (value && value.file) { if (value && value.file) {
fileObj[propStatus[index]] = true fileObj[propStatus[index]] = true
files.push(value.file) files.push(value.file)
fileObj.files.push(value.file) fileObj.files.push(value.fileName)
} else { } else {
fileObj[propStatus[index]] = false fileObj[propStatus[index]] = false
} }
@ -668,27 +668,27 @@ export default {
if (el.fileType == 'B') { if (el.fileType == 'B') {
obj.sampleSystemType = el.fileType obj.sampleSystemType = el.fileType
el.files.forEach((item) => { el.files.forEach((item) => {
if (item.name.search('_S_')) { if (item.search('_S_')) {
obj.sampleFileName = item.name obj.sampleFileName = item
} }
if (item.name.search('_G_')) { if (item.search('_G_')) {
obj.gasFileName = item.name obj.gasFileName = item
obj.gasFileStatus = el.gasFileStatus obj.gasFileStatus = el.gasFileStatus
} }
if (item.name.search('_D_')) { if (item.search('_D_')) {
obj.detFileName = item.name obj.detFileName = item
obj.detFileStatus = el.detFileStatus obj.detFileStatus = el.detFileStatus
} }
if (item.name.search('_Q_')) { if (item.search('_Q_')) {
obj.qcFileName = item.name obj.qcFileName = item
obj.qcFileStatus = el.qcFileStatus obj.qcFileStatus = el.qcFileStatus
} }
}) })
} else { } else {
el.files.forEach((item) => { el.files.forEach((item) => {
if (item.name.search('_S_')) { if (item.search('_S_')) {
obj.sampleSystemType = el.fileType obj.sampleSystemType = el.fileType
obj.sampleFileName = item.name obj.sampleFileName = item
obj.gasFileName = '' obj.gasFileName = ''
obj.detFileName = '' obj.detFileName = ''
obj.qcFileName = '' obj.qcFileName = ''