From 0ff3f3a00397695880bee95dd85f23b167e64447 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Mon, 27 Nov 2023 17:15:10 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=20from=20file=20=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E8=B0=B1=EF=BC=8C=E5=88=87=E5=9B=9E=E5=8F=A6?=
 =?UTF-8?q?=E5=A4=96=E4=B8=80=E4=B8=AA=E8=B0=B1=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=88=B7=E6=96=B0=E5=88=86=E6=9E=90=E5=90=8E?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=201=EF=BC=89=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E8=B0=B1=E4=B9=8B=E5=90=8E=EF=BC=8C=E8=AF=A6=E7=BB=86=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E8=BF=98=E6=98=AF=E6=AD=A3=E5=B8=B8=E7=9A=84=EF=BC=8C?=
 =?UTF-8?q?=E5=85=88=E5=88=87=E6=8D=A2=E5=88=B0=E7=AC=AC=E4=BA=8C=E4=B8=AA?=
 =?UTF-8?q?=E8=B0=B1=E7=84=B6=E5=90=8E=E7=82=B9=E5=87=BBreprocess=20all=20?=
 =?UTF-8?q?2=EF=BC=89=E5=88=86=E6=9E=90=E5=AE=8C=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E4=B8=AA=E8=B0=B1=E6=9C=89=E8=AF=A6=E7=BB=86?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=88=87=E6=8D=A2=E5=9B=9E=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=EF=BC=8C=E6=9B=B2=E7=BA=BF=E6=9C=89=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=BA=86=EF=BC=8C=E4=BD=86=E6=98=AF=E8=AF=A6=E7=BB=86?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE=E4=BA=86?=
 =?UTF-8?q?=20Save=20all=20to=20db=EF=BC=8C=E8=BF=94=E5=9B=9E=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E4=BF=A1=E6=81=AF=E4=B9=8B=E5=90=8E=EF=BC=8Csave=20?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=B8=8A=E7=9A=84=E6=95=88=E6=9E=9C=E5=BA=94?=
 =?UTF-8?q?=E8=AF=A5=E5=8E=BB=E6=8E=89=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/sample.js          |  7 +++++++
 src/views/spectrumAnalysis/index.vue | 19 ++++++++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)

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