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 da65891..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 @@ -687,10 +693,11 @@ export default { // ? this.oldScatterSeries // : this.list.map((item) => ({ x: item.channel, y: item.energy })), count: this.isFirstFitting || !this.isInverse ? undefined : this.count, + fittingBtn : this.isFirstFitting }) if (success) { // this.isFirstFitting = true - this.gammaIsFitting = false + this.gammaIsFitting = true this.$emit('isFitting', true) // 点击reAnalyze按钮,将isFirstFitting改为true 20231101:xiao this.setCache("CALIBRATION_GAMMA_"+this.newSampleData.inputFileName, result) // 缓存数据,如果点击ReAnalyze需要回显数据 20231101:xiao diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue index 00c078d..ffc61cc 100644 --- a/src/views/spectrumAnalysis/gamma-analysis.vue +++ b/src/views/spectrumAnalysis/gamma-analysis.vue @@ -1433,13 +1433,17 @@ export default { }, // 显示比较弹窗 - showCompareModal(isStrip) { + showCompareModal(isStrip, isOperating) { if (this.isLoading) { this.$message.warn('Sample is Loading') return } this.handleResetChart() this.clearCompareLine() + if(isOperating) { + return + } + this.isStrip = isStrip if (FilePicker.canUse()) { this.chooseFileFromFS() @@ -1512,6 +1516,8 @@ export default { this.$nextTick(() => { this.thumbnailOption.yAxis.max = getAxisMax(this.getChart(), 'yAxis') }) + + this.$emit('compareSuccess', this.isStrip) } else { this.$message.error(message) } diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index bf90e2d..1a8bc5a 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -18,7 +18,13 @@