From 8282663e3ecb6ff145ec6b9b3d62317f910138d0 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 18:42:07 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BetaGammaEnergyCalibrationModal/index.vue | 22 +++++++++++-------- .../BetaGammaExtrapolationModal.vue | 6 +++++ .../Modals/EfficiencyCalibrationModal.vue | 6 +++++ .../Modals/EnergyCalibrationModal.vue | 6 +++++ .../Modals/ResolutionCalibrationModal.vue | 6 +++++ 5 files changed, 37 insertions(+), 9 deletions(-) diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue index 6f16c6c..44e8514 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue @@ -10,7 +10,7 @@ > - + @@ -71,7 +71,7 @@ export default { }, betaEnergyValid: false, gammaEnergyValid: false, - isReanlyze: false + isReanlyze: false, } }, methods: { @@ -90,14 +90,14 @@ export default { this.betaEnergyValid = val }, getFittingFlag_gamma(val) { - console.log("zhiqian>>>"+this.gammaEnergyValid); + console.log('zhiqian>>>' + this.gammaEnergyValid) this.gammaEnergyValid = val - console.log("zhihou>>>"+this.gammaEnergyValid); + console.log('zhihou>>>' + this.gammaEnergyValid) }, handleReAnalyse() { // todo 1.fitting之后才能点击; 2.isReAnalyze需要缓存 - if(!this.gammaEnergyValid){ - return false; + if (!this.gammaEnergyValid) { + return false } const regExp = /^([A-Z]{1,}\d{1,})_/ const regMatched = this.newSampleData.inputFileName.match(regExp) @@ -157,9 +157,9 @@ export default { }, handleExit() { this.gammaEnergyValid = this.isReanlyze - console.log("exit>>>this.isReanlyze>>>"+this.isReanlyze); - if(!this.isReanlyze && this.$ls.get("calibration-gamma:"+this.newSampleData.inputFileName)){ - this.$ls.remove("calibration-gamma:"+this.newSampleData.inputFileName) // 如果没有点击ReANalyze，删除fitting之后缓存的数据 20231101:xiao + console.log('exit>>>this.isReanlyze>>>' + this.isReanlyze) + if (!this.isReanlyze && this.$ls.get('calibration-gamma:' + this.newSampleData.inputFileName)) { + this.$ls.remove('calibration-gamma:' + this.newSampleData.inputFileName) // 如果没有点击ReANalyze，删除fitting之后缓存的数据 20231101:xiao } this.visible = false }, @@ -182,6 +182,10 @@ export default { diff --git a/src/views/spectrumAnalysis/components/Modals/EnergyCalibrationModal.vue b/src/views/spectrumAnalysis/components/Modals/EnergyCalibrationModal.vue index dfc0cd9..d2d980f 100644 --- a/src/views/spectrumAnalysis/components/Modals/EnergyCalibrationModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/EnergyCalibrationModal.vue @@ -680,4 +680,10 @@ export default { .mt-20 { margin-top: 20px; } +::v-deep { + .ant-modal { + top: 5px; + padding-bottom: 15px; + } +} diff --git a/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal.vue b/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal.vue index 8ee8f88..ebdda9a 100644 --- a/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal.vue @@ -679,4 +679,10 @@ export default { .mt-20 { margin-top: 20px; } +::v-deep { + .ant-modal { + top: 5px; + padding-bottom: 15px; + } +} From e13f8cbc22ab99c2fcbf516729a62d68a1e9f638 Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Thu, 9 Nov 2023 10:01:55 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4?= =?UTF-8?q?Peak=E5=90=8E=EF=BC=8C=E5=9C=A8=E8=A7=86=E8=A7=89=E4=B8=8A?= =?UTF-8?q?=E8=BF=98=E5=AD=98=E5=9C=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modals/AnalyzeInteractiveToolModal/index.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue index 4604c00..61bacfe 100644 --- a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue @@ -892,6 +892,7 @@ export default { barChart: this.barChart, }) + this.opts.notMerge = true this.channelPeakChart = channelPeakChart const series = [] // 推入旧的BaseLine @@ -908,13 +909,15 @@ export default { this.list = table - this.opts.notMerge = true this.option.series = series - this.resetChartOpts() + this.$nextTick(() => { + this.resetChartOpts() + }) this.selectedKeys = [] this.selectedTableItem = null + } else { this.$message.error(message) } From b5c51883da35f2323e9b2da0174241de6f873556 Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Thu, 9 Nov 2023 10:33:17 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Daccept=E5=90=8E?= =?UTF-8?q?=E6=96=B0=E7=9A=84baseCtrl=E6=9C=AA=E4=BC=A0=E5=87=BA=E6=9D=A5?= =?UTF-8?q?=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/Modals/AnalyzeInteractiveToolModal/index.vue | 5 ++--- src/views/spectrumAnalysis/gamma-analysis.vue | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue index 61bacfe..7d23567 100644 --- a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue @@ -799,7 +799,7 @@ export default { shapeChannelData, shapeEnergyData, peak: table, - barChart: this.barChart + barChart: this.barChart, }) this.channelPeakChart = channelPeakChart @@ -917,7 +917,6 @@ export default { this.selectedKeys = [] this.selectedTableItem = null - } else { this.$message.error(message) } @@ -1441,7 +1440,7 @@ export default { this.resetChartOpts() }) - this.$bus.$emit('accept', result) + this.$bus.$emit('accept', { ...result, BaseCtrls: cloneDeep(this.baseCtrls_Copy) }) } else { this.$message.error(message) } diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue index 6d9bc99..85d45a8 100644 --- a/src/views/spectrumAnalysis/gamma-analysis.vue +++ b/src/views/spectrumAnalysis/gamma-analysis.vue @@ -1382,7 +1382,7 @@ export default { // 分析工具Accept时刷新部分数据 handleAccept(data) { - const { allData, peak, shadowChannelChart, shadowEnergyChart, shapeChannelData, shapeEnergyData, barChart } = data + const { allData, peak, shadowChannelChart, shadowEnergyChart, shapeChannelData, shapeEnergyData, barChart, BaseCtrls } = data const result = { DetailedInformation: this.detailedInfomation, @@ -1393,7 +1393,7 @@ export default { shapeChannelData, shapeEnergyData, peak, - BaseCtrls: this.baseCtrls, + BaseCtrls, bAnalyed: this.bAnalyed, barChart } From a8b4d3453619540dc23eac9c798920ffd62d7356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Thu, 9 Nov 2023 10:55:08 +0800 Subject: [PATCH 4/6] =?UTF-8?q?gamma=20=E6=A8=A1=E5=9D=97=20Interactive=20?= =?UTF-8?q?tool=20=E5=BC=B9=E7=AA=97=E4=BD=8D=E7=BD=AE=20Calibration=20?= =?UTF-8?q?=E7=82=B9=E5=87=BBReanalysis=E4=B9=8B=E5=90=8E=20=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=BB=93=E6=9E=9C=20Result=20display=20=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E9=87=8D=E6=96=B0=E6=B8=B2=E6=9F=93=20formFile=20?= =?UTF-8?q?=E7=82=B9=E5=87=BBsave=20to=20DB=20Result=20display=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/spectrumAnalysis/beta-gamma-analysis.vue | 14 ++++++++------ .../Modals/AnalyzeInteractiveToolModal/index.vue | 7 ++++++- src/views/spectrumAnalysis/index.vue | 9 +++++---- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index 62300ba..09946fe 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, @@ -466,7 +466,8 @@ export default { postAction('/spectrumAnalysis/analyseCurrentSpectrum', params).then((res) => { if (res.success) { // this.isReAnalyed_beta = true - this.analyseCurrentSpectrum = res.result + // this.analyseCurrentSpectrum = res.result + this.$emit('sendXeData', res.result.XeData) if (res.result.XeData && res.result.XeData.length > 0) { res.result.XeData.forEach((item) => { item.conc = parseFloat(item.conc.toPrecision(6)) @@ -493,7 +494,8 @@ export default { } postAction('/spectrumAnalysis/analyseAllSpectrum', params).then((res) => { if (res.success) { - this.analyseCurrentSpectrum = res.result + // this.analyseCurrentSpectrum = res.result + this.$emit('sendXeData', res.result.XeData) res.result.XeData.forEach((item) => { item.conc = parseFloat(item.conc.toPrecision(6)) item.concErr = parseFloat(item.concErr.toPrecision(6)) diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue index 7d23567..46d6b31 100644 --- a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue @@ -1820,7 +1820,12 @@ export default { width: 100%; } } - +::v-deep { + .ant-modal { + top: 5px; + padding-bottom: 7px; + } +} .is-modify, .is-fitting { color: #f00; diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index f0a7682..62b93dd 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -49,12 +49,13 @@ ref="betaGammaAnalysisRef" @getFiles="getFiles" @sendInfo="getStationName" + @sendXeData="getXeData" @reAnalyCurr="getReAnalyCurr" @reAnalyAll="getReAnalyAll" :sampleInfo="sampleInfo" :sample="sampleData" + :analyseCurrentSpectrum="analyseCurrentSpectrumData" /> -
Please Select a Sample
@@ -376,7 +377,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: '', @@ -467,7 +468,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 @@ -1304,7 +1305,7 @@ export default { title: 'BG log viewer', show: this.isBetaGamma, handler: () => { - if(this.params_toDB.savedAnalysisResult) { + if (this.params_toDB.savedAnalysisResult) { this.bgLogViewerVisible = true } }, From dd993b4ac8da9c7de6056a86cf581e61bfa530ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Thu, 9 Nov 2023 14:56:54 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=81=97=E7=95=99?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BetaGammaEnergyCalibrationModal/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue index 44e8514..3061830 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue @@ -141,10 +141,10 @@ export default { postAction('/spectrumAnalysis/ReAnalyse', params).then((res) => { if (res.success) { res.result.XeData.forEach((item) => { - item.conc = item.conc.toFixed(6) - item.concErr = item.concErr.toFixed(6) - item.lc = item.lc.toFixed(6) - item.mdc = item.mdc.toFixed(6) + item.conc = parseFloat(item.conc.toPrecision(6)) + item.concErr = parseFloat(item.concErr.toPrecision(6)) + item.lc = parseFloat(item.lc.toPrecision(6)) + item.mdc = parseFloat(item.mdc.toPrecision(6)) }) this.$emit('sendXeData', res.result.XeData) this.$message.success('Analyse Success!') From f1af8cc8b99f7928e17a9c75f1a2d8237e56e6d1 Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Thu, 9 Nov 2023 16:39:00 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20ReAnalyse=E5=90=8E=E7=9F=A9=E5=BD=A2?= =?UTF-8?q?=E6=A1=86=E6=9C=AA=E5=8F=98=E5=8C=96=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/spectrumAnalysis/beta-gamma-analysis.vue | 14 ++++++++++++++ .../BetaGammaEnergyCalibrationModal/index.vue | 1 + 2 files changed, 15 insertions(+) diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index 09946fe..7153206 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -224,10 +224,24 @@ export default { currSample: {}, } }, + created() { + this.$bus.$on('ReAnalyse', this.redrawRect) + }, destroyed() { this.cancelLastRequest() + this.$bus.$off('ReAnalyse', this.redrawRect) }, methods: { + // 重新绘制矩形框 + redrawRect(result) { + const keys = ['SampleBoundary', 'GasBoundary', 'DetBoundary', 'QCBoundary'] + SampleType.forEach((item, index) => { + const value = result[keys[index]] + this.sampleDetail[item.value].Boundary = value || [] + this.changeChartByType(this.spectraType) + }) + }, + handleGetFlag(val, obj) { this.resultDisplay.forEach((item) => { if (item.nuclideName === obj.nuclideName) { diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue index 3061830..11886d3 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue @@ -150,6 +150,7 @@ export default { this.$message.success('Analyse Success!') this.isReanlyze = true this.handleExit() + this.$bus.$emit('ReAnalyse', res.result) } else { this.$message.warning(res.message) }