From 7ecd6091854f246fc839aae19013d0ce0404f38c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Wed, 8 Nov 2023 10:52:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=88=E5=8A=A0=E8=BD=BD=20Gamma=20=E8=B0=B1?= =?UTF-8?q?=EF=BC=8C=E7=84=B6=E5=90=8E=E4=BB=8E=20From=20DB=20=E5=8A=A0?= =?UTF-8?q?=E8=BD=BDBeta=20=E8=B0=B1=EF=BC=8C=E5=88=87=E6=8D=A2=E5=88=B0?= =?UTF-8?q?=20Beta=20=E5=8F=B3=E4=B8=8B=E8=A7=92=E6=9C=89=E5=88=86?= =?UTF-8?q?=E6=9E=90=E7=BB=93=E6=9E=9C=EF=BC=8C=E5=88=87=E6=8D=A2=E5=88=B0?= =?UTF-8?q?=20Gamma=20=E8=B0=B1=E5=86=8D=E5=88=87=E5=9B=9E=20Beta=EF=BC=8C?= =?UTF-8?q?=E5=8F=B3=E4=B8=8B=E8=A7=92=E5=88=86=E6=9E=90=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spectrumAnalysis/beta-gamma-analysis.vue | 16 ++++++++-------- src/views/spectrumAnalysis/index.vue | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index e1fada0..62300ba 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, @@ -539,9 +539,9 @@ export default { } const minX = left - 10, - maxX = right + 10, - minY = bottom - 10, - maxY = top + 10 + maxX = right + 10, + minY = bottom - 10, + maxY = top + 10 this.$refs.betaGammaChartRef.setRange(minX, maxX, 'x') this.$refs.betaGammaChartRef.setRange(minY, maxY, 'y') @@ -590,7 +590,7 @@ export default { data: newVal.XeData, }) }, - immediate: true, + // immediate: true, deep: true, }, sampleInfo: { diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index 2789556..7730ff1 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -53,8 +53,8 @@ @reAnalyAll="getReAnalyAll" :sampleInfo="sampleInfo" :sample="sampleData" - :analyseCurrentSpectrum="analyseCurrentSpectrumData" /> +
Please Select a Sample
@@ -375,7 +375,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: '', @@ -463,7 +463,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