From 5e611231af1fad7993447234fc43a150b918f1e9 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 20 三月 2025 17:50:48 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 admin/src/router/index.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/src/router/index.js b/admin/src/router/index.js
index 224a5f2..3f3c68d 100644
--- a/admin/src/router/index.js
+++ b/admin/src/router/index.js
@@ -106,12 +106,12 @@
   const height = window.innerHeight
   console.log('beforeEach========================锛�' + height)
   const height13 = getEleHeghtByClassName('common-header', 0)
+  const height4 = getEleHeghtByClassName('table-pagination', 0,-20)
   const height5 = document.getElementsByTagName('thead') && document.getElementsByTagName('thead')[0] ? document.getElementsByTagName('thead')[0].clientHeight : 0
   if (document.getElementsByClassName('main_app') && document.getElementsByClassName('main_app')[0]) {
     console.log('main_app========================')
     // alert(height)
     const height3 = getEleHeghtByClassName('main-header', 0)
-    const height4 = getEleHeghtByClassName('table-pagination', 0)
     const height2 = getEleHeghtByClassName('toolbar', 0)
     const height6 = getEleHeghtByClassName('doumee-filter', 0, 16)
     const height7 = getEleHeghtByClassName('pt16', 0, 0)
@@ -125,7 +125,7 @@
     console.log('tableLayout========================')
     const height1 = getEleHeghtByClassName('table-search-form', 40, 16)
     const height3 = getEleHeghtByClassName('main-header', 0)
-    const height4 = getEleHeghtByClassName('table-pagination', 0)
+    // const height4 = getEleHeghtByClassName('table-pagination', 0,-20)
     const height2 = getEleHeghtByClassName('toolbar', 0)
     console.log('defualtlength', document.getElementsByClassName('table-search-form').length)
     router.app.$store.commit('setTableHeightNew', height - height4 - height3 - height2 - height1 - height5 - height13)

--
Gitblit v1.9.3