diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BGLogViewer.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BGLogViewer.vue index c306158..f16bb6d 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BGLogViewer.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BGLogViewer.vue @@ -25,7 +25,7 @@ export default { async getDetail() { try { this.isLoading = true - const { dbName, sampleId, sampleFileName, gasFileName, detFileName, qcFileName } = this.newSampleData + const { dbName, sampleId, inputFileName: sampleFileName, gasFileName, detFileName, qcFileName } = this.newSampleData const result = await getAction('/spectrumAnalysis/viewBGLogViewer', { dbName, sampleId, @@ -34,7 +34,16 @@ export default { detFileName, qcFileName, }) - this.content = result + if(typeof result == 'string') { + this.content = result + } else { + const { success, result, message } = res + if (success) { + this.content = result + } else { + this.$message.error(message) + } + } } catch (error) { console.error(error) } finally { diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index d7548e0..f614c4c 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -1303,7 +1303,9 @@ export default { title: 'BG log viewer', show: this.isBetaGamma, handler: () => { - this.bgLogViewerVisible = true + if(this.params_toDB.savedAnalysisResult) { + this.bgLogViewerVisible = true + } }, }, {