diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index 9e95563..b33e2c4 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, diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index b143b59..f488485 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -407,7 +407,7 @@ export default { isSaving: false, colorConfig: {}, // 颜色配置 - sampleInfo:{} + sampleInfo: {}, } }, created() { @@ -445,12 +445,14 @@ export default { this.params_toDB.comment = val.spectrumAnalysisCommentInfo }, getStationName(arg, val, flag) { - arg.forEach((item) => { - item.conc = parseFloat(Number(item.conc).toPrecision(6)) - item.concErr = parseFloat(Number(item.concErr).toPrecision(6)) - item.lc = parseFloat(Number(item.lc).toPrecision(6)) - item.mdc = parseFloat(Number(item.mdc).toPrecision(6)) - }) + if (arg.length > 0) { + arg.forEach((item) => { + item.conc = parseFloat(Number(item.conc).toPrecision(6)) + item.concErr = parseFloat(Number(item.concErr).toPrecision(6)) + item.lc = parseFloat(Number(item.lc).toPrecision(6)) + item.mdc = parseFloat(Number(item.mdc).toPrecision(6)) + }) + } this.resultDisplayFlag = arg this.params_toDB.stationName = val this.isReAnalyed_beta = flag