From 35b315421a7a42048bab8887f7fe8ca89a3b9e1e Mon Sep 17 00:00:00 2001 From: xiaoguangbin Date: Mon, 11 Dec 2023 14:36:50 +0800 Subject: [PATCH] =?UTF-8?q?fix;=E6=8C=89=E4=B9=94=E7=9A=84=E8=A6=81?= =?UTF-8?q?=E6=B1=82=E5=A2=9E=E5=8A=A0=E8=AF=B7=E6=B1=82reset=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=2020231211=EF=BC=9Axiao?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/BetaDetectorCalibration.vue | 8 +++++++- .../components/GammaDetectorCalibration.vue | 9 +++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) 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 c4db8f4..2d4334e 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue @@ -876,12 +876,18 @@ export default { }, // 点击Reset Button 重置 - handleReset() { + async handleReset() { this.removeCache("CALIBRATION_BETA_"+this.newSampleData.inputFileName) // 删除fitting之后缓存的数据 20231101:xiao this.newCalibrationFuncModel = cloneDeep(newCalibrationFuncModel) this.list = [] this.newE2C = [] + // 按乔的要求增加请求reset的接口 20231211:xiao + const res = await postAction('/spectrumAnalysis/resetButton', { + tabName: "beta", + sampleFileName: this.newSampleData.inputFileName + }) + this.figureChartOption = this.oldChartOption this.figureChartOption = cloneDeep(this.oldChartOption) 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 71f184f..0d9be43 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue @@ -656,12 +656,18 @@ export default { }, // 点击Reset Button 重置 - handleReset() { + async handleReset() { this.$ls.remove("CALIBRATION_GAMMA_"+this.newSampleData.inputFileName) // 删除fitting之后缓存的数据 20231101:xiao this.newCalibrationFuncModel = cloneDeep(newCalibrationFuncModel) this.list = [] this.newE2C = [] + // 按乔的要求增加请求reset的接口 20231211:xiao + const res = await postAction('/spectrumAnalysis/resetButton', { + tabName: "gamma", + sampleFileName: this.newSampleData.inputFileName + }) + this.figureChartOption = cloneDeep(this.oldChartOption) this.isFirstFitting = false this.isInverse = false @@ -669,7 +675,6 @@ export default { // 点击Fitting按钮执行重新计算 async handleFitting() { - console.log("isFirstFitting>>"+this.isFirstFitting); const hasEmpty = Object.entries(this.newCalibrationFuncModel).some(([_, v]) => !v) if (hasEmpty && this.list.length < 3) { return