diff --git a/src/store/modules/sample.js b/src/store/modules/sample.js index 49cdf51..04bdb20 100644 --- a/src/store/modules/sample.js +++ b/src/store/modules/sample.js @@ -22,6 +22,13 @@ const sample = { find.data[key] = data } }, + UPDATE_SAMPLE_DATA_ANALY: (state, { inputFileName, data }) => { + const find = state.sampleList.find(item => item.inputFileName == inputFileName) + if (find) { + data.DetailedInformation = find.data.DetailedInformation + find.data = data + } + }, REMOVE_SAMPLE_DATA: (state, inputFileName) => { const findIndex = state.sampleList.findIndex(item => item.inputFileName == inputFileName) diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index 4ddcfc1..ca711d8 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -734,20 +734,26 @@ export default { let count = 0 let gammaList = this.sampleList.filter(({ sampleType }) => sampleType !== 'B') let length = gammaList.length - gammaList.forEach(({ inputFileName: fileName }) => { + for (let i = 0; i < gammaList; i++) { + const { inputFileName: fileName } = array[i] + const params = { fileName, } - getAction('/gamma/saveToDB', params).then(({ result }) => { - // this.allSampleDet[fileName]= [...result.DetailedInformation] + const { result, success } = await getAction('/gamma/saveToDB', params) + if (success) { this.$set(this.allSampleDet, fileName, [...result.DetailedInformation]) count += 1 if (count == length) { this.isSaving = false this.currSampleDet = this.allSampleDet[this.sampleData.inputFileName] } - }) - }) + } else { + this.isSaving = false + this.$message.error(message) + break + } + } } } else { this.$message.warn('Please Analyse Spectrum First') @@ -856,10 +862,9 @@ export default { try { const { success, result, message } = await postAction(`/gamma/Reprocessing?fileName=${fileNames[0]}`) if (success) { - this.$store.commit('ADD_SAMPLE_DATA', { + this.$store.commit('UPDATE_SAMPLE_DATA_ANALY', { inputFileName: fileNames[0], data: result, - from: '', }) this.finishCont++ this.percentBar = this.finishCont / this.gammaSampleNum