diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index cfc11fc..3033f66 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -289,7 +289,7 @@ export default { } } - this.changeChartByType(this.spectraType) + this.changeChartByType(this.spectraType, result.XeData) }, handleGetFlag(val, obj) { @@ -401,7 +401,7 @@ export default { return cancelToken }, - changeChartByType(val) { + changeChartByType(val, data) { if (val === 'qc' && !this.sampleDetail.qc) { this.$message.warning('No qc spectrum file!') } else { @@ -452,7 +452,7 @@ export default { console.log('this.resultDisplaythis.resultDisplay', this.resultDisplay) - this.resultDisplay = XeData + this.resultDisplay = data ? data : XeData this.sortResultDisplay() this.$emit('sendInfo', this.resultDisplay, this.spectrumData.stationCode, savedAnalysisResult) @@ -555,7 +555,7 @@ export default { item.lc = parseFloat(item.lc.toPrecision(6)) item.mdc = parseFloat(item.mdc.toPrecision(6)) }) - this.$emit('reAnalyCurr', true, res.result.XeData) + this.$emit('reAnalyCurr', res.result.savedAnalysisResult, res.result.XeData) this.handleReAnalyse(res.result) if (res.result.bProcessed) { this.$message.success(res.result.message) diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue index fb127b2..aa583b2 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue @@ -153,7 +153,7 @@ export default { item.mdc = parseFloat(item.mdc.toPrecision(6)) }) this.$emit('sendXeData', res.result.XeData) - this.$emit('reAnalyCurr', true, res.result.XeData) + this.$emit('reAnalyCurr', res.result.savedAnalysisResult, res.result.XeData) this.isReanlyze = true this.handleExit() this.$bus.$emit('ReAnalyses', res.result) diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index 2d09bc5..ae3fe05 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -499,7 +499,7 @@ export default { methods: { getReAnalyCurr(flag, val) { this.isReAnalyed_beta = flag - this.params_toDB.savedAnalysisResult = true + this.params_toDB.savedAnalysisResult = flag this.resultDisplayFlag = val }, getReAnalyAll(val) {