diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index e6bcb0c..6feec6c 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -348,6 +348,17 @@ export default { this.statisticsType = statisticsType this.statisticModalVisible = true } + }, + + // 重新分析,设置右侧折线图的Energy + reanalyse([type, data]) { + const energy = data.map(item => [item.y]) + if(type == 'gamma') { + this.gammaEnergyData = energy + } else { + this.betaEnergyData = energy + } + } }, watch: { 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 19dfe2a..2118836 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue @@ -163,7 +163,7 @@ @@ -851,6 +851,7 @@ export default { const { EToC, newLineSeries, newScatterSeriesData, tableWidgets, CToE } = result this.newE2C = EToC + this.newLineSeries = newLineSeries if (tableWidgets) { this.list = tableWidgets @@ -919,6 +920,12 @@ export default { } }, + // 重新分析 + handleReAnalyse() { + this.$bus.$emit('reanalyse', 'beta', this.newLineSeries) + this.$emit('exit') + }, + /** * 返回的科学计数法的字符串处理 * @param {string} str 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 2a2e1b9..49df596 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue @@ -136,7 +136,7 @@ @@ -652,6 +652,8 @@ export default { const { EToC, newLineSeries, newScatterSeriesData, tableWidgets, CToE } = result this.newE2C = EToC + this.newLineSeries = newLineSeries + if (tableWidgets) { this.list = tableWidgets } @@ -717,6 +719,12 @@ export default { } }, + // 重新分析 + handleReAnalyse() { + this.$bus.$emit('reanalyse', 'gamma', this.newLineSeries) + this.$emit('exit') + }, + /** * 返回的科学计数法的字符串处理 * @param {string} str diff --git a/src/views/spectrumAnalysis/components/SpectrumLineChart.vue b/src/views/spectrumAnalysis/components/SpectrumLineChart.vue index db53ad9..a059043 100644 --- a/src/views/spectrumAnalysis/components/SpectrumLineChart.vue +++ b/src/views/spectrumAnalysis/components/SpectrumLineChart.vue @@ -168,6 +168,9 @@ export default { if(energy) { this.summary.energy = energy[0].toFixed(3) } + else { + this.summary.energy = 0 + } } else { this.option.series.markLine.data = [] this.summary.channel = 0 diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index 5985cb8..66aa0eb 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -29,8 +29,13 @@
+ + + + +
Please Select a Sample
@@ -338,6 +343,10 @@ export default { statisticsParamerHistoryModalVisible: false // beta-gamma Statistics Paramer History 弹窗 } }, + created() { + this.$bus.$on('reanalyse', this.handleReanalyse) + }, + methods: { /** * 从数据库加载-选择完成 @@ -429,6 +438,11 @@ export default { handleResize() { this.$refs.gammaAnalysisRef && this.$refs.gammaAnalysisRef.resize() this.$refs.betaGammaAnalysisRef && this.$refs.betaGammaAnalysisRef.resize() + }, + + // Beta-Gamma Energy Calibration 的重新分析 + handleReanalyse(...data) { + this.$refs.betaGammaAnalysisRef.reanalyse(data) } }, computed: {