Merge branch 'et86-black' into et86

@@ -4,7 +4,7 @@
     <sidebar class="sidebar-container"
     <sidebar class="sidebar-container"
       :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg }" />
       :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg }" />
     <div :class="{ hasTagsView: needTagsView }" class="main-container">
     <div :class="{ hasTagsView: needTagsView }" class="main-container">
-      <div :class="{ 'fixed-header': fixedHeader }" ref="headerRef">
+      <div class="headerRef" :class="{ 'fixed-header': fixedHeader }" ref="headerRef">
         <navbar />
         <navbar />
         <tags-view v-if="needTagsView" />
         <tags-view v-if="needTagsView" />
       </div>
       </div>

@@ -50,7 +50,6 @@ export default {
         let appMainHeight = this.$refs.appMainBlock.$el.clientHeight;
         let appMainHeight = this.$refs.appMainBlock.$el.clientHeight;
         this.$store.dispatch("app/setAppHeaderBlockCH", appHeaderHeight);
         this.$store.dispatch("app/setAppHeaderBlockCH", appHeaderHeight);
         this.$store.dispatch("app/setAppMainBlockCH", appMainHeight);
         this.$store.dispatch("app/setAppMainBlockCH", appMainHeight);
-        console.log(appHeaderHeight);
     },
     },
   },
   },
 };
 };

@@ -448,5 +448,7 @@ export function restTableHeight($refs) {
       heigth += getPropertyValue($refs[key]);
       heigth += getPropertyValue($refs[key]);
     }
     }
   });
   });
-  return heigth;
+  let topHeaderClientHeight =
+    document.querySelector(".headerRef").clientHeight;
+  return heigth + topHeaderClientHeight;
 }
 }

@@ -71,11 +71,12 @@ export default {
     });
     });
   },
   },
   mounted() {
   mounted() {
+    let headerRef = document.querySelector('.headerRef');
     this.$nextTick(() => {
     this.$nextTick(() => {
       this.tableAttr.maxHeight =
       this.tableAttr.maxHeight =
         window.innerHeight - restTableHeight(this.$refs);
         window.innerHeight - restTableHeight(this.$refs);
+        // console.log(headerRef.clientHeight)
     });
     });
-    console.log(store.getters.appHeaderBlockClientHeight)
   },
   },
   methods: {
   methods: {
     // ET86查询
     // ET86查询