xiaoguangbin/AnalysisSystemForRadionuclide_vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：解决beta的calibration tab是beta 点击reanalyze不生效问题

Browse Source
This commit is contained in:
xiaoguangbin 2023-11-16 18:55:10 +08:00
parent 709a0c069a
commit eb1ea53b8f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue
View File

@ -13,7 +13,7 @@
<gamma-detector-calibration @isFitting="getFittingFlag_gamma" :isFirstFitting="gammaEnergyValid" /> <gamma-detector-calibration @isFitting="getFittingFlag_gamma" :isFirstFitting="gammaEnergyValid" />
</a-tab-pane> </a-tab-pane>
<a-tab-pane tab="Beta Detector Calibration" key="beta"> <a-tab-pane tab="Beta Detector Calibration" key="beta">
<beta-detector-calibration @isFitting="getFittingFlag_beta" /> <beta-detector-calibration @isFitting="getFittingFlag_beta" :isFirstFitting="gammaEnergyValid" />
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
<div class="footer"> <div class="footer">
@ -88,6 +88,7 @@ export default {
}, },
getFittingFlag_beta(val) { getFittingFlag_beta(val) {
this.betaEnergyValid = val this.betaEnergyValid = val
console.log('beta-zhiqian>>>' + this.betaEnergyValid)
}, },
getFittingFlag_gamma(val) { getFittingFlag_gamma(val) {
console.log('zhiqian>>>' + this.gammaEnergyValid) console.log('zhiqian>>>' + this.gammaEnergyValid)
@ -96,7 +97,7 @@ export default {
}, },
handleReAnalyse() { handleReAnalyse() {
// todo 1.fitting之后才能点击; 2.isReAnalyze需要缓存 // todo 1.fitting之后才能点击; 2.isReAnalyze需要缓存
if (!this.gammaEnergyValid) { if (!this.gammaEnergyValid && !this.betaEnergyValid) {
return false return false
} }
const regExp = /^([A-Z]{1,}\d{1,})_/ const regExp = /^([A-Z]{1,}\d{1,})_/