From 8d1f2f2e82f3f7512930c536e91ee7c92315f3d6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 11 三月 2025 19:55:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/base/BasePage.vue | 40 +++-------------------------------------
1 files changed, 3 insertions(+), 37 deletions(-)
diff --git a/admin/src/components/base/BasePage.vue b/admin/src/components/base/BasePage.vue
index 2980f99..1fe7afd 100644
--- a/admin/src/components/base/BasePage.vue
+++ b/admin/src/components/base/BasePage.vue
@@ -1,10 +1,11 @@
<script>
import { mapState } from 'vuex'
+import BaseComputHeightDefault from '@/components/base/BaseComputHeightDefault'
export default {
+ extends: BaseComputHeightDefault,
name: 'BasePage',
data () {
return {
- tableHeightNew: 300,
// 瓒呯骇绠＄悊鍛樿鑹瞔ode
adminCode: 'admin'
}
@@ -12,46 +13,11 @@
computed: {
...mapState(['userInfo']),
// 鏄惁涓鸿秴绾х鐞嗗憳
- isAdmin () {
+ isAdmin() {
return this.userInfo.roles.findIndex(code => code === this.adminCode) > -1
}
},
- created() {
- this.computeTableHeight()
- },
- mounted () {
- this.computeTableHeight()
- window.addEventListener('resize', this.computeTableHeight)
- },
- activated() {
- this.computeTableHeight()
- },
methods: {
- computeTableHeight () {
- this.$nextTick(() => {
- // const height = window.innerHeight
- const height = document.getElementsByClassName('el-container') && document.getElementsByClassName('el-container')[0]?document.getElementsByClassName('el-container')[0].clientHeight:0
- // alert(height)
- const height1 = (document.getElementsByClassName('table-search-form') && document.getElementsByClassName('table-search-form')[0]? document.getElementsByClassName('table-search-form')[0].clientHeight:0)
- const height2 = document.getElementsByClassName('toolbar') && document.getElementsByClassName('toolbar')[0]?document.getElementsByClassName('toolbar')[0].clientHeight:0
- const height3 = document.getElementsByClassName('main-header') && document.getElementsByClassName('main-header')[0]?document.getElementsByClassName('main-header')[0].clientHeight:0
- const height4 = document.getElementsByClassName('table-pagination') && document.getElementsByClassName('table-pagination')[0]? document.getElementsByClassName('table-pagination')[0].clientHeight:0
- const height5 = document.getElementsByTagName('thead') && document.getElementsByTagName('thead')[0]? document.getElementsByTagName('thead')[0].clientHeight:0
- const height6 = document.getElementsByClassName('doumee-filter') && document.getElementsByClassName('doumee-filter')[0]? document.getElementsByClassName('doumee-filter')[0].clientHeight:0
- const height7 =( document.getElementsByClassName('pt16') && document.getElementsByClassName('pt16')[0]? 1+document.getElementsByClassName('pt16')[0].clientHeight:0)
- const height8 = document.getElementsByClassName('df_sb') && document.getElementsByClassName('df_sb')[0]? document.getElementsByClassName('df_sb')[0].clientHeight:0
- const height9 = document.getElementsByClassName('static_wrap') && document.getElementsByClassName('static_wrap')[0]? document.getElementsByClassName('df_sb')[0].clientHeight:0
- const height10 = document.getElementsByClassName('query_btns') && document.getElementsByClassName('query_btns')[0]? document.getElementsByClassName('query_btns')[0].clientHeight:0
- // this.tableHeightNew = height-height4-height3-height2-height1-height5-height6-height7-height8-height9 -height10// 鎵撳嵃楂樺害
-
- if(document.getElementsByClassName('main_app') && document.getElementsByClassName('main_app')[0]){
- this.tableHeightNew = height- height5-height6-height2-height7-height4-height8-height9-height10// 鎵撳嵃楂樺害
- }else{
- this.tableHeightNew = height-height4-height3-height2-height1-height5
- }
- console.log(this.tableHeightNew)
- })
- },
// 鏄惁鍖呭惈鎸囧畾瑙掕壊
containRoles (roles) {
if (roles == null) {
--
Gitblit v1.9.3