From 63a271be2b39b7b3de758d1c0f88954d7cc9c7dc Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Fri, 15 Mar 2024 09:49:19 +0800
Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E7=BA=A7?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=B8=8B=E7=9A=84=E4=BA=8C=E7=BA=A7=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E8=A2=AB=E6=A0=B7=E5=BC=8F=E9=9A=90=E8=97=8F=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/spectrumAnalysis/index.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index 77002c3..66bcb00 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -1764,8 +1764,6 @@ export default {
     padding: 0;
     position: relative;
     border-right: 0;
-    max-height: calc(100vh - 506px);
-    overflow: hidden auto;
 
     &-submenu {
       &-active {

From 2301ce140985fd3da19cc4bfa14ae17210c09351 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Fri, 15 Mar 2024 10:05:12 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=A0=B8=E7=B4=A0=E5=90=8E=E6=9C=AA=E5=88=B7=E6=96=B0table?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Modals/AnalyzeInteractiveToolModal/index.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue
index 9bfc63f..7f919a3 100644
--- a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue
+++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue
@@ -1562,14 +1562,16 @@ export default {
         try {
           this.$set(this.selectedTableItem, '_deleting', true)
           const { inputFileName: fileName } = this.sampleData
-          const { success, message } = await postAction('/gamma/deleteNuclide', {
+          const { success, result, message } = await postAction('/gamma/deleteNuclide', {
             curRow: this.curRow,
             nuclideName: this.model.identifiedNuclide,
             fileName,
             list_identify: nuclides,
           })
           if (success) {
-            nuclides.splice(findIndex, 1)
+            const { identify, table } = result
+            this.selectedTableItem.nuclides = identify
+            this.list = table
           } else {
             this.$message.error(message)
           }

From 1e6320a616ae7088b9efd93435c0b0e8c8380d18 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Fri, 15 Mar 2024 10:52:12 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=A0=B8=E7=B4=A0?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E4=B8=80=E7=BA=A7=E4=B8=8B=E6=8B=89=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=9C=A8=E7=82=B9=E5=87=BB=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E9=81=AE=E4=BD=8F=E5=BC=B9=E7=AA=97=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/spectrumAnalysis/index.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index 66bcb00..627b4df 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -1759,6 +1759,8 @@ export default {
 <style lang="less">
 .spectrum-analysis-operators-dropdown-overlay {
   background-color: #03353f;
+  z-index: 999;
+
   .ant-menu {
     background: transparent;
     padding: 0;

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 4/5] =?UTF-8?q?=E5=88=86=E6=9E=90=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E5=92=8C=E5=88=86=E6=9E=90=E5=A4=B1=E8=B4=A5=E9=83=BD=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=8F=90=E7=A4=BA=20=E5=88=86=E6=9E=90=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=20=E5=B0=86=E5=8F=B3=E4=B8=8B=E8=A7=92Result=20displa?=
 =?UTF-8?q?y=E7=9A=84=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) {

From 878212006aceae2c0d4316f2931b9e86db625bca 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 16:28:12 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=A4=84=E7=90=86beta=20=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E5=A4=B1=E8=B4=A5=EF=BC=8CsavedAnalysisResul?=
 =?UTF-8?q?t=20=E5=AD=97=E6=AE=B5=E6=9C=AA=E6=9B=B4=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
index cfc11fc..3033f66 100644
--- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
@@ -289,7 +289,7 @@ export default {
         }
       }
 
-      this.changeChartByType(this.spectraType)
+      this.changeChartByType(this.spectraType, result.XeData)
     },
 
     handleGetFlag(val, obj) {
@@ -401,7 +401,7 @@ export default {
       return cancelToken
     },
 
-    changeChartByType(val) {
+    changeChartByType(val, data) {
       if (val === 'qc' && !this.sampleDetail.qc) {
         this.$message.warning('No qc spectrum file!')
       } else {
@@ -452,7 +452,7 @@ export default {
 
         console.log('this.resultDisplaythis.resultDisplay', this.resultDisplay)
 
-        this.resultDisplay = XeData
+        this.resultDisplay = data ? data : XeData
         this.sortResultDisplay()
 
         this.$emit('sendInfo', this.resultDisplay, this.spectrumData.stationCode, savedAnalysisResult)
@@ -555,7 +555,7 @@ export default {
             item.lc = parseFloat(item.lc.toPrecision(6))
             item.mdc = parseFloat(item.mdc.toPrecision(6))
           })
-          this.$emit('reAnalyCurr', true, res.result.XeData)
+          this.$emit('reAnalyCurr', res.result.savedAnalysisResult, res.result.XeData)
           this.handleReAnalyse(res.result)
           if (res.result.bProcessed) {
             this.$message.success(res.result.message)
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue
index fb127b2..aa583b2 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue
@@ -153,7 +153,7 @@ export default {
             item.mdc = parseFloat(item.mdc.toPrecision(6))
           })
           this.$emit('sendXeData', res.result.XeData)
-          this.$emit('reAnalyCurr', true, res.result.XeData)
+          this.$emit('reAnalyCurr', res.result.savedAnalysisResult, res.result.XeData)
           this.isReanlyze = true
           this.handleExit()
           this.$bus.$emit('ReAnalyses', res.result)
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index db81862..b46b882 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -475,7 +475,7 @@ export default {
   methods: {
     getReAnalyCurr(flag, val) {
       this.isReAnalyed_beta = flag
-      this.params_toDB.savedAnalysisResult = true
+      this.params_toDB.savedAnalysisResult = flag
       this.resultDisplayFlag = val
     },
     getReAnalyAll(val) {