diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue index eb43c15..9dc33f8 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue @@ -52,6 +52,12 @@ import TitleOverBorder from '@/views/spectrumAnalysis/components/TitleOverBorder export default { components: { BetaDetectorCalibration, GammaDetectorCalibration, TitleOverBorder }, mixins: [ModalMixin, SampleDataMixin], + props: { + sampleList: { + type: Array, + required: true, + }, + }, data() { return { currTab: 'gamma', @@ -85,6 +91,28 @@ export default { this.gammaEnergyValid = val }, handleReAnalyse() { + const regExp = /^([A-Z]{1,}\d{1,})_/ + const regMatched = this.newSampleData.inputFileName.match(regExp) + const currStationName = regMatched[1] + const dbNames = [], + sampleIds = [], + sampleFileNames = [], + gasFileNames = [], + detFileNames = [], + qcFileNames = [] + + const matchedSampleList = this.sampleList.filter((item) => item.inputFileName.includes(currStationName)) + matchedSampleList.forEach( + ({ dbName, sampleId, sampleFileName, gasFileName, detFileName, qcFileName, qcFileStatus }) => { + dbNames.push(dbName || '') + sampleIds.push(sampleId || '') + sampleFileNames.push(sampleFileName) + gasFileNames.push(gasFileName) + detFileNames.push(detFileName) + qcFileNames.push(qcFileStatus ? qcFileName : '') + } + ) + let params = { applyType: this.newCalibrationIsAppliedTo, sampleData: this.recalculateROICountsFor.includes('sample') ? true : false, @@ -93,13 +121,14 @@ export default { qcData: this.recalculateROICountsFor.includes('qc') ? true : false, betaEnergyValid: this.betaEnergyValid, gammaEnergyValid: this.gammaEnergyValid, - dbNames: [this.newSampleData.dbName], - sampleIds: [this.newSampleData.sampleId ? this.newSampleData.sampleId : ''], - sampleFileNames: [this.newSampleData.inputFileName], - gasFileNames: [this.newSampleData.gasFileName], - detFileNames: [this.newSampleData.detFileName], - qcFileNames: [this.newSampleData.qcFileName], + dbNames, + sampleIds, + sampleFileNames, + gasFileNames, + detFileNames, + qcFileNames, currentFileName: this.newSampleData.inputFileName, + currentQCFileName: this.newSampleData.qcFileName, } postAction('/spectrumAnalysis/ReAnalyse', params).then((res) => { if (res.success) { diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index 833f58b..6391916 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -165,6 +165,7 @@