From 8bf55b007c526fce4e0a7c60b82bd279c5b2748a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <renpy@yuanian.com>
Date: Thu, 26 Oct 2023 16:38:08 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E5=A4=84=E7=90=86form=20DB=20=E6=9D=A5?=
 =?UTF-8?q?=E6=BA=90=E7=9A=84=20beta=20viewRRR=20=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Modals/ArrRrrModal.vue              | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue b/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue
index 64ff88d..b3d19b6 100644
--- a/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue
@@ -56,17 +56,7 @@ export default {
       try {
         this.content = ''
         this.isLoading = true
-        console.log(this.sampleData)
-        const {
-          sampleId,
-          inputFileName: fileName,
-          dbName,
-          detFileName,
-          gasFileName,
-          qcFileName,
-          sampleFileName,
-        } = this.sampleData
-        // const method = this.type == 4 ? postAction : getAction
+        const { sampleId, inputFileName: fileName, dbName, detFileName, gasFileName, qcFileName } = this.newSampleData
         let res = null
         if (this.type == 4) {
           let params = {
@@ -76,7 +66,7 @@ export default {
             gasBgData: this.extraData.GasBgData,
             detBgData: this.extraData.DetBgData,
             qcData: this.extraData.QCData,
-            sampleFileName,
+            sampleFileName: fileName,
             gasFileName,
             detFileName,
             qcFileName,

From dee3c5709046d73f9b8c5a34e4bc7431e5780856 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <renpy@yuanian.com>
Date: Thu, 26 Oct 2023 17:04:21 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=20ARR=E6=9F=A5=E8=AF=A2=E6=97=A0=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=20=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue b/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue
index b3d19b6..6f1e050 100644
--- a/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue
@@ -75,7 +75,7 @@ export default {
         } else {
           res = await getAction(url, {
             sampleId,
-            fileName,
+            // fileName,
             ...this.extraData,
           })
         }

From ad19436f820ddc1c6a18b9633f10bd6501479be0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <renpy@yuanian.com>
Date: Thu, 26 Oct 2023 17:34:33 +0800
Subject: [PATCH 3/9] =?UTF-8?q?bata=20=20QC=20results=20=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=20bata=20=20View=20Sample=20Infomation=20=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../spectrumAnalysis/beta-gamma-analysis.vue  |   2 +-
 .../BetaGammaQCResultsModal.vue               | 101 +++++++++---------
 .../BetaGammaSampleInfomationModal.vue        |  70 ++++++------
 3 files changed, 89 insertions(+), 84 deletions(-)

diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
index e87c043..1d6f7c0 100644
--- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
@@ -254,7 +254,7 @@ export default {
           this.$emit('getFiles', {
             detFileName: result.detBg.fileName,
             gasFileName: result.gasBg.fileName,
-            qcFileName: result.qc.fileName || '',
+            qcFileName: (result.qc && result.qc.fileName) || '',
           })
         } else {
           this.$message.error(message)
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaQCResultsModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaQCResultsModal.vue
index b9b8b79..2df4055 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaQCResultsModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaQCResultsModal.vue
@@ -12,49 +12,49 @@
 <script>
 import { getAction, getFileAction } from '@/api/manage'
 import ModalMixin from '@/mixins/ModalMixin'
-import { saveAs } from 'file-saver';
+import { saveAs } from 'file-saver'
 import SampleDataMixin from '@/views/spectrumAnalysis/SampleDataMixin'
 
 const columns = [
   {
     title: 'QC Flags',
     dataIndex: 'qcFlags',
-    align: 'center'
+    align: 'center',
   },
   {
     title: 'Evaluation Metrics',
     dataIndex: 'evaluationMetrics',
-    align: 'center'
+    align: 'center',
   },
   {
     title: 'Value',
     dataIndex: 'value',
-    align: 'center'
+    align: 'center',
   },
   {
     title: 'Status',
     dataIndex: 'status',
     align: 'center',
     scopedSlots: {
-      customRender: 'status'
+      customRender: 'status',
     },
-    customCell: record => {
+    customCell: (record) => {
       return {
         style: {
-          backgroundColor: record.status.toLowerCase() == 'pass' ? '#008000 !important' : '#f00 !important'
-        }
+          backgroundColor: record.status.toLowerCase() == 'pass' ? '#008000 !important' : '#f00 !important',
+        },
       }
-    }
-  }
+    },
+  },
 ]
 
 export default {
   mixins: [ModalMixin, SampleDataMixin],
-  props: {
-    sampleId: {
-      type: Number
-    }
-  },
+  // props: {
+  //   sampleId: {
+  //     type: Number
+  //   }
+  // },
   data() {
     this.columns = columns
     return {
@@ -62,15 +62,20 @@ export default {
       isLoading: false,
       text: '',
       fileName: '',
-      fileName_excel: ''
+      fileName_excel: '',
     }
   },
   methods: {
     async getData() {
+      const { sampleId, inputFileName: fileName, dbName, detFileName, gasFileName } = this.newSampleData
       try {
         this.isLoading = true
         const res = await getAction('/spectrumAnalysis/viewQCResult', {
-          sampleId: this.sampleId
+          sampleId,
+          dbName,
+          sampleFileName: fileName,
+          gasFileName,
+          detFileName,
         })
         if (res.success) {
           const result = res.result
@@ -79,42 +84,42 @@ export default {
             qcFlags: 'Collection Time (h)',
             evaluationMetrics: result.collectTimeEvaluationMetrics,
             value: result.collectTimeValue,
-            status: result.collectTimeStatus
+            status: result.collectTimeStatus,
           })
 
           this.list.push({
             qcFlags: 'Acquisition Time (h)',
             evaluationMetrics: result.acquisitionTimeEvaluationMetrics,
             value: result.acquisitionTimeValue,
-            status: result.acquisitionTimeStatus
+            status: result.acquisitionTimeStatus,
           })
 
           this.list.push({
             qcFlags: 'Xenon Volume (ml)',
             evaluationMetrics: result.xenonVolumeEvaluationMetrics,
             value: result.xenonVolumeValue,
-            status: result.xenonVolumeStatus
+            status: result.xenonVolumeStatus,
           })
 
           this.list.push({
             qcFlags: 'Gas Bg',
             evaluationMetrics: result.gasBgValueAndStatus,
             value: result.gasBgValueAndStatus ? 'Match' : 'UnMatch',
-            status: result.gasBgValueAndStatus ? 'Pass' : 'Failed'
+            status: result.gasBgValueAndStatus ? 'Pass' : 'Failed',
           })
 
           this.list.push({
             qcFlags: 'Det Bg',
             evaluationMetrics: result.detBgValueAndStatus,
             value: result.detBgValueAndStatus ? 'Match' : 'UnMatch',
-            status: result.detBgValueAndStatus ? 'Pass' : 'Failed'
+            status: result.detBgValueAndStatus ? 'Pass' : 'Failed',
           })
 
           this.list.push({
             qcFlags: 'MDC for Xe133(mBq/m3)',
             evaluationMetrics: result.xe133MDCEvaluationMetrics,
             value: result.xe133MDCValue,
-            status: result.xe133MDCStatus
+            status: result.xe133MDCStatus,
           })
         } else {
           this.$message.error(res.message)
@@ -131,73 +136,73 @@ export default {
       this.getData()
     },
     SaveText() {
-      this.fileName=""
+      this.fileName = ''
       this.text = `#QC RESULT\n${this.columns[0].title}                  ${this.columns[1].title}                  ${this.columns[2].title}                  ${this.columns[3].title}\n`
-      this.list.forEach(item => {
-        let str = ""
+      this.list.forEach((item) => {
+        let str = ''
         str += `${item.qcFlags}                  `
         str += `${item.evaluationMetrics}                  `
         str += `${item.value}                  `
         str += `${item.status}                  \n`
-        this.text+=str
+        this.text += str
       })
-      let strData = new Blob([this.text], { type: 'text/plain;charset=utf-8' });
+      let strData = new Blob([this.text], { type: 'text/plain;charset=utf-8' })
       let _this = this
       this.$confirm({
         title: 'Please enter file name',
-        content:  h => <a-input v-model={_this.fileName} />,
+        content: (h) => <a-input v-model={_this.fileName} />,
         okText: 'Cancle',
         cancelText: 'Save',
-        okButtonProps: {style: {backgroundColor: "#b98326", color: "#fff", borderColor: "transparent"}},
-        cancelButtonProps: {style: {color: "#fff", backgroundColor: "#31aab0", borderColor: "transparent"}},
+        okButtonProps: { style: { backgroundColor: '#b98326', color: '#fff', borderColor: 'transparent' } },
+        cancelButtonProps: { style: { color: '#fff', backgroundColor: '#31aab0', borderColor: 'transparent' } },
         onOk() {
-          console.log('Cancel');
+          console.log('Cancel')
         },
         onCancel() {
           if (_this.fileName) {
             saveAs(strData, `${_this.fileName}.txt`)
           }
         },
-      });
+      })
     },
     // 导出到Excel
     handleExportToExcel() {
-      this.fileName_excel = ""
+      this.fileName_excel = ''
       const { sampleId, inputFileName: fileName } = this.sampleData
-      if (this.list.length>0) {
+      if (this.list.length > 0) {
         let _this = this
         this.$confirm({
           title: 'Please enter file name',
-          content:  h => <a-input v-model={_this.fileName_excel} />,
+          content: (h) => <a-input v-model={_this.fileName_excel} />,
           okText: 'Cancle',
           cancelText: 'Save',
-          okButtonProps: {style: {backgroundColor: "#b98326", color: "#fff", borderColor: "transparent"}},
-          cancelButtonProps: {style: {color: "#fff", backgroundColor: "#31aab0", borderColor: "transparent"}},
+          okButtonProps: { style: { backgroundColor: '#b98326', color: '#fff', borderColor: 'transparent' } },
+          cancelButtonProps: { style: { color: '#fff', backgroundColor: '#31aab0', borderColor: 'transparent' } },
           onOk() {
-            console.log('Cancel');
+            console.log('Cancel')
           },
           onCancel() {
             if (_this.fileName_excel) {
               let params = {
-                sampleId: sampleId || "",
-                fileName
+                sampleId: sampleId || '',
+                fileName,
               }
-              getFileAction('/spectrumAnalysis/exportQCResult', params).then(res => {
+              getFileAction('/spectrumAnalysis/exportQCResult', params).then((res) => {
                 if (res.code && res.code == 500) {
-                  this.$message.warning("This operation fails. Contact your system administrator")
+                  this.$message.warning('This operation fails. Contact your system administrator')
                 } else {
-                  const blob = new Blob([res], { type: "application/vnd.ms-excel" })
+                  const blob = new Blob([res], { type: 'application/vnd.ms-excel' })
                   saveAs(blob, `${_this.fileName_excel}`)
                 }
               })
             }
           },
-        });
+        })
       } else {
-        this.$message.warning("No downloadable data")
+        this.$message.warning('No downloadable data')
       }
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="less" scoped></style>
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSampleInfomationModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSampleInfomationModal.vue
index 889671b..d4f6d1c 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSampleInfomationModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSampleInfomationModal.vue
@@ -17,21 +17,21 @@
 <script>
 import { getAction, getFileAction } from '@/api/manage'
 import ModalMixin from '@/mixins/ModalMixin'
-import { saveAs } from 'file-saver';
+import { saveAs } from 'file-saver'
 import SampleDataMixin from '@/views/spectrumAnalysis/SampleDataMixin'
 export default {
   mixins: [ModalMixin, SampleDataMixin],
   props: {
     sampleId: {
-      type: Number
-    }
+      type: Number,
+    },
   },
   data() {
     return {
       content: '',
       isLoading: true,
       fileName: '',
-      fileName_excel: ''
+      fileName_excel: '',
     }
   },
   methods: {
@@ -40,13 +40,13 @@ export default {
         this.content = ''
         this.isLoading = true
         const res = await getAction('/spectrumAnalysis/viewSampleInformation', {
-          sampleId: this.sampleId
+          sampleId: this.sampleId,
+          sampleFileName: this.newSampleData.inputFileName,
         })
-        if(res.success) {
+        if (res.success) {
           this.content = res.result
-        }
-        else {
-          this.content = ""
+        } else {
+          this.content = ''
           this.$message.error(res.message)
         }
       } catch (error) {
@@ -57,74 +57,74 @@ export default {
     },
 
     beforeModalOpen() {
-      if (this.sampleId) {
-        this.getContent()
-      }
+      // if (this.sampleId) {
+      this.getContent()
+      // }
     },
     saveText() {
-      this.fileName=""
-      if (this.content) { 
-        let strData = new Blob([this.content], { type: 'text/plain;charset=utf-8' });
+      this.fileName = ''
+      if (this.content) {
+        let strData = new Blob([this.content], { type: 'text/plain;charset=utf-8' })
         // saveAs(strData, `Beta-View Sample Infomation.txt`)
         let _this = this
         this.$confirm({
           title: 'Please enter file name',
-          content:  h => <a-input v-model={_this.fileName} />,
+          content: (h) => <a-input v-model={_this.fileName} />,
           okText: 'Cancle',
           cancelText: 'Save',
-          okButtonProps: {style: {backgroundColor: "#b98326", color: "#fff", borderColor: "transparent"}},
-          cancelButtonProps: {style: {color: "#fff", backgroundColor: "#31aab0", borderColor: "transparent"}},
+          okButtonProps: { style: { backgroundColor: '#b98326', color: '#fff', borderColor: 'transparent' } },
+          cancelButtonProps: { style: { color: '#fff', backgroundColor: '#31aab0', borderColor: 'transparent' } },
           onOk() {
-            console.log('Cancel');
+            console.log('Cancel')
           },
           onCancel() {
             if (_this.fileName) {
               saveAs(strData, `${_this.fileName}.txt`)
             }
           },
-        });
+        })
       } else {
-        this.$message.warning("No data can be saved!")
+        this.$message.warning('No data can be saved!')
       }
     },
     // 导出到Excel
     handleExportToExcel() {
-      this.fileName_excel = ""
+      this.fileName_excel = ''
       const { sampleId, inputFileName: fileName } = this.sampleData
       if (this.content) {
         let _this = this
         this.$confirm({
           title: 'Please enter file name',
-          content:  h => <a-input v-model={_this.fileName_excel} />,
+          content: (h) => <a-input v-model={_this.fileName_excel} />,
           okText: 'Cancle',
           cancelText: 'Save',
-          okButtonProps: {style: {backgroundColor: "#b98326", color: "#fff", borderColor: "transparent"}},
-          cancelButtonProps: {style: {color: "#fff", backgroundColor: "#31aab0", borderColor: "transparent"}},
+          okButtonProps: { style: { backgroundColor: '#b98326', color: '#fff', borderColor: 'transparent' } },
+          cancelButtonProps: { style: { color: '#fff', backgroundColor: '#31aab0', borderColor: 'transparent' } },
           onOk() {
-            console.log('Cancel');
+            console.log('Cancel')
           },
           onCancel() {
             if (_this.fileName_excel) {
               let params = {
-                sampleId: sampleId || "",
-                fileName
+                sampleId: sampleId || '',
+                fileName,
               }
-              getFileAction('/spectrumAnalysis/exportSampleInformation', params).then(res => {
+              getFileAction('/spectrumAnalysis/exportSampleInformation', params).then((res) => {
                 if (res.code && res.code == 500) {
-                  this.$message.warning("This operation fails. Contact your system administrator")
+                  this.$message.warning('This operation fails. Contact your system administrator')
                 } else {
-                  const blob = new Blob([res], { type: "application/vnd.ms-excel" })
+                  const blob = new Blob([res], { type: 'application/vnd.ms-excel' })
                   saveAs(blob, `${_this.fileName_excel}`)
                 }
               })
             }
           },
-        });
+        })
       } else {
-        this.$message.warning("No downloadable data")
+        this.$message.warning('No downloadable data')
       }
-    }
-  }
+    },
+  },
 }
 </script>
 

From 0f0b3eac143a8653f3a28d9ddb30944e0a9f701c Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Thu, 26 Oct 2023 18:14:15 +0800
Subject: [PATCH 4/9] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E8=B0=B1?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=97=B6=E6=9C=AC=E5=9C=B0=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BF=AE=E5=A4=8Dextrapolation=20?=
 =?UTF-8?q?=E5=92=8C=20Spectrum=E4=B8=AD=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/sample.js                   | 20 +++++---
 .../spectrumAnalysis/beta-gamma-analysis.vue  | 47 +++++++++++++++----
 .../spectrumAnalysis/clearSampleCache.js      |  2 +
 .../BetaGammaExtrapolationModal.vue           |  2 +-
 .../BetaGammaSpectrumModal.vue                | 38 ++++++++-------
 src/views/spectrumAnalysis/gamma-analysis.vue | 22 ++++++---
 src/views/spectrumAnalysis/index.vue          | 10 ++--
 7 files changed, 94 insertions(+), 47 deletions(-)

diff --git a/src/store/modules/sample.js b/src/store/modules/sample.js
index 0630a0c..273c4a0 100644
--- a/src/store/modules/sample.js
+++ b/src/store/modules/sample.js
@@ -1,6 +1,6 @@
 const sample = {
   state: {
-    sampleList: []
+    sampleList: [] // [{ inputFileName: String; data: Object; }]
   },
   mutations: {
     SET_SAMPLE_LIST: (state, sampleList) => {
@@ -8,12 +8,12 @@ const sample = {
     },
 
     ADD_SAMPLE_DATA: (state, sampleData) => {
-      state.sampleList.push(sampleData)
-    },
-
-    GET_SAMPLE_DATA: (state, inputFileName) => {
-      const find = state.sampleList.find(item => item.inputFileName == inputFileName)
-      return find
+      const find = state.sampleList.find(item => item.inputFileName == sampleData.inputFileName)
+      if(find) {
+        find.data = sampleData.data
+      } else {
+        state.sampleList.push(sampleData)
+      }
     },
 
     REMOVE_SAMPLE_DATA: (state, inputFileName) => {
@@ -24,6 +24,12 @@ const sample = {
     CLEAR_SAMPLE_DATA: () => {
       state.sampleList = []
     }
+  },
+  actions: {
+    GET_SAMPLE_DATA: ({ state }, inputFileName) => {
+      const find = state.sampleList.find(item => item.inputFileName == inputFileName)
+      return find ? find : null
+    }
   }
 }
 
diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
index 1d6f7c0..d41b4cb 100644
--- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
@@ -235,7 +235,7 @@ export default {
     async getSampleDetail() {
       this.spectraType = this.SampleType[0].value
 
-      const { dbName, sampleId } = this.sample
+      const { dbName, sampleId, inputFileName } = this.sample
       try {
         this.isLoading = true
         this.cancelLastRequest()
@@ -251,11 +251,14 @@ export default {
         if (success) {
           this.sampleDetail = result
           this.changeChartByType('sample')
-          this.$emit('getFiles', {
-            detFileName: result.detBg.fileName,
-            gasFileName: result.gasBg.fileName,
-            qcFileName: (result.qc && result.qc.fileName) || '',
+          this.emitGetFiles(result)
+
+          this.$store.commit('ADD_SAMPLE_DATA', {
+            inputFileName,
+            data: result,
+            from: 'db'
           })
+
         } else {
           this.$message.error(message)
         }
@@ -265,6 +268,15 @@ export default {
         this.isLoading = false
       }
     },
+
+    emitGetFiles(result) {
+      this.$emit('getFiles', {
+        detFileName: result.detBg.fileName,
+        gasFileName: result.gasBg.fileName,
+        qcFileName: result.qc ? result.qc.fileName : ''
+      })
+    },
+
     async getSampleDetail_file() {
       this.spectraType = this.SampleType[0].value
       let params = {
@@ -285,6 +297,12 @@ export default {
         if (success) {
           this.sampleDetail = result
           this.changeChartByType('sample')
+
+          this.$store.commit('ADD_SAMPLE_DATA', {
+            inputFileName,
+            data: result,
+            from: 'file'
+          })
           this.isLoading = false
         } else {
           this.$message.error(message)
@@ -435,12 +453,23 @@ export default {
   },
   watch: {
     sample: {
-      handler(newVal, oldVal) {
+      async handler(newVal, oldVal) {
         this.resultDisplay = []
-        if (newVal.sampleId) {
-          this.getSampleDetail()
+        const sampleData = await this.$store.dispatch('GET_SAMPLE_DATA', newVal.inputFileName)
+        if(sampleData) {
+          const { data, from } = sampleData
+          this.sampleDetail = data
+          this.changeChartByType('sample')
+          if(from == 'db') {
+            this.sampleDetail = data
+            this.emitGetFiles(data)
+          }
         } else {
-          this.getSampleDetail_file()
+          if (newVal.sampleId) {
+            this.getSampleDetail()
+          } else {
+            this.getSampleDetail_file()
+          }
         }
       },
       immediate: true,
diff --git a/src/views/spectrumAnalysis/clearSampleCache.js b/src/views/spectrumAnalysis/clearSampleCache.js
index f5a8de3..743f7a8 100644
--- a/src/views/spectrumAnalysis/clearSampleCache.js
+++ b/src/views/spectrumAnalysis/clearSampleCache.js
@@ -1,4 +1,5 @@
 import { deleteAction } from '@/api/manage'
+import store from '@/store'
 /**
  * 发起请求清理后端对sample的缓存
  * @param {Array<any>} sampleList 
@@ -13,5 +14,6 @@ export const clearSampleCache = (sampleList) => {
             params = { sampleFileName , qcFileName }
         }
         deleteAction(url, params)
+        store.commit('REMOVE_SAMPLE_DATA', fileName)
     })
 }
\ No newline at end of file
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaExtrapolationModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaExtrapolationModal.vue
index 7140185..43e6886 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaExtrapolationModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaExtrapolationModal.vue
@@ -706,7 +706,7 @@ export default {
         return
       }
 
-      const { sampleId, dbName, sampleFileName, detFileName } = this.sampleData
+      const { sampleId, dbName, inputFileName: sampleFileName, detFileName } = this.newSampleData
       try {
         const params = {
           sampleId,
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSpectrumModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSpectrumModal.vue
index e180f70..69eef1f 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSpectrumModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSpectrumModal.vue
@@ -3,16 +3,16 @@
     <a-spin :spinning="isLoading">
       <a-tabs :animated="false" @change="handleTabChange">
         <a-tab-pane tab="Sample Spectrum" :key="1">
-          <pre>{{ content.sample.join('\n') }}</pre>
+          <pre>{{ content.sample && content.sample.join('\n') }}</pre>
         </a-tab-pane>
         <a-tab-pane tab="GasBg Spectrum" :key="2">
-          <pre>{{ content.gasBg.join('\n') }}</pre>
+          <pre>{{ content.gasBg && content.gasBg.join('\n') }}</pre>
         </a-tab-pane>
         <a-tab-pane tab="DetBg Spectrum" :key="3">
-          <pre>{{ content.detBg.join('\n') }}</pre>
+          <pre>{{ content.detBg && content.detBg.join('\n') }}</pre>
         </a-tab-pane>
         <a-tab-pane tab="QC Spectrum" :key="4">
-          <pre>{{ content.qc.join('\n') }}</pre>
+          <pre>{{ content.qc && content.qc.join('\n') }}</pre>
         </a-tab-pane>
       </a-tabs>
     </a-spin>
@@ -28,13 +28,9 @@
 <script>
 import ModalMixin from '@/mixins/ModalMixin'
 import { getAction } from '../../../../../api/manage'
+import SampleDataMixin from '@/views/spectrumAnalysis/SampleDataMixin'
 export default {
-  mixins: [ModalMixin],
-  props: {
-    sampleId: {
-      type: Number
-    }
-  },
+  mixins: [ModalMixin, SampleDataMixin],
   data() {
     return {
       content: {
@@ -52,13 +48,21 @@ export default {
     async getContent() {
       try {
         this.isLoading = true
-        const res = await getAction('/spectrumAnalysis/viewSpectrum', {
-          sampleId: this.sampleId
+        const { sampleId, dbName, sampleFileName, gasFileName, detFileName, qcFileName } = this.newSampleData 
+        const { success, result, message } = await getAction('/spectrumAnalysis/viewSpectrum', {
+          sampleId,
+          dbName,
+          sampleFileName,
+          gasFileName,
+          detFileName,
+          qcFileName
         })
-        if (res.success) {
-          this.content = res.result
+        if (success) {
+          if(result) {
+            this.content = result
+          }
         } else {
-          this.$message.error(res.message)
+          this.$message.error(message)
         }
       } catch (error) {
         console.error(error)
@@ -68,9 +72,7 @@ export default {
     },
 
     beforeModalOpen() {
-      if (this.sampleId) {
-        this.getContent()
-      }
+      this.getContent()
     },
     handleTabChange(key) {
       this.currTab = key
diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue
index 241df67..91d6c94 100644
--- a/src/views/spectrumAnalysis/gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/gamma-analysis.vue
@@ -140,7 +140,6 @@ import { ACCESS_TOKEN } from '@/store/mutation-types'
 import StripModal from './components/Modals/StripModal.vue'
 import { FilePicker } from '@/utils/FilePicker'
 import { zipFile } from '@/utils/file'
-import { mapMutations } from 'vuex'
 
 export default {
   props: {
@@ -532,6 +531,14 @@ export default {
     },
 
     dataProcess(result, flag) {
+      const { inputFileName } = this.sample
+
+      this.$store.commit('ADD_SAMPLE_DATA', {
+        inputFileName,
+        data: result,
+        from: flag,
+      })
+
       this.isLoading = false
 
       const {
@@ -562,7 +569,7 @@ export default {
       this.detailedInfomation = DetailedInformation
       this.qcFlags = QCFlag
 
-      if(peak) {
+      if (peak) {
         this.peakList = peak
       }
 
@@ -1576,6 +1583,9 @@ export default {
       this.option.xAxis.name = 'Channel'
       this.option.yAxis.type = 'log'
       this.thumbnailOption.yAxis.type = 'log'
+
+      this.option.series[0].markLine.data[0].xAxis = -1
+      this.setChartBottomTitle(0, 0, 0)
     },
 
     /**
@@ -1697,8 +1707,6 @@ export default {
       const arrFunc = isList ? Array.prototype.filter : Array.prototype.find
       return arrFunc.call(allData, (item) => item.name == name && item.group == group) || {}
     },
-
-    ...mapMutations(['ADD_SAMPLE_DATA', 'GET_SAMPLE_DATA']),
   },
   watch: {
     currStep: {
@@ -1711,13 +1719,13 @@ export default {
       immediate: true,
     },
     sample: {
-      handler(newVal, oldVal) {
+      async handler(newVal, oldVal) {
         console.log('newValnewVal', newVal)
         this.graphAssistance.axisType = 'Channel'
         this.handleResetState()
-        const sampleData = this.GET_SAMPLE_DATA(newVal.inputFileName)
+        const sampleData = await this.$store.dispatch('GET_SAMPLE_DATA', newVal.inputFileName)
         if (sampleData) {
-          console.log('%c [  ]-1521', 'font-size:13px; background:pink; color:#bf2c9f;', sampleData)
+          this.dataProcess(sampleData.data, sampleData.from)
         } else {
           if (newVal.sampleId) {
             this.getSampleDetail()
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index b57630d..42bbbd3 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -174,7 +174,7 @@
     <!-- Beta-Gamma 的 Extrapolation 弹窗结束 -->
 
     <!-- Beta-Gamma 的 Spectrum 弹窗 -->
-    <beta-gamma-spectrum-modal v-model="betaGammaSpectrumModalVisible" :sampleId="this.sampleData.sampleId" />
+    <beta-gamma-spectrum-modal v-model="betaGammaSpectrumModalVisible" />
     <!-- Beta-Gamma 的 Spectrum 弹窗 结束 -->
 
     <!-- Beta-Gamma 的 Sample Infomation 弹窗 -->
@@ -415,10 +415,10 @@ export default {
     },
     getStationName(arg, val, flag) {
       arg.forEach((item) => {
-        item.conc = item.conc.toFixed(6)
-        item.concErr = item.concErr.toFixed(6)
-        item.lc = item.lc.toFixed(6)
-        item.mdc = item.mdc.toFixed(6)
+        item.conc = Number(item.conc).toFixed(6)
+        item.concErr = Number(item.concErr).toFixed(6)
+        item.lc = Number(item.lc).toFixed(6)
+        item.mdc = Number(item.mdc).toFixed(6)
       })
       this.resultDisplayFlag = arg
       this.params_toDB.stationName = val

From 5cc9a647a8dd03bf9a6a18aaed47e1c7e931a4ad Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Thu, 26 Oct 2023 18:26:03 +0800
Subject: [PATCH 5/9] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9statistics=20param?=
 =?UTF-8?q?er=20history=20=E5=BC=B9=E7=AA=97=E4=B8=AD=E7=9A=84=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../spectrumAnalysis/beta-gamma-analysis.vue  |  2 +-
 .../StatisticsParamerHistoryModal.vue         | 17 +++++++++++------
 ...tatisticsParamerHistoryModalForQCFlags.vue | 19 ++++++++++++-------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
index d41b4cb..74066a4 100644
--- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
@@ -299,7 +299,7 @@ export default {
           this.changeChartByType('sample')
 
           this.$store.commit('ADD_SAMPLE_DATA', {
-            inputFileName,
+            inputFileName: this.sample.sampleFileName,
             data: result,
             from: 'file'
           })
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue
index 94d2a35..33bfc2a 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue
@@ -17,7 +17,7 @@
               </a-space>
             </a-form-model-item>
             <a-form-model-item label="Detector">
-              <custom-select :options="detectorList" v-model="queryParams.detectorName" size="small"></custom-select>
+              <custom-select :options="detectorList" v-model="queryParams.detectorId" size="small"></custom-select>
             </a-form-model-item>
           </a-form-model>
         </title-over-border>
@@ -301,20 +301,21 @@ export default {
     // 设置左上角台站和探测器列表
     setStationAndDetector({ detectorList, stationName, stationId }) {
       this.queryParams.stationName = stationName
-      this.detectorList = detectorList.map(({ detectorCode }) => ({
+      this.detectorList = detectorList.map(({ detectorCode, detectorId }) => ({
         label: detectorCode,
-        value: detectorCode
+        value: detectorId || ''
       }))
       this.queryParams.detectorName = detectorList[0].detectorCode
+      this.queryParams.detectorId = detectorList[0].detectorId || ''
       this.queryParams.stationId = stationId
     },
 
     // 重置左上角查询信息
     handleReset() {
       this.queryParams.stationName = this.initialMDC.stationName
-      this.detectorList = this.initialMDC.detectorList.map(({ detectorCode }) => ({
+      this.detectorList = this.initialMDC.detectorList.map(({ detectorCode, detectorId }) => ({
         label: detectorCode,
-        value: detectorCode
+        value: detectorId || ''
       }))
     },
 
@@ -326,7 +327,11 @@ export default {
       }
 
       try {
-        const { success, message, result } = await postAction('/spectrumAnalysis/statisticsQuery', this.queryParams)
+        const find = this.detectorList.find(item => item.value == this.queryParams.detectorId)
+        const { success, message, result } = await postAction('/spectrumAnalysis/statisticsQuery', {
+          detectorCode: find.label,
+          ...this.queryParams
+        })
         if (success) {
           if (result) {
 
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue
index 281c48b..e5ec91d 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue
@@ -26,7 +26,7 @@
             <a-form-model-item label="Detector">
               <custom-select
                 :options="detectorList"
-                v-model="queryParams.detectorName"
+                v-model="queryParams.detectorId"
                 size="small"
                 dropdownClassName="statistics-paramer-history-select"
               ></custom-select>
@@ -204,27 +204,32 @@ export default {
     // 设置左上角台站和探测器列表
     setStationAndDetector({ detectorList, stationName, stationId }) {
       this.queryParams.stationName = stationName
-      this.detectorList = detectorList.map(({ detectorCode }) => ({
+      this.detectorList = detectorList.map(({ detectorCode, detectorId }) => ({
         label: detectorCode,
-        value: detectorCode,
+        value: detectorId || '',
       }))
       this.queryParams.detectorName = detectorList[0].detectorCode
-      this.queryParams.stationId = stationId
+      this.queryParams.detectorId = detectorList[0].detectorId || ''
+      this.queryParams.stationId = stationId || ''
     },
 
     // 重置左上角查询信息
     handleReset() {
       this.queryParams.stationName = this.initialMDC.stationName
-      this.detectorList = this.initialMDC.detectorList.map(({ detectorCode }) => ({
+      this.detectorList = this.initialMDC.detectorList.map(({ detectorCode, detectorId }) => ({
         label: detectorCode,
-        value: detectorCode,
+        value: detectorId || '',
       }))
     },
 
     // 查询右侧图表信息
     async handleStatisticsQuery() {
       try {
-        const { success, message, result } = await getAction('/spectrumAnalysis/statisticsQueryBtn', this.queryParams)
+        const find = this.detectorList.find(item => item.value == this.queryParams.detectorId)
+        const { success, message, result } = await getAction('/spectrumAnalysis/statisticsQueryBtn', {
+          detectorCode: find.label,
+          ...this.queryParams
+        })
         if (success) {
           if (result) {
             const data = result.m_Values

From 9dd1e3969ae7ff018e64bf5f9dba54677d171a50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <renpy@yuanian.com>
Date: Fri, 27 Oct 2023 10:50:01 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E5=8F=B0=E7=AB=99=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/markerPopupColumns.js          | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/stationOperation/components/markerPopupColumns.js b/src/views/stationOperation/components/markerPopupColumns.js
index a7c35b4..690c31c 100644
--- a/src/views/stationOperation/components/markerPopupColumns.js
+++ b/src/views/stationOperation/components/markerPopupColumns.js
@@ -3,6 +3,10 @@ import { MarkerType } from './markerEnum'
 // 核设施详情弹窗中的字段配置
 export default {
     [MarkerType.NuclearFacility]: [
+        {
+            label: 'FACILITY_NAME',
+            key: 'facilityName'
+        },
         {
             label: 'ACTIVITY DAY',
             key: 'activityDay'
@@ -35,10 +39,6 @@ export default {
             label: 'FACILITY ID',
             key: 'facilityId'
         },
-        {
-            label: 'FACILITY_NAME',
-            key: 'facilityName'
-        },
         {
             label: 'GRIDCONEETIONDATE',
             key: 'gridconeetionDate'
@@ -81,6 +81,9 @@ export default {
         },
     ],
     [MarkerType.ImsRnStationP]: [{
+        label: 'STATIONCODE',
+        key: 'stationCode'
+    }, {
         label: 'COUNTRYCODE',
         key: 'countryCode'
     }, {
@@ -104,9 +107,6 @@ export default {
     }, {
         label: 'MODDATE',
         key: 'moddate'
-    }, {
-        label: 'STATIONCODE',
-        key: 'stationCode'
     }, {
         label: 'STATIONID',
         key: 'stationId'
@@ -136,6 +136,9 @@ export default {
         key: 'phdMetSoh'
     }],
     [MarkerType.ImsRnStationG]: [{
+        label: 'STATIONCODE',
+        key: 'stationCode'
+    }, {
         label: 'COUNTRYCODE',
         key: 'countryCode'
     }, {
@@ -159,9 +162,6 @@ export default {
     }, {
         label: 'MODDATE',
         key: 'moddate'
-    }, {
-        label: 'STATIONCODE',
-        key: 'stationCode'
     }, {
         label: 'STATIONID',
         key: 'stationId'
@@ -191,6 +191,9 @@ export default {
         key: 'phdMetSoh'
     }],
     [MarkerType.NRL]: [{
+        label: 'STATIONCODE',
+        key: 'stationCode'
+    }, {
         label: 'COUNTRYCODE',
         key: 'countryCode'
     }, {
@@ -214,9 +217,6 @@ export default {
     }, {
         label: 'MODDATE',
         key: 'moddate'
-    }, {
-        label: 'STATIONCODE',
-        key: 'stationCode'
     }, {
         label: 'STATIONID',
         key: 'stationId'

From 13fc43d8c7187e603c5665dd792f8e0b52cb89c7 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Fri, 27 Oct 2023 10:54:26 +0800
Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbeta=E4=B8=8BAdd?=
 =?UTF-8?q?=20Comment=E3=80=81Statistics=E5=BC=B9=E7=AA=97=E5=8F=8Aload=20?=
 =?UTF-8?q?from=20file=E6=96=87=E4=BB=B6=E5=90=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BetaGammaModals/BetaGammaCommentsModal.vue       | 12 ++++++++++--
 .../StatisticsParamerHistoryModal.vue                |  6 +++---
 .../StatisticsParamerHistoryModalForQCFlags.vue      |  4 ++--
 .../components/Modals/LoadFromFileModal.vue          |  3 ++-
 src/views/spectrumAnalysis/index.vue                 |  2 ++
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaCommentsModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaCommentsModal.vue
index fd3499f..5cb2b6f 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaCommentsModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaCommentsModal.vue
@@ -34,6 +34,10 @@ export default {
       type: Boolean,
       default: true,
     },
+    comment: {
+      type: String,
+      default: '',
+    },
   },
   data() {
     return {
@@ -56,7 +60,9 @@ export default {
         })
         if (res.success) {
           this.comments = res.result
-          this.$emit('sedInfo', this.comments)
+          if(this.value) { // 如果之前有值，用之前的
+            this.comments.spectrumAnalysisCommentInfo = this.comment
+          }
         } else {
           this.$message.error(res.message)
         }
@@ -72,7 +78,9 @@ export default {
       this.getCommets()
     },
     handleOk() {
-      console.log('%c [  ]-26', 'font-size:13px; background:pink; color:#bf2c9f;', this.comments)
+      this.$emit('sendInfo', this.comments)
+      this.$message.success('Commit successful')
+      this.visible = false
     },
   },
 }
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue
index 33bfc2a..00da396 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue
@@ -61,7 +61,7 @@
           <template slot="title">
             <a-checkbox v-model="queryParams.filterGrpbox">Filter</a-checkbox>
           </template>
-          <a-checkbox>Xe Result Flag</a-checkbox>
+          <a-checkbox :disabled="filterDisabled">Xe Result Flag</a-checkbox>
           <!-- 配置详情 -->
           <div class="filter-options">
             <div class="filter-option">
@@ -291,7 +291,7 @@ export default {
           this.setStationAndDetector(result)
         } else {
           this.detectorList = []
-          this.queryParams.detectorName = undefined
+          this.queryParams.detectorId = ''
         }
       } catch (error) {
         console.error(error)
@@ -329,7 +329,7 @@ export default {
       try {
         const find = this.detectorList.find(item => item.value == this.queryParams.detectorId)
         const { success, message, result } = await postAction('/spectrumAnalysis/statisticsQuery', {
-          detectorCode: find.label,
+          detectorCode: find? find.label: '',
           ...this.queryParams
         })
         if (success) {
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue
index e5ec91d..f9516b0 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue
@@ -194,7 +194,7 @@ export default {
           this.setStationAndDetector(result)
         } else {
           this.detectorList = []
-          this.queryParams.detectorName = undefined
+          this.queryParams.detectorId = ''
         }
       } catch (error) {
         console.error(error)
@@ -227,7 +227,7 @@ export default {
       try {
         const find = this.detectorList.find(item => item.value == this.queryParams.detectorId)
         const { success, message, result } = await getAction('/spectrumAnalysis/statisticsQueryBtn', {
-          detectorCode: find.label,
+          detectorCode: find? find.label: '',
           ...this.queryParams
         })
         if (success) {
diff --git a/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue b/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue
index 7754454..f119b57 100644
--- a/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue
@@ -445,9 +445,10 @@ export default {
                 })
 
                 if (findFile) {
+                  const regExp = new RegExp(`(${otherFilePrefix}${fileType}_${qualify}_\\d{1,}\\.{0,}\\d{0,}).*?(\\.PHD)`)
                   record[nameKeys[index]] = {
                     file: findFile,
-                    fileName: findFile.name,
+                    fileName: findFile.name.replace(regExp, '$1$2'),
                   }
                 } else {
                   record[nameKeys[index]] = {
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index 42bbbd3..31a3707 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -157,6 +157,7 @@
     <beta-gamma-comments-modal
       v-model="betaGammaCommentsModalVisible"
       :isAdd="isBetaGammaCommentsAdd"
+      :comment="params_toDB.comment"
       @sendInfo="getcommentsInfo"
     />
     <!-- Beta-Gamma 的Comments 结束 -->
@@ -477,6 +478,7 @@ export default {
         this.analysisType = ANALYZE_TYPE.GAMMA
       }
       this.sampleData = this.newSampleData = sample
+      this.params_toDB.comment = ''
     },
 
     // 清理全部

From 0a483e98d3005cfd2373c33c82076a97336c7c47 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Fri, 27 Oct 2023 13:38:08 +0800
Subject: [PATCH 8/9] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0beta=E7=9A=84?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=86=E6=9E=90=E6=97=A5=E5=BF=97=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9spectrum=E9=A1=B5=E9=9D=A2=E9=94=80=E6=AF=81?=
 =?UTF-8?q?=E6=9C=AA=E6=B8=85=E7=90=86=E6=9C=AC=E5=9C=B0=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E7=9A=84=E8=B0=B1=E5=88=97=E8=A1=A8=E4=BF=A1=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Modals/BetaGammaModals/AutomaticAnalysisLogModal.vue        | 2 +-
 src/views/spectrumAnalysis/index.vue                            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/AutomaticAnalysisLogModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/AutomaticAnalysisLogModal.vue
index ad8ea00..871e6c5 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/AutomaticAnalysisLogModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/AutomaticAnalysisLogModal.vue
@@ -38,7 +38,7 @@ export default {
       try {
         this.isLoading = true
         const { sampleId } = this.sampleData
-        const res = await getAction(this.type == 1 ? '/gamma/viewAutomaticAnalysisLog' : '/gamma/viewAutomaticAnalysisLog', {  // 自动分析日志接口暂用都是gammam,beta暂时没有
+        const res = await getAction(this.type == 1 ? '/gamma/viewAutomaticAnalysisLog' : '/spectrumAnalysis/viewAutomaticAnalysisLog', {  // 自动分析日志接口暂用都是gammam,beta暂时没有
           sampleId
         })
         if(typeof res == 'string') {
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index 31a3707..42e9356 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -401,6 +401,7 @@ export default {
 
   destroyed() {
     this.$bus.$off('reanalyse', this.handleReanalyse)
+    this.$store.commit('CLEAR_SAMPLE_DATA')
   },
 
   methods: {

From a62efa494f43173c5fc08f33c35d669fb8e7d548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <renpy@yuanian.com>
Date: Fri, 27 Oct 2023 14:28:05 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=B0=E7=AB=99?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8F=90=E4=BE=9B=E7=8E=87=E5=8F=8A=E6=9C=89?=
 =?UTF-8?q?=E6=95=88=E7=8E=87=20=E6=97=A0=E6=95=B0=E6=8D=AE=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=98=AF=EF=BC=8C=E5=85=B3=E9=97=AD=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E5=99=A8=EF=BC=8C=E7=AD=89=E6=8E=A5=E5=8F=A3=E6=9C=89=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=98=AF=E5=9C=A8=E6=89=A7=E8=A1=8C=20=E5=8F=B0?=
 =?UTF-8?q?=E7=AB=99=E8=AF=A6=E6=83=85=E5=BC=B9=E7=AA=97=E4=B8=AD=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/markerPopupColumns.js          |  26 +--
 src/views/stationOperation/index.vue          | 184 ++++++++++--------
 2 files changed, 111 insertions(+), 99 deletions(-)

diff --git a/src/views/stationOperation/components/markerPopupColumns.js b/src/views/stationOperation/components/markerPopupColumns.js
index 690c31c..43ecce2 100644
--- a/src/views/stationOperation/components/markerPopupColumns.js
+++ b/src/views/stationOperation/components/markerPopupColumns.js
@@ -7,6 +7,10 @@ export default {
             label: 'FACILITY_NAME',
             key: 'facilityName'
         },
+        {
+            label: 'FACILITY ID',
+            key: 'facilityId'
+        },
         {
             label: 'ACTIVITY DAY',
             key: 'activityDay'
@@ -35,10 +39,6 @@ export default {
             label: 'CRITICALITYDATE',
             key: 'criticalityDate'
         },
-        {
-            label: 'FACILITY ID',
-            key: 'facilityId'
-        },
         {
             label: 'GRIDCONEETIONDATE',
             key: 'gridconeetionDate'
@@ -83,6 +83,9 @@ export default {
     [MarkerType.ImsRnStationP]: [{
         label: 'STATIONCODE',
         key: 'stationCode'
+    }, {
+        label: 'STATIONID',
+        key: 'stationId'
     }, {
         label: 'COUNTRYCODE',
         key: 'countryCode'
@@ -107,9 +110,6 @@ export default {
     }, {
         label: 'MODDATE',
         key: 'moddate'
-    }, {
-        label: 'STATIONID',
-        key: 'stationId'
     }, {
         label: 'STATUS',
         key: 'status'
@@ -138,6 +138,9 @@ export default {
     [MarkerType.ImsRnStationG]: [{
         label: 'STATIONCODE',
         key: 'stationCode'
+    }, {
+        label: 'STATIONID',
+        key: 'stationId'
     }, {
         label: 'COUNTRYCODE',
         key: 'countryCode'
@@ -162,9 +165,6 @@ export default {
     }, {
         label: 'MODDATE',
         key: 'moddate'
-    }, {
-        label: 'STATIONID',
-        key: 'stationId'
     }, {
         label: 'STATUS',
         key: 'status'
@@ -193,6 +193,9 @@ export default {
     [MarkerType.NRL]: [{
         label: 'STATIONCODE',
         key: 'stationCode'
+    }, {
+        label: 'STATIONID',
+        key: 'stationId'
     }, {
         label: 'COUNTRYCODE',
         key: 'countryCode'
@@ -217,9 +220,6 @@ export default {
     }, {
         label: 'MODDATE',
         key: 'moddate'
-    }, {
-        label: 'STATIONID',
-        key: 'stationId'
     }, {
         label: 'STATUS',
         key: 'status'
diff --git a/src/views/stationOperation/index.vue b/src/views/stationOperation/index.vue
index 798c74d..355f9d1 100644
--- a/src/views/stationOperation/index.vue
+++ b/src/views/stationOperation/index.vue
@@ -38,7 +38,7 @@
             :scrollContainer="getScrollContainer"
             class="data-list has-search"
             :class="{
-              'show-search': searchPlacementVisible
+              'show-search': searchPlacementVisible,
             }"
           >
             <div class="search-filter-placement">
@@ -144,13 +144,13 @@
         ref="mapRef"
         token="AAPK2b935e8bbf564ef581ca3c6fcaa5f2a71ZH84cPqqFvyz3KplFRHP8HyAwJJkh6cnpcQ-qkWh5aiyDQsGJbsXglGx0QM2cPm"
       >
-        <MapMarker 
-          :list="markerList" 
-          :currList="upDateStationList" 
-          :orgList="orgStationList" 
-          :marker-type="markerType" 
-          :radius="circleRadius" 
-          @markerClick="onMarkerClick" 
+        <MapMarker
+          :list="markerList"
+          :currList="upDateStationList"
+          :orgList="orgStationList"
+          :marker-type="markerType"
+          :radius="circleRadius"
+          @markerClick="onMarkerClick"
         />
         <MapPane
           ref="mapPane"
@@ -171,27 +171,27 @@ import DataListItem from './components/DataListItem.vue'
 import ScrollContainer from '@/components/ScrollContainer/index.vue'
 import { getAction } from '../../api/manage'
 import { cloneDeep } from 'lodash'
-const key= "updateList"
+const key = 'updateList'
 export default {
   components: {
     Map,
     MapMarker,
     MapPane,
     ScrollContainer,
-    DataListItem
+    DataListItem,
   },
   watch: {
-    "$route": {
-      handler:function(val,oldVal) {
-        if (val.name!=="station-operation") {
+    $route: {
+      handler: function (val, oldVal) {
+        if (val.name !== 'station-operation') {
           this.$message.destroy()
-          clearInterval(this.timer);
+          clearInterval(this.timer)
           this.timer = null
         }
       },
-      deep:true,
-      immediate:true
-    }
+      deep: true,
+      immediate: true,
+    },
   },
   data() {
     return {
@@ -216,7 +216,7 @@ export default {
       filter: {
         searchText: undefined,
         status: undefined,
-        type: undefined
+        type: undefined,
       },
 
       filterVisible: false, // 筛选组件是否显示
@@ -226,7 +226,7 @@ export default {
 
       treeData: [], // 台站树列表
       timer: null,
-      updataFilterType: []
+      updataFilterType: [],
     }
   },
   created() {
@@ -235,8 +235,8 @@ export default {
     this.getStationTypeList()
     this.getStationTree()
   },
-  beforeDestroy () {
-    clearInterval(this.timer);
+  beforeDestroy() {
+    clearInterval(this.timer)
     this.timer = null
   },
   methods: {
@@ -249,12 +249,12 @@ export default {
         this.dataList = cloneDeep(res)
         this.markerList = cloneDeep(res)
         this.markerList_clone = cloneDeep(res)
-        this.getDataProvisionEfficiency(this.markerList_clone,"one")
-        this.timer = setInterval(() => {
-          setTimeout(() => {
-            this.getDataProvisionEfficiency(this.markerList_clone)
-          }, 0);
-        }, 15000);
+        this.getDataProvisionEfficiency(this.markerList_clone, 'one')
+        // this.timer = setInterval(() => {
+        // setTimeout(() => {
+        // this.getDataProvisionEfficiency(this.markerList_clone)
+        //   }, 0);
+        // }, 15000);
         this.$nextTick(() => {
           this.$refs.scrollContainerRef.checkScrollEnd()
         })
@@ -267,51 +267,62 @@ export default {
 
     // 查询台站数据提供率及有效率
     async getDataProvisionEfficiency(arr, str) {
-      if (str && this.$route.path=="/station-operation") {
-        this.$message.loading({ content: 'Loading station data, please wait...', key,  duration: 0 })
+      if (str && this.$route.path == '/station-operation') {
+        this.$message.loading({ content: 'Loading station data, please wait...', key, duration: 0 })
       }
-      getAction('/stationOperation/getDataProvisionEfficiency').then(res => {
-        if (res.success) {
+      getAction('/stationOperation/getDataProvisionEfficiency')
+        .then((res) => {
+          if (res.success) {
+            this.$message.destroy()
+            if (str && this.$route.path == '/station-operation') {
+              this.$message.success({ content: 'Loaded!', key, duration: 2 })
+            }
+            res.result.forEach((item) => {
+              arr.forEach((el) => {
+                if (
+                  parseInt(item.id) == el.stationId &&
+                  el.stationType != 'Nuclear Facility' &&
+                  el.stationType != 'NRL'
+                ) {
+                  item.stationType = el.stationType
+                  item.stationId = el.stationId
+                }
+              })
+            })
+            this.orgStationList = res.result
+            if (this.updataFilterType.length > 0) {
+              this.upDateStationList = this.orgStationList.filter((item) =>
+                this.updataFilterType.includes(item.stationType)
+              )
+            } else {
+              this.upDateStationList = res.result
+            }
+            if (this.markerList.length > 0) {
+              let curList = []
+              this.markerList.forEach((item) => {
+                if (item.stationType != 'Nuclear Facility' && item.stationType != 'NRL') {
+                  this.orgStationList.forEach((el) => {
+                    if (parseInt(el.id) == item.stationId) {
+                      curList.push(el)
+                    }
+                  })
+                }
+              })
+              this.upDateStationList = curList
+            } else {
+              this.upDateStationList = []
+            }
+            setTimeout(() => {
+              this.getDataProvisionEfficiency(this.markerList_clone)
+            }, 10000)
+          } else {
+            this.$message.warning('This operation fails. Contact your system administrator')
+          }
+        })
+        .catch((error) => {
           this.$message.destroy()
-          if (str && this.$route.path == "/station-operation") { 
-            this.$message.success({ content: 'Loaded!', key, duration: 2 })
-          }
-          res.result.forEach(item => {
-            arr.forEach(el => {
-              if (parseInt(item.id) == el.stationId&&el.stationType!="Nuclear Facility"&&el.stationType!="NRL") { 
-                item.stationType = el.stationType
-                item.stationId = el.stationId
-              }
-            })
-          })
-          this.orgStationList = res.result
-          if (this.updataFilterType.length>0) {
-            this.upDateStationList = this.orgStationList.filter(item => this.updataFilterType.includes(item.stationType))
-          } else {
-            this.upDateStationList = res.result
-          }
-          if (this.markerList.length > 0) {
-            let curList = []
-            this.markerList.forEach(item => {
-              if (item.stationType!="Nuclear Facility" && item.stationType!="NRL") {
-                this.orgStationList.forEach(el => {
-                  if (parseInt(el.id) == item.stationId) {
-                    curList.push(el)
-                  }
-                })
-              }
-            })
-            this.upDateStationList=curList
-          } else {
-            this.upDateStationList=[]
-          }
-        } else {
-          this.$message.warning("This operation fails. Contact your system administrator")
-        }
-      }).catch(error => {
-        this.$message.destroy()
-        console.error(error)
-      })
+          console.error(error)
+        })
     },
 
     // 获取已关注站点列表
@@ -338,7 +349,7 @@ export default {
     async getStationTypeList() {
       try {
         const res = await getAction('/jeecg-station-operation/stationOperation/findStationType')
-        this.stationTypeList = res.filter(item => item).map(item => ({ label: item, value: item }))
+        this.stationTypeList = res.filter((item) => item).map((item) => ({ label: item, value: item }))
       } catch (error) {
         console.error(error)
       }
@@ -349,10 +360,10 @@ export default {
       try {
         const { success, result, message } = await getAction('/stationOperation/findTree')
         if (success) {
-          result.forEach(item => {
+          result.forEach((item) => {
             item.stationCode = item.code
             item.stationId = `root_${item.stationId}`
-            item.children.forEach(child => {
+            item.children.forEach((child) => {
               child.stationCode = child.code
               child.stationId = `${item.stationId}_parent_${child.stationId}`
             })
@@ -398,7 +409,7 @@ export default {
 
     // 左侧 All Data 筛选
     onFilterChange() {
-      this.dataList = this.originalDataList.filter(dataItem => {
+      this.dataList = this.originalDataList.filter((dataItem) => {
         const filterSearchText =
           !this.filter.searchText ||
           -1 !== dataItem.stationName.toLowerCase().indexOf(this.filter.searchText.toLowerCase())
@@ -415,7 +426,8 @@ export default {
     // 定位台站
     locateFacility(stationItem) {
       const find = this.markerList.find(
-        markerItem => markerItem.stationId == stationItem.stationId && markerItem.stationType == stationItem.stationType
+        (markerItem) =>
+          markerItem.stationId == stationItem.stationId && markerItem.stationType == stationItem.stationType
       )
       if (!find) {
         // 如果未显示，则不定位
@@ -427,7 +439,7 @@ export default {
       setTimeout(() => {
         // 在panTo结束后执行动画
         const overlays = this.$refs.mapRef.map.getOverlays()
-        const currOverlay = overlays.getArray().find(item => item.id == `marker_${stationType}_${stationId}`)
+        const currOverlay = overlays.getArray().find((item) => item.id == `marker_${stationType}_${stationId}`)
         const innerEle = currOverlay.getElement()
         innerEle.classList.add('ani-bounding')
 
@@ -445,10 +457,10 @@ export default {
     onChangeMarker(markerList) {
       this.markerList = markerList
       let curList = []
-      if (markerList.length>0) {
-        markerList.forEach(item => {
-          if (item.stationType!="Nuclear Facility" && item.stationType!="NRL") {
-            this.orgStationList.forEach(el => {
+      if (markerList.length > 0) {
+        markerList.forEach((item) => {
+          if (item.stationType != 'Nuclear Facility' && item.stationType != 'NRL') {
+            this.orgStationList.forEach((el) => {
               if (parseInt(el.id) == item.stationId) {
                 el.stationType = item.stationType
                 el.stationId = item.stationId
@@ -457,9 +469,9 @@ export default {
             })
           }
         })
-        this.upDateStationList=curList
+        this.upDateStationList = curList
       } else {
-        this.upDateStationList=[]
+        this.upDateStationList = []
       }
     },
 
@@ -480,8 +492,8 @@ export default {
         filterType,
         filterDataQuality
       )
-      this.markerList = this.originalDataList.filter(item => filterType.includes(item.stationType))
-      this.upDateStationList = this.orgStationList.filter(item => filterType.includes(item.stationType))
+      this.markerList = this.originalDataList.filter((item) => filterType.includes(item.stationType))
+      this.upDateStationList = this.orgStationList.filter((item) => filterType.includes(item.stationType))
     },
 
     // 地图图标点击
@@ -495,8 +507,8 @@ export default {
 
     getDictSelectTagContainer() {
       return document.body
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="less" scoped>