From 6cfd5d9a0c8f7bacbe2d3d1b1d84511207789ca6 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 11 三月 2025 19:55:17 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/router/index.js | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/admin/src/router/index.js b/admin/src/router/index.js
index db35fa8..d522993 100644
--- a/admin/src/router/index.js
+++ b/admin/src/router/index.js
@@ -68,8 +68,8 @@
return
}
if (to.name === 'login') {
- next()
- return
+ next()
+ return
}
getUserInfo()
.then(userInfo => {
@@ -98,4 +98,51 @@
})
})
+router.afterEach((to, from, failure) => {
+ setTimeout(function (){computeTableHeightIndex()},1000)
+ window.addEventListener('resize', computeTableHeightIndex())
+})
+function computeTableHeightIndex () {
+ const height = window.innerHeight
+ console.log('beforeEach========================锛�' + height)
+ const height13 = getEleHeghtByClassName('common-header', 0)
+ 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)
+ const height9 = getEleHeghtByClassName('static_wrap', 0)
+ const height10 = getEleHeghtByClassName('query_btns', 0)
+ const height11 = getEleHeghtByClassName('el-tabs-ele', 0)
+ const height12 = getEleHeghtByClassName('platgroup_tabs', 0)
+ router.app.$store.commit('setTableHeightNew', height - height13 - height3 - height5 - height6 - height2 - height7 - height4 - height9 - height10 - height11 - height12)
+ console.log('gableHeightNew', router.app.$store.state.tableHeightNew)
+ } else {
+ console.log('tableLayout========================')
+ const height1 = getEleHeghtByClassName('table-search-form', 40, 16)
+ const height3 = getEleHeghtByClassName('main-header', 0)
+ const height4 = getEleHeghtByClassName('table-pagination', 0)
+ 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)
+ console.log('gableHeightNew', router.app.$store.state.tableHeightNew)
+ }
+}
+
+function getEleHeghtByClassName (name, dv, margin) {
+ if ((document.getElementsByClassName(name) && document.getElementsByClassName(name)[0])) {
+ let t = 0
+ document.getElementsByClassName(name).forEach(e => {
+ console.log(name + '========================' + t + ':' + e.clientHeight)
+ t++
+ })
+ return document.getElementsByClassName(name)[document.getElementsByClassName(name).length - 1].clientHeight + (margin || 0)
+ }
+ return dv || 0
+}
+
export default router
--
Gitblit v1.9.3