From 8282663e3ecb6ff145ec6b9b3d62317f910138d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Wed, 8 Nov 2023 18:42:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=BC=B9=E7=AA=97=E7=9A=84?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BetaGammaEnergyCalibrationModal/index.vue | 22 +++++++++++--------
 .../BetaGammaExtrapolationModal.vue           |  6 +++++
 .../Modals/EfficiencyCalibrationModal.vue     |  6 +++++
 .../Modals/EnergyCalibrationModal.vue         |  6 +++++
 .../Modals/ResolutionCalibrationModal.vue     |  6 +++++
 5 files changed, 37 insertions(+), 9 deletions(-)

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 @@
   >
     <a-tabs :animated="false" v-model="currTab">
       <a-tab-pane tab="Gamma Detector Calibration" key="gamma">
-        <gamma-detector-calibration @isFitting="getFittingFlag_gamma" :isFirstFitting="gammaEnergyValid"/>
+        <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" />
@@ -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 {
 
 <style lang="less" scoped>
 ::v-deep {
+  .ant-modal {
+    top: 5px;
+    padding-bottom: 15px;
+  }
   .ant-form-item-label,
   .ant-form-item-control {
     line-height: 30px !important;
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaExtrapolationModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaExtrapolationModal.vue
index 43e6886..6ea7105 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaExtrapolationModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaExtrapolationModal.vue
@@ -813,6 +813,12 @@ export default {
 }
 </script>
 <style lang="less" scoped>
+::v-deep {
+  .ant-modal {
+    top: 5px;
+    padding-bottom: 15px;
+  }
+}
 .border {
   border: 1px solid #0b8c82;
 }
diff --git a/src/views/spectrumAnalysis/components/Modals/EfficiencyCalibrationModal.vue b/src/views/spectrumAnalysis/components/Modals/EfficiencyCalibrationModal.vue
index a031948..653370b 100644
--- a/src/views/spectrumAnalysis/components/Modals/EfficiencyCalibrationModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/EfficiencyCalibrationModal.vue
@@ -721,4 +721,10 @@ export default {
 .mt-20 {
   margin-top: 20px;
 }
+::v-deep {
+  .ant-modal {
+    top: 5px;
+    padding-bottom: 15px;
+  }
+}
 </style>
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;
+  }
+}
 </style>
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;
+  }
+}
 </style>