From 5535cbe78518d4dbde35ea08d71d8a8b5c5e05a9 Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Wed, 10 May 2023 16:51:38 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Report/ReportList.vue    |  4 ++--
 src/views/Report/ReportManager.vue | 13 ++++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/views/Report/ReportList.vue b/src/views/Report/ReportList.vue
index 87b3f14..0766427 100644
--- a/src/views/Report/ReportList.vue
+++ b/src/views/Report/ReportList.vue
@@ -47,7 +47,7 @@
 
     <div class="table">
       <el-row>
-        <el-col :span="3" class="treeList ">
+        <el-col :span="4" class="treeList ">
           <el-input placeholder="输入关键字进行过滤" v-model="filterText">
           </el-input>
           <div class="lef-tree scroll-myself">
@@ -74,7 +74,7 @@
           </div>
         </el-col>
 
-        <el-col :span="21" style="padding-left: 15px">
+        <el-col :span="20" style="padding-left: 15px">
           <vxe-table ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe
                      v-table-min-height="'calc(100vh - 320px)'"
                      @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent">
diff --git a/src/views/Report/ReportManager.vue b/src/views/Report/ReportManager.vue
index a3a2630..4cfc116 100644
--- a/src/views/Report/ReportManager.vue
+++ b/src/views/Report/ReportManager.vue
@@ -41,8 +41,9 @@
                     </div>
             </el-row>
         </div>
+      <div class="table">
         <el-row>
-            <el-col :span="3"  class="treeList">
+            <el-col :span="4"  class="treeList">
                 <el-input placeholder="输入关键字进行过滤" v-model="filterText">
                     </el-input>
                   <div class="lef-tree scroll-myself" >
@@ -68,7 +69,7 @@
                     </el-tree>
                    </div>
             </el-col>
-          <el-col :span="21" style="padding-left: 15px">
+          <el-col :span="20" style="padding-left: 15px">
                 <div class="table">
             <vxe-table  ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 320px)'">
                 <vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77">
@@ -100,7 +101,7 @@
         </div>
             </el-col>
         </el-row>
-
+      </div>
         <!--操作日志-->
         <el-dialog title="操作日志" :visible.sync="dialogLog" width="1100px" :close-on-click-modal="false"
             :close-on-press-escape="false" modal-append-to-body append-to-body>
@@ -945,6 +946,8 @@ export default {
                     this.q.pageNo = 1;
                     this.reportList();
                 }
+            }).catch(err=>{
+              this.tableData =[]
             })
         },
         // 日期列表
@@ -999,8 +1002,8 @@ export default {
 
 <style lang="scss" scoped>
 .treeList{
-    padding: 20px;
-    margin-left: 13px;
+      padding: 20px 20px 0;
+    //margin-left: 13px;
     box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
     .filter-tree{
         margin-top: 20px;