From eb1ea53b8f7f3bc369cc0efe92261c54dd3a39d2 Mon Sep 17 00:00:00 2001
From: xiaoguangbin <xiaoguangbin>
Date: Thu, 16 Nov 2023 18:55:10 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=A7=A3=E5=86=B3beta=E7=9A=84cali?=
 =?UTF-8?q?bration=20tab=E6=98=AFbeta=20=E7=82=B9=E5=87=BBreanalyze?=
 =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BetaGammaEnergyCalibrationModal/index.vue                | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue
index 7796652..419c27d 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue
@@ -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,})_/