diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/FitPeaksAndBaselineModal.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/FitPeaksAndBaselineModal.vue index ca12c50..999d946 100644 --- a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/FitPeaksAndBaselineModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/FitPeaksAndBaselineModal.vue @@ -156,9 +156,10 @@ export default { const { success, result, message } = await postAction('/gamma/acceptResults', { fileName, accept, - oldPeaks: this.oldPeaks, + oldPeak: this.oldPeaks, newPeak: this.newPeaks, - flag: this.isInsertPeak ? 'insert' : 'fit' + flag: this.isInsertPeak ? 'insert' : 'fit', + tablePeaksList: this.list }) if (success) { this.visible = false diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue index 64ec2ef..3d12eef 100644 --- a/src/views/spectrumAnalysis/gamma-analysis.vue +++ b/src/views/spectrumAnalysis/gamma-analysis.vue @@ -200,6 +200,7 @@ export default { baseLineCP: [], }, peakList: [], // Peak 列表(非点位) + baseCtrls: {}, // BaseCtrls nuclideLibraryList: [], // 当前鼠标点击选中的channel peakInfomationTooltip: { @@ -530,7 +531,7 @@ export default { this.$store.commit('ADD_SAMPLE_DATA', { inputFileName, - data: Object.assign(result, { BaseCtrls: baseCtrlJson }), + data: result, from: flag, }) @@ -553,6 +554,7 @@ export default { shapeChannelData, shapeEnergyData, peak, + BaseCtrls, } = result if (flag && (flag == 'dab' || flag == 'file')) { this.bAnalyed = result.bAnalyed @@ -568,6 +570,10 @@ export default { this.peakList = peak } + if(BaseCtrls) { + this.baseCtrls = BaseCtrls + } + const channelPeakGroup = this.getLineData(allData, 'Peak', 'channel', true) const energyPeakGroup = this.getLineData(allData, 'Peak', 'energy', true) @@ -1303,6 +1309,7 @@ export default { handleRefresh(data) { data.DetailedInformation = this.detailedInfomation data.QCFlag = this.qcFlags + data.BaseCtrls = this.baseCtrls this.clearCompareLine() this.redrawPeakLine() this.dataProcess(data) @@ -1329,6 +1336,7 @@ export default { shapeChannelData, shapeEnergyData, peak: peakSet, + BaseCtrls: this.baseCtrls, } this.clearCompareLine() this.redrawPeakLine()