From 6456b949e7036d6b309890d87c22b31af8aedbec Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Tue, 1 Aug 2023 15:12:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AF=B9=E6=8E=A5Tool=20of=20Calibrati?=
 =?UTF-8?q?on=20=E4=B8=ADFigure=20of=20Gamma=20Detector=20Calibration?=
 =?UTF-8?q?=E7=9A=84=E5=8E=86=E5=8F=B2=E5=B0=8F=E5=9C=86=E7=82=B9=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/GammaDetectorCalibration.vue   | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue
index 4eed3ad..1d539a8 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue
@@ -335,14 +335,25 @@ const initialFigureChartOption = {
     },
     nameGap: 55
   },
-  series: {
-    type: 'line',
-    itemStyle: {
-      color: '#04ADD9'
+  series: [
+    {
+      type: 'line',
+      itemStyle: {
+        color: '#04ADD9'
+      },
+      symbol: 'none',
+      data: []
     },
-    symbol: 'none',
-    data: []
-  }
+    {
+      type: 'line',
+      itemStyle: {
+        color: '#04ADD9'
+      },
+      symbol: 'circle',
+      symbolSize: 8,
+      data: []
+    }
+  ]
 }
 
 const columns = [
@@ -433,7 +444,7 @@ export default {
         })
 
         if (res.success) {
-          const { CToE, EToC, gammaEnergy, gammaSpectrum, max, min } = res.result
+          const { CToE, EToC, gammaEnergy, gammaSpectrum, max, min, oldScatterSeries } = res.result
 
           this.c2e = CToE
           this.e2c = EToC
@@ -451,7 +462,8 @@ export default {
           this.figureChartOption.yAxis.max = gammaEnergyInterval * 4
           this.figureChartOption.yAxis.min = gammaEnergyMin
           this.figureChartOption.yAxis.interval = Math.ceil((gammaEnergyMax * 1.1) / 4)
-          this.figureChartOption.series.data = gammaEnergyValue.map((item, index) => [index, item])
+          this.figureChartOption.series[0].data = gammaEnergyValue.map((item, index) => [index, item])
+          this.figureChartOption.series[1].data = oldScatterSeries.map(({ x, y }) => [x, y])
         } else {
           this.$message.error(res.message)
         }