fix: 修改Beta-Gamma 下的RRR弹窗传参

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 })
+        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 {

src/views/spectrumAnalysis/index.vue

@@ -118,12 +118,12 @@
     <nuclide-library-modal v-model="nuclideLibraryModalVisible" />
     <!-- Config User Library 弹窗结束 -->
 
-    <!-- Arr 弹窗开始 -->
+    <!-- Arr 和 RRR 弹窗开始 -->
-    <arr-rrr-modal v-model="arrOrRRRModalVisible" :type="arrOrRRRModalType" :sampleId="this.sampleData.sampleId" />
+    <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