diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue index 6f16c6c..44e8514 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue @@ -10,7 +10,7 @@ > - + @@ -71,7 +71,7 @@ export default { }, betaEnergyValid: false, gammaEnergyValid: false, - isReanlyze: false + isReanlyze: false, } }, methods: { @@ -90,14 +90,14 @@ export default { this.betaEnergyValid = val }, getFittingFlag_gamma(val) { - console.log("zhiqian>>>"+this.gammaEnergyValid); + console.log('zhiqian>>>' + this.gammaEnergyValid) this.gammaEnergyValid = val - console.log("zhihou>>>"+this.gammaEnergyValid); + console.log('zhihou>>>' + this.gammaEnergyValid) }, handleReAnalyse() { // todo 1.fitting之后才能点击; 2.isReAnalyze需要缓存 - if(!this.gammaEnergyValid){ - return false; + if (!this.gammaEnergyValid) { + return false } const regExp = /^([A-Z]{1,}\d{1,})_/ const regMatched = this.newSampleData.inputFileName.match(regExp) @@ -157,9 +157,9 @@ export default { }, handleExit() { this.gammaEnergyValid = this.isReanlyze - console.log("exit>>>this.isReanlyze>>>"+this.isReanlyze); - if(!this.isReanlyze && this.$ls.get("calibration-gamma:"+this.newSampleData.inputFileName)){ - this.$ls.remove("calibration-gamma:"+this.newSampleData.inputFileName) // 如果没有点击ReANalyze,删除fitting之后缓存的数据 20231101:xiao + console.log('exit>>>this.isReanlyze>>>' + this.isReanlyze) + if (!this.isReanlyze && this.$ls.get('calibration-gamma:' + this.newSampleData.inputFileName)) { + this.$ls.remove('calibration-gamma:' + this.newSampleData.inputFileName) // 如果没有点击ReANalyze,删除fitting之后缓存的数据 20231101:xiao } this.visible = false }, @@ -182,6 +182,10 @@ export default { diff --git a/src/views/spectrumAnalysis/components/Modals/EnergyCalibrationModal.vue b/src/views/spectrumAnalysis/components/Modals/EnergyCalibrationModal.vue index dfc0cd9..d2d980f 100644 --- a/src/views/spectrumAnalysis/components/Modals/EnergyCalibrationModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/EnergyCalibrationModal.vue @@ -680,4 +680,10 @@ export default { .mt-20 { margin-top: 20px; } +::v-deep { + .ant-modal { + top: 5px; + padding-bottom: 15px; + } +} diff --git a/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal.vue b/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal.vue index 8ee8f88..ebdda9a 100644 --- a/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal.vue @@ -679,4 +679,10 @@ export default { .mt-20 { margin-top: 20px; } +::v-deep { + .ant-modal { + top: 5px; + padding-bottom: 15px; + } +}