From f3c989afc3dab5b1a492db349a7a1fe3e8d969c6 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Tue, 12 Mar 2024 17:15:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96beta-gamma=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E9=83=A8=E5=88=86=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/spectrumAnalysis/beta-gamma-analysis.vue    | 11 +++++------
 .../Modals/AnalyzeInteractiveToolModal/index.vue      |  2 +-
 .../components/Modals/LoadFromDBModal.vue             |  1 -
 src/views/spectrumAnalysis/gamma-analysis.vue         | 11 ++++-------
 src/views/spectrumAnalysis/index.vue                  |  2 ++
 5 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
index f921acb..3eb0809 100644
--- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
@@ -14,7 +14,7 @@
           style="width: 154px"
           class="sample-select"
         ></custom-select>
-        <pop-over-with-icon placement="right" v-model="qcFlagsVisible">
+        <pop-over-with-icon placement="right" v-model="qcFlagsVisible" :auto-adjust-overflow="false">
           QC Flags
           <beta-gamma-qc-flags slot="content" :data="qcFlags" @click="handleQcFlagClick" />
         </pop-over-with-icon>
@@ -191,14 +191,12 @@ export default {
   },
   data() {
     this.SampleType = SampleType
+    this.sampleDetail = {}
 
     return {
       currSpectrum: '',
       // analyseCurrentSpectrum: {},
       qcFlags: {},
-
-      sampleDetail: {},
-
       spectraVisible: false,
       spectraType: 'sample',
 
@@ -336,7 +334,7 @@ export default {
       } catch (error) {
         console.error(error)
         const isCancel = axios.isCancel(error)
-        if(!isCancel) {
+        if (!isCancel) {
           this.isLoading = false
         }
       }
@@ -383,7 +381,7 @@ export default {
       } catch (error) {
         console.error(error)
         const isCancel = axios.isCancel(error)
-        if(!isCancel) {
+        if (!isCancel) {
           this.isLoading = false
         }
       }
@@ -735,6 +733,7 @@ export default {
 
     .pop-over-with-icon {
       height: 32px;
+      flex-shrink: 0;
 
       &:nth-child(1) {
         width: 224px;
diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue
index e81a4f5..9bfc63f 100644
--- a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue
+++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue
@@ -223,7 +223,7 @@ import { buildLineSeries, findSeriesByName, getXAxisAndYAxisByPosition, rangeNum
 import SampleDataMixin from '@/views/spectrumAnalysis/SampleDataMixin'
 import GeneralCommentModal from './components/GeneralCommentModal.vue'
 import EditSlopeModal from './components/EditSlopeModal.vue'
-import Response from './Response.json'
+// import Response from './Response.json'
 import { updateBaseLine } from '@/utils/WasmHelper'
 import RectList from './components/RectList.vue'
 import { isNullOrUndefined } from '@/utils/util'
diff --git a/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue b/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue
index 8523ca9..44b10d1 100644
--- a/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue
@@ -221,7 +221,6 @@ export default {
 
     // 来源改变
     handleSourceChange() {
-      console.log('%c [  ]-226', 'font-size:13px; background:pink; color:#bf2c9f;', this.queryParam.dbName)
       this.searchQuery()
     },
 
diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue
index bbeca39..c482f6d 100644
--- a/src/views/spectrumAnalysis/gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/gamma-analysis.vue
@@ -26,7 +26,7 @@
         <div class="peak-info">
           <button-with-switch-icon @change="handlePeakInfoChange" @click="handleTogglePeak"></button-with-switch-icon>
         </div>
-        <pop-over-with-icon placement="right" v-model="subOperatorsState.qcFlagsVisible">
+        <pop-over-with-icon placement="right" v-model="subOperatorsState.qcFlagsVisible" :auto-adjust-overflow="false">
           QC Flags
           <qc-flags slot="content" :data="qcFlags" />
         </pop-over-with-icon>
@@ -111,7 +111,7 @@ import GraphAssistance from './components/SubOperators/GraphAssistance/GraphAssi
 import NuclideLibrary from './components/SubOperators/NuclideLibrary.vue'
 import ButtonWithSwitchIcon from './components/SubOperators/ButtonWithSwitchIcon.vue'
 import { getAction, postAction } from '@/api/manage'
-import Response from './response.json'
+// import Response from './response.json'
 import {
   buildLineSeries,
   findSeriesByName,
@@ -252,8 +252,6 @@ export default {
 
     window.addEventListener('keydown', this.handleKeyboardEvent)
     window.addEventListener('click', this.closePeakInfomationTooltip)
-
-    console.log('%c [ this.channelData ]-256', 'font-size:13px; background:#e2a49d; color:#ffe8e1;', this.channelData)
   },
   destroyed() {
     this.cancelLastRequest()
@@ -661,8 +659,6 @@ export default {
         baseLineCP: shapeEnergyData,
       }
 
-      console.log('%c [ this.channelData ]-664', 'font-size:13px; background:#9bcb26; color:#dfff6a;', this.channelData)
-
       this.resetThumbnailChartDataMax()
 
       // 设置 Spectrum Line
@@ -2130,6 +2126,7 @@ export default {
     overflow: auto;
     height: 46px;
     align-items: center;
+    flex-shrink: 0;
 
     .pop-over-with-icon {
       height: 32px;
@@ -2151,7 +2148,7 @@ export default {
     .peak-info {
       width: 226px;
       height: 32px;
-      display: inline-block;
+      flex-shrink: 0;
     }
   }
   // 二级操作栏结束
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index 66bcb00..77002c3 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -1764,6 +1764,8 @@ export default {
     padding: 0;
     position: relative;
     border-right: 0;
+    max-height: calc(100vh - 506px);
+    overflow: hidden auto;
 
     &-submenu {
       &-active {