From 69ca835d9368d89a1bef116a2f7a55daf1f9b037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Tue, 20 Feb 2024 16:28:37 +0800 Subject: [PATCH] =?UTF-8?q?beta=20=E6=96=B0=E8=B0=B1=E9=A1=B5=E9=9D=A2=20r?= =?UTF-8?q?esult=20display=20=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/spectrumAnalysis/beta-analysis.vue | 59 ++++++++++++++++++- .../components/ResultDisplay-Beta.vue | 4 +- 2 files changed, 58 insertions(+), 5 deletions(-) diff --git a/src/views/spectrumAnalysis/beta-analysis.vue b/src/views/spectrumAnalysis/beta-analysis.vue index bf089f3..e14880c 100644 --- a/src/views/spectrumAnalysis/beta-analysis.vue +++ b/src/views/spectrumAnalysis/beta-analysis.vue @@ -124,14 +124,63 @@ export default { boundaryList: [], sampleDetail: {}, qcFlags: {}, - resultDisplay: [], + resultDisplay: [ + { + sampleId: null, + idAnalysis: null, + nuclideName: 'Xe131m', + conc: -0.049, + concErr: 0.04272, + mdc: 0.14539, + lc: 0.06362626536110005, + nidFlag: 0, + moddate: null, + color: 'red', + }, + { + sampleId: null, + idAnalysis: null, + nuclideName: 'Xe133', + conc: 0.07727, + concErr: 0.0631, + mdc: 0.23981, + lc: 0.09916332268275692, + nidFlag: 0, + moddate: null, + color: '#ffcc30', + }, + { + sampleId: null, + idAnalysis: null, + nuclideName: 'Xe133m', + conc: -0.07186, + concErr: 0.03596, + mdc: 0.11014, + lc: 0.044521536189968125, + nidFlag: 0, + moddate: null, + color: 'red', + }, + { + sampleId: null, + idAnalysis: null, + nuclideName: 'Xe135', + conc: 0.26636, + concErr: 0.23193, + mdc: 0.77578, + lc: 0.3655879636569543, + nidFlag: 0, + moddate: null, + color: '#ffcc30', + }, + ], currIdx: 0, } }, watch: { sample: { async handler(newVal, oldVal) { - this.resultDisplay = [] + // this.resultDisplay = [] const sampleData = await this.$store.dispatch('GET_SAMPLE_DATA', newVal.inputFileName) if (sampleData) { const { data, from } = sampleData @@ -263,7 +312,11 @@ export default { console.log(item) }, handleGetFlag(val, obj) { - console.log(val, obj) + this.resultDisplay.forEach((item) => { + if (item.nuclideName === obj.nuclideName) { + item.nidFlag = val ? 1 : 0 + } + }) }, resize() {}, }, diff --git a/src/views/spectrumAnalysis/components/ResultDisplay-Beta.vue b/src/views/spectrumAnalysis/components/ResultDisplay-Beta.vue index 9b812dd..cf96583 100644 --- a/src/views/spectrumAnalysis/components/ResultDisplay-Beta.vue +++ b/src/views/spectrumAnalysis/components/ResultDisplay-Beta.vue @@ -60,7 +60,7 @@ const columns = [ title: 'Isotope', dataIndex: 'nuclideName', ellipsis: true, - width: 60, + width: 76, }, { title: 'Concentration', @@ -76,7 +76,7 @@ const columns = [ scopedSlots: { customRender: 'uncertainty', }, - width: 88, + width: 108, }, { title: 'MDC[mBq/m3]',