From 0b23a1874823d8f6c39cb421be4cc2c59e1c0d46 Mon Sep 17 00:00:00 2001 From: xiaoguangbin Date: Thu, 28 Nov 2024 11:16:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=97=A7beta=E7=9A=84=E8=83=BD=E9=87=8F?= =?UTF-8?q?=E5=88=BB=E5=BA=A6=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=8A=A8=E6=A0=A1?= =?UTF-8?q?=E6=AD=A3=EF=BC=9B=E5=A2=9E=E5=8A=A0F=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=9A=84=E8=83=BD=E8=B0=B1=E6=9F=A5=E8=AF=A2=E5=92=8C=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/spectrumAnalysis/beta-gamma-analysis.vue | 1 + .../Modals/AnalyzeInteractiveToolModal/index.vue | 2 +- .../components/BetaDetectorCalibration.vue | 7 +++++++ .../SelfStation/BetaAnalyzeInteractiveToolModal/index.vue | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index bc2fe6b..70b2b6e 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -337,6 +337,7 @@ export default { }) } else { this.$message.error(message) + this.isLoading = false } } catch (error) { console.error(error) diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue index 9a6fb77..47a0f7c 100644 --- a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue @@ -1536,7 +1536,7 @@ export default { nuclideName: possibleNuclide, fileName, list_identify: nuclides, - energyTolerance: parseFloat(this.model.tolerance) + energyTolerance: this.model.tolerance }) if (success) { nuclides.push(possibleNuclide) diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue index 73283c2..a5316ab 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue @@ -668,9 +668,11 @@ export default { oldScatterSeries, newCToE, newEToC, + tableWidgets, } = res.result this.c2e = CToE this.e2c = EToC + this.list = tableWidgets this.oldScatterSeries = oldScatterSeries this.count = oldScatterSeries.length @@ -695,6 +697,11 @@ export default { this.oldChartOption = cloneDeep(this.figureChartOption) + this.figureChartOption.series[1].markPoint.data = tableWidgets.map((item) => ({ + xAxis: item.channel, + yAxis: item.energy, + })) + // 如果点击过reanalyze则渲染之前fitting的数据，如果没点Reanalyze，数据会在窗口关闭时删掉 20231101：xiao // todo 现在能谱数据没有缓存，刷新页面时也会获取到fitting的数据 if (this.getCache('CALIBRATION_BETA_' + this.newSampleData.inputFileName)) { diff --git a/src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/index.vue b/src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/index.vue index 5399e64..5b2bd5d 100644 --- a/src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/index.vue @@ -1603,6 +1603,7 @@ export default { fileName, list_identify: nuclides, gammaRoiNum: this.currROIIndex + 1, + energyTolerance: this.model.tolerance }) if (success) { nuclides.push(possibleNuclide)