From 56aada9e3cc1cb10250f3056effe7dbf653a0401 Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Fri, 26 Jul 2024 11:25:17 +0800 Subject: [PATCH] =?UTF-8?q?WIP:=20=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E7=A7=BB=E6=A4=8D=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EditSlopeModal.vue | 0 .../components/FitPeaksAndBaselineModal.vue | 9 +- .../components/GeneralCommentModal.vue | 18 +- .../components/NuclideReviewChart.vue | 0 .../components/NuclideReviewModal.vue | 13 +- .../components/PeakCommentModal.vue | 20 +- .../components/RectList.vue | 0 .../BetaAnalyzeInteractiveToolModal/index.vue | 14 +- .../components/BetaDetectorCalibration.vue | 0 .../components/GammaDetectorCalibration.vue | 4 +- .../CalibrationModal/index.vue | 2 +- .../SelfStationAnalyzeSettingModal.vue | 276 ++++++++++++++++++ .../RoiLimits/components/RoiLimitItem.vue | 40 ++- src/views/spectrumAnalysis/index.vue | 22 +- 14 files changed, 384 insertions(+), 34 deletions(-) rename src/views/spectrumAnalysis/components/Modals/{ => SelfStation}/BetaAnalyzeInteractiveToolModal/components/EditSlopeModal.vue (100%) rename src/views/spectrumAnalysis/components/Modals/{ => SelfStation}/BetaAnalyzeInteractiveToolModal/components/FitPeaksAndBaselineModal.vue (96%) rename src/views/spectrumAnalysis/components/Modals/{ => SelfStation}/BetaAnalyzeInteractiveToolModal/components/GeneralCommentModal.vue (86%) rename src/views/spectrumAnalysis/components/Modals/{ => SelfStation}/BetaAnalyzeInteractiveToolModal/components/NuclideReviewChart.vue (100%) rename src/views/spectrumAnalysis/components/Modals/{ => SelfStation}/BetaAnalyzeInteractiveToolModal/components/NuclideReviewModal.vue (97%) rename src/views/spectrumAnalysis/components/Modals/{ => SelfStation}/BetaAnalyzeInteractiveToolModal/components/PeakCommentModal.vue (86%) rename src/views/spectrumAnalysis/components/Modals/{ => SelfStation}/BetaAnalyzeInteractiveToolModal/components/RectList.vue (100%) rename src/views/spectrumAnalysis/components/Modals/{ => SelfStation}/BetaAnalyzeInteractiveToolModal/index.vue (99%) rename src/views/spectrumAnalysis/components/Modals/{NewBetaModals => SelfStation}/CalibrationModal/components/BetaDetectorCalibration.vue (100%) rename src/views/spectrumAnalysis/components/Modals/{NewBetaModals => SelfStation}/CalibrationModal/components/GammaDetectorCalibration.vue (99%) rename src/views/spectrumAnalysis/components/Modals/{NewBetaModals => SelfStation}/CalibrationModal/index.vue (99%) create mode 100644 src/views/spectrumAnalysis/components/Modals/SelfStation/SelfStationAnalyzeSettingModal.vue diff --git a/src/views/spectrumAnalysis/components/Modals/BetaAnalyzeInteractiveToolModal/components/EditSlopeModal.vue b/src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/components/EditSlopeModal.vue similarity index 100% rename from src/views/spectrumAnalysis/components/Modals/BetaAnalyzeInteractiveToolModal/components/EditSlopeModal.vue rename to src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/components/EditSlopeModal.vue diff --git a/src/views/spectrumAnalysis/components/Modals/BetaAnalyzeInteractiveToolModal/components/FitPeaksAndBaselineModal.vue b/src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/components/FitPeaksAndBaselineModal.vue similarity index 96% rename from src/views/spectrumAnalysis/components/Modals/BetaAnalyzeInteractiveToolModal/components/FitPeaksAndBaselineModal.vue rename to src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/components/FitPeaksAndBaselineModal.vue index e234442..c3fe56c 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaAnalyzeInteractiveToolModal/components/FitPeaksAndBaselineModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/components/FitPeaksAndBaselineModal.vue @@ -130,6 +130,10 @@ export default { isInsertPeak: { type: Boolean, }, + currROIIndex: { + type: Number, + default: 1, + }, }, data() { this.columns = columns @@ -151,6 +155,7 @@ export default { newPeak: this.newPeaks, flag: this.isInsertPeak ? 'insert' : 'fit', tablePeaksList: this.list, + gammaROINum: this.currROIIndex + 1, }) if (success) { this.visible = false @@ -187,6 +192,7 @@ export default { left: this.channel_1, right: this.channel_2, fileName, + gammaROINum: this.currROIIndex + 1, } // 如果是Insert Peak @@ -196,6 +202,7 @@ export default { sampleId, fileName, curChan: Math.ceil(this.channel_1), + gammaROINum: this.currROIIndex + 1, } } @@ -211,7 +218,7 @@ export default { item.fwhm = Number(item.fwhm).toPrecision(6) }) this.list = tablePeaksList - + this.newPeaks = newPeaks this.oldPeaks = oldPeaks } else { diff --git a/src/views/spectrumAnalysis/components/Modals/BetaAnalyzeInteractiveToolModal/components/GeneralCommentModal.vue b/src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/components/GeneralCommentModal.vue similarity index 86% rename from src/views/spectrumAnalysis/components/Modals/BetaAnalyzeInteractiveToolModal/components/GeneralCommentModal.vue rename to src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/components/GeneralCommentModal.vue index 5dab8bb..13ca96e 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaAnalyzeInteractiveToolModal/components/GeneralCommentModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/components/GeneralCommentModal.vue @@ -12,9 +12,15 @@ import ModalMixin from '@/mixins/ModalMixin' import SampleDataMixin from '@/views/spectrumAnalysis/SampleDataMixin' export default { mixins: [ModalMixin, SampleDataMixin], + props: { + currROIIndex: { + type: Number, + default: 1, + }, + }, data() { return { - content: '' + content: '', } }, methods: { @@ -28,7 +34,8 @@ export default { const { inputFileName: fileName } = this.sampleData const { success, message } = await postAction('/selfStation/addGeneralComment', { fileName, - comments: this.content + comments: this.content, + gammaROINum: this.currROIIndex + 1, }) if (!success) { this.$message.error(message) @@ -44,7 +51,8 @@ export default { this.isLoading = true const { inputFileName: fileName } = this.sampleData const { success, result, message } = await getAction('/selfStation/viewGeneralComment', { - fileName + fileName, + gammaROINum: this.currROIIndex + 1, }) if (success) { this.content = result @@ -61,8 +69,8 @@ export default { beforeModalOpen() { this.content = '' this.getComment() - } - } + }, + }, } diff --git a/src/views/spectrumAnalysis/components/Modals/BetaAnalyzeInteractiveToolModal/components/NuclideReviewChart.vue b/src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/components/NuclideReviewChart.vue similarity index 100% rename from src/views/spectrumAnalysis/components/Modals/BetaAnalyzeInteractiveToolModal/components/NuclideReviewChart.vue rename to src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/components/NuclideReviewChart.vue diff --git a/src/views/spectrumAnalysis/components/Modals/BetaAnalyzeInteractiveToolModal/components/NuclideReviewModal.vue b/src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/components/NuclideReviewModal.vue similarity index 97% rename from src/views/spectrumAnalysis/components/Modals/BetaAnalyzeInteractiveToolModal/components/NuclideReviewModal.vue rename to src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/components/NuclideReviewModal.vue index cae40bd..7455365 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaAnalyzeInteractiveToolModal/components/NuclideReviewModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/components/NuclideReviewModal.vue @@ -165,7 +165,11 @@ export default { }, page: { type: String, - default: 'AnalyzeInteractiveToolModal' + default: 'AnalyzeInteractiveToolModal', + }, + currROIIndex: { + type: Number, + default: 1, }, }, data() { @@ -273,13 +277,14 @@ export default { const { sampleId, inputFileName: fileName } = this.sampleData let url = '/selfStation/nuclideReview' // 根据新需求，首页查询中需要包含其他数据，如果首页跳转则请求另外的接口 20231219:xiao - if(this.page === 'gamma-analysis'){ + if (this.page === 'gamma-analysis') { url = '/selfStation/nuclideReviewGamma' } const { success, result, message } = await getAction(url, { sampleId: sampleId, channel: this.channel, fileName, + gammaROINum: this.currROIIndex + 1, }) if (success) { this.model = { @@ -342,13 +347,14 @@ export default { const { sampleId, inputFileName } = this.sampleData let url = '/selfStation/changeNuclide' // 根据新需求，首页查询中需要包含其他数据，如果首页跳转则请求另外的接口 20231219:xiao - if(this.page === 'gamma-analysis'){ + if (this.page === 'gamma-analysis') { url = '/selfStation/changeNuclideGamma' } const { success, result, message } = await getAction(url, { sampleId, nuclideName: this.currNuclide, fileName: inputFileName, + gammaROINum: this.currROIIndex + 1, }) if (success) { const { chart, halfLife, halfLifeErr, lines, name, table } = result @@ -388,6 +394,7 @@ export default { sampleId, fileName, ...this.model, + gammaROINum: this.currROIIndex + 1, }) if (success) { this.handleResData(result) diff --git a/src/views/spectrumAnalysis/components/Modals/BetaAnalyzeInteractiveToolModal/components/PeakCommentModal.vue b/src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/components/PeakCommentModal.vue similarity index 86% rename from src/views/spectrumAnalysis/components/Modals/BetaAnalyzeInteractiveToolModal/components/PeakCommentModal.vue rename to src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/components/PeakCommentModal.vue index b2e13b7..6550376 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaAnalyzeInteractiveToolModal/components/PeakCommentModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/components/PeakCommentModal.vue @@ -14,12 +14,16 @@ export default { mixins: [ModalMixin, SampleDataMixin], props: { curRow: { - type: Number - } + type: Number, + }, + currROIIndex: { + type: Number, + default: 1, + }, }, data() { return { - content: '' + content: '', } }, methods: { @@ -34,7 +38,8 @@ export default { const { success, message } = await postAction('/selfStation/addPeakComment', { fileName, comments: this.content, - curRow: this.curRow + curRow: this.curRow, + gammaROINum: this.currROIIndex + 1, }) if (!success) { this.$message.error(message) @@ -51,7 +56,8 @@ export default { const { inputFileName: fileName } = this.sampleData const { success, result, message } = await getAction('/selfStation/viewPeakComment', { fileName, - curRow: this.curRow + curRow: this.curRow, + gammaROINum: this.currROIIndex + 1, }) if (success) { this.content = result @@ -68,8 +74,8 @@ export default { beforeModalOpen() { this.content = '' this.getComment() - } - } + }, + }, } diff --git a/src/views/spectrumAnalysis/components/Modals/BetaAnalyzeInteractiveToolModal/components/RectList.vue b/src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/components/RectList.vue similarity index 100% rename from src/views/spectrumAnalysis/components/Modals/BetaAnalyzeInteractiveToolModal/components/RectList.vue rename to src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/components/RectList.vue diff --git a/src/views/spectrumAnalysis/components/Modals/BetaAnalyzeInteractiveToolModal/index.vue b/src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/index.vue similarity index 99% rename from src/views/spectrumAnalysis/components/Modals/BetaAnalyzeInteractiveToolModal/index.vue rename to src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/index.vue index 143f8ca..05963e4 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaAnalyzeInteractiveToolModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/index.vue @@ -185,11 +185,11 @@ - + - + @@ -198,12 +198,18 @@ :channel_1="channel_1" :channel_2="channel_2" :isInsertPeak="isInsertPeak" + :currROIIndex="currROIIndex" @result="handleInsertSuccess" @cancel="handleCancelSuccess" /> - + @@ -214,7 +220,7 @@ + + diff --git a/src/views/spectrumAnalysis/components/RoiLimits/components/RoiLimitItem.vue b/src/views/spectrumAnalysis/components/RoiLimits/components/RoiLimitItem.vue index b9440cb..b395950 100644 --- a/src/views/spectrumAnalysis/components/RoiLimits/components/RoiLimitItem.vue +++ b/src/views/spectrumAnalysis/components/RoiLimits/components/RoiLimitItem.vue @@ -15,6 +15,7 @@ { + this.resetChartOpts() + }) + }, + // 重绘Peak Line redrawPeakLine() { + this.clearPeakLine() + const data = this.channelData.peakGroup const peakLines = [] data.forEach((item, index) => { @@ -425,20 +449,24 @@ export default { this.option.xAxis.min = x1 this.option.xAxis.max = x2 }, + + resetAxiosInfo() { + this.axisInfo = cloneDeep(initialAxisInfo) + }, }, watch: { roiList: { handler(val) { this.option.series[0].data = val.map(({ x, y }) => [x, y]) + this.resetAxiosInfo() }, immediate: true, }, analyzeResult: { handler(val) { if (val && Object.keys(val).length) { + this.resetAxiosInfo() this.handleAnalyzeResult() - - console.log('%c [ ]-441', 'font-size:13px; background:pink; color:#bf2c9f;', ) } }, immediate: true, diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index 0479dce..d814861 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -105,12 +105,19 @@ - + + + (this.analyzeConfigureModalVisible = true), + show: this.isGamma || this.isBeta, + handler: () => { + if (this.isGamma) this.analyzeConfigureModalVisible = true + if (this.isBeta) this.$refs.selfStationAnalyzeConfigureModalRef.open() + }, }, { type: 'a-menu-item',