Merge branch 'master-dev' into feature-Beta-dev-renpy

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>
@@ -134,6 +134,7 @@ import PopOverWithIcon from './components/SubOperators/PopOverWithIcon.vue'
 import Spectra from './components/SubOperators/Spectra.vue'
 import CustomSelect from '@/components/CustomSelect/index.vue'
 import axios from 'axios'
+import { cloneDeep } from 'lodash'
 
 const StatisticsType = {
   'Collection Time': 'Colloc_Time',
@@ -191,14 +192,12 @@ export default {
   },
   data() {
     this.SampleType = SampleType
+    this.sampleDetail = {}
 
     return {
       currSpectrum: '',
       // analyseCurrentSpectrum: {},
       qcFlags: {},
-
-      sampleDetail: {},
-
       spectraVisible: false,
       spectraType: 'sample',
 
@@ -227,7 +226,6 @@ export default {
       statisticModalVisible: false, // Qc Flags 点击后的弹窗
       statisticsType: StatisticsType['Collection Time'],
       currSample: {},
-      copyXeData: null,
       qcFlagsVisible: false,
     }
   },
@@ -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
         }
       }
@@ -454,12 +452,7 @@ export default {
 
         console.log('this.resultDisplaythis.resultDisplay', this.resultDisplay)
 
-        this.resultDisplay = this.copyXeData
+        this.resultDisplay = XeData
-          ? this.copyXeData
-          : this.resultDisplay.length > 0
-          ? this.resultDisplay
-          : XeData
-
         this.sortResultDisplay()
 
         this.$emit('sendInfo', this.resultDisplay, this.spectrumData.stationCode, savedAnalysisResult)
@@ -563,8 +556,6 @@ export default {
               item.mdc = parseFloat(item.mdc.toPrecision(6))
             })
             this.$emit('reAnalyCurr', true, res.result.XeData)
-            this.copyXeData = res.result.XeData
-
             this.handleReAnalyse(res.result)
           }
         } else {
@@ -685,7 +676,7 @@ export default {
     analyseCurrentSpectrum: {
       handler(newVal, oldVal) {
         // this.currResultDisplay = newVal.XeData
-        this.resultDisplay = newVal.XeData || []
+        this.resultDisplay = cloneDeep(newVal.XeData) || []
         this.sortResultDisplay()
         this.$store.commit('UPDATE_SAMPLE_DATA', {
           inputFileName: this.sample.inputFileName,
@@ -735,6 +726,7 @@ export default {
 
     .pop-over-with-icon {
       height: 32px;
+      flex-shrink: 0;
 
       &:nth-child(1) {
         width: 224px;

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'

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()
     },
 

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;
     }
   }
   // 二级操作栏结束

src/views/spectrumAnalysis/index.vue

@@ -1829,6 +1829,8 @@ export default {
     padding: 0;
     position: relative;
     border-right: 0;
+    max-height: calc(100vh - 506px);
+    overflow: hidden auto;
 
     &-submenu {
       &-active {