diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue index 61bacfe..7d23567 100644 --- a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue @@ -799,7 +799,7 @@ export default { shapeChannelData, shapeEnergyData, peak: table, - barChart: this.barChart + barChart: this.barChart, }) this.channelPeakChart = channelPeakChart @@ -917,7 +917,6 @@ export default { this.selectedKeys = [] this.selectedTableItem = null - } else { this.$message.error(message) } @@ -1441,7 +1440,7 @@ export default { this.resetChartOpts() }) - this.$bus.$emit('accept', result) + this.$bus.$emit('accept', { ...result, BaseCtrls: cloneDeep(this.baseCtrls_Copy) }) } else { this.$message.error(message) } diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue index 6d9bc99..85d45a8 100644 --- a/src/views/spectrumAnalysis/gamma-analysis.vue +++ b/src/views/spectrumAnalysis/gamma-analysis.vue @@ -1382,7 +1382,7 @@ export default { // 分析工具Accept时刷新部分数据 handleAccept(data) { - const { allData, peak, shadowChannelChart, shadowEnergyChart, shapeChannelData, shapeEnergyData, barChart } = data + const { allData, peak, shadowChannelChart, shadowEnergyChart, shapeChannelData, shapeEnergyData, barChart, BaseCtrls } = data const result = { DetailedInformation: this.detailedInfomation, @@ -1393,7 +1393,7 @@ export default { shapeChannelData, shapeEnergyData, peak, - BaseCtrls: this.baseCtrls, + BaseCtrls, bAnalyed: this.bAnalyed, barChart }