From d8ca6598bc35a1846eeba34d6248f24be877f266 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Fri, 12 Jan 2024 18:47:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modals/ResolutionCalibrationModal-Beta.vue | 17 +++++++++-------- src/views/spectrumAnalysis/index.vue | 4 ++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal-Beta.vue b/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal-Beta.vue index 39114c4..e2d0758 100644 --- a/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal-Beta.vue +++ b/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal-Beta.vue @@ -270,7 +270,8 @@ export default { const { AllData, equation, param, table, uncert } = result // 有数据 if (AllData) { - const [linePoint, scatterPoint] = AllData + // const [linePoint, scatterPoint] = AllData + const [scatterPoint] = AllData this.equation = equation this.param = param this.uncert = uncert @@ -279,13 +280,13 @@ export default { this.generateTableId() const series = [] - series.push( - buildLineSeries( - 'LineSeries', - linePoint.pointlist.map(({ x, y }) => [x, y]), - linePoint.color - ) - ) + // series.push( + // buildLineSeries( + // 'LineSeries', + // linePoint.pointlist.map(({ x, y }) => [x, y]), + // linePoint.color + // ) + // ) series.push({ type: 'scatter', data: scatterPoint.pointlist.map(({ x, y }) => { diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index 5837498..487716f 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -262,7 +262,7 @@ import EfficiencyCalibrationModalBeta from './components/Modals/EfficiencyCalibr import EnergyCalibrationModal from './components/Modals/EnergyCalibrationModal.vue' import EnergyCalibrationModalBeta from './components/Modals/EnergyCalibrationModal-Beta.vue' import ResolutionCalibrationModal from './components/Modals/ResolutionCalibrationModal.vue' -import ResolutionCalibrationModallBeta from './components/Modals/ResolutionCalibrationModal-Beta.vue' +import ResolutionCalibrationModalBeta from './components/Modals/ResolutionCalibrationModal-Beta.vue' import SpectrumCommentsModal from './components/Modals/SpectrumCommentsModal.vue' import ColorConfigModal from './components/Modals/ColorConfigModal.vue' import DataProcessingLogModal from './components/Modals/DataProcessingLogModal.vue' @@ -321,7 +321,7 @@ export default { EnergyCalibrationModal, EnergyCalibrationModalBeta, ResolutionCalibrationModal, - ResolutionCalibrationModallBeta, + ResolutionCalibrationModalBeta, SpectrumCommentsModal, ColorConfigModal, DataProcessingLogModal,