From 801ff3d10a1e18f8a5ab02e1dd0f0c68d1f543f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <renpy@yuanian.com>
Date: Fri, 15 Sep 2023 18:17:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=20form=20File=20=E6=9D=A5?=
 =?UTF-8?q?=E6=BA=90=20Energy=20Calibration=20=E5=BC=B9=E7=AA=97=E6=97=A0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E5=8F=8A?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/BetaDetectorCalibration.vue         |  8 ++++----
 .../components/GammaDetectorCalibration.vue        |  8 ++++----
 src/views/spectrumAnalysis/index.vue               | 14 ++++++++++----
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue
index 22ab33c..ca3e86e 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue
@@ -596,9 +596,9 @@ export default {
     }
   },
   created() {
-    if (this.sampleId) {
-      this.getData()
-    }
+    // if (this.sampleId) {
+    this.getData()
+    // }
   },
   methods: {
     handleExit() {
@@ -606,7 +606,7 @@ export default {
     },
 
     async getData() {
-      const { sampleId, qcFileName } = this.newSampleData
+      const { sampleId = '', qcFileName } = this.newSampleData
       try {
         this.isLoading = true
         const res = await getAction('/spectrumAnalysis/viewBetaDetectorCalibration', {
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue
index 5e2d662..485391d 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue
@@ -475,9 +475,9 @@ export default {
     }
   },
   created() {
-    if (this.sampleId) {
-      this.getData()
-    }
+    // if (this.sampleId) {
+    this.getData()
+    // }
   },
   methods: {
     handleExit() {
@@ -485,7 +485,7 @@ export default {
     },
 
     async getData() {
-      const { sampleId, qcFileName } = this.newSampleData
+      const { sampleId = '', qcFileName } = this.newSampleData
       try {
         this.isLoading = true
         const res = await getAction('/spectrumAnalysis/viewGammaDetectorCalibration', {
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index 2dd9692..fcc510d 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -375,6 +375,7 @@ export default {
   },
 
   methods: {
+    // formDB 来源 吧接口返回的文件名称添加到sampleData
     getFiles(val) {
       this.newSampleData = { ...this.sampleData, ...val }
     },
@@ -419,7 +420,7 @@ export default {
       } else {
         this.analysisType = ANALYZE_TYPE.GAMMA
       }
-      this.sampleData = sample
+      this.sampleData = this.newSampleData = sample
     },
 
     // 清理全部
@@ -512,7 +513,6 @@ export default {
         detFileNames: [this.sampleData.detFileName],
       }
       postAction('/spectrumAnalysis/analyseCurrentSpectrum', params).then((res) => {
-        console.log(res)
         if (res.success) {
           this.analyseCurrentSpectrumData = res.result
         } else {
@@ -524,8 +524,14 @@ export default {
       console.log('savetodb')
     },
     handleEnergyCalib() {
-      if (this.newSampleData.qcFileName) {
-        this.betaGammaEnergyCalibrationModalVisible = true
+      if (this.newSampleData.sampleId) {
+        if (this.newSampleData.qcFileName) {
+          this.betaGammaEnergyCalibrationModalVisible = true
+        }
+      } else {
+        if (this.newSampleData.qcFileStatus && this.newSampleData.qcFileName) {
+          this.betaGammaEnergyCalibrationModalVisible = true
+        }
       }
     },
   },