From 9038fc51168a2d39e1b6dc96ced774ba6c8ecfa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Thu, 16 Nov 2023 19:01:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4=EF=BC=8C?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StatisticsParamerHistoryModal.vue          |  4 ++--
 .../Modals/ProcessingMonitorModal.vue          | 10 +++++++++-
 src/views/spectrumAnalysis/gamma-analysis.vue  |  1 +
 src/views/spectrumAnalysis/index.vue           | 18 ++++++++++++++++++
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue
index 18c4898..e139c61 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue
@@ -61,7 +61,7 @@
           <template slot="title">
             <a-checkbox v-model="queryParams.filterGrpbox">Filter</a-checkbox>
           </template>
-          <a-checkbox :disabled="filterDisabled" v-model="queryParams.xeResFlag">Xe Result Flag</a-checkbox>
+          <a-checkbox :disabled="filterDisabled" v-model="queryParams.xeResultFlag">Xe Result Flag</a-checkbox>
           <!-- 配置详情 -->
           <div class="filter-options">
             <div class="filter-option">
@@ -255,7 +255,7 @@ export default {
       initialMDC: {}, // 初始化的信息，用于重置
 
       queryParams: {
-        xeResFlag: false,
+        xeResultFlag: false,
       },
       detectorList: [], // 探测器列表
     }
diff --git a/src/views/spectrumAnalysis/components/Modals/ProcessingMonitorModal.vue b/src/views/spectrumAnalysis/components/Modals/ProcessingMonitorModal.vue
index 0ef27d3..31d321d 100644
--- a/src/views/spectrumAnalysis/components/Modals/ProcessingMonitorModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/ProcessingMonitorModal.vue
@@ -5,7 +5,7 @@
         <span class="processing-monitor-content-bar-percent">{{ percent * 100 }}%</span>
       </div>
     </div>
-    <div style="margin-top: 15px; font-size: 12px">{{ analysedFileName[0] }}</div>
+    <div style="margin-top: 15px; font-size: 12px">{{ analysedFileName.length > 0 ? analysedFileName[0] : '' }}</div>
     <div slot="custom-footer">
       <a-button @click="visible = false">Cancel</a-button>
     </div>
@@ -22,6 +22,14 @@ export default {
     },
     analysedFileName: {
       type: Array,
+      default: () => [],
+    },
+  },
+  watch: {
+    percent(newValue, oldValue) {
+      if (newValue == 1) {
+        this.visible = false
+      }
     },
   },
 }
diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue
index 5124d0a..7427a69 100644
--- a/src/views/spectrumAnalysis/gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/gamma-analysis.vue
@@ -1557,6 +1557,7 @@ export default {
               content: () => arr.map((text) => <div>{text}</div>),
             })
           }
+          return message
         }
       } catch (error) {
         console.error(error)
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index 785ac27..7d5e9e7 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -794,6 +794,8 @@ export default {
     },
 
     handleReprocessAll() {
+      this.percentBar = 0
+      this.finishCont = 0
       this.analyzeAllModalVisible = true
       const { inputFileName, sampleType } = this.sampleData
       // 获取所有的gamma list
@@ -829,6 +831,14 @@ export default {
             if (fileNames.length > 0) {
               this.fetchReprocessing(fileNames, currFileName, sampleType)
             }
+          } else {
+            this.analyzeAllModalVisible = false
+            const arr = res.split('\n')
+            this.$warning({
+              title: 'Warning',
+              content: () => arr.map((text) => <div>{text}</div>),
+            })
+            return
           }
         })
       } else {
@@ -841,6 +851,14 @@ export default {
             if (fileNames.length > 0) {
               this.fetchReprocessing(fileNames, currFileName, sampleType)
             }
+          } else {
+            this.analyzeAllModalVisible = false
+            const arr = message.split('\n')
+            this.$warning({
+              title: 'Warning',
+              content: () => arr.map((text) => <div>{text}</div>),
+            })
+            return
           }
         } catch (error) {
           console.error(error)