diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue index 515f988..00c078d 100644 --- a/src/views/spectrumAnalysis/gamma-analysis.vue +++ b/src/views/spectrumAnalysis/gamma-analysis.vue @@ -152,6 +152,9 @@ export default { updateFlag: { type: String, }, + currSampleDet: { + type: Array, + }, }, components: { CustomChart, @@ -913,7 +916,6 @@ export default { } }, - // 设置图表底部的标题 setChartBottomTitle(channel, energy, counts) { const { index, find } = findNearPeak(channel, this.peakList) @@ -925,7 +927,7 @@ export default { // 根据xAixs值找channel、energy和counts getEnergyAndCountsByXAxis(xAxis) { - if(-1 == xAxis) { + if (-1 == xAxis) { return { channel: -1, energy: 0, @@ -1811,6 +1813,11 @@ export default { }, immediate: true, }, + currSampleDet: { + handler(val) { + this.detailedInfomation = [...val] + }, + }, }, computed: { // 是不是Energy diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index b5ae6e8..f3c7a00 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -37,6 +37,7 @@ v-if="isGamma" ref="gammaAnalysisRef" :sample="sampleData" + :currSampleDet="currSampleDet" :updateFlag="updateFlag" @reAnalyed="handleReAnalyed" /> @@ -427,6 +428,7 @@ export default { finishCont: 0, percentBar: 0, analysedFileName: '', //分析完成的文件名称 + currSampleDet: [], // DetailedInformation } }, created() { @@ -711,11 +713,12 @@ export default { if (type == 'current') { const hideLoading = this.$message.loading('Saving...', 0) try { - const { success, message } = await getAction('/gamma/saveToDB', { + const { success, message, result } = await getAction('/gamma/saveToDB', { fileName: this.sampleData.inputFileName, }) if (success) { this.$message.success('Save Success') + this.currSampleDet = [...result.DetailedInformation] } else { this.$message.error(message) } @@ -796,7 +799,7 @@ export default { handleReprocessAll() { this.percentBar = 0 this.finishCont = 0 - this.analysedFileName="" + this.analysedFileName = '' this.analyzeAllModalVisible = true const { inputFileName, sampleType } = this.sampleData // 获取所有的gamma list