From b5c51883da35f2323e9b2da0174241de6f873556 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Thu, 9 Nov 2023 10:33:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Daccept=E5=90=8E?=
 =?UTF-8?q?=E6=96=B0=E7=9A=84baseCtrl=E6=9C=AA=E4=BC=A0=E5=87=BA=E6=9D=A5?=
 =?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  | 5 ++---
 src/views/spectrumAnalysis/gamma-analysis.vue                | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue
index 61bacfe..7d23567 100644
--- a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue
+++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue
@@ -799,7 +799,7 @@ export default {
         shapeChannelData,
         shapeEnergyData,
         peak: table,
-        barChart: this.barChart
+        barChart: this.barChart,
       })
 
       this.channelPeakChart = channelPeakChart
@@ -917,7 +917,6 @@ export default {
               this.selectedKeys = []
 
               this.selectedTableItem = null
-
             } else {
               this.$message.error(message)
             }
@@ -1441,7 +1440,7 @@ export default {
             this.resetChartOpts()
           })
 
-          this.$bus.$emit('accept', result)
+          this.$bus.$emit('accept', { ...result, BaseCtrls: cloneDeep(this.baseCtrls_Copy) })
         } else {
           this.$message.error(message)
         }
diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue
index 6d9bc99..85d45a8 100644
--- a/src/views/spectrumAnalysis/gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/gamma-analysis.vue
@@ -1382,7 +1382,7 @@ export default {
 
     // 分析工具Accept时刷新部分数据
     handleAccept(data) {
-      const { allData, peak, shadowChannelChart, shadowEnergyChart, shapeChannelData, shapeEnergyData, barChart } = data
+      const { allData, peak, shadowChannelChart, shadowEnergyChart, shapeChannelData, shapeEnergyData, barChart, BaseCtrls } = data
 
       const result = {
         DetailedInformation: this.detailedInfomation,
@@ -1393,7 +1393,7 @@ export default {
         shapeChannelData,
         shapeEnergyData,
         peak,
-        BaseCtrls: this.baseCtrls,
+        BaseCtrls,
         bAnalyed: this.bAnalyed,
         barChart
       }