diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index 09946fe..7153206 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -224,10 +224,24 @@ export default { currSample: {}, } }, + created() { + this.$bus.$on('ReAnalyse', this.redrawRect) + }, destroyed() { this.cancelLastRequest() + this.$bus.$off('ReAnalyse', this.redrawRect) }, methods: { + // 重新绘制矩形框 + redrawRect(result) { + const keys = ['SampleBoundary', 'GasBoundary', 'DetBoundary', 'QCBoundary'] + SampleType.forEach((item, index) => { + const value = result[keys[index]] + this.sampleDetail[item.value].Boundary = value || [] + this.changeChartByType(this.spectraType) + }) + }, + handleGetFlag(val, obj) { this.resultDisplay.forEach((item) => { if (item.nuclideName === obj.nuclideName) { diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue index 112765f..d0cea09 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue @@ -151,6 +151,7 @@ export default { this.$message.success('Analyse Success!') this.isReanlyze = true this.handleExit() + this.$bus.$emit('ReAnalyse', res.result) } else { this.$message.warning(res.message) } diff --git a/src/views/spectrumAnalysis/components/Modals/EfficiencyCalibrationModal.vue b/src/views/spectrumAnalysis/components/Modals/EfficiencyCalibrationModal.vue index 653370b..9cddec2 100644 --- a/src/views/spectrumAnalysis/components/Modals/EfficiencyCalibrationModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/EfficiencyCalibrationModal.vue @@ -346,6 +346,8 @@ export default { }, beforeModalOpen() { + this.model.energy = null + this.model.efficiency = null this.selectedRowKeys = [] this.funcId = 1 this.getData() diff --git a/src/views/spectrumAnalysis/components/Modals/EnergyCalibrationModal.vue b/src/views/spectrumAnalysis/components/Modals/EnergyCalibrationModal.vue index d2d980f..b61ba7b 100644 --- a/src/views/spectrumAnalysis/components/Modals/EnergyCalibrationModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/EnergyCalibrationModal.vue @@ -310,6 +310,8 @@ export default { beforeModalOpen() { this.selectedRowKeys = [] this.getData() + this.model.channel = null + this.model.energy = null }, // 表格单行点击 diff --git a/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal.vue b/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal.vue index ebdda9a..dce8e1b 100644 --- a/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal.vue @@ -309,6 +309,8 @@ export default { beforeModalOpen() { this.selectedRowKeys = [] this.getData() + this.model.energy = null + this.model.fwhm = null }, // 表格单行点击