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:51:10 +08:00
commit 6f43ad6fd6
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -663,30 +663,31 @@ export default {
const { success, message } = await this.uploadZipFile(zipedFiles) const { success, message } = await this.uploadZipFile(zipedFiles)
if (success) { if (success) {
let result = [] let result = []
console.log('allFiles', allFiles)
allFiles.forEach((el) => { allFiles.forEach((el) => {
let obj = {} let obj = {}
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.search('_S_')) { if (item.includes('_S_')) {
obj.sampleFileName = item obj.sampleFileName = item
} }
if (item.search('_G_')) { if (item.includes('_G_')) {
obj.gasFileName = item obj.gasFileName = item
obj.gasFileStatus = el.gasFileStatus obj.gasFileStatus = el.gasFileStatus
} }
if (item.search('_D_')) { if (item.includes('_D_')) {
obj.detFileName = item obj.detFileName = item
obj.detFileStatus = el.detFileStatus obj.detFileStatus = el.detFileStatus
} }
if (item.search('_Q_')) { if (item.includes('_Q_')) {
obj.qcFileName = item obj.qcFileName = item
obj.qcFileStatus = el.qcFileStatus obj.qcFileStatus = el.qcFileStatus
} }
}) })
} else { } else {
el.files.forEach((item) => { el.files.forEach((item) => {
if (item.search('_S_')) { if (item.includes('_S_')) {
obj.sampleSystemType = el.fileType obj.sampleSystemType = el.fileType
obj.sampleFileName = item obj.sampleFileName = item
obj.gasFileName = '' obj.gasFileName = ''
@ -697,6 +698,7 @@ export default {
} }
result.push(obj) result.push(obj)
}) })
console.log(result)
this.$emit('loadFormFile', result) this.$emit('loadFormFile', result)
this.visible = false this.visible = false
this.isUploadingZip = false this.isUploadingZip = false