diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index 7153206..5085e76 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -225,11 +225,11 @@ export default { } }, created() { - this.$bus.$on('ReAnalyse', this.redrawRect) + this.$bus.$on('ReAnalyses', this.redrawRect) }, destroyed() { this.cancelLastRequest() - this.$bus.$off('ReAnalyse', this.redrawRect) + this.$bus.$off('ReAnalyses', this.redrawRect) }, methods: { // 重新绘制矩形框 @@ -372,7 +372,6 @@ export default { XeData, // 右下角Result Display savedAnalysisResult, } = this.sampleDetail - this.spectrumData = spectrumData this.histogramDataList = histogramDataList diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue index 5aae86e..d9f3371 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue @@ -151,7 +151,7 @@ export default { this.$message.success('Analyse Success!') this.isReanlyze = true this.handleExit() - this.$bus.$emit('ReAnalyse', res.result) + this.$bus.$emit('ReAnalyses', res.result) } else { this.$message.warning(res.message) } diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index 69b0f57..63c77f2 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -461,7 +461,7 @@ export default { } this.resultDisplayFlag = arg this.params_toDB.stationName = val - this.isReAnalyed_beta = flag + this.isReAnalyed_beta = this.isReAnalyed_beta ? this.isReAnalyed_beta : flag }, getCheckFlag(val) { this.params_toDB.checkSample = val.checkSample