diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index 308b33e..dd9c46c 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -242,19 +242,24 @@ export default { this.sampleDetail[item.value].Boundary = value || [] }) - const mapper = [{ - key: 'sample', - sampleType: 'sample' - }, { - key: 'gas', - sampleType: 'gasBg' - }, { - key: 'det', - sampleType: 'detBg' - }, { - key: 'qc', - sampleType: 'qc' - }] + 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的维度 @@ -264,16 +269,14 @@ export default { const key = `${mapper[i].key}${dimension2[j]}EnergyData` // 返回的result中的key,形如 gasBetaEnergyData const value = result[key] // 如果有值,将值赋给相应的sampleDetail中的谱的energy - if(value) { + if (value) { const dimensionKey = dimension[j] const sampleType = mapper[i].sampleType this.sampleDetail[sampleType][`${dimensionKey}EnergyData`] = value } } - } - this.changeChartByType(this.spectraType) }, @@ -288,7 +291,7 @@ export default { async getSampleDetail() { this.spectraType = this.SampleType[0].value - const { dbName, sampleId, inputFileName } = this.sample + const { dbName, sampleId, inputFileName, analyst } = this.sample try { this.isLoading = true this.cancelLastRequest() @@ -298,6 +301,7 @@ export default { { dbName, sampleId, + analyst, }, cancelToken )