From fc7c62b504252e42ff7d700cfc5cb1f04331f16b Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Thu, 26 Oct 2023 13:51:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DBeta=E7=82=B9=E5=87=BB?= =?UTF-8?q?QC=20Flags=E5=BC=B9=E7=AA=97=E4=B8=ADDetectorList=20=E4=B8=BAun?= =?UTF-8?q?defined=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8Cgamma=E5=8F=8C?= =?UTF-8?q?=E5=87=BB=E5=9B=BE=E8=A1=A8=E6=94=B9=E4=B8=BA=E6=98=BE=E7=A4=BA?= =?UTF-8?q?peak=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StatisticsParamerHistoryModalForQCFlags.vue | 14 +++++++------- src/views/spectrumAnalysis/gamma-analysis.vue | 7 +------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue index 19724c2..281c48b 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue @@ -204,20 +204,20 @@ export default { // 设置左上角台站和探测器列表 setStationAndDetector({ detectorList, stationName, stationId }) { this.queryParams.stationName = stationName - this.detectorList = detectorList.map((item) => ({ - label: item, - value: item, + this.detectorList = detectorList.map(({ detectorCode }) => ({ + label: detectorCode, + value: detectorCode, })) - this.queryParams.detectorName = detectorList[0] + this.queryParams.detectorName = detectorList[0].detectorCode this.queryParams.stationId = stationId }, // 重置左上角查询信息 handleReset() { this.queryParams.stationName = this.initialMDC.stationName - this.detectorList = this.initialMDC.detectorList.map((item) => ({ - label: item, - value: item, + this.detectorList = this.initialMDC.detectorList.map(({ detectorCode }) => ({ + label: detectorCode, + value: detectorCode, })) }, diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue index ae5c81e..c711308 100644 --- a/src/views/spectrumAnalysis/gamma-analysis.vue +++ b/src/views/spectrumAnalysis/gamma-analysis.vue @@ -48,7 +48,7 @@ :option="option" :opts="opts" @zr:click="handleChartClick" - @zr:dblclick="handleChartDblClick" + @zr:dblclick="handleTogglePeak" @zr:mousedown="handleMouseDown" @zr:mouseup="handleMouseUp" @brushEnd="handleBrushEnd" @@ -891,11 +891,6 @@ export default { } }, - // 双击还原 - handleChartDblClick() { - this.handleResetChart() - }, - // 获取 Nuclide Library 数据 async getSelPosNuclide(channel) { this.currChannel = channel