beta 查看RRR的接口参数调整

beta、gamma 查看RRR 逻辑调整，增加权限，（分析后才可以查看）

src/views/spectrumAnalysis/beta-gamma-analysis.vue

@@ -335,6 +335,7 @@ export default {
         } = this.sampleDetail[this.spectraType]
         const {
           XeData, // 右下角Result Display
+          savedAnalysisResult,
         } = this.sampleDetail
 
         this.spectrumData = spectrumData
@@ -353,7 +354,7 @@ export default {
 
         this.resultDisplay = XeData
 
-        this.$emit('sendInfo', this.resultDisplay, this.spectrumData.stationCode)
+        this.$emit('sendInfo', this.resultDisplay, this.spectrumData.stationCode, savedAnalysisResult)
 
         this.qcFlags = {
           AcqTimeBtn,

src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue

@@ -52,16 +52,43 @@ export default {
           url = '/spectrumAnalysis/viewRRR'
           break
       }
+      console.log(this.extraData)
       try {
         this.content = ''
         this.isLoading = true
-        const { sampleId, inputFileName: fileName } = this.sampleData
+        console.log(this.sampleData)
-        const method = this.type == 4? postAction : getAction
+        const {
-        const res = await method(url, {
           sampleId,
-          fileName,
+          inputFileName: fileName,
-          ...this.extraData,
+          dbName,
-        })
+          detFileName,
+          gasFileName,
+          qcFileName,
+          sampleFileName,
+        } = this.sampleData
+        // const method = this.type == 4 ? postAction : getAction
+        let res = null
+        if (this.type == 4) {
+          let params = {
+            dbName,
+            sampleId,
+            sampleData: this.extraData.sampleData,
+            gasBgData: this.extraData.GasBgData,
+            detBgData: this.extraData.DetBgData,
+            qcData: this.extraData.QCData,
+            sampleFileName,
+            gasFileName,
+            detFileName,
+            qcFileName,
+          }
+          res = await postAction(url, params)
+        } else {
+          res = await getAction(url, {
+            sampleId,
+            fileName,
+            ...this.extraData,
+          })
+        }
 
         if (typeof res == 'string') {
           this.content = res

src/views/spectrumAnalysis/gamma-analysis.vue

@@ -222,6 +222,7 @@ export default {
       checkBox_updateCal: false, //update复选框状态
       newCheckBox_updateCal: false, //update复选框状态
       currStep: '',
+      isReAnalyed: false,
     }
   },
   created() {
@@ -388,6 +389,7 @@ export default {
       } = result
       if (flag && (flag == 'dab' || flag == 'file')) {
         this.bAnalyed = result.bAnalyed
+        this.$emit('reAnalyed', this.bAnalyed)
         this.checkBox_updateCal = result.checkBox_updateCal
         this.newCheckBox_updateCal = '2'
         console.log(this.checkBox_updateCal)
@@ -1291,6 +1293,8 @@ export default {
         const { inputFileName: fileName } = this.sample
         const { success, result, message } = await postAction(`/gamma/Reprocessing?fileName=${fileName}`)
         if (success) {
+          this.isReAnalyed = true
+          this.$emit('reAnalyed', this.isReAnalyed)
           this.handleResetState()
           result.DetailedInformation = this.detailedInfomation
           this.dataProsess(result)

src/views/spectrumAnalysis/index.vue

@@ -30,7 +30,13 @@
     <!-- 频谱分析部分 -->
     <div class="spectrum-analysis-main">
       <!-- Gamma 分析 -->
-      <gamma-analysis v-if="isGamma" ref="gammaAnalysisRef" :sample="sampleData" :updateFlag="updateFlag" />
+      <gamma-analysis
+        v-if="isGamma"
+        ref="gammaAnalysisRef"
+        :sample="sampleData"
+        :updateFlag="updateFlag"
+        @reAnalyed="handleReAnalyed"
+      />
       <!-- Gamma 分析 -->
 
       <!-- Beta-Gamma 分析 -->
@@ -376,6 +382,8 @@ export default {
         xe135Flag: null,
       },
       updateFlag: '2',
+      isReAnalyed_gamma: false,
+      isReAnalyed_beta: false,
     }
   },
   created() {
@@ -393,6 +401,9 @@ export default {
   },
 
   methods: {
+    handleReAnalyed(val) {
+      this.isReAnalyed_gamma = val
+    },
     getUpdateFlag(val) {
       console.log('qerq', val)
       this.updateFlag = val
@@ -400,7 +411,7 @@ export default {
     getcommentsInfo(val) {
       this.params_toDB.comment = val.spectrumAnalysisCommentInfo
     },
-    getStationName(arg, val) {
+    getStationName(arg, val, flag) {
       arg.forEach((item) => {
         item.conc = item.conc.toFixed(6)
         item.concErr = item.concErr.toFixed(6)
@@ -409,6 +420,7 @@ export default {
       })
       this.resultDisplayFlag = arg
       this.params_toDB.stationName = val
+      this.isReAnalyed_beta = flag
     },
     getCheckFlag(val) {
       this.params_toDB.checkSample = val.checkSample
@@ -641,6 +653,7 @@ export default {
       }
       postAction('/spectrumAnalysis/analyseCurrentSpectrum', params).then((res) => {
         if (res.success) {
+          this.isReAnalyed_beta = true
           this.analyseCurrentSpectrumData = res.result
           this.resultDisplayFlag = res.result.XeData
           this.resultDisplayFlag.forEach((item) => {
@@ -1026,9 +1039,13 @@ export default {
                   type: 'a-menu-item',
                   title: 'RRR',
                   handler: () => {
-                    this.arrOrRRRModalVisible = true
+                    if (this.isReAnalyed_gamma) {
-                    this.arrOrRRRModalExtraData = {}
+                      this.arrOrRRRModalVisible = true
-                    this.arrOrRRRModalType = 2
+                      this.arrOrRRRModalExtraData = {}
+                      this.arrOrRRRModalType = 2
+                    } else {
+                      this.$message.warning('Please analyze the spectrum first!')
+                    }
                   },
                   show: this.isGamma,
                 },
@@ -1084,17 +1101,21 @@ export default {
                   type: 'a-menu-item',
                   title: 'View RRR',
                   handler: () => {
-                    this.arrOrRRRModalVisible = true
+                    if (this.isReAnalyed_beta) {
-                    this.arrOrRRRModalExtraData = {
+                      this.arrOrRRRModalVisible = true
-                      dbName: this.sampleData.dbName,
+                      this.arrOrRRRModalExtraData = {
-                      sampleData: false,
+                        dbName: this.sampleData.dbName,
-                      GasBgData: false,
+                        sampleData: false,
-                      DetBgData: false,
+                        GasBgData: false,
-                      QCData: false,
+                        DetBgData: false,
-                      bGammaEnergyValid: false,
+                        QCData: false,
-                      bBetaEnergyValid: false,
+                        bGammaEnergyValid: false,
+                        bBetaEnergyValid: false,
+                      }
+                      this.arrOrRRRModalType = 4
+                    } else {
+                      this.$message.warning('Please analyze the spectrum first!')
                     }
-                    this.arrOrRRRModalType = 4
                   },
                   show: this.isBetaGamma,
                 },