From c33fb7ecc3355c19dca7b8f00184463aca8094b3 Mon Sep 17 00:00:00 2001
From: renpy <peiyu_ren@163.com>
Date: Thu, 31 Aug 2023 09:59:14 +0800
Subject: [PATCH] =?UTF-8?q?gammaView=20log=E5=BC=B9=E7=AA=97=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E7=9A=84=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=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/DataProcessingLogModal.vue         | 70 ++++++++++---------
 src/views/spectrumAnalysis/index.vue          |  2 +-
 2 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/DataProcessingLogModal.vue b/src/views/spectrumAnalysis/components/Modals/DataProcessingLogModal.vue
index 135c31e..11d762d 100644
--- a/src/views/spectrumAnalysis/components/Modals/DataProcessingLogModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/DataProcessingLogModal.vue
@@ -1,52 +1,58 @@
 <template>
   <custom-modal v-model="visible" :width="1000" title="Data Processing Log">
-    <pre class="data-processing-log">{{ text }}</pre>
-    <div slot="custom-footer" style="text-align: center;">
-      <a-space :size="20">
-        <a-button type="primary">Export</a-button>
-        <a-button @click="visible = false">Cancel</a-button>
-      </a-space>
-    </div>
+    <a-spin :spinning="isLoading">
+      <pre class="data-processing-log">{{ text }}</pre>
+    </a-spin>
+      <div slot="custom-footer" style="text-align: center;">
+        <a-space :size="20">
+          <a-button type="primary">Export</a-button>
+          <a-button @click="visible = false">Cancel</a-button>
+        </a-space>
+      </div>
   </custom-modal>
 </template>
 
 <script>
 import ModalMixin from '@/mixins/ModalMixin'
+import { getAction } from '@/api/manage'
 export default {
   mixins: [ModalMixin],
+  props: {
+    sampleId: {
+      type: Number
+    }
+  },
   data() {
     return {
-      text: `--------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-       `
+      text: "",
+      isLoading: false,
     }
-  }
+  },
+  methods: {
+    beforeModalOpen() {
+      this.getViewGammaviewerLog();
+    },
+    getViewGammaviewerLog() {
+      this.isLoading = true
+      let params = {
+        sampleId: this.sampleId
+      }
+      getAction("/gamma/viewGammaviewerLog", params).then(res => {
+        this.isLoading = false
+        if (res.success) {
+          this.text = res.result
+        } else {
+          this.$message.warning("This operation fails. Contact your system administrator")
+        }
+      })
+    }
+  },
 }
 </script>
 
 <style lang="less" scoped>
 .data-processing-log {
+  height: 450px;
   max-height: 450px;
   padding: 5px;
   overflow: auto;
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index 241c3ca..0c4835d 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -116,7 +116,7 @@
     <!-- Color Config 弹窗结束 -->
 
     <!-- Data Processing Log 弹窗开始 -->
-    <data-processing-log-modal v-model="dataProcessingLogModalVisible" />
+    <data-processing-log-modal v-model="dataProcessingLogModalVisible" :sampleId="sampleData.sampleId" />
     <!-- Data Processing Log 弹窗结束 -->
 
     <!-- Config User Library 弹窗开始 -->