From 82f707971a120cd4c0dadc228f8998582c10f091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Mon, 15 Jan 2024 16:01:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E6=A0=87=E6=B7=BB=E5=8A=A0=E6=8B=96?= =?UTF-8?q?=E6=8B=BD=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=8E=A5=E5=8F=A3=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=EF=BC=8C=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/spectrumAnalysis/beta-analysis.vue | 10 +- .../components/BetaGammaSpectrum.vue | 155 +++++++++++++++++- src/views/spectrumAnalysis/index.vue | 2 + 3 files changed, 160 insertions(+), 7 deletions(-) diff --git a/src/views/spectrumAnalysis/beta-analysis.vue b/src/views/spectrumAnalysis/beta-analysis.vue index a7cc3ec..1e1f23c 100644 --- a/src/views/spectrumAnalysis/beta-analysis.vue +++ b/src/views/spectrumAnalysis/beta-analysis.vue @@ -176,8 +176,9 @@ export default { this.currIdx = val }, async handleDetalSelfStationCache() { + const { inputFileName } = this.sample let params = { - sampleFileName: 'ABC01_001-20240108_1405_S_FULL_40186.0.PHD', + sampleFileName: inputFileName, } try { const { success, result, message } = await deleteAction('/selfStation/deleteSelfStationCache', params) @@ -188,9 +189,10 @@ export default { async getSelfStationSampleDetail() { const { inputFileName, detFileName } = this.sample let params = { - // sampleFileName: inputFileName, - sampleFileName: 'ABC01_001-20240108_1405_S_FULL_40186.0.PHD', - detFileName: detFileName || 'ABC01_001-20240108_1327_D_FULL_381505.PHD', + sampleFileName: inputFileName, + detFileName: detFileName, + // sampleFileName: 'ABC01_001-20240108_1405_S_FULL_40186.0.PHD', + // detFileName: detFileName || 'ABC01_001-20240108_1327_D_FULL_381505.PHD', } try { this.isLoading = true diff --git a/src/views/spectrumAnalysis/components/BetaGammaSpectrum.vue b/src/views/spectrumAnalysis/components/BetaGammaSpectrum.vue index f8c3981..bd65884 100644 --- a/src/views/spectrumAnalysis/components/BetaGammaSpectrum.vue +++ b/src/views/spectrumAnalysis/components/BetaGammaSpectrum.vue @@ -15,7 +15,7 @@
-
+
c && b >= minX && b <= maxX && g >= minY && g <= maxY) .map(({ b, g, c }) => this.buildScatterItem(b, g, c)) - console.log('this.twoDOption.series.data', this.twoDOption.series.data) }, // 构造一个scatter 的点 @@ -702,7 +838,20 @@ export default { this.reDrawRect() }, // 点击Update - handleUpdate() {}, + async handleUpdate() { + const { inputFileName } = this.sampleData + let params = { + sampleFileName: inputFileName, + startChannel: this.startChannel, + endChannel: this.endChannel, + ROINum: this.currCount + 1, + } + try { + const { success, result, message } = await postAction('/selfStation/updateROI', params) + } catch (error) { + console.error(error) + } + }, // 颜色插值算法 interpolateColor(percentage) { diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index c2d7fd8..ab617dc 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -566,6 +566,8 @@ export default { return item } else if (!item.gasFileName && !item.detFileName && !item.qcFileName) { return item + } else { + return item } } })