From 98ce272d05470fa212d6913ad69a222c44a9f3d3 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, 2 Nov 2023 15:18:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=20beta=20=E6=99=AE=E9=87=8D?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=8E=A5=E5=8F=A3=E4=BB=A3=E7=A0=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../spectrumAnalysis/beta-gamma-analysis.vue  | 63 ++++++++++++++++--
 src/views/spectrumAnalysis/index.vue          | 66 ++++---------------
 2 files changed, 71 insertions(+), 58 deletions(-)

diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
index 836c3c7..8fb72a7 100644
--- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
@@ -121,7 +121,7 @@
 </template>
 
 <script>
-import { getAction } from '../../api/manage'
+import { getAction, postAction } from '../../api/manage'
 import BetaGammaChartContainer from './components/BetaGammaChartContainer.vue'
 import BetaGammaSpectrumChart from './components/BetaGammaSpectrumChart.vue'
 import StatisticsParamerHistoryModalForQcFlags from './components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue'
@@ -180,14 +180,15 @@ export default {
     sample: {
       type: Object,
     },
-    analyseCurrentSpectrum: {
-      type: Object,
-    },
+    // analyseCurrentSpectrum: {
+    //   type: Object,
+    // },
   },
   data() {
     this.SampleType = SampleType
 
     return {
+      analyseCurrentSpectrum: {},
       qcFlags: {},
 
       spectraVisible: false,
@@ -449,6 +450,58 @@ export default {
         this.betaEnergyData = energy
       }
     },
+    // beta Analyze current spectrum 分析接口
+    getAnalyzeCurrentSpectrum() {
+      let params = {
+        dbNames: [this.sample.dbName],
+        sampleIds: [this.sample.sampleId ? this.sample.sampleId : ''],
+        sampleFileNames: [this.sample.inputFileName],
+        gasFileNames: [this.sample.gasFileName],
+        detFileNames: [this.sample.detFileName],
+        qcFileNames: [this.sample.qcFileName],
+      }
+      postAction('/spectrumAnalysis/analyseCurrentSpectrum', params).then((res) => {
+        console.log('分析分析', res)
+        if (res.success) {
+          // this.isReAnalyed_beta = true
+          this.analyseCurrentSpectrum = res.result
+          res.result.XeData.forEach((item) => {
+            item.conc = parseFloat(item.conc.toPrecision(6))
+            item.concErr = parseFloat(item.concErr.toPrecision(6))
+            item.lc = parseFloat(item.lc.toPrecision(6))
+            item.mdc = parseFloat(item.mdc.toPrecision(6))
+          })
+          this.$emit('reAnalyCurr', true, res.result.XeData)
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    getAnalyzeAllSpectrum() {
+      let params = {
+        dbNames: [this.sample.dbName],
+        sampleIds: [this.sample.sampleId ? this.sample.sampleId : ''],
+        sampleFileNames: [this.sample.inputFileName],
+        gasFileNames: [this.sample.gasFileName],
+        detFileNames: [this.sample.detFileName],
+        qcFileNames: [this.sample.qcFileName],
+        currentFileName: this.sample.inputFileName,
+      }
+      postAction('/spectrumAnalysis/analyseAllSpectrum', params).then((res) => {
+        if (res.success) {
+          this.analyseCurrentSpectrum = res.result
+          res.result.XeData.forEach((item) => {
+            item.conc = parseFloat(item.conc.toPrecision(6))
+            item.concErr = parseFloat(item.concErr.toPrecision(6))
+            item.lc = parseFloat(item.lc.toPrecision(6))
+            item.mdc = parseFloat(item.mdc.toPrecision(6))
+          })
+          this.$emit('reAnalyAll', true, res.result.XeData)
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
   },
   watch: {
     sample: {
@@ -482,7 +535,7 @@ export default {
         this.$store.commit('UPDATE_SAMPLE_DATA', {
           inputFileName: this.sample.inputFileName,
           key: 'XeData',
-          data: newVal.XeData
+          data: newVal.XeData,
         })
       },
       immediate: true,
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index 0653424..c4c2281 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -49,6 +49,8 @@
         ref="betaGammaAnalysisRef"
         @getFiles="getFiles"
         @sendInfo="getStationName"
+        @reAnalyCurr="getReAnalyCurr"
+        @reAnalyAll="getReAnalyAll"
         :sample="sampleData"
         :analyseCurrentSpectrum="analyseCurrentSpectrumData"
       />
@@ -422,6 +424,13 @@ export default {
   },
 
   methods: {
+    getReAnalyCurr(flag, val) {
+      this.isReAnalyed_beta = flag
+      this.resultDisplayFlag = val
+    },
+    getReAnalyAll(val) {
+      this.resultDisplayFlag = val
+    },
     handleReAnalyed(val) {
       this.isReAnalyed_gamma = val
     },
@@ -709,57 +718,6 @@ export default {
     handleReanalyse(...data) {
       this.$refs.betaGammaAnalysisRef.reanalyse(data)
     },
-    // beta Analyze current spectrum 分析接口
-    getAnalyzeCurrentSpectrum() {
-      let params = {
-        dbNames: [this.newSampleData.dbName],
-        sampleIds: [this.newSampleData.sampleId ? this.newSampleData.sampleId : ''],
-        sampleFileNames: [this.newSampleData.inputFileName],
-        gasFileNames: [this.newSampleData.gasFileName],
-        detFileNames: [this.newSampleData.detFileName],
-        qcFileNames: [this.newSampleData.qcFileName],
-      }
-      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) => {
-            item.conc = parseFloat(item.conc.toPrecision(6))
-            item.concErr = parseFloat(item.concErr.toPrecision(6))
-            item.lc = parseFloat(item.lc.toPrecision(6))
-            item.mdc = parseFloat(item.mdc.toPrecision(6))
-          })
-        } else {
-          this.$message.warning(res.message)
-        }
-      })
-    },
-    getAnalyzeAllSpectrum() {
-      let params = {
-        dbNames: [this.newSampleData.dbName],
-        sampleIds: [this.newSampleData.sampleId ? this.newSampleData.sampleId : ''],
-        sampleFileNames: [this.newSampleData.inputFileName],
-        gasFileNames: [this.newSampleData.gasFileName],
-        detFileNames: [this.newSampleData.detFileName],
-        qcFileNames: [this.newSampleData.qcFileName],
-        currentFileName: this.newSampleData.inputFileName,
-      }
-      postAction('/spectrumAnalysis/analyseAllSpectrum', params).then((res) => {
-        if (res.success) {
-          this.analyseCurrentSpectrumData = res.result
-          this.resultDisplayFlag = res.result.XeData
-          this.resultDisplayFlag.forEach((item) => {
-            item.conc = parseFloat(item.conc.toPrecision(6))
-            item.concErr = parseFloat(item.concErr.toPrecision(6))
-            item.lc = parseFloat(item.lc.toPrecision(6))
-            item.mdc = parseFloat(item.mdc.toPrecision(6))
-          })
-        } else {
-          this.$message.warning(res.message)
-        }
-      })
-    },
     handleEnergyCalib() {
       if (this.newSampleData.sampleId) {
         if (this.newSampleData.qcFileName) {
@@ -998,7 +956,8 @@ export default {
                   title: 'Analyze current spectrum',
                   show: this.isBetaGamma,
                   handler: () => {
-                    this.getAnalyzeCurrentSpectrum()
+                    // this.getAnalyzeCurrentSpectrum()
+                    this.$refs.betaGammaAnalysisRef.getAnalyzeCurrentSpectrum()
                   },
                 },
                 {
@@ -1006,7 +965,8 @@ export default {
                   title: 'Analyze all spectra',
                   show: this.isBetaGamma,
                   handler: () => {
-                    this.getAnalyzeAllSpectrum()
+                    // this.getAnalyzeAllSpectrum()
+                    this.$refs.betaGammaAnalysisRef.getAnalyzeAllSpectrum()
                   },
                 },
               ],