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

This commit is contained in:
xiaoguangbin 2023-11-16 18:55:10 +08:00
parent 709a0c069a
commit eb1ea53b8f

View File

@ -13,7 +13,7 @@
<gamma-detector-calibration @isFitting="getFittingFlag_gamma" :isFirstFitting="gammaEnergyValid" />
</a-tab-pane>
<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-tabs>
<div class="footer">
@ -88,6 +88,7 @@ export default {
},
getFittingFlag_beta(val) {
this.betaEnergyValid = val
console.log('beta-zhiqian>>>' + this.betaEnergyValid)
},
getFittingFlag_gamma(val) {
console.log('zhiqian>>>' + this.gammaEnergyValid)
@ -96,7 +97,7 @@ export default {
},
handleReAnalyse() {
// todo 1.fitting; 2.isReAnalyze
if (!this.gammaEnergyValid) {
if (!this.gammaEnergyValid && !this.betaEnergyValid) {
return false
}
const regExp = /^([A-Z]{1,}\d{1,})_/