diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index da5f89e..9e95563 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -180,6 +180,9 @@ export default { sample: { type: Object, }, + sampleInfo: { + type: Object, + }, // analyseCurrentSpectrum: { // type: Object, // }, @@ -542,6 +545,14 @@ export default { immediate: true, deep: true, }, + sampleInfo: { + handler(newVal, oldVal) { + this.spectrumData.sampleId = newVal.sampleId + this.spectrumData.status = newVal.status + }, + immediate: true, + deep: true, + }, }, } diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index fbb28f1..b143b59 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -51,6 +51,7 @@ @sendInfo="getStationName" @reAnalyCurr="getReAnalyCurr" @reAnalyAll="getReAnalyAll" + :sampleInfo="sampleInfo" :sample="sampleData" :analyseCurrentSpectrum="analyseCurrentSpectrumData" /> @@ -406,6 +407,7 @@ export default { isSaving: false, colorConfig: {}, // 颜色配置 + sampleInfo:{} } }, created() { @@ -641,6 +643,7 @@ export default { if (res.success) { this.$message.success('Save Successfully!') this.isSaving = false + this.sampleInfo = res.result.sample } else { this.isSaving = false this.$message.warning(`${res.message}`)