From 4842684b6ea25e0a9f3ddc9480712581a25e9989 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: Fri, 15 Mar 2024 14:28:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=9E=90=E6=88=90=E5=8A=9F=E5=92=8C?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E5=A4=B1=E8=B4=A5=E9=83=BD=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=20=E5=88=86=E6=9E=90=E5=A4=B1=E8=B4=A5=20?=
 =?UTF-8?q?=E5=B0=86=E5=8F=B3=E4=B8=8B=E8=A7=92Result=20display=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../spectrumAnalysis/beta-gamma-analysis.vue  | 23 +++++++++++--------
 .../BetaGammaEnergyCalibrationModal/index.vue |  6 ++++-
 src/views/spectrumAnalysis/index.vue          |  8 +++----
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
index dd7150c..cfc11fc 100644
--- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
@@ -548,16 +548,21 @@ export default {
           // this.isReAnalyed_beta = true
           // this.analyseCurrentSpectrum = res.result
           this.$emit('sendXeData', res.result.XeData)
-          if (res.result.XeData && res.result.XeData.length > 0) {
-            res.result.XeData.forEach((item) => {
-              item.conc = parseFloat(item.conc.toPrecision(6))
-              item.concErr = parseFloat(item.concErr.toPrecision(6))
-              item.lc = parseFloat(item.lc.toPrecision(6))
-              item.mdc = parseFloat(item.mdc.toPrecision(6))
-            })
-            this.$emit('reAnalyCurr', true, res.result.XeData)
-            this.handleReAnalyse(res.result)
+          // if (res.result.XeData && res.result.XeData.length > 0) {
+          res.result.XeData.forEach((item) => {
+            item.conc = parseFloat(item.conc.toPrecision(6))
+            item.concErr = parseFloat(item.concErr.toPrecision(6))
+            item.lc = parseFloat(item.lc.toPrecision(6))
+            item.mdc = parseFloat(item.mdc.toPrecision(6))
+          })
+          this.$emit('reAnalyCurr', true, res.result.XeData)
+          this.handleReAnalyse(res.result)
+          if (res.result.bProcessed) {
+            this.$message.success(res.result.message)
+          } else {
+            this.$message.warning(res.result.message)
           }
+          // }
         } else {
           this.$message.warning(res.message)
         }
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue
index 351bae0..fb127b2 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue
@@ -154,10 +154,14 @@ export default {
           })
           this.$emit('sendXeData', res.result.XeData)
           this.$emit('reAnalyCurr', true, res.result.XeData)
-          this.$message.success('Analyse Success!')
           this.isReanlyze = true
           this.handleExit()
           this.$bus.$emit('ReAnalyses', res.result)
+          if (res.result.bProcessed) {
+            this.$message.success(res.result.message)
+          } else {
+            this.$message.warning(res.result.message)
+          }
 
           if (this.newCalibrationIsAppliedTo == 'AllSpectrum') {
             let sameStation = matchedSampleList.filter(
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index 77002c3..19dde8f 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -509,10 +509,10 @@ export default {
       this.params_toDB.checkDet = val.checkDet
     },
     getXeData(val) {
-      if (val && val.length) {
-        this.$set(this.analyseCurrentSpectrumData, 'XeData', val)
-        this.resultDisplayFlag = val
-      }
+      // if (val && val.length) {
+      this.$set(this.analyseCurrentSpectrumData, 'XeData', val)
+      this.resultDisplayFlag = val
+      // }
     },
     // formDB 来源 吧接口返回的文件名称添加到sampleData
     getFiles(val) {