From 25792a7c06a11d79b3805625eab9c0f6b8997e0a Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Thu, 4 Jan 2024 19:40:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DTool=20of=20Calibratio?= =?UTF-8?q?n=20->=20beta=E4=B8=ADE=20to=20C=20=E5=8F=96=E5=80=BC=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98=EF=BC=8C=E5=8F=8Agamma=E7=9A=84Stri?= =?UTF-8?q?p=E6=9C=AA=E6=B8=85=E7=90=86=E6=A0=87=E9=A2=98=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/BetaDetectorCalibration.vue | 4 ++-- src/views/spectrumAnalysis/index.vue | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue index e802ac1..e40ddc7 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue @@ -136,8 +136,8 @@
E to C : C = {{ scientificNotationStr2Fixed(newE2C[0]) }} + {{ scientificNotationStr2Fixed(newE2C[0]) }} *E - + {{ scientificNotationStr2Fixed(newE2C[0]) }} *E 2 + >C = {{ scientificNotationStr2Fixed(newE2C[0]) }} + {{ scientificNotationStr2Fixed(newE2C[1]) }} *E + + {{ scientificNotationStr2Fixed(newE2C[2]) }} *E 2
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index fe21e15..9c77ea1 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -1120,6 +1120,7 @@ export default { submenuClick: ({ child: { key } }) => { switch (key) { case 'compareFromFile': + this.isComparing = false this.isStriping = false this.$refs.gammaAnalysisRef.showCompareModal(false) break @@ -1128,6 +1129,7 @@ export default { break case 'stripFromFile': this.isComparing = false + this.isStriping = false this.$refs.gammaAnalysisRef.showCompareModal(true) break case 'stripFromDB':