From 8f0a095715d201adaebedd43d958f5fee45ad685 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Thu, 29 Feb 2024 16:58:10 +0800
Subject: [PATCH] =?UTF-8?q?=EE=A4=81=E4=BA=BA=E5=B7=A5=E4=BA=A4=E4=BA=92?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2ARR=E3=80=81RRR=E3=80=81=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E4=B8=A4=E4=B8=AA=20log=E5=BC=B9=E7=AA=97=E5=AD=97=E4=BD=93?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=94=B9=E4=B8=BAfangsong=20=E5=A4=84?=
 =?UTF-8?q?=E7=90=86log=E6=97=A5=E5=BF=97=E6=A8=A1=E5=9D=97=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E4=B8=AD=E6=98=BE=E7=A4=BA=E7=9A=84=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8E=E6=96=87=E4=BB=B6=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/logManage/index.vue                             | 8 +++++---
 .../spectrumAnalysis/components/Modals/ArrRrrModal.vue    | 2 +-
 .../Modals/BetaGammaModals/AutomaticAnalysisLogModal.vue  | 2 +-
 .../components/Modals/BetaGammaModals/BGLogViewer.vue     | 2 +-
 .../BetaGammaModals/BetaGammaSampleInfomationModal.vue    | 2 +-
 .../Modals/BetaGammaModals/BetaGammaSpectrumModal.vue     | 8 ++++----
 .../components/Modals/DataProcessingLogModal.vue          | 2 +-
 7 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/views/logManage/index.vue b/src/views/logManage/index.vue
index f489570..0b4ee06 100644
--- a/src/views/logManage/index.vue
+++ b/src/views/logManage/index.vue
@@ -57,9 +57,10 @@
     <!-- 日志列表结束 -->
     <custom-modal title="Log" :width="950" v-model="visible" :footer="null">
       <a-spin class="log-detail" :spinning="isGettingDetail">
-        <div style="font-family: 宋体" v-for="(logItem, index) in logInfo" :key="index">
+        <pre style="font-family: 仿宋">{{ logInfo }}</pre>
+        <!-- <div style="font-family: 宋体" v-for="(logItem, index) in logInfo" :key="index">
           {{ logItem }}
-        </div>
+        </div> -->
       </a-spin>
     </custom-modal>
   </div>
@@ -200,7 +201,8 @@ export default {
       try {
         this.isGettingDetail = true
         const res = await postAction('/logManage/downloadFile', formData)
-        this.logInfo = res.split('\r\n')
+        // this.logInfo = res.split('\r\n')
+        this.logInfo = res
       } catch (error) {
         console.error(error)
       } finally {
diff --git a/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue b/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue
index e024b0c..7925e35 100644
--- a/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue
@@ -1,7 +1,7 @@
 <template>
   <custom-modal v-model="visible" :width="1200" :title="type == 1 || type == 3 ? 'ARR' : 'RRR'">
     <a-spin :spinning="isLoading">
-      <a-textarea style="font-family: 宋体" v-model="content" :readonly="type == 1 || type == 2"></a-textarea>
+      <a-textarea style="font-family: 仿宋" v-model="content" :readonly="type == 1 || type == 2"></a-textarea>
     </a-spin>
     <div slot="custom-footer" style="text-align: center">
       <a-space :size="20">
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/AutomaticAnalysisLogModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/AutomaticAnalysisLogModal.vue
index 2f6813f..d8f4c3f 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/AutomaticAnalysisLogModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/AutomaticAnalysisLogModal.vue
@@ -1,7 +1,7 @@
 <template>
   <custom-modal v-model="visible" :width="1000" title="Auto Process Log Viewer">
     <a-spin :spinning="isLoading">
-      <pre style="font-family: 宋体">
+      <pre style="font-family: 仿宋">
         {{ content }}
       </pre>
     </a-spin>
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BGLogViewer.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BGLogViewer.vue
index 12cdb3a..2125ee2 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BGLogViewer.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BGLogViewer.vue
@@ -1,7 +1,7 @@
 <template>
   <custom-modal v-model="visible" title="BetaGamma Analyser Log" :width="1200">
     <a-spin :spinning="isLoading">
-      <a-textarea v-model="content" style="font-family: 宋体"></a-textarea>
+      <a-textarea v-model="content" style="font-family: 仿宋"></a-textarea>
     </a-spin>
     <div slot="custom-footer">
       <a-button type="primary" @click="handleClick">Save As</a-button>
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSampleInfomationModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSampleInfomationModal.vue
index 225787e..26ae678 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSampleInfomationModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSampleInfomationModal.vue
@@ -1,7 +1,7 @@
 <template>
   <custom-modal v-model="visible" :width="1000" title="View Sample Infomation">
     <a-spin :spinning="isLoading">
-      <a-textarea v-model="content" style="font-family: 宋体"></a-textarea>
+      <a-textarea v-model="content" style="font-family: 仿宋"></a-textarea>
     </a-spin>
 
     <div slot="custom-footer">
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSpectrumModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSpectrumModal.vue
index 0e48f15..990600c 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSpectrumModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSpectrumModal.vue
@@ -3,16 +3,16 @@
     <a-spin :spinning="isLoading">
       <a-tabs :animated="false" @change="handleTabChange">
         <a-tab-pane tab="Sample Spectrum" :key="1">
-          <a-textarea v-model="content.sample" style="font-family: 宋体"></a-textarea>
+          <a-textarea v-model="content.sample" style="font-family: 仿宋"></a-textarea>
         </a-tab-pane>
         <a-tab-pane tab="GasBg Spectrum" :key="2">
-          <a-textarea v-model="content.gasBg" style="font-family: 宋体"></a-textarea>
+          <a-textarea v-model="content.gasBg" style="font-family: 仿宋"></a-textarea>
         </a-tab-pane>
         <a-tab-pane tab="DetBg Spectrum" :key="3">
-          <a-textarea v-model="content.detBg" style="font-family: 宋体"></a-textarea>
+          <a-textarea v-model="content.detBg" style="font-family: 仿宋"></a-textarea>
         </a-tab-pane>
         <a-tab-pane tab="QC Spectrum" :key="4">
-          <a-textarea v-model="content.qc" style="font-family: 宋体"></a-textarea>
+          <a-textarea v-model="content.qc" style="font-family: 仿宋"></a-textarea>
         </a-tab-pane>
       </a-tabs>
     </a-spin>
diff --git a/src/views/spectrumAnalysis/components/Modals/DataProcessingLogModal.vue b/src/views/spectrumAnalysis/components/Modals/DataProcessingLogModal.vue
index 1e9344a..44d79b1 100644
--- a/src/views/spectrumAnalysis/components/Modals/DataProcessingLogModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/DataProcessingLogModal.vue
@@ -1,7 +1,7 @@
 <template>
   <custom-modal v-model="visible" :width="1000" title="Data Processing Log">
     <a-spin :spinning="isLoading">
-      <pre class="data-processing-log" style="font-family: 宋体">{{ text }}</pre>
+      <pre class="data-processing-log" style="font-family: 仿宋">{{ text }}</pre>
     </a-spin>
     <div slot="custom-footer" style="text-align: center">
       <a-space :size="20">