From 6e8f8baf007fe0f43b9be2bf10dd7ea2b494afee Mon Sep 17 00:00:00 2001
From: orgin <feixingyuanup@gmail.com>
Date: Wed, 20 Dec 2023 13:51:53 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9AreviewModal=EF=BC=8C=20gamma=20?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E5=92=8C=20interactive=E8=AE=B2=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E4=B8=8D=E5=90=8C=E7=9A=84=E6=8E=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E4=BB=8E=20gamma=20=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B0=86=E8=AF=B7=E6=B1=82=E5=8F=A6=E5=A4=96?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/NuclideReviewModal.vue         | 20 ++++++++++++++++---
 src/views/spectrumAnalysis/gamma-analysis.vue | 16 ++++++++-------
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/NuclideReviewModal.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/NuclideReviewModal.vue
index 74c1480..33285ab 100644
--- a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/NuclideReviewModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/NuclideReviewModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <custom-modal v-model="visible" :width="1280" title="Nuclide Review" :footer="null" destroy-on-close>
+  <custom-modal v-model="visible" :width="1280" title="Nuclide Review" :footer="null" @close="handleCancel">
     <a-spin :spinning="isLoading">
       <div class="nuclide-review-search">
         <span @click="handleNuclideChange('prev')">&lt;</span>
@@ -163,6 +163,10 @@ export default {
     nuclide: {
       type: String,
     },
+    page: {
+      type: String,
+      default: 'AnalyzeInteractiveToolModal'
+    },
   },
   data() {
     this.columns = columns
@@ -267,7 +271,12 @@ export default {
       try {
         this.isLoading = true
         const { sampleId, inputFileName: fileName } = this.sampleData
-        const { success, result, message } = await getAction('/gamma/nuclideReview', {
+        let url = '/gamma/nuclideReview'
+        // 根据新需求，首页查询中需要包含其他数据，如果首页跳转则请求另外的接口 20231219:xiao
+        if(this.page === 'gamma-analysis'){
+          url = '/gamma/nuclideReviewGamma'
+        }
+        const { success, result, message } = await getAction(url, {
           sampleId: sampleId,
           channel: this.channel,
           fileName,
@@ -331,7 +340,12 @@ export default {
       try {
         this.isLoading = true
         const { sampleId, inputFileName } = this.sampleData
-        const { success, result, message } = await getAction('/gamma/changeNuclide', {
+        let url = '/gamma/changeNuclide'
+        // 根据新需求，首页查询中需要包含其他数据，如果首页跳转则请求另外的接口 20231219:xiao
+        if(this.page === 'gamma-analysis'){
+          url = '/gamma/changeNuclideGamma'
+        }
+        const { success, result, message } = await getAction(url, {
           sampleId,
           nuclideName: this.currNuclide,
           fileName: inputFileName,
diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue
index a01f337..cb6360b 100644
--- a/src/views/spectrumAnalysis/gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/gamma-analysis.vue
@@ -87,6 +87,7 @@
       :sampleId="sample.sampleId"
       :channel="currChannel"
       :nuclide="nuclideReview.nuclide"
+      :page="`gamma-analysis`"
     />
 
     <compare-file-list-modal v-model="compareFileListModalVisible" @fileSelect="handleFileSelect" />
@@ -392,7 +393,7 @@ export default {
             counts: rightCounts,
           } = this.getEnergyAndCountsByXAxis(rightAxis)
           this.setChartBottomTitle(rightChannel, rightEnergy, rightCounts)
-          this.getSelPosNuclide(rightChannel)
+          this.getSelPosNuclide(rightChannel, rightEnergy)
           break
         case 'ArrowLeft':
           if (markLineXAxis <= this.xAxisMin) {
@@ -412,7 +413,7 @@ export default {
             counts: leftCounts,
           } = this.getEnergyAndCountsByXAxis(leftAxis)
           this.setChartBottomTitle(leftChannel, leftEnergy, leftCounts)
-          this.getSelPosNuclide(leftChannel)
+          this.getSelPosNuclide(leftChannel, leftEnergy)
           break
       }
     },
@@ -972,7 +973,7 @@ export default {
         const { channel, energy, counts } = this.getEnergyAndCountsByXAxis(xAxis)
         this.setChartBottomTitle(channel, energy, counts)
 
-        this.getSelPosNuclide(channel)
+        this.getSelPosNuclide(channel, energy)
       }
     },
 
@@ -1012,17 +1013,18 @@ export default {
     },
 
     // 获取 Nuclide Library 数据
-    async getSelPosNuclide(channel) {
+    async getSelPosNuclide(channel, energy) {
       this.currChannel = channel
 
       try {
         this.isLoadingNuclide = true
         const { sampleId, inputFileName: fileName } = this.sample
 
-        const { success, result, message } = await getAction('/gamma/getSelPosNuclide', {
+        const { success, result, message } = await getAction('/gamma/getGammaSelPosNuclide', {
           sampleId,
           channel,
           fileName,
+          energy
         })
         if (success) {
           const { possible } = result
@@ -1126,7 +1128,7 @@ export default {
           if (centroid > prevChannel) {
             const energy = this.getEnergyByChannel(centroid)
             this.setMarkLineXAxis(this.isEnergy ? energy : centroid, i)
-            this.getSelPosNuclide(centroid)
+            this.getSelPosNuclide(centroid, energy)
             const { counts } = this.getEnergyAndCountsByXAxis(this.isEnergy ? energy : centroid)
             this.setChartBottomTitle(centroid, energy, counts)
             return
@@ -1138,7 +1140,7 @@ export default {
           if (Math.round(centroid) < prevChannel) {
             const energy = this.getEnergyByChannel(centroid)
             this.setMarkLineXAxis(this.isEnergy ? energy : centroid, i)
-            this.getSelPosNuclide(centroid)
+            this.getSelPosNuclide(centroid, energy)
             const { counts } = this.getEnergyAndCountsByXAxis(this.isEnergy ? energy : centroid)
             this.setChartBottomTitle(centroid, energy, counts)
             return