From de400c66d8eeb64e01353afd2cd6be3257cdccde Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 22 Nov 2024 16:29:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8E=86=E7=A7=91=E7=A0=94=E8=AF=BE?=
 =?UTF-8?q?=E9=A2=98=E6=A0=B7=E5=BC=8F=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../info/scientificResearchProject.vue        | 28 ++++++++++++---
 .../reviewers/curriculumVitae/preview.vue     | 35 +++++++++++++++----
 2 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/src/views/reviewers/curriculumVitae/components/info/scientificResearchProject.vue b/src/views/reviewers/curriculumVitae/components/info/scientificResearchProject.vue
index 3876188a..e51459d3 100644
--- a/src/views/reviewers/curriculumVitae/components/info/scientificResearchProject.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/scientificResearchProject.vue
@@ -16,15 +16,25 @@
       v-if="DATA.Research || DATA.ResearchCN || DATA.Grants || DATA.GrantsCN"
     >
       <el-form class="demo-form-inline">
-        <el-form-item
+        <!-- <el-form-item
           :label="$t('curriculumVitae:scientificResearchProject:direction')"
         >
           <div>
             <span v-if="isEN">{{ DATA.Research }}</span>
             <span v-else>{{ DATA.ResearchCN }}</span>
           </div>
-        </el-form-item>
-        <el-form-item
+        </el-form-item> -->
+        <div style="display: flex; font-size: 14px">
+          <span style="display: inline-block; width: 80px; color: #606266">{{
+            $t('curriculumVitae:scientificResearchProject:direction')
+          }}</span>
+          <span
+            class="break-word"
+            style="white-space: pre-wrap; width: calc(100% - 80px)"
+            v-html="isEN ? DATA.Research : DATA.ResearchCN"
+          ></span>
+        </div>
+        <!-- <el-form-item
           :label="$t('curriculumVitae:scientificResearchProject:subject')"
         >
           <div>
@@ -33,7 +43,17 @@
               v-html="isEN ? DATA.Grants : DATA.GrantsCN"
             ></span>
           </div>
-        </el-form-item>
+        </el-form-item> -->
+        <div style="display: flex; font-size: 14px">
+          <span style="display: inline-block; width: 80px; color: #606266">{{
+            $t('curriculumVitae:scientificResearchProject:subject')
+          }}</span>
+          <span
+            class="break-word"
+            style="white-space: pre-wrap; width: calc(100% - 80px)"
+            v-html="isEN ? DATA.Grants : DATA.GrantsCN"
+          ></span>
+        </div>
       </el-form>
     </div>
     <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
diff --git a/src/views/reviewers/curriculumVitae/preview.vue b/src/views/reviewers/curriculumVitae/preview.vue
index 914246d2..02104508 100644
--- a/src/views/reviewers/curriculumVitae/preview.vue
+++ b/src/views/reviewers/curriculumVitae/preview.vue
@@ -297,7 +297,7 @@
         </div>
         <div class="content">
           <el-form class="demo-form-inline">
-            <el-form-item
+            <!-- <el-form-item
               :label="$t('curriculumVitae:scientificResearchProject:direction')"
             >
               <span v-if="isEN" class="break-word">{{
@@ -306,20 +306,41 @@
               <span v-else class="break-word">{{
                 reviewerData.ResearchPublicationView.ResearchCN
               }}</span>
-            </el-form-item>
-            <el-form-item
-              :label="$t('curriculumVitae:scientificResearchProject:subject')"
-            >
+            </el-form-item> -->
+            <div style="display: flex; font-size: 14px">
+              <span
+                style="display: inline-block; width: 80px; color: #606266"
+                >{{
+                  $t('curriculumVitae:scientificResearchProject:direction')
+                }}</span
+              >
               <span
                 class="break-word"
-                style="white-space: pre-wrap"
+                style="white-space: pre-wrap; width: calc(100% - 80px)"
+                v-html="
+                  isEN
+                    ? reviewerData.ResearchPublicationView.Research
+                    : reviewerData.ResearchPublicationView.ResearchCN
+                "
+              ></span>
+            </div>
+            <div style="display: flex; font-size: 14px">
+              <span
+                style="display: inline-block; width: 80px; color: #606266"
+                >{{
+                  $t('curriculumVitae:scientificResearchProject:subject')
+                }}</span
+              >
+              <span
+                class="break-word"
+                style="white-space: pre-wrap; width: calc(100% - 80px)"
                 v-html="
                   isEN
                     ? reviewerData.ResearchPublicationView.Grants
                     : reviewerData.ResearchPublicationView.GrantsCN
                 "
               ></span>
-            </el-form-item>
+            </div>
           </el-form>
         </div>
       </div>