From 967fa6705a154114fe913b1d70caa457a2875058 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Fri, 11 Aug 2023 09:25:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9Beta-Gamma=20=E4=B8=8B?=
 =?UTF-8?q?=E7=9A=84RRR=E5=BC=B9=E7=AA=97=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Modals/ArrRrrModal.vue         | 14 +++++++++++--
 src/views/spectrumAnalysis/index.vue          | 20 ++++++++++++++++---
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue b/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue
index 590fefb..cb84c7c 100644
--- a/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue
@@ -23,6 +23,10 @@ export default {
     },
     sampleId: {
       type: Number
+    },
+    extraData: {
+      type: Object,
+      default: () => ({})
     }
   },
   data() {
@@ -40,12 +44,18 @@ export default {
           break
         case 4:
           url = '/spectrumAnalysis/viewRRR'
+          break;
       }
       try {
         this.content = ''
         this.isLoading = true
-        const res = await getAction(url, { sampleId: this.sampleId })
-        this.content = res
+        const res = await getAction(url, { sampleId: this.sampleId, ...this.extraData })
+        if(res.success) {
+          this.content = res.result
+        }
+        else {
+          this.content = res
+        }
       } catch (error) {
         console.error(error)
       } finally {
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index 20ac8ff..5985cb8 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -118,12 +118,12 @@
     <nuclide-library-modal v-model="nuclideLibraryModalVisible" />
     <!-- Config User Library 弹窗结束 -->
 
-    <!-- Arr 弹窗开始 -->
-    <arr-rrr-modal v-model="arrOrRRRModalVisible" :type="arrOrRRRModalType" :sampleId="this.sampleData.sampleId" />
+    <!-- Arr 和 RRR 弹窗开始 -->
+    <arr-rrr-modal v-model="arrOrRRRModalVisible" :type="arrOrRRRModalType" :sampleId="this.sampleData.sampleId" :extraData="this.arrOrRRRModalExtraData" />
     <!-- Arr 弹窗结束 -->
 
     <!-- Spectrum 弹窗开始 -->
-    <spectrum-modal v-model="spectrumModalVisible" :type="arrOrRRRModalType" :sampleId="this.sampleData.sampleId" />
+    <spectrum-modal v-model="spectrumModalVisible" :sampleId="this.sampleData.sampleId" />
     <!-- Spectrum 弹窗结束 -->
 
     <!-- SampleInfo 弹窗开始 -->
@@ -312,6 +312,8 @@ export default {
       peakInfomationModalVisible: false, // Reports -> PeakInfo 弹窗
       arrOrRRRModalVisible: false, // Reports -> ARR 或RRR 弹窗
       arrOrRRRModalType: 1, // Reports -> ARR 或RRR 弹窗类型
+      arrOrRRRModalExtraData: {},
+
       nuclideActivityAndMDCModalVisible: false, // Reports -> Radionuclide Activity 弹窗
       spectrumModalVisible: false, // Reports -> Spectrum 弹窗
       sampleInfomationModalVisible: false, // Reports -> Sample Infomation 弹窗
@@ -724,6 +726,7 @@ export default {
                   title: 'ARR',
                   handler: () => {
                     this.arrOrRRRModalVisible = true
+                    this.arrOrRRRModalExtraData = {}
                     this.arrOrRRRModalType = 1
                   },
                   show: this.isGamma
@@ -733,6 +736,7 @@ export default {
                   title: 'RRR',
                   handler: () => {
                     this.arrOrRRRModalVisible = true
+                    this.arrOrRRRModalExtraData = {}
                     this.arrOrRRRModalType = 2
                   },
                   show: this.isGamma
@@ -776,6 +780,7 @@ export default {
                   title: 'View ARR',
                   handler: () => {
                     this.arrOrRRRModalVisible = true
+                    this.arrOrRRRModalExtraData = {}
                     this.arrOrRRRModalType = 3
                   },
                   show: this.isBetaGamma
@@ -785,6 +790,15 @@ export default {
                   title: 'View RRR',
                   handler: () => {
                     this.arrOrRRRModalVisible = true
+                    this.arrOrRRRModalExtraData = {
+                      dbName: this.sampleData.dbName,
+                      sampleData: false,
+                      GasBgData: false,
+                      DetBgData: false,
+                      QCData: false,
+                      bGammaEnergyValid: false,
+                      bBetaEnergyValid: false
+                    }
                     this.arrOrRRRModalType = 4
                   },
                   show: this.isBetaGamma