diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index 5085e76..308b33e 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -194,6 +194,8 @@ export default { // analyseCurrentSpectrum: {}, qcFlags: {}, + sampleDetail: {}, + spectraVisible: false, spectraType: 'sample', @@ -225,21 +227,54 @@ export default { } }, created() { - this.$bus.$on('ReAnalyses', this.redrawRect) + this.$bus.$on('ReAnalyses', this.handleReAnalyse) }, destroyed() { this.cancelLastRequest() - this.$bus.$off('ReAnalyses', this.redrawRect) + this.$bus.$off('ReAnalyses', this.handleReAnalyse) }, methods: { // 重新绘制矩形框 - redrawRect(result) { + handleReAnalyse(result) { const keys = ['SampleBoundary', 'GasBoundary', 'DetBoundary', 'QCBoundary'] SampleType.forEach((item, index) => { const value = result[keys[index]] this.sampleDetail[item.value].Boundary = value || [] - this.changeChartByType(this.spectraType) }) + + const mapper = [{ + key: 'sample', + sampleType: 'sample' + }, { + key: 'gas', + sampleType: 'gasBg' + }, { + key: 'det', + sampleType: 'detBg' + }, { + key: 'qc', + sampleType: 'qc' + }] + + const dimension = ['beta', 'gamma'] // sampleDatail的key的维度 + const dimension2 = ['Beta', 'Gamma'] // 返回值的key的维度 + + for (let i = 0; i < mapper.length; i++) { + for (let j = 0; j < dimension.length; j++) { + const key = `${mapper[i].key}${dimension2[j]}EnergyData` // 返回的result中的key,形如 gasBetaEnergyData + const value = result[key] + // 如果有值,将值赋给相应的sampleDetail中的谱的energy + if(value) { + const dimensionKey = dimension[j] + const sampleType = mapper[i].sampleType + this.sampleDetail[sampleType][`${dimensionKey}EnergyData`] = value + } + } + + } + + + this.changeChartByType(this.spectraType) }, handleGetFlag(val, obj) {