自建台站ROI功能修改

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)
-
+      if(target) {
         target[keys[keys.length - 1]] = data
+      } else {
+        console.log(`${key}不存在`)
+      }
     } else {
       find.data[key] = data
     }

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
+        Object.entries(result).forEach(([k, v]) => {
-        this.spectrumData = DetailedInformation
           // 更新缓存中的DetailedInfomation数据
           updateSampleData({
             inputFileName: fileName,
-          key: `${this.spectraType}.spectrumData`,
+            key: `${k}.spectrumData`,
-          data: DetailedInformation,
+            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)
       }

src/views/spectrumAnalysis/components/BetaGammaSpectrum.vue

@@ -256,6 +256,7 @@ export default {
 
     setBoundaryList(boundary) {
       this.boundary = boundary
+      this.reDrawRect()
     },
 
     setOption(option, opts) {