diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
index 4cd3b2c..04a9d86 100644
--- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
@@ -182,6 +182,9 @@ export default {
sample: {
type: Object,
},
+ analyseCurrentSpectrum: {
+ type: Object,
+ },
},
data() {
this.SampleType = SampleType
@@ -197,6 +200,7 @@ export default {
spectrumData: {}, // Detailed Infomation 信息
resultDisplay: [],
+ currResultDisplay: [],
histogramDataList: [],
histogramDataDList: [],
@@ -232,7 +236,7 @@ export default {
this.sampleDetail = result
this.changeChartByType('sample')
this.isLoading = false
- // this.$emit("getFiles",{detFileName:result.detBg.fileName,gasFileName:result.gasBg.fileName})
+ this.$emit('getFiles', { detFileName: result.detBg.fileName, gasFileName: result.gasBg.fileName })
} else {
this.$message.error(message)
}
@@ -305,7 +309,7 @@ export default {
this.betaProjectedData = betaProjectedData
this.betaEnergyData = betaEnergyData
- this.resultDisplay = XeData
+ this.resultDisplay = this.currResultDisplay || XeData
this.qcFlags = {
AcqTimeBtn,
@@ -387,7 +391,6 @@ export default {
watch: {
sample: {
handler(newVal, oldVal) {
- console.log('newValnewVal', newVal)
if (newVal.sampleId) {
this.getSampleDetail()
} else {
@@ -396,6 +399,14 @@ export default {
},
immediate: true,
},
+ analyseCurrentSpectrum: {
+ handler(newVal, oldVal) {
+ this.currResultDisplay = newVal.XeData
+ this.resultDisplay = newVal.XeData
+ },
+ immediate: true,
+ deep: true,
+ },
},
}
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index dd170aa..62654ac 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -34,8 +34,14 @@
-