diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index 62300ba..09946fe 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, @@ -466,7 +466,8 @@ export default { postAction('/spectrumAnalysis/analyseCurrentSpectrum', params).then((res) => { if (res.success) { // this.isReAnalyed_beta = true - this.analyseCurrentSpectrum = res.result + // this.analyseCurrentSpectrum = res.result + this.$emit('sendXeData', res.result.XeData) if (res.result.XeData && res.result.XeData.length > 0) { res.result.XeData.forEach((item) => { item.conc = parseFloat(item.conc.toPrecision(6)) @@ -493,7 +494,8 @@ export default { } postAction('/spectrumAnalysis/analyseAllSpectrum', params).then((res) => { if (res.success) { - this.analyseCurrentSpectrum = res.result + // this.analyseCurrentSpectrum = res.result + this.$emit('sendXeData', res.result.XeData) res.result.XeData.forEach((item) => { item.conc = parseFloat(item.conc.toPrecision(6)) item.concErr = parseFloat(item.concErr.toPrecision(6)) diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue index 7d23567..46d6b31 100644 --- a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue @@ -1820,7 +1820,12 @@ export default { width: 100%; } } - +::v-deep { + .ant-modal { + top: 5px; + padding-bottom: 7px; + } +} .is-modify, .is-fitting { color: #f00; diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index f0a7682..62b93dd 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -49,12 +49,13 @@ ref="betaGammaAnalysisRef" @getFiles="getFiles" @sendInfo="getStationName" + @sendXeData="getXeData" @reAnalyCurr="getReAnalyCurr" @reAnalyAll="getReAnalyAll" :sampleInfo="sampleInfo" :sample="sampleData" + :analyseCurrentSpectrum="analyseCurrentSpectrumData" /> -
Please Select a Sample
@@ -376,7 +377,7 @@ export default { betaGammaRlrModalVisible: false, // beta-gamma RLR 弹窗 statisticsParamerHistoryModalVisible: false, // beta-gamma Statistics Paramer History 弹窗 bgLogViewerVisible: false, // beta-gamma Log 下的BG log viewer 弹窗 - // analyseCurrentSpectrumData: {}, + analyseCurrentSpectrumData: {}, resultDisplayFlag: [], params_toDB: { comment: '', @@ -467,7 +468,7 @@ export default { this.params_toDB.checkDet = val.checkDet }, getXeData(val) { - // this.$set(this.analyseCurrentSpectrumData, 'XeData', val) + this.$set(this.analyseCurrentSpectrumData, 'XeData', val) this.resultDisplayFlag = val }, // formDB 来源 吧接口返回的文件名称添加到sampleData @@ -1304,7 +1305,7 @@ export default { title: 'BG log viewer', show: this.isBetaGamma, handler: () => { - if(this.params_toDB.savedAnalysisResult) { + if (this.params_toDB.savedAnalysisResult) { this.bgLogViewerVisible = true } },