From 6a02884fb46e7eedffad549996d462c347602cff Mon Sep 17 00:00:00 2001
From: yuekuo <yuekuo@syxysoft.com>
Date: Wed, 19 Apr 2023 09:20:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8C=BA=E5=9F=9F=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Report/ReportList.vue | 55 +++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/src/views/Report/ReportList.vue b/src/views/Report/ReportList.vue
index 00cc597..c55fc05 100644
--- a/src/views/Report/ReportList.vue
+++ b/src/views/Report/ReportList.vue
@@ -5,9 +5,15 @@
         </div>
         <div class="tag-search">
             <el-row>
-                <el-col :span="24">
+                <el-col :span="6">
                     <div class="tag-item">
-                        <label class="tag-title">报告年份</label>
+                        <label class="tag-title">关键词:</label>
+                        <el-input v-model="q.keyContent" placeholder="请输入报告名称"></el-input>
+                    </div>
+                </el-col>
+                <el-col :span="6">
+                    <div class="tag-item">
+                        <label class="tag-title">报告年份：</label>
                         <el-select v-model="q.year" multiple collapse-tags placeholder="请选择报告年份">
                             <template v-for="item in yearList">
                                 <el-option :label="item" :value="item" :key="item"></el-option>
@@ -15,7 +21,18 @@
                         </el-select>
                     </div>
                 </el-col>
-                <el-col :span="24">
+                <el-col :span="6">
+                    <div class="tag-item">
+                        <label class="tag-title">报告名称:</label>
+                        <el-input v-model="q.name" placeholder="请输入报告名称"></el-input>
+                    </div>
+                </el-col>
+             
+                <el-col :span="6" align="right" class="tag-btns">
+                    <el-button type="primary" @click="search">查询</el-button>
+                    <el-button type="default" @click="reset">重置</el-button>
+                </el-col>
+                <!-- <el-col :span="24">
                     <div class="tag-item">
                         <el-tooltip :content="tagData[1].name" placement="top">
                             <label class="tag-title">{{ tagData[1].name }}</label>
@@ -34,8 +51,8 @@
                                :class="{'el-icon-arrow-down': !tagData[1].tagShow, 'el-icon-arrow-up': tagData[1].tagShow}"></i>
                         </div>
                     </div>
-                </el-col>
-                <el-col :span="24">
+                </el-col> -->
+                <!-- <el-col :span="24">
                     <div class="tag-item">
                         <el-tooltip :content="tagData[2].name" placement="top">
                             <label class="tag-title">{{ tagData[2].name }}</label>
@@ -54,8 +71,8 @@
                                :class="{'el-icon-arrow-down': !tagData[2].tagShow, 'el-icon-arrow-up': tagData[2].tagShow}"></i>
                         </div>
                     </div>
-                </el-col>
-                <el-col :span="24">
+                </el-col> -->
+                <!-- <el-col :span="24">
                     <div class="tag-item">
                         <el-tooltip :content="tagData[3].name" placement="top">
                             <label class="tag-title">{{ tagData[3].name }}</label>
@@ -74,17 +91,9 @@
                                :class="{'el-icon-arrow-down': !tagData[3].tagShow, 'el-icon-arrow-up': tagData[3].tagShow}"></i>
                         </div>
                     </div>
-                </el-col>
-                <el-col :span="12">
-                    <div class="tag-item">
-                        <label class="tag-title">搜索:</label>
-                        <el-input v-model="q.keyContent" placeholder="请输入搜索内容"></el-input>
-                    </div>
-                </el-col>
-                <el-col :span="12" align="right" class="tag-btns">
-                    <el-button type="primary" @click="search">查询</el-button>
-                    <el-button type="default" @click="reset">重置</el-button>
-                </el-col>
+                </el-col> -->
+             
+               
             </el-row>
         </div>
         <div class="table">
@@ -127,12 +136,12 @@
                                 <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"
+                                    <!-- <span class="icon-tag-item"><img src="@/assets/imgs/icon-tag01.png"
                                                                      alt=""><span>{{row.labelOneName}}</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>
+                                                                     alt=""><span>{{row.labelThreeName}}</span></span> -->
                                     <!--<span class="icon-tag-item"><span>{{(row.fileSize / 1024 / 1024).toFixed(2) }}MB</span></span>-->
                                 </div>
                             </div>
@@ -477,11 +486,11 @@ export default {
                 font-weight: normal;
                 color: #646464;
                 display: inline-block;
-                width: 112px;
+                // width: 112px;
                 height: 19px;
                 line-height: 19px;
-                padding-left: 48px;
-                border-right: 1px solid #BFBFBF;
+                padding-left: 13px;
+                // border-right: 1px solid #BFBFBF;
                 margin-right: 10px;
                 margin-top: 2.5px;
                 overflow: hidden;