diff --git a/package-lock.json b/package-lock.json
index 21d24ea..6bcc20d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,11 +3502,6 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
-    "batch-processor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
-      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
-    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6119,18 +6114,10 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
-    "element-resize-detector": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
-      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
-      "requires": {
-        "batch-processor": "1.0.0"
-      }
-    },
     "element-ui": {
-      "version": "2.15.5",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
-      "integrity": "sha512-B/YCdz2aRY2WnFXzbTRTHPKZHBD/2KV6u88EBnkaARC/Lyxnap+7vpvrcW5UNTyVwjItS5Fj1eQyRy6236lbXg==",
+      "version": "2.15.6",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.6.tgz",
+      "integrity": "sha512-rcYXEKd/j2G0AgficAOk1Zd1AsnHRkhmrK4yLHmNOiimU2JfsywgfKUjMoFuT6pQx0luhovj8lFjpE4Fnt58Iw==",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",

diff --git a/package-lock.json b/package-lock.json
index 21d24ea..6bcc20d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,11 +3502,6 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
-    "batch-processor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
-      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
-    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6119,18 +6114,10 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
-    "element-resize-detector": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
-      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
-      "requires": {
-        "batch-processor": "1.0.0"
-      }
-    },
     "element-ui": {
-      "version": "2.15.5",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
-      "integrity": "sha512-B/YCdz2aRY2WnFXzbTRTHPKZHBD/2KV6u88EBnkaARC/Lyxnap+7vpvrcW5UNTyVwjItS5Fj1eQyRy6236lbXg==",
+      "version": "2.15.6",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.6.tgz",
+      "integrity": "sha512-rcYXEKd/j2G0AgficAOk1Zd1AsnHRkhmrK4yLHmNOiimU2JfsywgfKUjMoFuT6pQx0luhovj8lFjpE4Fnt58Iw==",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
diff --git a/package.json b/package.json
index f835d2d..5db2c9b 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.6.5",
-    "element-ui": "^2.15.5",
+    "element-ui": "^2.15.6",
     "js-cookie": "^3.0.0",
     "jsencrypt": "^3.2.1",
     "mockjs": "^1.1.0",

diff --git a/package-lock.json b/package-lock.json
index 21d24ea..6bcc20d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,11 +3502,6 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
-    "batch-processor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
-      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
-    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6119,18 +6114,10 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
-    "element-resize-detector": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
-      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
-      "requires": {
-        "batch-processor": "1.0.0"
-      }
-    },
     "element-ui": {
-      "version": "2.15.5",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
-      "integrity": "sha512-B/YCdz2aRY2WnFXzbTRTHPKZHBD/2KV6u88EBnkaARC/Lyxnap+7vpvrcW5UNTyVwjItS5Fj1eQyRy6236lbXg==",
+      "version": "2.15.6",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.6.tgz",
+      "integrity": "sha512-rcYXEKd/j2G0AgficAOk1Zd1AsnHRkhmrK4yLHmNOiimU2JfsywgfKUjMoFuT6pQx0luhovj8lFjpE4Fnt58Iw==",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
diff --git a/package.json b/package.json
index f835d2d..5db2c9b 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.6.5",
-    "element-ui": "^2.15.5",
+    "element-ui": "^2.15.6",
     "js-cookie": "^3.0.0",
     "jsencrypt": "^3.2.1",
     "mockjs": "^1.1.0",
diff --git a/src/App.vue b/src/App.vue
index ec9032c..abeec72 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,11 +1,35 @@
 <template>
-  <div id="app">
+  <div id="app" v-resize="windowResize">
     <router-view />
   </div>
 </template>
 
 <script>
+import { tagsView, breadcrumb } from './settings'
+import store from '@/store'
 export default {
-  name: 'App'
+  name: 'App',
+  mounted() {
+    this.windowResize(window.innerHeight, window.innerWidth)
+  },
+  methods: {
+    // 窗口变化
+    windowResize(height, width) {
+      // 查找header高度
+      const el_header = document.getElementById('app-header')
+      let bodyHeight = height - (el_header ? el_header.clientHeight : 56)
+      if (store.getters.tagsView) {
+        const el_tagsView = document.getElementById('tags-view-container')
+        bodyHeight -= el_tagsView ? el_tagsView.clientHeight : 34
+      }
+      if (breadcrumb) {
+        const el_navbar = document.getElementsByClassName('navbar')
+        bodyHeight -= el_navbar ? el_navbar[0].clientHeight : 48
+      }
+      // 减去2个padding
+      // bodyHeight -= 20
+      store.dispatch('settings/ChangeHeight', bodyHeight)
+    }
+  }
 }
 </script>

diff --git a/package-lock.json b/package-lock.json
index 21d24ea..6bcc20d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,11 +3502,6 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
-    "batch-processor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
-      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
-    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6119,18 +6114,10 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
-    "element-resize-detector": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
-      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
-      "requires": {
-        "batch-processor": "1.0.0"
-      }
-    },
     "element-ui": {
-      "version": "2.15.5",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
-      "integrity": "sha512-B/YCdz2aRY2WnFXzbTRTHPKZHBD/2KV6u88EBnkaARC/Lyxnap+7vpvrcW5UNTyVwjItS5Fj1eQyRy6236lbXg==",
+      "version": "2.15.6",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.6.tgz",
+      "integrity": "sha512-rcYXEKd/j2G0AgficAOk1Zd1AsnHRkhmrK4yLHmNOiimU2JfsywgfKUjMoFuT6pQx0luhovj8lFjpE4Fnt58Iw==",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
diff --git a/package.json b/package.json
index f835d2d..5db2c9b 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.6.5",
-    "element-ui": "^2.15.5",
+    "element-ui": "^2.15.6",
     "js-cookie": "^3.0.0",
     "jsencrypt": "^3.2.1",
     "mockjs": "^1.1.0",
diff --git a/src/App.vue b/src/App.vue
index ec9032c..abeec72 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,11 +1,35 @@
 <template>
-  <div id="app">
+  <div id="app" v-resize="windowResize">
     <router-view />
   </div>
 </template>
 
 <script>
+import { tagsView, breadcrumb } from './settings'
+import store from '@/store'
 export default {
-  name: 'App'
+  name: 'App',
+  mounted() {
+    this.windowResize(window.innerHeight, window.innerWidth)
+  },
+  methods: {
+    // 窗口变化
+    windowResize(height, width) {
+      // 查找header高度
+      const el_header = document.getElementById('app-header')
+      let bodyHeight = height - (el_header ? el_header.clientHeight : 56)
+      if (store.getters.tagsView) {
+        const el_tagsView = document.getElementById('tags-view-container')
+        bodyHeight -= el_tagsView ? el_tagsView.clientHeight : 34
+      }
+      if (breadcrumb) {
+        const el_navbar = document.getElementsByClassName('navbar')
+        bodyHeight -= el_navbar ? el_navbar[0].clientHeight : 48
+      }
+      // 减去2个padding
+      // bodyHeight -= 20
+      store.dispatch('settings/ChangeHeight', bodyHeight)
+    }
+  }
 }
 </script>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a85509a..9d3b68d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -160,7 +160,7 @@
       default: function() {
         return {
           needIndex: true, // 是否需要序号列
-          border: false // 是否需要上方边框
+          border: true // 是否需要上方边框
         }
       }
     }, // 配置项

diff --git a/package-lock.json b/package-lock.json
index 21d24ea..6bcc20d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,11 +3502,6 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
-    "batch-processor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
-      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
-    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6119,18 +6114,10 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
-    "element-resize-detector": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
-      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
-      "requires": {
-        "batch-processor": "1.0.0"
-      }
-    },
     "element-ui": {
-      "version": "2.15.5",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
-      "integrity": "sha512-B/YCdz2aRY2WnFXzbTRTHPKZHBD/2KV6u88EBnkaARC/Lyxnap+7vpvrcW5UNTyVwjItS5Fj1eQyRy6236lbXg==",
+      "version": "2.15.6",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.6.tgz",
+      "integrity": "sha512-rcYXEKd/j2G0AgficAOk1Zd1AsnHRkhmrK4yLHmNOiimU2JfsywgfKUjMoFuT6pQx0luhovj8lFjpE4Fnt58Iw==",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
diff --git a/package.json b/package.json
index f835d2d..5db2c9b 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.6.5",
-    "element-ui": "^2.15.5",
+    "element-ui": "^2.15.6",
     "js-cookie": "^3.0.0",
     "jsencrypt": "^3.2.1",
     "mockjs": "^1.1.0",
diff --git a/src/App.vue b/src/App.vue
index ec9032c..abeec72 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,11 +1,35 @@
 <template>
-  <div id="app">
+  <div id="app" v-resize="windowResize">
     <router-view />
   </div>
 </template>
 
 <script>
+import { tagsView, breadcrumb } from './settings'
+import store from '@/store'
 export default {
-  name: 'App'
+  name: 'App',
+  mounted() {
+    this.windowResize(window.innerHeight, window.innerWidth)
+  },
+  methods: {
+    // 窗口变化
+    windowResize(height, width) {
+      // 查找header高度
+      const el_header = document.getElementById('app-header')
+      let bodyHeight = height - (el_header ? el_header.clientHeight : 56)
+      if (store.getters.tagsView) {
+        const el_tagsView = document.getElementById('tags-view-container')
+        bodyHeight -= el_tagsView ? el_tagsView.clientHeight : 34
+      }
+      if (breadcrumb) {
+        const el_navbar = document.getElementsByClassName('navbar')
+        bodyHeight -= el_navbar ? el_navbar[0].clientHeight : 48
+      }
+      // 减去2个padding
+      // bodyHeight -= 20
+      store.dispatch('settings/ChangeHeight', bodyHeight)
+    }
+  }
 }
 </script>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a85509a..9d3b68d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -160,7 +160,7 @@
       default: function() {
         return {
           needIndex: true, // 是否需要序号列
-          border: false // 是否需要上方边框
+          border: true // 是否需要上方边框
         }
       }
     }, // 配置项
diff --git a/src/components/layout/AppContainer.vue b/src/components/layout/AppContainer.vue
index ca5bbc6..f4db10c 100644
--- a/src/components/layout/AppContainer.vue
+++ b/src/components/layout/AppContainer.vue
@@ -1,10 +1,11 @@
 <template>
-  <div :style="{'padding':hasPadding?paddingSize:'0px','background-color':background}" class="app-container">
+  <div :style="{'padding':hasPadding?paddingSize:'0px','background-color':background, minHeight: (bodyHeight-20)+'px' }" class="app-container">
     <slot />
   </div>
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 export default {
   name: 'AppContainer',
   props: {
@@ -20,6 +21,9 @@
       type: String,
       default: '#fff'
     }
+  },
+  computed: {
+    ...mapGetters(['bodyHeight'])
   }
 }
 </script>

diff --git a/package-lock.json b/package-lock.json
index 21d24ea..6bcc20d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,11 +3502,6 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
-    "batch-processor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
-      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
-    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6119,18 +6114,10 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
-    "element-resize-detector": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
-      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
-      "requires": {
-        "batch-processor": "1.0.0"
-      }
-    },
     "element-ui": {
-      "version": "2.15.5",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
-      "integrity": "sha512-B/YCdz2aRY2WnFXzbTRTHPKZHBD/2KV6u88EBnkaARC/Lyxnap+7vpvrcW5UNTyVwjItS5Fj1eQyRy6236lbXg==",
+      "version": "2.15.6",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.6.tgz",
+      "integrity": "sha512-rcYXEKd/j2G0AgficAOk1Zd1AsnHRkhmrK4yLHmNOiimU2JfsywgfKUjMoFuT6pQx0luhovj8lFjpE4Fnt58Iw==",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
diff --git a/package.json b/package.json
index f835d2d..5db2c9b 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.6.5",
-    "element-ui": "^2.15.5",
+    "element-ui": "^2.15.6",
     "js-cookie": "^3.0.0",
     "jsencrypt": "^3.2.1",
     "mockjs": "^1.1.0",
diff --git a/src/App.vue b/src/App.vue
index ec9032c..abeec72 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,11 +1,35 @@
 <template>
-  <div id="app">
+  <div id="app" v-resize="windowResize">
     <router-view />
   </div>
 </template>
 
 <script>
+import { tagsView, breadcrumb } from './settings'
+import store from '@/store'
 export default {
-  name: 'App'
+  name: 'App',
+  mounted() {
+    this.windowResize(window.innerHeight, window.innerWidth)
+  },
+  methods: {
+    // 窗口变化
+    windowResize(height, width) {
+      // 查找header高度
+      const el_header = document.getElementById('app-header')
+      let bodyHeight = height - (el_header ? el_header.clientHeight : 56)
+      if (store.getters.tagsView) {
+        const el_tagsView = document.getElementById('tags-view-container')
+        bodyHeight -= el_tagsView ? el_tagsView.clientHeight : 34
+      }
+      if (breadcrumb) {
+        const el_navbar = document.getElementsByClassName('navbar')
+        bodyHeight -= el_navbar ? el_navbar[0].clientHeight : 48
+      }
+      // 减去2个padding
+      // bodyHeight -= 20
+      store.dispatch('settings/ChangeHeight', bodyHeight)
+    }
+  }
 }
 </script>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a85509a..9d3b68d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -160,7 +160,7 @@
       default: function() {
         return {
           needIndex: true, // 是否需要序号列
-          border: false // 是否需要上方边框
+          border: true // 是否需要上方边框
         }
       }
     }, // 配置项
diff --git a/src/components/layout/AppContainer.vue b/src/components/layout/AppContainer.vue
index ca5bbc6..f4db10c 100644
--- a/src/components/layout/AppContainer.vue
+++ b/src/components/layout/AppContainer.vue
@@ -1,10 +1,11 @@
 <template>
-  <div :style="{'padding':hasPadding?paddingSize:'0px','background-color':background}" class="app-container">
+  <div :style="{'padding':hasPadding?paddingSize:'0px','background-color':background, minHeight: (bodyHeight-20)+'px' }" class="app-container">
     <slot />
   </div>
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 export default {
   name: 'AppContainer',
   props: {
@@ -20,6 +21,9 @@
       type: String,
       default: '#fff'
     }
+  },
+  computed: {
+    ...mapGetters(['bodyHeight'])
   }
 }
 </script>
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index df2044d..6e0f656 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -1,7 +1,7 @@
 <template>
   <el-container :class="classObj" class="app-wrapper">
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
-    <app-header class="app-header" />
+    <app-header id="app-header" class="app-header" />
     <el-main class="app-body">
       <!--侧边栏-->
       <sidebar class="sidebar-container" />
@@ -10,11 +10,11 @@
         <!--开启固定头部设置-->
         <div v-if="fixedHeader">
           <!--导航(面包屑)-->
-          <navbar />
+          <navbar v-if="breadcrumb" />
           <!--标签栏-->
           <tags-view v-if="needTagsView" />
           <!--主内容包裹在el-scrollbar中-->
-          <el-scrollbar class="no-head-scrollbar">
+          <el-scrollbar :style="{height:bodyHeight+'px'}" class="no-head-scrollbar">
             <app-main />
           </el-scrollbar>
         </div>
@@ -22,7 +22,7 @@
         <div v-else>
           <!--导航，tagsView都包裹在el-scrollbar中-->
           <el-scrollbar class="has-head-scrollbar">
-            <navbar />
+            <navbar v-if="breadcrumb" />
             <tags-view v-if="needTagsView" />
             <app-main />
           </el-scrollbar>
@@ -62,7 +62,9 @@
       device: state => state.app.device,
       showSettings: state => state.settings.showSettings,
       needTagsView: state => state.settings.tagsView,
-      fixedHeader: state => state.settings.fixedHeader
+      fixedHeader: state => state.settings.fixedHeader,
+      breadcrumb: state => state.settings.breadcrumb,
+      bodyHeight: state => state.settings.bodyHeight
     }),
     classObj() {
       return {

diff --git a/package-lock.json b/package-lock.json
index 21d24ea..6bcc20d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,11 +3502,6 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
-    "batch-processor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
-      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
-    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6119,18 +6114,10 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
-    "element-resize-detector": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
-      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
-      "requires": {
-        "batch-processor": "1.0.0"
-      }
-    },
     "element-ui": {
-      "version": "2.15.5",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
-      "integrity": "sha512-B/YCdz2aRY2WnFXzbTRTHPKZHBD/2KV6u88EBnkaARC/Lyxnap+7vpvrcW5UNTyVwjItS5Fj1eQyRy6236lbXg==",
+      "version": "2.15.6",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.6.tgz",
+      "integrity": "sha512-rcYXEKd/j2G0AgficAOk1Zd1AsnHRkhmrK4yLHmNOiimU2JfsywgfKUjMoFuT6pQx0luhovj8lFjpE4Fnt58Iw==",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
diff --git a/package.json b/package.json
index f835d2d..5db2c9b 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.6.5",
-    "element-ui": "^2.15.5",
+    "element-ui": "^2.15.6",
     "js-cookie": "^3.0.0",
     "jsencrypt": "^3.2.1",
     "mockjs": "^1.1.0",
diff --git a/src/App.vue b/src/App.vue
index ec9032c..abeec72 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,11 +1,35 @@
 <template>
-  <div id="app">
+  <div id="app" v-resize="windowResize">
     <router-view />
   </div>
 </template>
 
 <script>
+import { tagsView, breadcrumb } from './settings'
+import store from '@/store'
 export default {
-  name: 'App'
+  name: 'App',
+  mounted() {
+    this.windowResize(window.innerHeight, window.innerWidth)
+  },
+  methods: {
+    // 窗口变化
+    windowResize(height, width) {
+      // 查找header高度
+      const el_header = document.getElementById('app-header')
+      let bodyHeight = height - (el_header ? el_header.clientHeight : 56)
+      if (store.getters.tagsView) {
+        const el_tagsView = document.getElementById('tags-view-container')
+        bodyHeight -= el_tagsView ? el_tagsView.clientHeight : 34
+      }
+      if (breadcrumb) {
+        const el_navbar = document.getElementsByClassName('navbar')
+        bodyHeight -= el_navbar ? el_navbar[0].clientHeight : 48
+      }
+      // 减去2个padding
+      // bodyHeight -= 20
+      store.dispatch('settings/ChangeHeight', bodyHeight)
+    }
+  }
 }
 </script>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a85509a..9d3b68d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -160,7 +160,7 @@
       default: function() {
         return {
           needIndex: true, // 是否需要序号列
-          border: false // 是否需要上方边框
+          border: true // 是否需要上方边框
         }
       }
     }, // 配置项
diff --git a/src/components/layout/AppContainer.vue b/src/components/layout/AppContainer.vue
index ca5bbc6..f4db10c 100644
--- a/src/components/layout/AppContainer.vue
+++ b/src/components/layout/AppContainer.vue
@@ -1,10 +1,11 @@
 <template>
-  <div :style="{'padding':hasPadding?paddingSize:'0px','background-color':background}" class="app-container">
+  <div :style="{'padding':hasPadding?paddingSize:'0px','background-color':background, minHeight: (bodyHeight-20)+'px' }" class="app-container">
     <slot />
   </div>
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 export default {
   name: 'AppContainer',
   props: {
@@ -20,6 +21,9 @@
       type: String,
       default: '#fff'
     }
+  },
+  computed: {
+    ...mapGetters(['bodyHeight'])
   }
 }
 </script>
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index df2044d..6e0f656 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -1,7 +1,7 @@
 <template>
   <el-container :class="classObj" class="app-wrapper">
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
-    <app-header class="app-header" />
+    <app-header id="app-header" class="app-header" />
     <el-main class="app-body">
       <!--侧边栏-->
       <sidebar class="sidebar-container" />
@@ -10,11 +10,11 @@
         <!--开启固定头部设置-->
         <div v-if="fixedHeader">
           <!--导航(面包屑)-->
-          <navbar />
+          <navbar v-if="breadcrumb" />
           <!--标签栏-->
           <tags-view v-if="needTagsView" />
           <!--主内容包裹在el-scrollbar中-->
-          <el-scrollbar class="no-head-scrollbar">
+          <el-scrollbar :style="{height:bodyHeight+'px'}" class="no-head-scrollbar">
             <app-main />
           </el-scrollbar>
         </div>
@@ -22,7 +22,7 @@
         <div v-else>
           <!--导航，tagsView都包裹在el-scrollbar中-->
           <el-scrollbar class="has-head-scrollbar">
-            <navbar />
+            <navbar v-if="breadcrumb" />
             <tags-view v-if="needTagsView" />
             <app-main />
           </el-scrollbar>
@@ -62,7 +62,9 @@
       device: state => state.app.device,
       showSettings: state => state.settings.showSettings,
       needTagsView: state => state.settings.tagsView,
-      fixedHeader: state => state.settings.fixedHeader
+      fixedHeader: state => state.settings.fixedHeader,
+      breadcrumb: state => state.settings.breadcrumb,
+      bodyHeight: state => state.settings.bodyHeight
     }),
     classObj() {
       return {
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 8018291..e485bb5 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -120,7 +120,7 @@
   }
 }
 .no-head-scrollbar{
-  height: calc(100vh - 138px);
+  //height: calc(100vh - 138px);
 }
 
 .app-body{

diff --git a/package-lock.json b/package-lock.json
index 21d24ea..6bcc20d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,11 +3502,6 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
-    "batch-processor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
-      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
-    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6119,18 +6114,10 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
-    "element-resize-detector": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
-      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
-      "requires": {
-        "batch-processor": "1.0.0"
-      }
-    },
     "element-ui": {
-      "version": "2.15.5",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
-      "integrity": "sha512-B/YCdz2aRY2WnFXzbTRTHPKZHBD/2KV6u88EBnkaARC/Lyxnap+7vpvrcW5UNTyVwjItS5Fj1eQyRy6236lbXg==",
+      "version": "2.15.6",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.6.tgz",
+      "integrity": "sha512-rcYXEKd/j2G0AgficAOk1Zd1AsnHRkhmrK4yLHmNOiimU2JfsywgfKUjMoFuT6pQx0luhovj8lFjpE4Fnt58Iw==",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
diff --git a/package.json b/package.json
index f835d2d..5db2c9b 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.6.5",
-    "element-ui": "^2.15.5",
+    "element-ui": "^2.15.6",
     "js-cookie": "^3.0.0",
     "jsencrypt": "^3.2.1",
     "mockjs": "^1.1.0",
diff --git a/src/App.vue b/src/App.vue
index ec9032c..abeec72 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,11 +1,35 @@
 <template>
-  <div id="app">
+  <div id="app" v-resize="windowResize">
     <router-view />
   </div>
 </template>
 
 <script>
+import { tagsView, breadcrumb } from './settings'
+import store from '@/store'
 export default {
-  name: 'App'
+  name: 'App',
+  mounted() {
+    this.windowResize(window.innerHeight, window.innerWidth)
+  },
+  methods: {
+    // 窗口变化
+    windowResize(height, width) {
+      // 查找header高度
+      const el_header = document.getElementById('app-header')
+      let bodyHeight = height - (el_header ? el_header.clientHeight : 56)
+      if (store.getters.tagsView) {
+        const el_tagsView = document.getElementById('tags-view-container')
+        bodyHeight -= el_tagsView ? el_tagsView.clientHeight : 34
+      }
+      if (breadcrumb) {
+        const el_navbar = document.getElementsByClassName('navbar')
+        bodyHeight -= el_navbar ? el_navbar[0].clientHeight : 48
+      }
+      // 减去2个padding
+      // bodyHeight -= 20
+      store.dispatch('settings/ChangeHeight', bodyHeight)
+    }
+  }
 }
 </script>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a85509a..9d3b68d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -160,7 +160,7 @@
       default: function() {
         return {
           needIndex: true, // 是否需要序号列
-          border: false // 是否需要上方边框
+          border: true // 是否需要上方边框
         }
       }
     }, // 配置项
diff --git a/src/components/layout/AppContainer.vue b/src/components/layout/AppContainer.vue
index ca5bbc6..f4db10c 100644
--- a/src/components/layout/AppContainer.vue
+++ b/src/components/layout/AppContainer.vue
@@ -1,10 +1,11 @@
 <template>
-  <div :style="{'padding':hasPadding?paddingSize:'0px','background-color':background}" class="app-container">
+  <div :style="{'padding':hasPadding?paddingSize:'0px','background-color':background, minHeight: (bodyHeight-20)+'px' }" class="app-container">
     <slot />
   </div>
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 export default {
   name: 'AppContainer',
   props: {
@@ -20,6 +21,9 @@
       type: String,
       default: '#fff'
     }
+  },
+  computed: {
+    ...mapGetters(['bodyHeight'])
   }
 }
 </script>
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index df2044d..6e0f656 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -1,7 +1,7 @@
 <template>
   <el-container :class="classObj" class="app-wrapper">
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
-    <app-header class="app-header" />
+    <app-header id="app-header" class="app-header" />
     <el-main class="app-body">
       <!--侧边栏-->
       <sidebar class="sidebar-container" />
@@ -10,11 +10,11 @@
         <!--开启固定头部设置-->
         <div v-if="fixedHeader">
           <!--导航(面包屑)-->
-          <navbar />
+          <navbar v-if="breadcrumb" />
           <!--标签栏-->
           <tags-view v-if="needTagsView" />
           <!--主内容包裹在el-scrollbar中-->
-          <el-scrollbar class="no-head-scrollbar">
+          <el-scrollbar :style="{height:bodyHeight+'px'}" class="no-head-scrollbar">
             <app-main />
           </el-scrollbar>
         </div>
@@ -22,7 +22,7 @@
         <div v-else>
           <!--导航，tagsView都包裹在el-scrollbar中-->
           <el-scrollbar class="has-head-scrollbar">
-            <navbar />
+            <navbar v-if="breadcrumb" />
             <tags-view v-if="needTagsView" />
             <app-main />
           </el-scrollbar>
@@ -62,7 +62,9 @@
       device: state => state.app.device,
       showSettings: state => state.settings.showSettings,
       needTagsView: state => state.settings.tagsView,
-      fixedHeader: state => state.settings.fixedHeader
+      fixedHeader: state => state.settings.fixedHeader,
+      breadcrumb: state => state.settings.breadcrumb,
+      bodyHeight: state => state.settings.bodyHeight
     }),
     classObj() {
       return {
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 8018291..e485bb5 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -120,7 +120,7 @@
   }
 }
 .no-head-scrollbar{
-  height: calc(100vh - 138px);
+  //height: calc(100vh - 138px);
 }
 
 .app-body{
diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss
index dfa0193..58e2993 100644
--- a/src/styles/sidebar.scss
+++ b/src/styles/sidebar.scss
@@ -13,11 +13,10 @@
   .sidebar-container {
     transition: width 0.28s;
     width: $sideBarWidth !important;
-    height: 100%;
+    height: calc( 100% - #{$headerHeight} );
     position: fixed;
-    margin-top:$headerHeight;
+    top:$headerHeight;
     font-size: 0px;
-    top: 0;
     bottom: 0;
     left: 0;
     z-index: 1001;

diff --git a/package-lock.json b/package-lock.json
index 21d24ea..6bcc20d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,11 +3502,6 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
-    "batch-processor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
-      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
-    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6119,18 +6114,10 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
-    "element-resize-detector": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
-      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
-      "requires": {
-        "batch-processor": "1.0.0"
-      }
-    },
     "element-ui": {
-      "version": "2.15.5",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
-      "integrity": "sha512-B/YCdz2aRY2WnFXzbTRTHPKZHBD/2KV6u88EBnkaARC/Lyxnap+7vpvrcW5UNTyVwjItS5Fj1eQyRy6236lbXg==",
+      "version": "2.15.6",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.6.tgz",
+      "integrity": "sha512-rcYXEKd/j2G0AgficAOk1Zd1AsnHRkhmrK4yLHmNOiimU2JfsywgfKUjMoFuT6pQx0luhovj8lFjpE4Fnt58Iw==",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
diff --git a/package.json b/package.json
index f835d2d..5db2c9b 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.6.5",
-    "element-ui": "^2.15.5",
+    "element-ui": "^2.15.6",
     "js-cookie": "^3.0.0",
     "jsencrypt": "^3.2.1",
     "mockjs": "^1.1.0",
diff --git a/src/App.vue b/src/App.vue
index ec9032c..abeec72 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,11 +1,35 @@
 <template>
-  <div id="app">
+  <div id="app" v-resize="windowResize">
     <router-view />
   </div>
 </template>
 
 <script>
+import { tagsView, breadcrumb } from './settings'
+import store from '@/store'
 export default {
-  name: 'App'
+  name: 'App',
+  mounted() {
+    this.windowResize(window.innerHeight, window.innerWidth)
+  },
+  methods: {
+    // 窗口变化
+    windowResize(height, width) {
+      // 查找header高度
+      const el_header = document.getElementById('app-header')
+      let bodyHeight = height - (el_header ? el_header.clientHeight : 56)
+      if (store.getters.tagsView) {
+        const el_tagsView = document.getElementById('tags-view-container')
+        bodyHeight -= el_tagsView ? el_tagsView.clientHeight : 34
+      }
+      if (breadcrumb) {
+        const el_navbar = document.getElementsByClassName('navbar')
+        bodyHeight -= el_navbar ? el_navbar[0].clientHeight : 48
+      }
+      // 减去2个padding
+      // bodyHeight -= 20
+      store.dispatch('settings/ChangeHeight', bodyHeight)
+    }
+  }
 }
 </script>
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a85509a..9d3b68d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -160,7 +160,7 @@
       default: function() {
         return {
           needIndex: true, // 是否需要序号列
-          border: false // 是否需要上方边框
+          border: true // 是否需要上方边框
         }
       }
     }, // 配置项
diff --git a/src/components/layout/AppContainer.vue b/src/components/layout/AppContainer.vue
index ca5bbc6..f4db10c 100644
--- a/src/components/layout/AppContainer.vue
+++ b/src/components/layout/AppContainer.vue
@@ -1,10 +1,11 @@
 <template>
-  <div :style="{'padding':hasPadding?paddingSize:'0px','background-color':background}" class="app-container">
+  <div :style="{'padding':hasPadding?paddingSize:'0px','background-color':background, minHeight: (bodyHeight-20)+'px' }" class="app-container">
     <slot />
   </div>
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 export default {
   name: 'AppContainer',
   props: {
@@ -20,6 +21,9 @@
       type: String,
       default: '#fff'
     }
+  },
+  computed: {
+    ...mapGetters(['bodyHeight'])
   }
 }
 </script>
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index df2044d..6e0f656 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -1,7 +1,7 @@
 <template>
   <el-container :class="classObj" class="app-wrapper">
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
-    <app-header class="app-header" />
+    <app-header id="app-header" class="app-header" />
     <el-main class="app-body">
       <!--侧边栏-->
       <sidebar class="sidebar-container" />
@@ -10,11 +10,11 @@
         <!--开启固定头部设置-->
         <div v-if="fixedHeader">
           <!--导航(面包屑)-->
-          <navbar />
+          <navbar v-if="breadcrumb" />
           <!--标签栏-->
           <tags-view v-if="needTagsView" />
           <!--主内容包裹在el-scrollbar中-->
-          <el-scrollbar class="no-head-scrollbar">
+          <el-scrollbar :style="{height:bodyHeight+'px'}" class="no-head-scrollbar">
             <app-main />
           </el-scrollbar>
         </div>
@@ -22,7 +22,7 @@
         <div v-else>
           <!--导航，tagsView都包裹在el-scrollbar中-->
           <el-scrollbar class="has-head-scrollbar">
-            <navbar />
+            <navbar v-if="breadcrumb" />
             <tags-view v-if="needTagsView" />
             <app-main />
           </el-scrollbar>
@@ -62,7 +62,9 @@
       device: state => state.app.device,
       showSettings: state => state.settings.showSettings,
       needTagsView: state => state.settings.tagsView,
-      fixedHeader: state => state.settings.fixedHeader
+      fixedHeader: state => state.settings.fixedHeader,
+      breadcrumb: state => state.settings.breadcrumb,
+      bodyHeight: state => state.settings.bodyHeight
     }),
     classObj() {
       return {
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 8018291..e485bb5 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -120,7 +120,7 @@
   }
 }
 .no-head-scrollbar{
-  height: calc(100vh - 138px);
+  //height: calc(100vh - 138px);
 }
 
 .app-body{
diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss
index dfa0193..58e2993 100644
--- a/src/styles/sidebar.scss
+++ b/src/styles/sidebar.scss
@@ -13,11 +13,10 @@
   .sidebar-container {
     transition: width 0.28s;
     width: $sideBarWidth !important;
-    height: 100%;
+    height: calc( 100% - #{$headerHeight} );
     position: fixed;
-    margin-top:$headerHeight;
+    top:$headerHeight;
     font-size: 0px;
-    top: 0;
     bottom: 0;
     left: 0;
     z-index: 1001;
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index 0a5a765..8bbac98 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -8,7 +8,7 @@
             <div slot="header" class="clearfix">
               <span>组织机构</span>
             </div>
-            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+            <el-scrollbar ref="deptScroll" :style="{'height':(bodyHeight-116)+'px'}" class="user-dept-scroll">
               <el-tree
                 ref="tree2"
                 v-loading="treeLoading"
@@ -107,6 +107,7 @@
 import { getUserList, delUser, freezeUser, unfreezeUser, resetPwd } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import { mapGetters } from 'vuex'
 
 export default {
   name: 'ListUser',
@@ -164,6 +165,9 @@
       expandNodeClick: false
     }
   },
+  computed:{
+    ...mapGetters(['bodyHeight'])
+  },
   watch: {
     registerTime(val) {
       if (val && val.length > 0) {