From 99e9ad2bd91552f0be4f8da3ab24381ddcb1b5f4 Mon Sep 17 00:00:00 2001 From: xiaoguangbin Date: Mon, 11 Dec 2023 14:18:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:ftiting=E6=8C=89=E7=85=A7=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E9=9C=80=E8=A6=81=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0?= =?UTF-8?q?fittingBtn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/GammaDetectorCalibration.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue index da65891..71f184f 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue @@ -669,6 +669,7 @@ export default { // 点击Fitting按钮执行重新计算 async handleFitting() { + console.log("isFirstFitting>>"+this.isFirstFitting); const hasEmpty = Object.entries(this.newCalibrationFuncModel).some(([_, v]) => !v) if (hasEmpty && this.list.length < 3) { return @@ -687,10 +688,11 @@ export default { // ? this.oldScatterSeries // : this.list.map((item) => ({ x: item.channel, y: item.energy })), count: this.isFirstFitting || !this.isInverse ? undefined : this.count, + fittingBtn : this.isFirstFitting }) if (success) { // this.isFirstFitting = true - this.gammaIsFitting = false + this.gammaIsFitting = true this.$emit('isFitting', true) // 点击reAnalyze按钮，将isFirstFitting改为true 20231101：xiao this.setCache("CALIBRATION_GAMMA_"+this.newSampleData.inputFileName, result) // 缓存数据，如果点击ReAnalyze需要回显数据 20231101：xiao From 35b315421a7a42048bab8887f7fe8ca89a3b9e1e Mon Sep 17 00:00:00 2001 From: xiaoguangbin Date: Mon, 11 Dec 2023 14:36:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix;=E6=8C=89=E4=B9=94=E7=9A=84=E8=A6=81?= =?UTF-8?q?=E6=B1=82=E5=A2=9E=E5=8A=A0=E8=AF=B7=E6=B1=82reset=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=2020231211=EF=BC=9Axiao?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/BetaDetectorCalibration.vue | 8 +++++++- .../components/GammaDetectorCalibration.vue | 9 +++++++-- 2 files changed, 14 insertions(+), 3 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 c4db8f4..2d4334e 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue @@ -876,12 +876,18 @@ export default { }, // 点击Reset Button 重置 - handleReset() { + async handleReset() { this.removeCache("CALIBRATION_BETA_"+this.newSampleData.inputFileName) // 删除fitting之后缓存的数据 20231101:xiao this.newCalibrationFuncModel = cloneDeep(newCalibrationFuncModel) this.list = [] this.newE2C = [] + // 按乔的要求增加请求reset的接口 20231211：xiao + const res = await postAction('/spectrumAnalysis/resetButton', { + tabName: "beta", + sampleFileName: this.newSampleData.inputFileName + }) + this.figureChartOption = this.oldChartOption this.figureChartOption = cloneDeep(this.oldChartOption) diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue index 71f184f..0d9be43 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue @@ -656,12 +656,18 @@ export default { }, // 点击Reset Button 重置 - handleReset() { + async handleReset() { this.$ls.remove("CALIBRATION_GAMMA_"+this.newSampleData.inputFileName) // 删除fitting之后缓存的数据 20231101:xiao this.newCalibrationFuncModel = cloneDeep(newCalibrationFuncModel) this.list = [] this.newE2C = [] + // 按乔的要求增加请求reset的接口 20231211：xiao + const res = await postAction('/spectrumAnalysis/resetButton', { + tabName: "gamma", + sampleFileName: this.newSampleData.inputFileName + }) + this.figureChartOption = cloneDeep(this.oldChartOption) this.isFirstFitting = false this.isInverse = false @@ -669,7 +675,6 @@ export default { // 点击Fitting按钮执行重新计算 async handleFitting() { - console.log("isFirstFitting>>"+this.isFirstFitting); const hasEmpty = Object.entries(this.newCalibrationFuncModel).some(([_, v]) => !v) if (hasEmpty && this.list.length < 3) { return From 7f443f55a94472c2f864d7a34af5faccb85a8751 Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Mon, 11 Dec 2023 15:10:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20Compare=E5=92=8CStrip=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=8A=B6=E6=80=81=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/spectrumAnalysis/gamma-analysis.vue | 8 +++- src/views/spectrumAnalysis/index.vue | 48 +++++++++++++++++-- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue index 00c078d..ffc61cc 100644 --- a/src/views/spectrumAnalysis/gamma-analysis.vue +++ b/src/views/spectrumAnalysis/gamma-analysis.vue @@ -1433,13 +1433,17 @@ export default { }, // 显示比较弹窗 - showCompareModal(isStrip) { + showCompareModal(isStrip, isOperating) { if (this.isLoading) { this.$message.warn('Sample is Loading') return } this.handleResetChart() this.clearCompareLine() + if(isOperating) { + return + } + this.isStrip = isStrip if (FilePicker.canUse()) { this.chooseFileFromFS() @@ -1512,6 +1516,8 @@ export default { this.$nextTick(() => { this.thumbnailOption.yAxis.max = getAxisMax(this.getChart(), 'yAxis') }) + + this.$emit('compareSuccess', this.isStrip) } else { this.$message.error(message) } diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index bf90e2d..1a8bc5a 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -18,7 +18,13 @@