From 0af8d2525b8e58c3eb2c3eb30bb32ac482d20856 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 15 七月 2025 11:03:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 93daf95..0ab59e8 100644
--- a/admin/src/router/index.js
+++ b/admin/src/router/index.js
@@ -104,12 +104,12 @@
const height = window.innerHeight
// console.log('beforeEach========================锛�' + height)
const height13 = getEleHeghtByClassName('common-header', 0)
- const height4 = getEleHeghtByClassName('table-pagination', 0,-20)
+ const height4 = getEleHeghtByClassName('table-pagination', 0,16)
const height1 = getEleHeghtByClassName('table-search-form', 40, 16)
const height3 = getEleHeghtByClassName('main-header', 0)
const height2 = getEleHeghtByClassName('toolbar', 0)
const height5 = getEleHeghtByClassName('status-bar', 0)
- router.app.$store.commit('setTableHeightNew', height - height4 - height3 - height2 - height1 - height13-height5)
+ router.app.$store.commit('setTableHeightNew', height - height4 - height3 - height2 - height1 - height13 - height5)
}
function getEleHeghtByClassName (name, dv, margin) {
--
Gitblit v1.9.3