From 53f05ac649893fb22bf065cc743421055b00a30d Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Mon, 11 Mar 2024 11:35:52 +0800
Subject: [PATCH] =?UTF-8?q?CN-1574=20fix:=20report=20table=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E7=BB=86=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../css/components/views/report/report.scss   |  6 --
 src/components/table/report/ReportTable.vue   | 63 ++++++++-----------
 2 files changed, 26 insertions(+), 43 deletions(-)

diff --git a/src/assets/css/components/views/report/report.scss b/src/assets/css/components/views/report/report.scss
index 4b56bb4c..906ded73 100644
--- a/src/assets/css/components/views/report/report.scss
+++ b/src/assets/css/components/views/report/report.scss
@@ -206,12 +206,6 @@
             }
           }
         }
-        .el-table__border-left-patch, .el-table--border::before {
-          width: 0;
-        }
-        .el-table--border .el-table__inner-wrapper::after, .el-table__inner-wrapper::before {
-          height: 0;
-        }
       }
     }
     .table-operation-all {
diff --git a/src/components/table/report/ReportTable.vue b/src/components/table/report/ReportTable.vue
index c3acad82..69be7372 100644
--- a/src/components/table/report/ReportTable.vue
+++ b/src/components/table/report/ReportTable.vue
@@ -1,22 +1,18 @@
 <template>
-  <div>
-    <el-table
-        id="reportTable"
-        ref="dataTable"
-        :header-cell-class-name="headerCellClass"
-        :data="tableData"
-        height="100%"
-        :expand-row-keys="expandedIds"
-        border
-        empty-text=" "
-        tooltip-effect="light"
-        style="border-top: 1px solid #ebeef5; border-left: 1px solid #ebeef5;"
-        :row-key="(row) => { return row.id }"
-        :reserve-selection="true"
-        @header-dragend="dragend"
-        @sort-change="tableDataSort"
-        @expand-change="dropExpandChange"
-        @selection-change="selectionChange"
+  <el-table
+      id="reportTable"
+      ref="dataTable"
+      :header-cell-class-name="headerCellClass"
+      :data="tableData"
+      :expand-row-keys="expandedIds"
+      empty-text=" "
+      tooltip-effect="light"
+      :row-key="(row) => { return row.id }"
+      :reserve-selection="true"
+      @header-dragend="dragend"
+      @sort-change="tableDataSort"
+      @expand-change="dropExpandChange"
+      @selection-change="selectionChange"
     >
       <el-table-column type="expand" width="30">
         <template #default="props">
@@ -193,20 +189,19 @@
           <div class="table-no-data__title">{{ $t('npm.noData') }}</div>
         </div>
       </template>
-    </el-table>
-<!--    <div class="table-operation-all">
-      <el-checkbox v-model="checkboxAll" :indeterminate="isIndeterminate" @change="selectAll(tableData)"></el-checkbox>
-      <div class="table-operation-all-span">
-        <span>{{ $t('overall.all') }}</span>
-        <div class="table-operation-back-down"
-             :class="{'table-operation-all-checkbox': batchDow, 'table-operation-all-loading': loading}"
-             @click="checkboxIds.id ? tableOperation(['delete', checkboxIds]) : ''">
-          <loading :loading="loading"></loading>
-          <span>{{ $t('report.batchDeletion') }}</span>
-        </div>
+  </el-table>
+<!-- <div class="table-operation-all">
+    <el-checkbox v-model="checkboxAll" :indeterminate="isIndeterminate" @change="selectAll(tableData)"></el-checkbox>
+    <div class="table-operation-all-span">
+      <span>{{ $t('overall.all') }}</span>
+      <div class="table-operation-back-down"
+           :class="{'table-operation-all-checkbox': batchDow, 'table-operation-all-loading': loading}"
+           @click="checkboxIds.id ? tableOperation(['delete', checkboxIds]) : ''">
+        <loading :loading="loading"></loading>
+        <span>{{ $t('report.batchDeletion') }}</span>
       </div>
-    </div>-->
-  </div>
+    </div>
+  </div>-->
 </template>
 
 <script>
@@ -786,9 +781,3 @@ export default {
   }
 }
 </script>
-
-<style lang="scss">
-.list-page .cn-table .el-table:not(.chart-table) td {
-  padding: 7.5px 0;
-}
-</style>