From 35a90e467732d7f33cf0ebbaa5b3f20ed67982cb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 11 三月 2025 19:54:25 +0800
Subject: [PATCH] 最新版本541200007

---
 admin/src/components/common/Menu.vue |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/admin/src/components/common/Menu.vue b/admin/src/components/common/Menu.vue
index 0b0df39..a485a10 100644
--- a/admin/src/components/common/Menu.vue
+++ b/admin/src/components/common/Menu.vue
@@ -50,9 +50,16 @@
     // 榛樿灞曞紑鐨勮彍鍗昳ndex
     defaultOpeneds() {
       // return this.menuData.list.map(menu => menu.index)
-
       return [this.menuData.list[0].index]
     }
+  },
+  watch: {
+   /* $route (to, from) {
+      var that =this
+      this.$nextTick(() => {
+        setTimeout(function(){ that.computeTableHeight()},1000)
+      })
+    }*/
   },
   methods: {
     // 澶勭悊鑿滃崟閫変腑
@@ -73,10 +80,12 @@
         return
       }
       if (menuConfig.params != null && menuConfig.params != '') {
-        this.$router.push({ path: menuConfig.url, query: { index: menuConfig.index, param: menuConfig.params } })
+        // this.$router.push({ path: menuConfig.url, query: { index: menuConfig.index, param: menuConfig.params } })
       } else {
-        this.$router.push(menuConfig.url)
+        // this.$router.push(menuConfig.url)
       }
+
+      this.$router.push({ path: menuConfig.url, query: { index: menuConfig.index, param: menuConfig.params, time: (Math.random().toString()) } })
       this.$store.commit('pushtags', menuConfig)
     },
     // 鑾峰彇鑿滃崟閰嶇疆
@@ -93,6 +102,49 @@
         }
       }
       return null
+    },
+    computeTableHeight () {
+      this.$nextTick(() => {
+        const height = window.innerHeight
+        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
+        if (document.getElementsByClassName('main_app') && document.getElementsByClassName('main_app')[0]) {
+          console.log('main_app========================')
+          // alert(height)
+          const height3 = this.getEleHeghtByClassName('main-header',0)
+          const height4 = this.getEleHeghtByClassName('table-pagination',0)
+          const height2 = this.getEleHeghtByClassName('toolbar',0)
+          const height6 = this.getEleHeghtByClassName('doumee-filter',0,16)
+          const height7 = this.getEleHeghtByClassName('pt16',0,0)
+          const height9 = this.getEleHeghtByClassName('static_wrap',0)
+          const height10 = this.getEleHeghtByClassName('query_btns',0)
+          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)
+        } else {
+          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)
+          this.$router.app.$store.commit('setTableHeightNew', height - height4 - height3 - height2 - height1 - height5 - height13)
+          console.log('gableHeightNew', this.$router.app.$store.state.tableHeightNew)
+        }
+      })
+    },
+    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
     }
   }
 }

--
Gitblit v1.9.3