diff --git a/src/App.vue b/src/App.vue
index 5cb69ab..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,36 +1,11 @@
 <template>
-  <div v-resize="windowResize" id="app">
+  <div id="app">
     <router-view />
   </div>
 </template>
 
 <script>
-import { breadcrumb } from './settings'
-import store from '@/store'
 export default {
-  name: 'App',
-  mounted() {
-    this.windowResize(window.innerHeight, window.innerWidth)
-  },
-  methods: {
-    // 窗口变化
-    windowResize(height, width) {
-      console.log(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)
-    }
-  }
+  name: 'App'
 }
 </script>

diff --git a/src/App.vue b/src/App.vue
index 5cb69ab..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,36 +1,11 @@
 <template>
-  <div v-resize="windowResize" id="app">
+  <div id="app">
     <router-view />
   </div>
 </template>
 
 <script>
-import { breadcrumb } from './settings'
-import store from '@/store'
 export default {
-  name: 'App',
-  mounted() {
-    this.windowResize(window.innerHeight, window.innerWidth)
-  },
-  methods: {
-    // 窗口变化
-    windowResize(height, width) {
-      console.log(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)
-    }
-  }
+  name: 'App'
 }
 </script>
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
deleted file mode 100644
index a3f9955..0000000
--- a/src/directive/resize/resize.js
+++ /dev/null
@@ -1,21 +0,0 @@
-export default {
-  bind(el, binding, value) {
-  },
-  inserted(el, binding) {
-    // 将回调函数从参数binding中取出来
-    const callback = binding.value
-    function documentHandler() {
-      const bodyHeight = window.innerHeight
-      const bodyWidth = window.innerWidth
-      console.log('window resize:', bodyHeight, bodyWidth)
-      callback(bodyHeight, bodyWidth)
-    }
-    el.__vueWindowResize__ = documentHandler
-    // 监听浏览器的resize事件
-    window.addEventListener('resize', documentHandler)
-  },
-  unbind(el, binding, vnode) {
-    window.removeEventListener('onresize', el.__vueWindowResize__)
-    delete el.__vueWindowResize__
-  }
-}

diff --git a/src/App.vue b/src/App.vue
index 5cb69ab..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,36 +1,11 @@
 <template>
-  <div v-resize="windowResize" id="app">
+  <div id="app">
     <router-view />
   </div>
 </template>
 
 <script>
-import { breadcrumb } from './settings'
-import store from '@/store'
 export default {
-  name: 'App',
-  mounted() {
-    this.windowResize(window.innerHeight, window.innerWidth)
-  },
-  methods: {
-    // 窗口变化
-    windowResize(height, width) {
-      console.log(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)
-    }
-  }
+  name: 'App'
 }
 </script>
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
deleted file mode 100644
index a3f9955..0000000
--- a/src/directive/resize/resize.js
+++ /dev/null
@@ -1,21 +0,0 @@
-export default {
-  bind(el, binding, value) {
-  },
-  inserted(el, binding) {
-    // 将回调函数从参数binding中取出来
-    const callback = binding.value
-    function documentHandler() {
-      const bodyHeight = window.innerHeight
-      const bodyWidth = window.innerWidth
-      console.log('window resize:', bodyHeight, bodyWidth)
-      callback(bodyHeight, bodyWidth)
-    }
-    el.__vueWindowResize__ = documentHandler
-    // 监听浏览器的resize事件
-    window.addEventListener('resize', documentHandler)
-  },
-  unbind(el, binding, vnode) {
-    window.removeEventListener('onresize', el.__vueWindowResize__)
-    delete el.__vueWindowResize__
-  }
-}
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index 6db1e13..37011d7 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -14,7 +14,7 @@
           <!--标签栏-->
           <tags-view v-if="needTagsView" />
           <!--主内容包裹在el-scrollbar中-->
-          <el-scrollbar :style="{height:bodyHeight+'px'}" class="no-head-scrollbar">
+          <el-scrollbar class="no-head-scrollbar">
             <app-main/>
           </el-scrollbar>
         </div>
@@ -62,8 +62,7 @@
       device: state => state.app.device,
       showSettings: state => state.settings.showSettings,
       needTagsView: state => state.settings.tagsView,
-      fixedHeader: state => state.settings.fixedHeader,
-      bodyHeight: state => state.settings.bodyHeight
+      fixedHeader: state => state.settings.fixedHeader
     }),
     classObj() {
       return {

diff --git a/src/App.vue b/src/App.vue
index 5cb69ab..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,36 +1,11 @@
 <template>
-  <div v-resize="windowResize" id="app">
+  <div id="app">
     <router-view />
   </div>
 </template>
 
 <script>
-import { breadcrumb } from './settings'
-import store from '@/store'
 export default {
-  name: 'App',
-  mounted() {
-    this.windowResize(window.innerHeight, window.innerWidth)
-  },
-  methods: {
-    // 窗口变化
-    windowResize(height, width) {
-      console.log(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)
-    }
-  }
+  name: 'App'
 }
 </script>
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
deleted file mode 100644
index a3f9955..0000000
--- a/src/directive/resize/resize.js
+++ /dev/null
@@ -1,21 +0,0 @@
-export default {
-  bind(el, binding, value) {
-  },
-  inserted(el, binding) {
-    // 将回调函数从参数binding中取出来
-    const callback = binding.value
-    function documentHandler() {
-      const bodyHeight = window.innerHeight
-      const bodyWidth = window.innerWidth
-      console.log('window resize:', bodyHeight, bodyWidth)
-      callback(bodyHeight, bodyWidth)
-    }
-    el.__vueWindowResize__ = documentHandler
-    // 监听浏览器的resize事件
-    window.addEventListener('resize', documentHandler)
-  },
-  unbind(el, binding, vnode) {
-    window.removeEventListener('onresize', el.__vueWindowResize__)
-    delete el.__vueWindowResize__
-  }
-}
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index 6db1e13..37011d7 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -14,7 +14,7 @@
           <!--标签栏-->
           <tags-view v-if="needTagsView" />
           <!--主内容包裹在el-scrollbar中-->
-          <el-scrollbar :style="{height:bodyHeight+'px'}" class="no-head-scrollbar">
+          <el-scrollbar class="no-head-scrollbar">
             <app-main/>
           </el-scrollbar>
         </div>
@@ -62,8 +62,7 @@
       device: state => state.app.device,
       showSettings: state => state.settings.showSettings,
       needTagsView: state => state.settings.tagsView,
-      fixedHeader: state => state.settings.fixedHeader,
-      bodyHeight: state => state.settings.bodyHeight
+      fixedHeader: state => state.settings.fixedHeader
     }),
     classObj() {
       return {
diff --git a/src/main.js b/src/main.js
index ac6a5db..74decb6 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,9 +37,6 @@
 Vue.component('search-area', SearchArea)
 Vue.component('search-item', SearchItem)
 
-import resize from '@/directive/resize/resize' // resize directive
-Vue.directive('resize', resize)
-
 // 加载leaflet的css
 import 'leaflet/dist/leaflet.css'
 import 'leaflet-draw/dist/leaflet.draw.css'

diff --git a/src/App.vue b/src/App.vue
index 5cb69ab..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,36 +1,11 @@
 <template>
-  <div v-resize="windowResize" id="app">
+  <div id="app">
     <router-view />
   </div>
 </template>
 
 <script>
-import { breadcrumb } from './settings'
-import store from '@/store'
 export default {
-  name: 'App',
-  mounted() {
-    this.windowResize(window.innerHeight, window.innerWidth)
-  },
-  methods: {
-    // 窗口变化
-    windowResize(height, width) {
-      console.log(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)
-    }
-  }
+  name: 'App'
 }
 </script>
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
deleted file mode 100644
index a3f9955..0000000
--- a/src/directive/resize/resize.js
+++ /dev/null
@@ -1,21 +0,0 @@
-export default {
-  bind(el, binding, value) {
-  },
-  inserted(el, binding) {
-    // 将回调函数从参数binding中取出来
-    const callback = binding.value
-    function documentHandler() {
-      const bodyHeight = window.innerHeight
-      const bodyWidth = window.innerWidth
-      console.log('window resize:', bodyHeight, bodyWidth)
-      callback(bodyHeight, bodyWidth)
-    }
-    el.__vueWindowResize__ = documentHandler
-    // 监听浏览器的resize事件
-    window.addEventListener('resize', documentHandler)
-  },
-  unbind(el, binding, vnode) {
-    window.removeEventListener('onresize', el.__vueWindowResize__)
-    delete el.__vueWindowResize__
-  }
-}
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index 6db1e13..37011d7 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -14,7 +14,7 @@
           <!--标签栏-->
           <tags-view v-if="needTagsView" />
           <!--主内容包裹在el-scrollbar中-->
-          <el-scrollbar :style="{height:bodyHeight+'px'}" class="no-head-scrollbar">
+          <el-scrollbar class="no-head-scrollbar">
             <app-main/>
           </el-scrollbar>
         </div>
@@ -62,8 +62,7 @@
       device: state => state.app.device,
       showSettings: state => state.settings.showSettings,
       needTagsView: state => state.settings.tagsView,
-      fixedHeader: state => state.settings.fixedHeader,
-      bodyHeight: state => state.settings.bodyHeight
+      fixedHeader: state => state.settings.fixedHeader
     }),
     classObj() {
       return {
diff --git a/src/main.js b/src/main.js
index ac6a5db..74decb6 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,9 +37,6 @@
 Vue.component('search-area', SearchArea)
 Vue.component('search-item', SearchItem)
 
-import resize from '@/directive/resize/resize' // resize directive
-Vue.directive('resize', resize)
-
 // 加载leaflet的css
 import 'leaflet/dist/leaflet.css'
 import 'leaflet-draw/dist/leaflet.draw.css'
diff --git a/src/store/getters.js b/src/store/getters.js
index b5bf7c2..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -25,7 +25,6 @@
   wellTypes: state => state.user.wellTypes, // 用户支持的闸井类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
-  area: state => state.user.area, // 用户所在区域
-  bodyHeight: state => state.settings.bodyHeight // 内容高度
+  area: state => state.user.area // 用户所在区域
 }
 export default getters

diff --git a/src/App.vue b/src/App.vue
index 5cb69ab..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,36 +1,11 @@
 <template>
-  <div v-resize="windowResize" id="app">
+  <div id="app">
     <router-view />
   </div>
 </template>
 
 <script>
-import { breadcrumb } from './settings'
-import store from '@/store'
 export default {
-  name: 'App',
-  mounted() {
-    this.windowResize(window.innerHeight, window.innerWidth)
-  },
-  methods: {
-    // 窗口变化
-    windowResize(height, width) {
-      console.log(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)
-    }
-  }
+  name: 'App'
 }
 </script>
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
deleted file mode 100644
index a3f9955..0000000
--- a/src/directive/resize/resize.js
+++ /dev/null
@@ -1,21 +0,0 @@
-export default {
-  bind(el, binding, value) {
-  },
-  inserted(el, binding) {
-    // 将回调函数从参数binding中取出来
-    const callback = binding.value
-    function documentHandler() {
-      const bodyHeight = window.innerHeight
-      const bodyWidth = window.innerWidth
-      console.log('window resize:', bodyHeight, bodyWidth)
-      callback(bodyHeight, bodyWidth)
-    }
-    el.__vueWindowResize__ = documentHandler
-    // 监听浏览器的resize事件
-    window.addEventListener('resize', documentHandler)
-  },
-  unbind(el, binding, vnode) {
-    window.removeEventListener('onresize', el.__vueWindowResize__)
-    delete el.__vueWindowResize__
-  }
-}
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index 6db1e13..37011d7 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -14,7 +14,7 @@
           <!--标签栏-->
           <tags-view v-if="needTagsView" />
           <!--主内容包裹在el-scrollbar中-->
-          <el-scrollbar :style="{height:bodyHeight+'px'}" class="no-head-scrollbar">
+          <el-scrollbar class="no-head-scrollbar">
             <app-main/>
           </el-scrollbar>
         </div>
@@ -62,8 +62,7 @@
       device: state => state.app.device,
       showSettings: state => state.settings.showSettings,
       needTagsView: state => state.settings.tagsView,
-      fixedHeader: state => state.settings.fixedHeader,
-      bodyHeight: state => state.settings.bodyHeight
+      fixedHeader: state => state.settings.fixedHeader
     }),
     classObj() {
       return {
diff --git a/src/main.js b/src/main.js
index ac6a5db..74decb6 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,9 +37,6 @@
 Vue.component('search-area', SearchArea)
 Vue.component('search-item', SearchItem)
 
-import resize from '@/directive/resize/resize' // resize directive
-Vue.directive('resize', resize)
-
 // 加载leaflet的css
 import 'leaflet/dist/leaflet.css'
 import 'leaflet-draw/dist/leaflet.draw.css'
diff --git a/src/store/getters.js b/src/store/getters.js
index b5bf7c2..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -25,7 +25,6 @@
   wellTypes: state => state.user.wellTypes, // 用户支持的闸井类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
-  area: state => state.user.area, // 用户所在区域
-  bodyHeight: state => state.settings.bodyHeight // 内容高度
+  area: state => state.user.area // 用户所在区域
 }
 export default getters
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index fe92b84..cfc94a8 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -8,8 +8,7 @@
   showSettings: showSettings, // 是否显示设置按钮
   tagsView: tagsView, // 是否显示tagsView
   fixedHeader: fixedHeader, // 是否固定面包屑
-  sidebarLogo: sidebarLogo, // 是否显示logo
-  bodyHeight: '' // 内容高度
+  sidebarLogo: sidebarLogo // 是否显示logo
 }
 
 const mutations = {
@@ -17,10 +16,6 @@
     if (state.hasOwnProperty(key)) {
       state[key] = value
     }
-  },
-  SET_BODY_HEIGHT: (state, height) => {
-    state.bodyHeight = height
-    console.log('bodyHeight', height)
   }
 }
 

diff --git a/src/App.vue b/src/App.vue
index 5cb69ab..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,36 +1,11 @@
 <template>
-  <div v-resize="windowResize" id="app">
+  <div id="app">
     <router-view />
   </div>
 </template>
 
 <script>
-import { breadcrumb } from './settings'
-import store from '@/store'
 export default {
-  name: 'App',
-  mounted() {
-    this.windowResize(window.innerHeight, window.innerWidth)
-  },
-  methods: {
-    // 窗口变化
-    windowResize(height, width) {
-      console.log(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)
-    }
-  }
+  name: 'App'
 }
 </script>
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
deleted file mode 100644
index a3f9955..0000000
--- a/src/directive/resize/resize.js
+++ /dev/null
@@ -1,21 +0,0 @@
-export default {
-  bind(el, binding, value) {
-  },
-  inserted(el, binding) {
-    // 将回调函数从参数binding中取出来
-    const callback = binding.value
-    function documentHandler() {
-      const bodyHeight = window.innerHeight
-      const bodyWidth = window.innerWidth
-      console.log('window resize:', bodyHeight, bodyWidth)
-      callback(bodyHeight, bodyWidth)
-    }
-    el.__vueWindowResize__ = documentHandler
-    // 监听浏览器的resize事件
-    window.addEventListener('resize', documentHandler)
-  },
-  unbind(el, binding, vnode) {
-    window.removeEventListener('onresize', el.__vueWindowResize__)
-    delete el.__vueWindowResize__
-  }
-}
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index 6db1e13..37011d7 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -14,7 +14,7 @@
           <!--标签栏-->
           <tags-view v-if="needTagsView" />
           <!--主内容包裹在el-scrollbar中-->
-          <el-scrollbar :style="{height:bodyHeight+'px'}" class="no-head-scrollbar">
+          <el-scrollbar class="no-head-scrollbar">
             <app-main/>
           </el-scrollbar>
         </div>
@@ -62,8 +62,7 @@
       device: state => state.app.device,
       showSettings: state => state.settings.showSettings,
       needTagsView: state => state.settings.tagsView,
-      fixedHeader: state => state.settings.fixedHeader,
-      bodyHeight: state => state.settings.bodyHeight
+      fixedHeader: state => state.settings.fixedHeader
     }),
     classObj() {
       return {
diff --git a/src/main.js b/src/main.js
index ac6a5db..74decb6 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,9 +37,6 @@
 Vue.component('search-area', SearchArea)
 Vue.component('search-item', SearchItem)
 
-import resize from '@/directive/resize/resize' // resize directive
-Vue.directive('resize', resize)
-
 // 加载leaflet的css
 import 'leaflet/dist/leaflet.css'
 import 'leaflet-draw/dist/leaflet.draw.css'
diff --git a/src/store/getters.js b/src/store/getters.js
index b5bf7c2..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -25,7 +25,6 @@
   wellTypes: state => state.user.wellTypes, // 用户支持的闸井类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
-  area: state => state.user.area, // 用户所在区域
-  bodyHeight: state => state.settings.bodyHeight // 内容高度
+  area: state => state.user.area // 用户所在区域
 }
 export default getters
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index fe92b84..cfc94a8 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -8,8 +8,7 @@
   showSettings: showSettings, // 是否显示设置按钮
   tagsView: tagsView, // 是否显示tagsView
   fixedHeader: fixedHeader, // 是否固定面包屑
-  sidebarLogo: sidebarLogo, // 是否显示logo
-  bodyHeight: '' // 内容高度
+  sidebarLogo: sidebarLogo // 是否显示logo
 }
 
 const mutations = {
@@ -17,10 +16,6 @@
     if (state.hasOwnProperty(key)) {
       state[key] = value
     }
-  },
-  SET_BODY_HEIGHT: (state, height) => {
-    state.bodyHeight = height
-    console.log('bodyHeight', height)
   }
 }
 
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
index 6f2c538..c7cfc9c 100644
--- a/src/views/gasOverview/gasOverviewSimple.vue
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -69,7 +69,7 @@
         <el-checkbox v-for="item in deviceTypeList" :label="item.name" :key="item.value" :value="item.value" style="display:block;">{{ item.name }}</el-checkbox>
       </el-checkbox-group>
     </div>
-    <div id="mars3dContainer" :style="{height:(bodyHeight-200)+'px'}" class="mars3d-container"/>
+    <div id="mars3dContainer" :style="{'height':(screenHeight-160)+'px'}" class="mars3d-container"/>
     <div class="cover"/>
   </div>
 </template>
@@ -77,7 +77,7 @@
 <script>
 import axios from 'axios'
 import { mapGetters } from 'vuex'
-import { getAlarmsNow, getMapping } from '@/api/gasOverview'
+import { getAlarmsNow, getMapping } from '@/api/overview'
 import { getDeviceType } from '@/api/device'
 
 import 'mars3d/dist/mars3d.css'
@@ -105,6 +105,7 @@
   components: {},
   data() {
     return {
+      screenHeight: null,
       checkedCities: [],
       left: '',
       mapMark: '-',
@@ -171,10 +172,17 @@
   },
   computed: {
     ...mapGetters([
-      'bodyHeight'
+      'needRefresh'
     ])
   },
   watch: {
+    screenHeight: {
+      handler: function(val) {
+        console.log(val)
+      },
+      immediate: true,
+      deep: true
+    },
     sceneMode(val) {
       if (val) {
         // 深蓝
@@ -219,6 +227,12 @@
     this.fetchDeviceType()// 获取设备列表
   },
   mounted() {
+    this.screenHeight = document.body.clientHeight
+    window.onresize = () => {
+      return (() => {
+        this.screenHeight = document.body.clientHeight
+      })()
+    }
     this.initMars3D()
   },
   methods: {
@@ -479,7 +493,7 @@
                 scale: 1,
                 horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
                 verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-                scaleByDistance: new Cesium.NearFarScalar(10, 1, 1800, 0.3)
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
               },
               popup: `远程水表<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
             }))
@@ -518,7 +532,7 @@
                 scale: 1,
                 horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
                 verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-                scaleByDistance: new Cesium.NearFarScalar(10, 1, 1600, 0.3)
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
               },
               popup: `腐蚀速率监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
             }))
@@ -557,7 +571,7 @@
                 scale: 1,
                 horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
                 verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-                scaleByDistance: new Cesium.NearFarScalar(10, 1, 1400, 0.3)
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
               },
               popup: `气体流量计<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
             }))
@@ -596,7 +610,7 @@
                 scale: 1,
                 horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
                 verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-                scaleByDistance: new Cesium.NearFarScalar(10, 1, 1200, 0.3)
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
               },
               popup: `气体泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
             }))
@@ -635,7 +649,7 @@
                 scale: 1,
                 horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
                 verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-                scaleByDistance: new Cesium.NearFarScalar(10, 1, 1000, 0.3)
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
               },
               popup: `供水泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
             }))