From 4feda76add3db95c1929b53a4d941b3a2c893f36 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Thu, 2 Nov 2023 10:42:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20Peak=20Infomation=E6=9C=80=E5=90=8E?=
 =?UTF-8?q?=E4=B8=80=E5=88=97=E6=BA=A2=E5=87=BA=E9=9A=90=E8=97=8F=EF=BC=8C?=
 =?UTF-8?q?Resolution=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Modals/ResolutionCalibrationModal.vue             | 1 +
 src/views/spectrumAnalysis/components/PeakInfomation.vue         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal.vue b/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal.vue
index 853b386..541a005 100644
--- a/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal.vue
@@ -421,6 +421,7 @@ export default {
           m_vCurReso: this.list.map((item) => item.fwhm),
           m_vCurUncert: this.uncert,
           m_curParam: this.param,
+          width: 922,
         })
         if (success) {
           this.handleResult(result)
diff --git a/src/views/spectrumAnalysis/components/PeakInfomation.vue b/src/views/spectrumAnalysis/components/PeakInfomation.vue
index 62d4262..d94009c 100644
--- a/src/views/spectrumAnalysis/components/PeakInfomation.vue
+++ b/src/views/spectrumAnalysis/components/PeakInfomation.vue
@@ -86,6 +86,7 @@ const columns = [
   {
     title: 'Indentify',
     dataIndex: 'indentify',
+    ellipsis: true,
   },
 ]
 export default {

From 5b0bb1ec4e3bf3f575672b84b17d25155174dde3 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Thu, 2 Nov 2023 10:43:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20BG=20Log=20Viewer=E5=92=8CQC=20Resul?=
 =?UTF-8?q?ts=E5=AF=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Modals/BetaGammaModals/BGLogViewer.vue        | 15 +++------------
 .../BetaGammaModals/BetaGammaQCResultsModal.vue   |  8 ++++----
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BGLogViewer.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BGLogViewer.vue
index 5fa1710..c306158 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BGLogViewer.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BGLogViewer.vue
@@ -1,7 +1,7 @@
 <template>
   <custom-modal v-model="visible" title="BetaGamma Analyser Log" :width="800">
     <a-spin :spinning="isLoading">
-      <a-textarea class="bg-log-viewer" v-model="content"></a-textarea>
+      <a-textarea :rows="20" v-model="content"></a-textarea>
     </a-spin>
     <div slot="custom-footer">
       <a-button type="primary" @click="handleClick">Save As</a-button>
@@ -26,7 +26,7 @@ export default {
       try {
         this.isLoading = true
         const { dbName, sampleId, sampleFileName, gasFileName, detFileName, qcFileName } = this.newSampleData
-        const { success, result, message } = await getAction('/spectrumAnalysis/viewBGLogViewer', {
+        const result = await getAction('/spectrumAnalysis/viewBGLogViewer', {
           dbName,
           sampleId,
           sampleFileName,
@@ -34,12 +34,7 @@ export default {
           detFileName,
           qcFileName,
         })
-        if (success) {
-          console.log('%c [  ]-21', 'font-size:13px; background:pink; color:#bf2c9f;', result)
-          this.content = 'test'
-        } else {
-          this.$message.error(message)
-        }
+        this.content = result
       } catch (error) {
         console.error(error)
       } finally {
@@ -60,8 +55,4 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.bg-log-viewer {
-  height: 400px;
-  overflow: auto;
-}
 </style>
\ No newline at end of file
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaQCResultsModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaQCResultsModal.vue
index 958cece..2504ef0 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaQCResultsModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaQCResultsModal.vue
@@ -110,15 +110,15 @@ export default {
 
           this.list.push({
             qcFlags: 'Gas Bg',
-            evaluationMetrics: result.gasBgValueAndStatus,
-            value: result.gasBgValueAndStatus ? 'Match' : 'UnMatch',
+            evaluationMetrics: result.gasBgEvaluationMetrics,
+            value: result.gasBgValue,
             status: result.gasBgValueAndStatus ? 'Pass' : 'Failed',
           })
 
           this.list.push({
             qcFlags: 'Det Bg',
-            evaluationMetrics: result.detBgValueAndStatus,
-            value: result.detBgValueAndStatus ? 'Match' : 'UnMatch',
+            evaluationMetrics: result.detBgEvaluationMetrics,
+            value: result.detBgValue,
             status: result.detBgValueAndStatus ? 'Pass' : 'Failed',
           })