From dc9664de474ec0e8d55beb38545b5b54f390416a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Fri, 3 Nov 2023 10:03:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=20from=20db=20=E4=B8=AD=20sampleType=20=3D?= =?UTF-8?q?=20all=20=E7=9A=84=E6=97=B6=E5=80=99=20=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E4=B8=8D=E5=8B=BE=E9=80=89=20sample?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Modals/LoadFromDBModal.vue | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue b/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue index ae711a8..248e78d 100644 --- a/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue @@ -114,7 +114,7 @@ export default { return { queryParam: { menuTypes: 'G,B', - sampleType: 'P', + sampleType: '', startDate: moment().add(-7, 'd').format('YYYY-MM-DD'), endDate: moment().format('YYYY-MM-DD'), dbName: 'auto', @@ -326,13 +326,19 @@ export default { ] if (event == 'B') { this.sampleTypeOption = arr_B - this.queryParam.sampleType = 'B' + this.$nextTick(() => { + this.queryParam.sampleType = 'B' + }) } else if (event == 'G') { this.sampleTypeOption = arr_G - this.queryParam.sampleType = 'P' + this.$nextTick(() => { + this.queryParam.sampleType = 'P' + }) } else { this.sampleTypeOption = arr_A - this.queryParam.sampleType = 'P' + this.$nextTick(() => { + this.queryParam.sampleType = '' + }) } this.getStationAndDetectorList(event) }, From 1b2ccfc6b7df379a5bf8b616ab72069d21603894 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Fri, 3 Nov 2023 10:23:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?beta=20=20=E9=87=8D=E6=96=B0=E5=88=86?= =?UTF-8?q?=E6=9E=90=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E5=88=A4=E6=96=AD=EF=BC=8C=E5=A4=84=E7=90=86=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spectrumAnalysis/beta-gamma-analysis.vue | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index 2915521..da5f89e 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -464,13 +464,15 @@ export default { if (res.success) { // this.isReAnalyed_beta = true this.analyseCurrentSpectrum = res.result - res.result.XeData.forEach((item) => { - 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('reAnalyCurr', true, res.result.XeData) + if (res.result.XeData && res.result.XeData.length > 0) { + res.result.XeData.forEach((item) => { + 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('reAnalyCurr', true, res.result.XeData) + } } else { this.$message.warning(res.message) } From 5e4abce032f73335f59c79b572e79528a5856eee Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Fri, 3 Nov 2023 10:30:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E5=B3=B0=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=E9=A1=BA=E5=B8=A6=E6=B8=85=E7=A9=BA=E5=8F=B3?= =?UTF-8?q?=E4=B8=8B=E8=A7=92=E6=A0=B8=E7=B4=A0=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Modals/AnalyzeInteractiveToolModal/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue index b33681e..e862a41 100644 --- a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue @@ -913,6 +913,8 @@ export default { this.resetChartOpts() this.selectedKeys = [] + + this.selectedTableItem = null } else { this.$message.error(message) }