diff --git a/src/views/spectrumAnalysis/beta-analysis.vue b/src/views/spectrumAnalysis/beta-analysis.vue index 475266b..a5f6529 100644 --- a/src/views/spectrumAnalysis/beta-analysis.vue +++ b/src/views/spectrumAnalysis/beta-analysis.vue @@ -215,13 +215,9 @@ export default { async handler(newVal, oldVal) { const sampleData = getSampleData(newVal.inputFileName) if (sampleData) { - const { data, from } = sampleData + const { data } = sampleData this.sampleDetail = data this.changeChartByType('sample') - if (from == 'db') { - this.sampleDetail = data - } - this.ROIAnalyzeLists = data.ROIAnalyzeLists || [] } else { if (newVal.sampleId) { this.getDetailFromDB() @@ -272,7 +268,7 @@ export default { const { success, result, message } = await postAction('/selfStation/Reprocessing', formData) if (success) { const analyseList = this.getROIAnalyzeListsFromResult(result) - this.ROIAnalyzeLists = analyseList + this.ROIAnalyzeLists = this.spectraType == 'sample' ? analyseList : [] updateSampleData({ inputFileName, key: 'ROIAnalyzeLists', @@ -409,7 +405,7 @@ export default { } }, - // 获取样品详情 + // 获取谱详情 async getDetailFromDB() { const { dbName, sampleId, analyst, inputFileName } = this.sample try { @@ -434,7 +430,6 @@ export default { }) const analyseList = this.getROIAnalyzeListsFromResult(result.sample) - this.ROIAnalyzeLists = analyseList updateSampleData({ inputFileName, key: 'ROIAnalyzeLists',