From 7f443f55a94472c2f864d7a34af5faccb85a8751 Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Mon, 11 Dec 2023 15:10:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20Compare=E5=92=8CStrip=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/spectrumAnalysis/gamma-analysis.vue | 8 +++- src/views/spectrumAnalysis/index.vue | 48 +++++++++++++++++-- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue index 00c078d..ffc61cc 100644 --- a/src/views/spectrumAnalysis/gamma-analysis.vue +++ b/src/views/spectrumAnalysis/gamma-analysis.vue @@ -1433,13 +1433,17 @@ export default { }, // 显示比较弹窗 - showCompareModal(isStrip) { + showCompareModal(isStrip, isOperating) { if (this.isLoading) { this.$message.warn('Sample is Loading') return } this.handleResetChart() this.clearCompareLine() + if(isOperating) { + return + } + this.isStrip = isStrip if (FilePicker.canUse()) { this.chooseFileFromFS() @@ -1512,6 +1516,8 @@ export default { this.$nextTick(() => { this.thumbnailOption.yAxis.max = getAxisMax(this.getChart(), 'yAxis') }) + + this.$emit('compareSuccess', this.isStrip) } else { this.$message.error(message) } diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index bf90e2d..1a8bc5a 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -18,7 +18,13 @@