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) }