From cfe0b7f134c5f4d3b86d9a417ea29d561e4fd67a Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Wed, 30 Aug 2023 13:36:53 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AF=B9=E6=8E=A5PeakInfomation?= =?UTF-8?q?=E3=80=81ARR=E3=80=81RRR=E3=80=81QC=20Results=E3=80=81SampleInf?= =?UTF-8?q?omation=E5=92=8CSpectrum=E5=BC=B9=E7=AA=97=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mixins/ModalMixin.js | 50 +-- .../components/Modals/ArrRrrModal.vue | 17 +- .../Modals/NuclideActivityAndMDCModal.vue | 153 +++++----- .../components/Modals/QcResultsModal.vue | 77 ++++- .../Modals/SampleInfomationModal.vue | 74 +++-- .../components/Modals/SpectrumModal.vue | 59 ++-- .../components/PeakInfomation.vue | 287 +++--------------- src/views/spectrumAnalysis/index.vue | 8 +- 8 files changed, 306 insertions(+), 419 deletions(-) diff --git a/src/mixins/ModalMixin.js b/src/mixins/ModalMixin.js index 8fac17e..54e61df 100644 --- a/src/mixins/ModalMixin.js +++ b/src/mixins/ModalMixin.js @@ -1,25 +1,29 @@ export default { - props: { - value: { - type: Boolean - } - }, - data() { - return { - isLoading: false - } - }, - computed: { - visible: { - get() { - return this.value - }, - set(val) { - if (val && this.beforeModalOpen && typeof this.beforeModalOpen == 'function') { - this.beforeModalOpen() - } - this.$emit('input', val) - } - } + props: { + value: { + type: Boolean } -} \ No newline at end of file + }, + data() { + return { + isLoading: false + } + }, + + methods: { + beforeModalOpen() {} + }, + computed: { + visible: { + get() { + return this.value + }, + set(val) { + if (val && this.beforeModalOpen && typeof this.beforeModalOpen == 'function') { + this.beforeModalOpen() + } + this.$emit('input', val) + } + } + } +} diff --git a/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue b/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue index cb84c7c..4844b3c 100644 --- a/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue @@ -38,22 +38,29 @@ export default { methods: { async getContent() { let url = '' + + console.log('%c [ ]-42', 'font-size:13px; background:pink; color:#bf2c9f;', this.type) switch (this.type) { + case 1: + url = '/gamma/viewARR' + break + case 2: + url = '/gamma/viewRRR' + break case 3: url = '/spectrumAnalysis/viewARR' break case 4: url = '/spectrumAnalysis/viewRRR' - break; + break } try { this.content = '' this.isLoading = true const res = await getAction(url, { sampleId: this.sampleId, ...this.extraData }) - if(res.success) { + if (res.success) { this.content = res.result - } - else { + } else { this.content = res } } catch (error) { @@ -64,6 +71,8 @@ export default { }, beforeModalOpen() { + + console.log('%c [ ]-75', 'font-size:13px; background:pink; color:#bf2c9f;', this.sampleId) if (this.sampleId) { this.getContent() } diff --git a/src/views/spectrumAnalysis/components/Modals/NuclideActivityAndMDCModal.vue b/src/views/spectrumAnalysis/components/Modals/NuclideActivityAndMDCModal.vue index 36f4139..0b3c36b 100644 --- a/src/views/spectrumAnalysis/components/Modals/NuclideActivityAndMDCModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/NuclideActivityAndMDCModal.vue @@ -28,18 +28,27 @@ - -
-
-
{{ item.title }}
- + + +
+
+
ARMD
+ +
+
+
IDC
+ +
-
- + + diff --git a/src/views/spectrumAnalysis/components/Modals/QcResultsModal.vue b/src/views/spectrumAnalysis/components/Modals/QcResultsModal.vue index 8cc24f3..f9790d6 100644 --- a/src/views/spectrumAnalysis/components/Modals/QcResultsModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/QcResultsModal.vue @@ -1,44 +1,97 @@ diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index 1bd9f35..263bed6 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -60,11 +60,11 @@ - + - + @@ -141,11 +141,11 @@ - + - +