From cb6aca0642ac8dd5de877ade168066d85acb589c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 17 十月 2025 15:54:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/components/common/Menu.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/admin/src/components/common/Menu.vue b/admin/src/components/common/Menu.vue
index a485a10..2d42e3c 100644
--- a/admin/src/components/common/Menu.vue
+++ b/admin/src/components/common/Menu.vue
@@ -106,11 +106,11 @@
computeTableHeight () {
this.$nextTick(() => {
const height = window.innerHeight
- console.log('main_app========================锛�'+height)
+ // console.log('main_app========================锛�'+height)
const height13 = this.getEleHeghtByClassName('common-header',0)
- const height5 = document.getElementsByTagName('thead') && document.getElementsByTagName('thead')[0] ? document.getElementsByTagName('thead')[0].clientHeight : 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========================')
+ // console.log('main_app========================')
// alert(height)
const height3 = this.getEleHeghtByClassName('main-header',0)
const height4 = this.getEleHeghtByClassName('table-pagination',0)
@@ -122,16 +122,16 @@
const height11 = this.getEleHeghtByClassName('el-tabs-ele',0)
const height12 = this.getEleHeghtByClassName('platgroup_tabs',0)
this.$router.app.$store.commit('setTableHeightNew', height - height13- height3 - height5 - height6 - height2 - height7 - height4 - height9 - height10 - height11 - height12)
- console.log('gableHeightNew', this.$router.app.$store.state.tableHeightNew)
+ // console.log('gableHeightNew', this.$router.app.$store.state.tableHeightNew)
} else {
- console.log('tableLayout========================')
+ // console.log('tableLayout========================')
const height1 = this.getEleHeghtByClassName('table-search-form', 40,16)
const height3 = this.getEleHeghtByClassName('main-header', 0)
const height4 = this.getEleHeghtByClassName('table-pagination', 0)
const height2 = this.getEleHeghtByClassName('toolbar', 0)
- console.log('defualtlength', document.getElementsByClassName('table-search-form').length)
+ // console.log('defualtlength', document.getElementsByClassName('table-search-form').length)
this.$router.app.$store.commit('setTableHeightNew', height - height4 - height3 - height2 - height1 - height5 - height13)
- console.log('gableHeightNew', this.$router.app.$store.state.tableHeightNew)
+ // console.log('gableHeightNew', this.$router.app.$store.state.tableHeightNew)
}
})
},
@@ -139,7 +139,7 @@
if ((document.getElementsByClassName(name) && document.getElementsByClassName(name)[0])) {
let t = 0
document.getElementsByClassName(name).forEach(e => {
- console.log(name+'========================' + t + ':' + e.clientHeight)
+ // console.log(name+'========================' + t + ':' + e.clientHeight)
t++
})
return document.getElementsByClassName(name)[document.getElementsByClassName(name).length - 1].clientHeight+(margin||0)
--
Gitblit v1.9.3