From f3444ab8b3f3a0b36456c0933f824d1b7d02a42d Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Wed, 26 Apr 2023 10:57:17 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Report/ReportList.vue | 62 ++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 24 deletions(-)

diff --git a/src/views/Report/ReportList.vue b/src/views/Report/ReportList.vue
index 80ab138..82fb58a 100644
--- a/src/views/Report/ReportList.vue
+++ b/src/views/Report/ReportList.vue
@@ -127,33 +127,44 @@
                 </vxe-column>
                 <vxe-column show-header-overflow field="name" title="报告名称">
                     <template #default="{ row, rowIndex }">
-                        <div class="row-info">
-                            <img v-if="row.fileType === '3'" class="icon-file-type" src="@/assets/imgs/icon-pdf.png" alt="">
-                            <img v-if="row.fileType === '4'" class="icon-file-type" src="@/assets/imgs/icon-doc.png" alt="">
-                            <img v-if="row.fileType === '1'" class="icon-file-type" src="@/assets/imgs/icon-ppt.png" alt="">
-                            <img v-if="row.fileType === '2'"  class="icon-file-type" src="@/assets/imgs/icon-excel.png" alt="">
+<!--                      <label class="row-title" >-->
+<!--                          <el-tooltip :content="row.name" placement="top-start">-->
+                              <span class="report-name" @click="goReportDetail(row)"> {{row.name}}</span>
+<!--                          </el-tooltip>-->
+<!--                      </label>-->
+<!--                        <div class="row-info">-->
+<!--                            <img v-if="row.fileType === '3'" class="icon-file-type" src="@/assets/imgs/icon-pdf.png" alt="">-->
+<!--                            <img v-if="row.fileType === '4'" class="icon-file-type" src="@/assets/imgs/icon-doc.png" alt="">-->
+<!--                            <img v-if="row.fileType === '1'" class="icon-file-type" src="@/assets/imgs/icon-ppt.png" alt="">-->
+<!--                            <img v-if="row.fileType === '2'"  class="icon-file-type" src="@/assets/imgs/icon-excel.png" alt="">-->
 
-                            <div class="row-text">
-                                <label class="row-title" @click="goReportDetail(row)">
-                                    <el-tooltip :content="row.name" placement="top-start">
-                                        <span>{{row.name}}</span>
-                                    </el-tooltip>
-                                </label>
-                                <div class="tag-info">
-                                    <span class="icon-tag-item"><img src="@/assets/imgs/icon-time.png"
-                                                                     alt=""><span>{{row?.year}}</span></span>
-                                   <span class="icon-tag-item"><img src="@/assets/imgs/icon-tag01.png"
-                                                                     alt=""><span class="keyContent">{{getKeyContent(row?.keyContent)}}</span></span>
-                                     <!-- <span class="icon-tag-item"><img src="@/assets/imgs/icon-tag02.png"
-                                                                     alt=""><span>{{row.labelTwoName}}</span></span>
-                                    <span class="icon-tag-item"><img src="@/assets/imgs/icon-tag03.png"
-                                                                     alt=""><span>{{row.labelThreeName}}</span></span> -->
-                                    <!--<span class="icon-tag-item"><span>{{(row.fileSize / 1024 / 1024).toFixed(2) }}MB</span></span>-->
-                                </div>
-                            </div>
-                        </div>
+<!--                            <div class="row-text">-->
+<!--                                <label class="row-title" @click="goReportDetail(row)">-->
+<!--                                    <el-tooltip :content="row.name" placement="top-start">-->
+<!--                                        <span>{{row.name}}</span>-->
+<!--                                    </el-tooltip>-->
+<!--                                </label>-->
+<!--                                <div class="tag-info">-->
+<!--                                    <span class="icon-tag-item"><img src="@/assets/imgs/icon-time.png"-->
+<!--                                                                     alt=""><span>{{row?.year}}</span></span>-->
+<!--                                   <span class="icon-tag-item"><img src="@/assets/imgs/icon-tag01.png"-->
+<!--                                                                     alt=""><span class="keyContent">{{getKeyContent(row?.keyContent)}}</span></span>-->
+<!--                                     &lt;!&ndash; <span class="icon-tag-item"><img src="@/assets/imgs/icon-tag02.png"-->
+<!--                                                                     alt=""><span>{{row.labelTwoName}}</span></span>-->
+<!--                                    <span class="icon-tag-item"><img src="@/assets/imgs/icon-tag03.png"-->
+<!--                                                                     alt=""><span>{{row.labelThreeName}}</span></span> &ndash;&gt;-->
+<!--                                    &lt;!&ndash;<span class="icon-tag-item"><span>{{(row.fileSize / 1024 / 1024).toFixed(2) }}MB</span></span>&ndash;&gt;-->
+<!--                                </div>-->
+<!--                            </div>-->
+<!--                        </div>-->
                     </template>
                 </vxe-column>
+              <vxe-column show-overflow show-header-overflow field="year" title="报告年份"></vxe-column>
+              <vxe-column show-overflow show-header-overflow field="keyContent" title="关键字">
+                <template #default="{ row }">
+                  {{getKeyContent(row.keyContent)}}
+                </template>
+              </vxe-column>
                 <vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
                     <template #default="{ row }">
                         <el-button type="text" @click="previewRow(row)">预览</el-button>
@@ -470,6 +481,9 @@ export default {
     }
 
 }
+.report-name{
+  cursor: pointer;
+}
 .report-list {
     .title {
         border-bottom: 1px solid #EBEEF5;