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 @@
Filter
- Xe Result Flag
+ Xe Result Flag
@@ -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 @@
{{ percent * 100 }}%
- {{ analysedFileName[0] }}
+ {{ analysedFileName.length > 0 ? analysedFileName[0] : '' }}
@@ -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) => {text}
),
})
}
+ 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) => {text}
),
+ })
+ 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) => {text}
),
+ })
+ return
}
} catch (error) {
console.error(error)