From 29bf022af90fcbd538104ca224790a2c2428bb62 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Wed, 22 Nov 2023 10:11:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=94=AE=E7=9B=98=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=85=A8=E5=B1=80=EF=BC=8C=E5=9C=A8=E7=BA=A2?=
 =?UTF-8?q?=E7=BA=BF=E6=9C=AA=E5=87=BA=E7=8E=B0=E6=97=B6=EF=BC=8C=E7=82=B9?=
 =?UTF-8?q?=E5=87=BBPeak=20Infomation=20=E7=AE=AD=E5=A4=B4=E5=92=8C?=
 =?UTF-8?q?=E9=94=AE=E7=9B=98=E5=B7=A6=E5=8F=B3=E9=94=AE=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/spectrumAnalysis/gamma-analysis.vue | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue
index a1f598a..515f988 100644
--- a/src/views/spectrumAnalysis/gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/gamma-analysis.vue
@@ -42,7 +42,7 @@
       <!-- 二级交互栏结束 -->
       <!-- 主体部分 -->
       <div class="gamma-analysis-main">
-        <div class="gamma-analysis-chart" ref="chartContainerRef" tabindex="0" @keydown="handleKeyboardEvent">
+        <div class="gamma-analysis-chart">
           <CustomChart
             ref="chartRef"
             :option="option"
@@ -239,12 +239,16 @@ export default {
 
     this.$bus.$on('gammaRefresh', this.handleRefresh)
     this.$bus.$on('accept', this.handleAccept)
+
+    window.addEventListener('keydown', this.handleKeyboardEvent)
   },
   destroyed() {
     this.cancelLastRequest()
 
     this.$bus.$off('gammaRefresh', this.handleRefresh)
     this.$bus.$off('accept', this.handleAccept)
+
+    window.removeEventListener('keydown', this.handleKeyboardEvent)
   },
   mounted() {
     this.option.brush = { toolbox: [] }
@@ -895,7 +899,6 @@ export default {
 
     // 点击图表，设置红线
     handleChartClick(param) {
-      this.focusChart()
       const { offsetX, offsetY } = param
       const point = getXAxisAndYAxisByPosition(this.getChart(), offsetX, offsetY)
       if (point) {
@@ -910,10 +913,6 @@ export default {
       }
     },
 
-    // 聚焦图表容器，以接收keydown事件
-    focusChart() {
-      this.$refs.chartContainerRef.focus()
-    },
 
     // 设置图表底部的标题
     setChartBottomTitle(channel, energy, counts) {
@@ -926,6 +925,13 @@ export default {
 
     // 根据xAixs值找channel、energy和counts
     getEnergyAndCountsByXAxis(xAxis) {
+      if(-1 == xAxis) {
+        return {
+          channel: -1,
+          energy: 0,
+          counts: 0,
+        }
+      }
       let channel, energy, counts
       if (this.isEnergy) {
         channel = this.getChannelByEnergy(xAxis)
@@ -986,13 +992,10 @@ export default {
     // peak info 点击左右方向
     handlePeakInfoChange(direction) {
       this.moveMarkLine(direction)
-      this.focusChart()
     },
 
     // 触发Peak Infomation
     handleTogglePeak() {
-      this.focusChart()
-
       const spectrumLineSeries = findSeriesByName(this.option.series, 'Spectrum')
       const xAxis = spectrumLineSeries.markLine.data[0].xAxis
       const channel = this.isEnergy ? this.getChannelByEnergy(xAxis) : parseInt(xAxis.toFixed())