From 4a59c95cbbcf9bdc027a535a39f12bbbceaa468f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Fri, 24 Nov 2023 14:04:03 +0800 Subject: [PATCH] =?UTF-8?q?from=20file=20=E5=8A=A0=E8=BD=BD=E4=B8=A4?= =?UTF-8?q?=E4=B8=AA=E8=B0=B1=EF=BC=8C=E5=88=87=E5=9B=9E=E5=8F=A6=E5=A4=96?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=B0=B1=E7=9A=84=E6=97=B6=E5=80=99=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=88=B7=E6=96=B0=E5=88=86=E6=9E=90=E5=90=8E=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=0B1=EF=BC=89=E5=8A=A0=E8=BD=BD=E8=B0=B1?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=EF=BC=8C=E5=85=88=E5=88=87=E6=8D=A2=E5=88=B0?= =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E4=B8=AA=E8=B0=B1=E7=84=B6=E5=90=8E=E7=82=B9?= =?UTF-8?q?=E5=87=BBreprocess=20all=0B2=EF=BC=89=E5=88=86=E6=9E=90?= =?UTF-8?q?=E5=AE=8C=E4=B9=8B=E5=90=8E=E7=AC=AC=E4=BA=8C=E4=B8=AA=E8=B0=B1?= =?UTF-8?q?=E6=9C=89=E5=88=86=E6=9E=90=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E5=9B=9E=E7=AC=AC=E4=B8=80=E4=B8=AA=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9C=80=E6=96=B0=E7=9A=84=E5=88=86=E6=9E=90?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=0B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/spectrumAnalysis/index.vue | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index f3c7a00..b800491 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -810,20 +810,6 @@ export default { if (gammaInputFileNames.length > 0) { this.fetchReprocessing(gammaInputFileNames, inputFileName, sampleType) } - - // // 先排除当前的谱 - // const otherSampleList = this.sampleList.filter((sample) => sample.inputFileName !== inputFileName) - - // const betaSamples = otherSampleList.filter((sample) => sample.sampleType == 'B') - // const gammaSamples = otherSampleList.filter((sample) => sample.sampleType !== 'B') - // gammaSamples.forEach((gammaSample) => { - // postAction(`/gamma/Reprocessing?fileName=${gammaSample.inputFileName}`) - // }) - - // // 处理当前的谱的reprocessing - // if (inputFileName && sampleType !== 'B') { - // this.$refs.gammaAnalysisRef.reProcessing(false) - // } }, async fetchReprocessing(fileNames, currFileName, sampleType) { if (fileNames[0] == currFileName && sampleType !== 'B') { @@ -832,6 +818,7 @@ export default { this.finishCont++ this.percentBar = this.finishCont / this.gammaSampleNum this.analysedFileName = fileNames.splice(0, 1) + if (fileNames.length > 0) { this.fetchReprocessing(fileNames, currFileName, sampleType) } @@ -849,6 +836,11 @@ export default { try { const { success, result, message } = await postAction(`/gamma/Reprocessing?fileName=${fileNames[0]}`) if (success) { + this.$store.commit('ADD_SAMPLE_DATA', { + inputFileName: fileNames[0], + data: result, + from: '', + }) this.finishCont++ this.percentBar = this.finishCont / this.gammaSampleNum this.analysedFileName = fileNames.splice(0, 1)