diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index e1fada0..62300ba 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -183,15 +183,15 @@ export default { sampleInfo: { type: Object, }, - analyseCurrentSpectrum: { - type: Object, - }, + // analyseCurrentSpectrum: { + // type: Object, + // }, }, data() { this.SampleType = SampleType return { - // analyseCurrentSpectrum: {}, + analyseCurrentSpectrum: {}, qcFlags: {}, spectraVisible: false, @@ -539,9 +539,9 @@ export default { } const minX = left - 10, - maxX = right + 10, - minY = bottom - 10, - maxY = top + 10 + maxX = right + 10, + minY = bottom - 10, + maxY = top + 10 this.$refs.betaGammaChartRef.setRange(minX, maxX, 'x') this.$refs.betaGammaChartRef.setRange(minY, maxY, 'y') @@ -590,7 +590,7 @@ export default { data: newVal.XeData, }) }, - immediate: true, + // immediate: true, deep: true, }, sampleInfo: { diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index 2789556..7730ff1 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -53,8 +53,8 @@ @reAnalyAll="getReAnalyAll" :sampleInfo="sampleInfo" :sample="sampleData" - :analyseCurrentSpectrum="analyseCurrentSpectrumData" /> +