From b81d5a9797fd9e4570108086574259245f81683e Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Thu, 2 Nov 2023 19:30:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DbarChart=E5=9C=A8?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=90=8E=E6=9C=AA=E5=9B=9E=E4=BC=A0=E5=80=BC?=
 =?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

---
 .../Modals/AnalyzeInteractiveToolModal/index.vue  |  2 ++
 src/views/spectrumAnalysis/gamma-analysis.vue     | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue
index c631035..b33681e 100644
--- a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue
+++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue
@@ -799,6 +799,7 @@ export default {
         shapeChannelData,
         shapeEnergyData,
         peak: table,
+        barChart: this.barChart
       })
 
       this.channelPeakChart = channelPeakChart
@@ -888,6 +889,7 @@ export default {
                 shapeChannelData,
                 shapeEnergyData,
                 peak: table,
+                barChart: this.barChart,
               })
 
               this.channelPeakChart = channelPeakChart
diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue
index bdada8b..e43ad7c 100644
--- a/src/views/spectrumAnalysis/gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/gamma-analysis.vue
@@ -1368,9 +1368,13 @@ export default {
 
     // 从分析工具刷新部分数据
     handleRefresh(data) {
-      data.DetailedInformation = this.detailedInfomation
-      data.QCFlag = this.qcFlags
-      data.BaseCtrls = this.baseCtrls
+      Object.assign(data, {
+        DetailedInformation: this.detailedInfomation,
+        QCFlag: this.qcFlags,
+        BaseCtrls: this.baseCtrls,
+        bAnalyed: this.bAnalyed
+      })
+
       this.clearCompareLine()
       this.redrawPeakLine()
       this.dataProcess(data)
@@ -1378,7 +1382,7 @@ export default {
 
     // 分析工具Accept时刷新部分数据
     handleAccept(data) {
-      const { allData, peakSet, shadowChannelChart, shadowEnergyChart, shapeChannelData, shapeEnergyData } = data
+      const { allData, peakSet, shadowChannelChart, shadowEnergyChart, shapeChannelData, shapeEnergyData, barChart } = data
 
       const result = {
         DetailedInformation: this.detailedInfomation,
@@ -1386,11 +1390,12 @@ export default {
         allData,
         shadowChannelChart,
         shadowEnergyChart,
-
         shapeChannelData,
         shapeEnergyData,
         peak: peakSet,
         BaseCtrls: this.baseCtrls,
+        bAnalyed: this.bAnalyed,
+        barChart
       }
       this.clearCompareLine()
       this.redrawPeakLine()