From f3c989afc3dab5b1a492db349a7a1fe3e8d969c6 Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Tue, 12 Mar 2024 17:15:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96beta-gamma?= =?UTF-8?q?=E9=A1=B5=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" > - + QC Flags @@ -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 @@
- + QC Flags @@ -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 { From f6a7547aff0c0f8a136b0025b9646c14e834b2c5 Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Wed, 13 Mar 2024 18:50:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E5=88=86=E6=9E=90Beta=E8=B0=B1=E6=97=B6=EF=BC=8C=E5=8F=B3?= =?UTF-8?q?=E4=B8=8B=E8=A7=92Result=20Display=E4=B8=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=8F=8A=E5=9C=A8=E4=BB=8E=E6=89=8B?= =?UTF-8?q?=E5=8A=A8=E5=88=86=E6=9E=90=E5=90=8E=E7=9A=84=E8=B0=B1=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E5=88=B0=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E8=B0=B1=EF=BC=8CResult=20Display=E5=80=BC=E4=B8=8D=E5=8F=98?= =?UTF-8?q?=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/views/spectrumAnalysis/beta-gamma-analysis.vue | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index 3eb0809..dd7150c 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -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', @@ -225,7 +226,6 @@ export default { statisticModalVisible: false, // Qc Flags 点击后的弹窗 statisticsType: StatisticsType['Collection Time'], currSample: {}, - copyXeData: null, qcFlagsVisible: false, } }, @@ -452,12 +452,7 @@ export default { console.log('this.resultDisplaythis.resultDisplay', this.resultDisplay) - this.resultDisplay = this.copyXeData - ? this.copyXeData - : this.resultDisplay.length > 0 - ? this.resultDisplay - : XeData - + this.resultDisplay = XeData this.sortResultDisplay() this.$emit('sendInfo', this.resultDisplay, this.spectrumData.stationCode, savedAnalysisResult) @@ -561,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 { @@ -683,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,