From 829e870ec97b4b2c8d711b069cc5d2b6865bfe33 Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Tue, 20 Feb 2024 10:41:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20Gamma=E7=9A=84Spectrum=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E5=A2=9E=E5=8A=A0phd:raw=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Modals/SpectrumModal.vue | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/views/spectrumAnalysis/components/Modals/SpectrumModal.vue b/src/views/spectrumAnalysis/components/Modals/SpectrumModal.vue index 166a2a4..329e0df 100644 --- a/src/views/spectrumAnalysis/components/Modals/SpectrumModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/SpectrumModal.vue @@ -1,9 +1,14 @@ @@ -16,8 +21,9 @@ export default { mixins: [ModalMixin, SampleDataMixin], data() { return { - content: '', - isLoading: true + spectrum: '', + phdSpectrum: '', + isLoading: true, } }, methods: { @@ -27,10 +33,12 @@ export default { const { sampleId, inputFileName: fileName } = this.sampleData const { success, result, message } = await getAction('/gamma/Spectrum', { sampleId, - fileName + fileName, }) if (success) { - this.content = result + const { Spectrum, phdSpectrum } = result + this.spectrum = Spectrum + this.phdSpectrum = (phdSpectrum || []).join('\r\n') } else { this.$message.error(message) } @@ -43,8 +51,8 @@ export default { beforeModalOpen() { this.getContent() - } - } + }, + }, } From f55ca0eb3bbcddbdcc8c8900de9ca552d880c715 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 14:33:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?Data=20Receive=20status=20Monitoring=20?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=8F=B3=E4=BE=A7=E5=9B=BE=E6=A0=87=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E6=A1=86=E6=97=B6=E9=97=B4=E4=B8=8E=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=B8=8D=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/stationOperation/components/RealTimeDataChart.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/stationOperation/components/RealTimeDataChart.vue b/src/views/stationOperation/components/RealTimeDataChart.vue index 075af92..37afcc8 100644 --- a/src/views/stationOperation/components/RealTimeDataChart.vue +++ b/src/views/stationOperation/components/RealTimeDataChart.vue @@ -73,7 +73,7 @@ const initialOption = { formatter: (params) => { return `
${params.marker}${params.name}
-
START：${dayjs(new Date(params.value[1])).format('YYYY-MM-DD HH:mm:ss')}
+
START：${dayjs(new Date(params.value[4])).format('YYYY-MM-DD HH:mm:ss')}
END：${dayjs(new Date(params.value[2])).format('YYYY-MM-DD HH:mm:ss')}
` }, @@ -249,6 +249,7 @@ export default { item.dataList.forEach((item) => { this.convertStatus(item) + let originalTime = new Date(item.beginTime * 1000).getTime() let startTime = new Date(item.beginTime * 1000).getTime() if (item.type == 'PHD') { startTime = item.endTime * 1000 - 60 * 1000 * 30 @@ -261,7 +262,7 @@ export default { if (find.isShow) { data.push({ name: item.status, - value: [index, startTime, endTime, duration], + value: [index, startTime, endTime, duration, originalTime], itemStyle: { normal: { color: find.color, 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 3/3] =?UTF-8?q?beta=20=E6=96=B0=E8=B0=B1=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=20result=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]',