From 12cdef2ae197ff77a5a444a80d5538899f66142c Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Fri, 2 Aug 2024 09:40:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=BB=BA=E5=8F=B0=E7=AB=99ROI?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/SampleStore.js                      | 10 +++--
 src/views/spectrumAnalysis/beta-analysis.vue  | 39 +++++++++++++------
 .../components/BetaGammaSpectrum.vue          |  1 +
 3 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/src/utils/SampleStore.js b/src/utils/SampleStore.js
index c2cc432..7b9c07f 100644
--- a/src/utils/SampleStore.js
+++ b/src/utils/SampleStore.js
@@ -27,6 +27,7 @@ const addSampleData = sampleData => {
  * @param {{ inputFileName: string; key: string; data: any; }} param0
  */
 const updateSampleData = ({ inputFileName, key, data }) => {
+  console.log('updateSampleData:', key)
   const find = sampleList.find(item => item.inputFileName == inputFileName)
   if (find) {
     if (key.includes('.')) {
@@ -35,10 +36,13 @@ const updateSampleData = ({ inputFileName, key, data }) => {
         if (index == keys.length - 1) {
           return acc
         }
-        return acc[k]
+        return acc? acc[k]: null
       }, find.data)
-
-      target[keys[keys.length - 1]] = data
+      if(target) {
+        target[keys[keys.length - 1]] = data
+      } else {
+        console.log(`${key}不存在`)
+      }
     } else {
       find.data[key] = data
     }
diff --git a/src/views/spectrumAnalysis/beta-analysis.vue b/src/views/spectrumAnalysis/beta-analysis.vue
index 6475d08..d30157c 100644
--- a/src/views/spectrumAnalysis/beta-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-analysis.vue
@@ -364,8 +364,6 @@ export default {
 
       try {
         this.isLoading = true
-        const { inputFileName } = this.sample
-
         const params = this.roiParamList.map(([startChannel, endChannel], index) => ({
           startChannel,
           endChannel,
@@ -373,8 +371,10 @@ export default {
         }))
 
         const formData = new FormData()
+        const { inputFileName } = this.sample
         formData.append('sampleFileName', inputFileName)
         formData.append('roiParams', JSON.stringify(params))
+        formData.append('dataType', this.spectrumData.dataType)
 
         const { success, result, message } = await putAction('/selfStation/updateROI', formData)
         if (success) {
@@ -395,12 +395,27 @@ export default {
 
           this.ROILists = [ROIOneList, ROITwoList, ROIThreeList, ROIFourList]
 
-          this.$refs.betaChartRef.setBoundaryList([
+          const boundaryList = [
             [ROIOneStart, ROIOneStop],
             [ROITwoStart, ROITwoStop],
             [ROIThreeStart, ROIThreeStop],
             [ROIFourStart, ROIFourStop],
-          ])
+          ]
+
+          this.$refs.betaChartRef.setBoundaryList(boundaryList)
+
+          const updateKeys = ['One', 'Two', 'Three', 'Four']
+          updateKeys.forEach((updateKey) => {
+            const innerKeys = ['Start', 'Stop', 'List']
+            innerKeys.forEach((innerKey) => {
+              const realKey = `ROI${updateKey}${innerKey}`
+              updateSampleData({
+                inputFileName,
+                key: `${this.spectraType}.${realKey}`,
+                data: result[realKey],
+              })
+            })
+          })
         } else {
           this.isLoading = false
           this.$message.error(message)
@@ -603,16 +618,16 @@ export default {
         fileName,
       })
       if (success) {
-        const { DetailedInformation } = result
-        this.spectrumData = DetailedInformation
-        // 更新缓存中的DetailedInfomation数据
-        updateSampleData({
-          inputFileName: fileName,
-          key: `${this.spectraType}.spectrumData`,
-          data: DetailedInformation,
+        Object.entries(result).forEach(([k, v]) => {
+          // 更新缓存中的DetailedInfomation数据
+          updateSampleData({
+            inputFileName: fileName,
+            key: `${k}.spectrumData`,
+            data: v,
+          })
         })
 
-        console.log('%c [  ]-617', 'font-size:13px; background:pink; color:#bf2c9f;', getSampleData(fileName))
+        this.spectrumData = result[this.spectraType]
       } else {
         throw new Error(message)
       }
diff --git a/src/views/spectrumAnalysis/components/BetaGammaSpectrum.vue b/src/views/spectrumAnalysis/components/BetaGammaSpectrum.vue
index ce2dacb..7936f32 100644
--- a/src/views/spectrumAnalysis/components/BetaGammaSpectrum.vue
+++ b/src/views/spectrumAnalysis/components/BetaGammaSpectrum.vue
@@ -256,6 +256,7 @@ export default {
 
     setBoundaryList(boundary) {
       this.boundary = boundary
+      this.reDrawRect()
     },
 
     setOption(option, opts) {