beta 分析接口调试

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

@@ -182,6 +182,9 @@ export default {
     sample: {
       type: Object,
     },
+    analyseCurrentSpectrum: {
+      type: Object,
+    },
   },
   data() {
     this.SampleType = SampleType
@@ -197,6 +200,7 @@ export default {
       spectrumData: {}, // Detailed Infomation 信息
 
       resultDisplay: [],
+      currResultDisplay: [],
 
       histogramDataList: [],
       histogramDataDList: [],
@@ -232,7 +236,7 @@ export default {
           this.sampleDetail = result
           this.changeChartByType('sample')
           this.isLoading = false
-          // this.$emit("getFiles",{detFileName:result.detBg.fileName,gasFileName:result.gasBg.fileName})
+          this.$emit('getFiles', { detFileName: result.detBg.fileName, gasFileName: result.gasBg.fileName })
         } else {
           this.$message.error(message)
         }
@@ -305,7 +309,7 @@ export default {
         this.betaProjectedData = betaProjectedData
         this.betaEnergyData = betaEnergyData
 
-        this.resultDisplay = XeData
+        this.resultDisplay = this.currResultDisplay || XeData
 
         this.qcFlags = {
           AcqTimeBtn,
@@ -387,7 +391,6 @@ export default {
   watch: {
     sample: {
       handler(newVal, oldVal) {
-        console.log('newValnewVal', newVal)
         if (newVal.sampleId) {
           this.getSampleDetail()
         } else {
@@ -396,6 +399,14 @@ export default {
       },
       immediate: true,
     },
+    analyseCurrentSpectrum: {
+      handler(newVal, oldVal) {
+        this.currResultDisplay = newVal.XeData
+        this.resultDisplay = newVal.XeData
+      },
+      immediate: true,
+      deep: true,
+    },
   },
 }
 </script>

src/views/spectrumAnalysis/index.vue

@@ -34,8 +34,14 @@
       <!-- Gamma 分析 -->
 
       <!-- Beta-Gamma 分析 -->
-      <beta-gamma-analysis v-else-if="isBetaGamma" ref="betaGammaAnalysisRef" :sample="sampleData" />
+      <!-- <beta-gamma-analysis v-else-if="isBetaGamma" ref="betaGammaAnalysisRef" :sample="sampleData" /> -->
-      <!-- <beta-gamma-analysis v-else-if="isBetaGamma" ref="betaGammaAnalysisRef" @getFiles="getFiles" :sample="sampleData" /> -->
+      <beta-gamma-analysis
+        v-else-if="isBetaGamma"
+        ref="betaGammaAnalysisRef"
+        @getFiles="getFiles"
+        :sample="sampleData"
+        :analyseCurrentSpectrum="analyseCurrentSpectrumData"
+      />
       <!-- Beta-Gamma 分析 -->
       <div v-else class="empty">Please Select a Sample</div>
       <resize-observer @notify="handleResize" />
@@ -191,6 +197,7 @@
   </div>
 </template>
 <script>
+import { postAction } from '@/api/manage'
 import GammaAnalysis from './gamma-analysis.vue'
 import BetaGammaAnalysis from './beta-gamma-analysis.vue'
 import SpectraListInMenu from './components/SpectraListInMenu.vue'
@@ -350,6 +357,7 @@ export default {
       betaGammaQCResultsModalVisible: false, // beta-gamma QC Result 弹窗
       betaGammaRlrModalVisible: false, // beta-gamma RLR 弹窗
       statisticsParamerHistoryModalVisible: false, // beta-gamma Statistics Paramer History 弹窗
+      analyseCurrentSpectrumData: {},
     }
   },
   created() {
@@ -367,9 +375,9 @@ export default {
   },
 
   methods: {
-    // getFiles(val){
+    getFiles(val) {
-    //   this.sampleData={...this.sampleData,...val}
+      this.sampleData = { ...this.sampleData, ...val }
-    // },
+    },
     /**
      * 从数据库加载-选择完成
      * @param {any[]} sampleList
@@ -392,6 +400,7 @@ export default {
       })
       console.log('sampleListsampleList', arr)
       arr.forEach((item) => {
+        item.dbNames = ''
         item.sampleId = ''
         item.inputFileName = item.sampleFileName
         item.sampleType = item.sampleSystemType
@@ -493,6 +502,32 @@ export default {
     handleReanalyse(...data) {
       this.$refs.betaGammaAnalysisRef.reanalyse(data)
     },
+    // beta Analyze current spectrum 分析接口
+    getAnalyzeCurrentSpectrum() {
+      let params = {
+        // dbNames: [''],
+        // sampleIds: [''],
+        // sampleFileNames: ['AUX09_003-20151226_1855_S_FULL_40184.8.PHD'],
+        // gasFileNames: ['AUX09_003-20151226_0655_G_FULL_40184.7.PHD'],
+        // detFileNames: ['AUX09_003-20150527_0425_D_FULL_259450.PHD'],
+        dbNames: [this.sampleData.dbName],
+        sampleIds: [this.sampleData.sampleId],
+        sampleFileNames: [this.sampleData.inputFileName],
+        gasFileNames: [this.sampleData.gasFileName],
+        detFileNames: [this.sampleData.detFileName],
+      }
+      postAction('/spectrumAnalysis/analyseCurrentSpectrum', params).then((res) => {
+        console.log(res)
+        if (res.success) {
+          this.analyseCurrentSpectrumData = res.result
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    saveToDb() {
+      console.log('savetodb')
+    },
   },
   computed: {
     // 顶部菜单栏配置
@@ -661,7 +696,9 @@ export default {
                   type: 'a-menu-item',
                   title: 'Analyze current spectrum',
                   show: this.isBetaGamma,
-                  handler: () => {},
+                  handler: () => {
+                    this.getAnalyzeCurrentSpectrum()
+                  },
                 },
                 {
                   type: 'a-menu-item',