From 4a77ea8f82f0d772af751c6e2c303b793e52cad9 Mon Sep 17 00:00:00 2001
From: renpy <peiyu_ren@163.com>
Date: Wed, 30 Aug 2023 18:36:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86rlr=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=EF=BC=8C=E5=8F=8A=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0loading=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Modals/RLRModal/components/Header.vue     |  38 +++--
 .../components/Modals/RLRModal/index.vue      | 138 +++++++++---------
 2 files changed, 94 insertions(+), 82 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/RLRModal/components/Header.vue b/src/views/spectrumAnalysis/components/Modals/RLRModal/components/Header.vue
index 149d02e..e00d9d9 100644
--- a/src/views/spectrumAnalysis/components/Modals/RLRModal/components/Header.vue
+++ b/src/views/spectrumAnalysis/components/Modals/RLRModal/components/Header.vue
@@ -72,25 +72,35 @@ export default {
   watch: {
     allData: {
       handler(val) {
-        console.log(val);
+        this.model.msgId = val.header_msg_id;
+        this.model.dataType = val.header_data_type;
+        this.model.priorityLevel = val.header_priority_level;
+        this.model.stationCode = val.header_station_code;
+        this.model.srid = val.header_srid;
+        this.model.labCode = val.header_lab_code;
+        this.model.labDetector = val.header_lab_detector;
+        this.model.reportType = val.header_report_type;
+        this.model.reportnumber = val.header_report_number;
+        this.model.sampleCategory = val.header_sample_category;
+        this.model.transmission = val.header_transmission;
       },
       deep: true,
       immediate:true
     }
   },
-  mounted () {
-    this.model.msgId = this.allData.header_msg_id;
-    this.model.dataType = this.allData.header_data_type;
-    this.model.priorityLevel = this.allData.header_priority_level;
-    this.model.stationCode = this.allData.header_station_code;
-    this.model.srid = this.allData.header_srid;
-    this.model.labCode = this.allData.header_lab_code;
-    this.model.labDetector = this.allData.header_lab_detector;
-    this.model.reportType = this.allData.header_report_type;
-    this.model.reportnumber = this.allData.header_report_number;
-    this.model.sampleCategory = this.allData.header_sample_category;
-    this.model.transmission = this.allData.header_transmission;
-  },
+  // mounted () {
+  //   this.model.msgId = this.allData.header_msg_id;
+  //   this.model.dataType = this.allData.header_data_type;
+  //   this.model.priorityLevel = this.allData.header_priority_level;
+  //   this.model.stationCode = this.allData.header_station_code;
+  //   this.model.srid = this.allData.header_srid;
+  //   this.model.labCode = this.allData.header_lab_code;
+  //   this.model.labDetector = this.allData.header_lab_detector;
+  //   this.model.reportType = this.allData.header_report_type;
+  //   this.model.reportnumber = this.allData.header_report_number;
+  //   this.model.sampleCategory = this.allData.header_sample_category;
+  //   this.model.transmission = this.allData.header_transmission;
+  // },
   data() {
     this.priorityLevbelOptions = priorityLevbelOptions
     this.reportTypeOptions = reportTypeOptions
diff --git a/src/views/spectrumAnalysis/components/Modals/RLRModal/index.vue b/src/views/spectrumAnalysis/components/Modals/RLRModal/index.vue
index 2afce8a..e7e80c9 100644
--- a/src/views/spectrumAnalysis/components/Modals/RLRModal/index.vue
+++ b/src/views/spectrumAnalysis/components/Modals/RLRModal/index.vue
@@ -1,71 +1,73 @@
 <template>
   <custom-modal v-model="visible" :width="1280" title="Mini Radionuclide Laboratory Reports" :destroyOnClose="true">
-    <div class="rlr">
-      <div class="rlr-tabs">
-        <div
-          class="rlr-tabs-item"
-          :class="activeKey == index ? 'active' : ''"
-          v-for="(tab, index) in tabs"
-          :key="index"
-          @click="activeKey = index"
-        >
-          {{ tab }}
+    <a-spin :spinning="isLoading">
+      <div class="rlr">
+        <div class="rlr-tabs">
+          <div
+            class="rlr-tabs-item"
+            :class="activeKey == index ? 'active' : ''"
+            v-for="(tab, index) in tabs"
+            :key="index"
+            @click="activeKey = index"
+          >
+            {{ tab }}
+          </div>
+        </div>
+        <div class="rlr-content">
+          <h4>{{ tabs[activeKey] }}</h4>
+          <div class="rlr-content-detail">
+            <template v-if="activeKey == 0">
+              <c-header :allData="allInfo" />
+            </template>
+            <template v-if="activeKey == 1">
+              <Objective :allData="allInfo" />
+            </template>
+            <template v-if="activeKey == 2">
+              <collection :allData="allInfo" />
+            </template>
+            <template v-if="activeKey == 3">
+              <sample-receipt :allData="allInfo" />
+            </template>
+            <template v-if="activeKey == 4">
+              <test :allData="allInfo" />
+            </template>
+            <template v-if="activeKey == 5">
+              <peaks-method :allData="allInfo" />
+            </template>
+            <template v-if="activeKey == 6">
+              <peak-fit :allData="allInfo" />
+            </template>
+            <template v-if="activeKey == 7">
+              <g-analysis-methods :allData="allInfo" />
+            </template>
+            <template v-if="activeKey == 8">
+              <peak-association :allData="allInfo" />
+            </template>
+            <template v-if="activeKey == 9">
+              <references :allData="allInfo" />
+            </template>
+            <template v-if="activeKey == 10">
+              <results :allData="allInfo" />
+            </template>
+            <template v-if="activeKey == 11">
+              <nuclide-ratios :allData="allInfo" />
+            </template>
+            <template v-if="activeKey == 12">
+              <g-coincidence-correction />
+            </template>
+            <template v-if="activeKey == 13">
+              <mda />
+            </template>
+            <template v-if="activeKey == 14">
+              <conclusions :allData="allInfo" />
+            </template>
+            <template v-if="activeKey == 15">
+              <comment :allData="allInfo" />
+            </template>
+          </div>
         </div>
       </div>
-      <div class="rlr-content">
-        <h4>{{ tabs[activeKey] }}</h4>
-        <div class="rlr-content-detail">
-          <template v-if="activeKey == 0">
-            <c-header :allData="allInfo" />
-          </template>
-          <template v-if="activeKey == 1">
-            <Objective :allData="allInfo" />
-          </template>
-          <template v-if="activeKey == 2">
-            <collection :allData="allInfo" />
-          </template>
-          <template v-if="activeKey == 3">
-            <sample-receipt :allData="allInfo" />
-          </template>
-          <template v-if="activeKey == 4">
-            <test :allData="allInfo" />
-          </template>
-          <template v-if="activeKey == 5">
-            <peaks-method :allData="allInfo" />
-          </template>
-          <template v-if="activeKey == 6">
-            <peak-fit :allData="allInfo" />
-          </template>
-          <template v-if="activeKey == 7">
-            <g-analysis-methods :allData="allInfo" />
-          </template>
-          <template v-if="activeKey == 8">
-            <peak-association :allData="allInfo" />
-          </template>
-          <template v-if="activeKey == 9">
-            <references :allData="allInfo" />
-          </template>
-          <template v-if="activeKey == 10">
-            <results :allData="allInfo" />
-          </template>
-          <template v-if="activeKey == 11">
-            <nuclide-ratios :allData="allInfo" />
-          </template>
-          <template v-if="activeKey == 12">
-            <g-coincidence-correction />
-          </template>
-          <template v-if="activeKey == 13">
-            <mda />
-          </template>
-          <template v-if="activeKey == 14">
-            <conclusions :allData="allInfo" />
-          </template>
-          <template v-if="activeKey == 15">
-            <comment :allData="allInfo" />
-          </template>
-        </div>
-      </div>
-    </div>
+    </a-spin>
   </custom-modal>
 </template>
 
@@ -136,23 +138,23 @@ export default {
   data() {
     this.tabs = tabs
     return {
+      isLoading: false,
       activeKey: 0,
       allInfo: {}
     }
   },
-  mounted () {
-    this.getGammaViewRLR();
-  },
   methods: {
     beforeModalOpen() {
       this.activeKey = 0
+      this.getGammaViewRLR();
     },
     getGammaViewRLR() {
+      this.isLoading = true
       let params = {
         sampleId: this.sampleId
       }
       getAction("/gamma/viewRLR", params).then(res => {
-        console.log(res);
+        this.isLoading = false
         if (res.success) {
           this.allInfo = res.result
         } else {