From a8b4d3453619540dc23eac9c798920ffd62d7356 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: Thu, 9 Nov 2023 10:55:08 +0800
Subject: [PATCH] =?UTF-8?q?gamma=20=E6=A8=A1=E5=9D=97=20Interactive=20tool?=
 =?UTF-8?q?=20=E5=BC=B9=E7=AA=97=E4=BD=8D=E7=BD=AE=20Calibration=20?=
 =?UTF-8?q?=E7=82=B9=E5=87=BBReanalysis=E4=B9=8B=E5=90=8E=20=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E7=BB=93=E6=9E=9C=20Result=20display=20=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E9=87=8D=E6=96=B0=E6=B8=B2=E6=9F=93=20formFile=20?=
 =?UTF-8?q?=E7=82=B9=E5=87=BBsave=20to=20DB=20Result=20display=20=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/spectrumAnalysis/beta-gamma-analysis.vue | 14 ++++++++------
 .../Modals/AnalyzeInteractiveToolModal/index.vue   |  7 ++++++-
 src/views/spectrumAnalysis/index.vue               |  9 +++++----
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
index 62300ba..09946fe 100644
--- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
@@ -183,15 +183,15 @@ export default {
     sampleInfo: {
       type: Object,
     },
-    // analyseCurrentSpectrum: {
-    //   type: Object,
-    // },
+    analyseCurrentSpectrum: {
+      type: Object,
+    },
   },
   data() {
     this.SampleType = SampleType
 
     return {
-      analyseCurrentSpectrum: {},
+      // analyseCurrentSpectrum: {},
       qcFlags: {},
 
       spectraVisible: false,
@@ -466,7 +466,8 @@ export default {
       postAction('/spectrumAnalysis/analyseCurrentSpectrum', params).then((res) => {
         if (res.success) {
           // this.isReAnalyed_beta = true
-          this.analyseCurrentSpectrum = res.result
+          // this.analyseCurrentSpectrum = res.result
+          this.$emit('sendXeData', res.result.XeData)
           if (res.result.XeData && res.result.XeData.length > 0) {
             res.result.XeData.forEach((item) => {
               item.conc = parseFloat(item.conc.toPrecision(6))
@@ -493,7 +494,8 @@ export default {
       }
       postAction('/spectrumAnalysis/analyseAllSpectrum', params).then((res) => {
         if (res.success) {
-          this.analyseCurrentSpectrum = res.result
+          // this.analyseCurrentSpectrum = res.result
+          this.$emit('sendXeData', res.result.XeData)
           res.result.XeData.forEach((item) => {
             item.conc = parseFloat(item.conc.toPrecision(6))
             item.concErr = parseFloat(item.concErr.toPrecision(6))
diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue
index 7d23567..46d6b31 100644
--- a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue
+++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue
@@ -1820,7 +1820,12 @@ export default {
     width: 100%;
   }
 }
-
+::v-deep {
+  .ant-modal {
+    top: 5px;
+    padding-bottom: 7px;
+  }
+}
 .is-modify,
 .is-fitting {
   color: #f00;
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index f0a7682..62b93dd 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -49,12 +49,13 @@
         ref="betaGammaAnalysisRef"
         @getFiles="getFiles"
         @sendInfo="getStationName"
+        @sendXeData="getXeData"
         @reAnalyCurr="getReAnalyCurr"
         @reAnalyAll="getReAnalyAll"
         :sampleInfo="sampleInfo"
         :sample="sampleData"
+        :analyseCurrentSpectrum="analyseCurrentSpectrumData"
       />
-        <!-- :analyseCurrentSpectrum="analyseCurrentSpectrumData" -->
       <!-- Beta-Gamma 分析 -->
       <div v-else class="empty">Please Select a Sample</div>
       <resize-observer @notify="handleResize" />
@@ -376,7 +377,7 @@ export default {
       betaGammaRlrModalVisible: false, // beta-gamma RLR 弹窗
       statisticsParamerHistoryModalVisible: false, // beta-gamma Statistics Paramer History 弹窗
       bgLogViewerVisible: false, // beta-gamma Log 下的BG log viewer 弹窗
-      // analyseCurrentSpectrumData: {},
+      analyseCurrentSpectrumData: {},
       resultDisplayFlag: [],
       params_toDB: {
         comment: '',
@@ -467,7 +468,7 @@ export default {
       this.params_toDB.checkDet = val.checkDet
     },
     getXeData(val) {
-      // this.$set(this.analyseCurrentSpectrumData, 'XeData', val)
+      this.$set(this.analyseCurrentSpectrumData, 'XeData', val)
       this.resultDisplayFlag = val
     },
     // formDB 来源 吧接口返回的文件名称添加到sampleData
@@ -1304,7 +1305,7 @@ export default {
                   title: 'BG log viewer',
                   show: this.isBetaGamma,
                   handler: () => {
-                    if(this.params_toDB.savedAnalysisResult) {
+                    if (this.params_toDB.savedAnalysisResult) {
                       this.bgLogViewerVisible = true
                     }
                   },