diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index dd7150c..cfc11fc 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -548,16 +548,21 @@ export default { // this.isReAnalyed_beta = true // 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)) - item.concErr = parseFloat(item.concErr.toPrecision(6)) - item.lc = parseFloat(item.lc.toPrecision(6)) - item.mdc = parseFloat(item.mdc.toPrecision(6)) - }) - this.$emit('reAnalyCurr', true, res.result.XeData) - this.handleReAnalyse(res.result) + // if (res.result.XeData && res.result.XeData.length > 0) { + res.result.XeData.forEach((item) => { + item.conc = parseFloat(item.conc.toPrecision(6)) + item.concErr = parseFloat(item.concErr.toPrecision(6)) + item.lc = parseFloat(item.lc.toPrecision(6)) + item.mdc = parseFloat(item.mdc.toPrecision(6)) + }) + this.$emit('reAnalyCurr', true, res.result.XeData) + this.handleReAnalyse(res.result) + if (res.result.bProcessed) { + this.$message.success(res.result.message) + } else { + this.$message.warning(res.result.message) } + // } } else { this.$message.warning(res.message) } diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue index 351bae0..fb127b2 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue @@ -154,10 +154,14 @@ export default { }) this.$emit('sendXeData', res.result.XeData) this.$emit('reAnalyCurr', true, res.result.XeData) - this.$message.success('Analyse Success!') this.isReanlyze = true this.handleExit() this.$bus.$emit('ReAnalyses', res.result) + if (res.result.bProcessed) { + this.$message.success(res.result.message) + } else { + this.$message.warning(res.result.message) + } if (this.newCalibrationIsAppliedTo == 'AllSpectrum') { let sameStation = matchedSampleList.filter( diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index 5f7ace3..2d09bc5 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -533,10 +533,10 @@ export default { this.params_toDB.checkDet = val.checkDet }, getXeData(val) { - if (val && val.length) { - this.$set(this.analyseCurrentSpectrumData, 'XeData', val) - this.resultDisplayFlag = val - } + // if (val && val.length) { + this.$set(this.analyseCurrentSpectrumData, 'XeData', val) + this.resultDisplayFlag = val + // } }, // formDB 来源 吧接口返回的文件名称添加到sampleData getFiles(val) { @@ -1824,6 +1824,8 @@ export default {