diff --git a/config/dev.env.js b/config/dev.env.js
index b654c4c..95e311a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,7 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://111.198.10.15:12204"'
+  // BASE_API: '"http://111.198.10.15:12204"'
+  BASE_API: '"http://111.198.10.15:11409"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'

diff --git a/config/dev.env.js b/config/dev.env.js
index b654c4c..95e311a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,7 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://111.198.10.15:12204"'
+  // BASE_API: '"http://111.198.10.15:12204"'
+  BASE_API: '"http://111.198.10.15:11409"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/mock/system/area.js b/mock/system/area.js
index 3495001..dd8e88e 100644
--- a/mock/system/area.js
+++ b/mock/system/area.js
@@ -79,5 +79,52 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/levelType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '省级',
+            'id': '166',
+            'value': '1'
+          },
+          {
+            'name': '市级',
+            'id': '167',
+            'value': '2'
+          },
+          {
+            'name': '区级',
+            'id': '168',
+            'value': '3'
+          },
+          {
+            'name': '街道',
+            'id': '169',
+            'value': '4'
+          },
+          {
+            'name': '社区',
+            'id': '170',
+            'value': '5'
+          },
+          {
+            'name': '网格',
+            'id': '171',
+            'value': '6'
+          },
+          {
+            'name': '责任网格',
+            'id': '172',
+            'value': '7'
+          }
+        ]
+      }
+    }
   }
 ]

diff --git a/config/dev.env.js b/config/dev.env.js
index b654c4c..95e311a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,7 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://111.198.10.15:12204"'
+  // BASE_API: '"http://111.198.10.15:12204"'
+  BASE_API: '"http://111.198.10.15:11409"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/mock/system/area.js b/mock/system/area.js
index 3495001..dd8e88e 100644
--- a/mock/system/area.js
+++ b/mock/system/area.js
@@ -79,5 +79,52 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/levelType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '省级',
+            'id': '166',
+            'value': '1'
+          },
+          {
+            'name': '市级',
+            'id': '167',
+            'value': '2'
+          },
+          {
+            'name': '区级',
+            'id': '168',
+            'value': '3'
+          },
+          {
+            'name': '街道',
+            'id': '169',
+            'value': '4'
+          },
+          {
+            'name': '社区',
+            'id': '170',
+            'value': '5'
+          },
+          {
+            'name': '网格',
+            'id': '171',
+            'value': '6'
+          },
+          {
+            'name': '责任网格',
+            'id': '172',
+            'value': '7'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f17c427 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -176,5 +176,32 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/dataScopeType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '全部',
+            'id': '55',
+            'value': '03'
+          },
+          {
+            'name': '本部门',
+            'id': '56',
+            'value': '04'
+          },
+          {
+            'name': '自定义',
+            'id': '57',
+            'value': '04'
+          }
+        ]
+      }
+    }
   }
 ]

diff --git a/config/dev.env.js b/config/dev.env.js
index b654c4c..95e311a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,7 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://111.198.10.15:12204"'
+  // BASE_API: '"http://111.198.10.15:12204"'
+  BASE_API: '"http://111.198.10.15:11409"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/mock/system/area.js b/mock/system/area.js
index 3495001..dd8e88e 100644
--- a/mock/system/area.js
+++ b/mock/system/area.js
@@ -79,5 +79,52 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/levelType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '省级',
+            'id': '166',
+            'value': '1'
+          },
+          {
+            'name': '市级',
+            'id': '167',
+            'value': '2'
+          },
+          {
+            'name': '区级',
+            'id': '168',
+            'value': '3'
+          },
+          {
+            'name': '街道',
+            'id': '169',
+            'value': '4'
+          },
+          {
+            'name': '社区',
+            'id': '170',
+            'value': '5'
+          },
+          {
+            'name': '网格',
+            'id': '171',
+            'value': '6'
+          },
+          {
+            'name': '责任网格',
+            'id': '172',
+            'value': '7'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f17c427 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -176,5 +176,32 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/dataScopeType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '全部',
+            'id': '55',
+            'value': '03'
+          },
+          {
+            'name': '本部门',
+            'id': '56',
+            'value': '04'
+          },
+          {
+            'name': '自定义',
+            'id': '57',
+            'value': '04'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/src/main.js b/src/main.js
index 5630ee7..ae15138 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
  * it will intercept your request, so you won't see the request in the network.
  * If you remove `../mock` it will automatically request easy-mock data.
  */
-// import './../mock' // simulation data
+import './../mock' // simulation data
 // require('./../mock')
 // 兼容IE11
 import 'babel-polyfill'

diff --git a/config/dev.env.js b/config/dev.env.js
index b654c4c..95e311a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,7 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://111.198.10.15:12204"'
+  // BASE_API: '"http://111.198.10.15:12204"'
+  BASE_API: '"http://111.198.10.15:11409"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/mock/system/area.js b/mock/system/area.js
index 3495001..dd8e88e 100644
--- a/mock/system/area.js
+++ b/mock/system/area.js
@@ -79,5 +79,52 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/levelType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '省级',
+            'id': '166',
+            'value': '1'
+          },
+          {
+            'name': '市级',
+            'id': '167',
+            'value': '2'
+          },
+          {
+            'name': '区级',
+            'id': '168',
+            'value': '3'
+          },
+          {
+            'name': '街道',
+            'id': '169',
+            'value': '4'
+          },
+          {
+            'name': '社区',
+            'id': '170',
+            'value': '5'
+          },
+          {
+            'name': '网格',
+            'id': '171',
+            'value': '6'
+          },
+          {
+            'name': '责任网格',
+            'id': '172',
+            'value': '7'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f17c427 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -176,5 +176,32 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/dataScopeType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '全部',
+            'id': '55',
+            'value': '03'
+          },
+          {
+            'name': '本部门',
+            'id': '56',
+            'value': '04'
+          },
+          {
+            'name': '自定义',
+            'id': '57',
+            'value': '04'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/src/main.js b/src/main.js
index 5630ee7..ae15138 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
  * it will intercept your request, so you won't see the request in the network.
  * If you remove `../mock` it will automatically request easy-mock data.
  */
-// import './../mock' // simulation data
+import './../mock' // simulation data
 // require('./../mock')
 // 兼容IE11
 import 'babel-polyfill'
diff --git a/src/settings.js b/src/settings.js
index b8159bf..b568ce0 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: false,
+  showSettings: true,
 
   /**
    * @type {boolean} true | false

diff --git a/config/dev.env.js b/config/dev.env.js
index b654c4c..95e311a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,7 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://111.198.10.15:12204"'
+  // BASE_API: '"http://111.198.10.15:12204"'
+  BASE_API: '"http://111.198.10.15:11409"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/mock/system/area.js b/mock/system/area.js
index 3495001..dd8e88e 100644
--- a/mock/system/area.js
+++ b/mock/system/area.js
@@ -79,5 +79,52 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/levelType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '省级',
+            'id': '166',
+            'value': '1'
+          },
+          {
+            'name': '市级',
+            'id': '167',
+            'value': '2'
+          },
+          {
+            'name': '区级',
+            'id': '168',
+            'value': '3'
+          },
+          {
+            'name': '街道',
+            'id': '169',
+            'value': '4'
+          },
+          {
+            'name': '社区',
+            'id': '170',
+            'value': '5'
+          },
+          {
+            'name': '网格',
+            'id': '171',
+            'value': '6'
+          },
+          {
+            'name': '责任网格',
+            'id': '172',
+            'value': '7'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f17c427 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -176,5 +176,32 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/dataScopeType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '全部',
+            'id': '55',
+            'value': '03'
+          },
+          {
+            'name': '本部门',
+            'id': '56',
+            'value': '04'
+          },
+          {
+            'name': '自定义',
+            'id': '57',
+            'value': '04'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/src/main.js b/src/main.js
index 5630ee7..ae15138 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
  * it will intercept your request, so you won't see the request in the network.
  * If you remove `../mock` it will automatically request easy-mock data.
  */
-// import './../mock' // simulation data
+import './../mock' // simulation data
 // require('./../mock')
 // 兼容IE11
 import 'babel-polyfill'
diff --git a/src/settings.js b/src/settings.js
index b8159bf..b568ce0 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: false,
+  showSettings: true,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/example/tableExample.vue b/src/views/example/tableExample.vue
index a313e57..9d98bb5 100644
--- a/src/views/example/tableExample.vue
+++ b/src/views/example/tableExample.vue
@@ -145,8 +145,8 @@
           needIndex: false // 是否需要序号列
         },
         toolsOption: {
-          selectColumns: false, // 是否需要筛选列
-          refresh: false // 是否需要刷新按钮
+          selectColumns: true, // 是否需要筛选列
+          refresh: true // 是否需要刷新按钮
         }
       } // 表格属性
     }

diff --git a/config/dev.env.js b/config/dev.env.js
index b654c4c..95e311a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,7 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://111.198.10.15:12204"'
+  // BASE_API: '"http://111.198.10.15:12204"'
+  BASE_API: '"http://111.198.10.15:11409"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/mock/system/area.js b/mock/system/area.js
index 3495001..dd8e88e 100644
--- a/mock/system/area.js
+++ b/mock/system/area.js
@@ -79,5 +79,52 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/levelType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '省级',
+            'id': '166',
+            'value': '1'
+          },
+          {
+            'name': '市级',
+            'id': '167',
+            'value': '2'
+          },
+          {
+            'name': '区级',
+            'id': '168',
+            'value': '3'
+          },
+          {
+            'name': '街道',
+            'id': '169',
+            'value': '4'
+          },
+          {
+            'name': '社区',
+            'id': '170',
+            'value': '5'
+          },
+          {
+            'name': '网格',
+            'id': '171',
+            'value': '6'
+          },
+          {
+            'name': '责任网格',
+            'id': '172',
+            'value': '7'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f17c427 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -176,5 +176,32 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/dataScopeType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '全部',
+            'id': '55',
+            'value': '03'
+          },
+          {
+            'name': '本部门',
+            'id': '56',
+            'value': '04'
+          },
+          {
+            'name': '自定义',
+            'id': '57',
+            'value': '04'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/src/main.js b/src/main.js
index 5630ee7..ae15138 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
  * it will intercept your request, so you won't see the request in the network.
  * If you remove `../mock` it will automatically request easy-mock data.
  */
-// import './../mock' // simulation data
+import './../mock' // simulation data
 // require('./../mock')
 // 兼容IE11
 import 'babel-polyfill'
diff --git a/src/settings.js b/src/settings.js
index b8159bf..b568ce0 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: false,
+  showSettings: true,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/example/tableExample.vue b/src/views/example/tableExample.vue
index a313e57..9d98bb5 100644
--- a/src/views/example/tableExample.vue
+++ b/src/views/example/tableExample.vue
@@ -145,8 +145,8 @@
           needIndex: false // 是否需要序号列
         },
         toolsOption: {
-          selectColumns: false, // 是否需要筛选列
-          refresh: false // 是否需要刷新按钮
+          selectColumns: true, // 是否需要筛选列
+          refresh: true // 是否需要刷新按钮
         }
       } // 表格属性
     }
diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
deleted file mode 100644
index c7b94e7..0000000
--- a/src/views/layout/Layout.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <app-header class="app-header"/>
-    <div class="app-body">
-      <!--侧边栏-->
-      <sidebar class="sidebar-container"/>
-      <!--右半部分-->
-      <div class="main-container">
-        <!--上方导航-->
-        <navbar/>
-        <!--标签栏-->
-        <tags-view/>
-        <!--主页-->
-        <el-scrollbar>
-          <app-main/>
-        </el-scrollbar>
-
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { AppHeader, Navbar, Sidebar, AppMain } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import TagsView from './components/TagsView/index'
-
-export default {
-  name: 'Layout',
-  components: {
-    TagsView,
-    AppHeader,
-    Navbar,
-    Sidebar,
-    AppMain
-  },
-  mixins: [ResizeMixin],
-  computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    device() {
-      return this.$store.state.app.device
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened,
-        withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    }
-  },
-  methods: {
-    handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  @import "src/styles/mixin.scss";
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-    &.mobile.openSidebar{
-      position: fixed;
-      top: 0;
-    }
-  }
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-  .el-scrollbar{
-    height: calc(100vh - 50px);
-  }
-</style>

diff --git a/config/dev.env.js b/config/dev.env.js
index b654c4c..95e311a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,7 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://111.198.10.15:12204"'
+  // BASE_API: '"http://111.198.10.15:12204"'
+  BASE_API: '"http://111.198.10.15:11409"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/mock/system/area.js b/mock/system/area.js
index 3495001..dd8e88e 100644
--- a/mock/system/area.js
+++ b/mock/system/area.js
@@ -79,5 +79,52 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/levelType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '省级',
+            'id': '166',
+            'value': '1'
+          },
+          {
+            'name': '市级',
+            'id': '167',
+            'value': '2'
+          },
+          {
+            'name': '区级',
+            'id': '168',
+            'value': '3'
+          },
+          {
+            'name': '街道',
+            'id': '169',
+            'value': '4'
+          },
+          {
+            'name': '社区',
+            'id': '170',
+            'value': '5'
+          },
+          {
+            'name': '网格',
+            'id': '171',
+            'value': '6'
+          },
+          {
+            'name': '责任网格',
+            'id': '172',
+            'value': '7'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f17c427 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -176,5 +176,32 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/dataScopeType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '全部',
+            'id': '55',
+            'value': '03'
+          },
+          {
+            'name': '本部门',
+            'id': '56',
+            'value': '04'
+          },
+          {
+            'name': '自定义',
+            'id': '57',
+            'value': '04'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/src/main.js b/src/main.js
index 5630ee7..ae15138 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
  * it will intercept your request, so you won't see the request in the network.
  * If you remove `../mock` it will automatically request easy-mock data.
  */
-// import './../mock' // simulation data
+import './../mock' // simulation data
 // require('./../mock')
 // 兼容IE11
 import 'babel-polyfill'
diff --git a/src/settings.js b/src/settings.js
index b8159bf..b568ce0 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: false,
+  showSettings: true,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/example/tableExample.vue b/src/views/example/tableExample.vue
index a313e57..9d98bb5 100644
--- a/src/views/example/tableExample.vue
+++ b/src/views/example/tableExample.vue
@@ -145,8 +145,8 @@
           needIndex: false // 是否需要序号列
         },
         toolsOption: {
-          selectColumns: false, // 是否需要筛选列
-          refresh: false // 是否需要刷新按钮
+          selectColumns: true, // 是否需要筛选列
+          refresh: true // 是否需要刷新按钮
         }
       } // 表格属性
     }
diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
deleted file mode 100644
index c7b94e7..0000000
--- a/src/views/layout/Layout.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <app-header class="app-header"/>
-    <div class="app-body">
-      <!--侧边栏-->
-      <sidebar class="sidebar-container"/>
-      <!--右半部分-->
-      <div class="main-container">
-        <!--上方导航-->
-        <navbar/>
-        <!--标签栏-->
-        <tags-view/>
-        <!--主页-->
-        <el-scrollbar>
-          <app-main/>
-        </el-scrollbar>
-
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { AppHeader, Navbar, Sidebar, AppMain } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import TagsView from './components/TagsView/index'
-
-export default {
-  name: 'Layout',
-  components: {
-    TagsView,
-    AppHeader,
-    Navbar,
-    Sidebar,
-    AppMain
-  },
-  mixins: [ResizeMixin],
-  computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    device() {
-      return this.$store.state.app.device
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened,
-        withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    }
-  },
-  methods: {
-    handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  @import "src/styles/mixin.scss";
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-    &.mobile.openSidebar{
-      position: fixed;
-      top: 0;
-    }
-  }
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-  .el-scrollbar{
-    height: calc(100vh - 50px);
-  }
-</style>
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
deleted file mode 100644
index 6326221..0000000
--- a/src/views/layout/components/AppHeader.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
-    <h3>{{ title }}</h3>
-    <el-dropdown class="avatar-container" trigger="click">
-      <div class="avatar-wrapper">
-        <span style="line-height:50px;">欢迎您，{{ name }}</span>
-        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
-        <i class="el-icon-caret-bottom"/>
-      </div>
-      <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <!--<router-link class="inlineBlock" to="/">-->
-        <!--<el-dropdown-item>-->
-        <!--主页-->
-        <!--</el-dropdown-item>-->
-        <!--</router-link>-->
-        <el-dropdown-item>
-          <span style="display:block;" @click="resetPwd">修改密码</span>
-        </el-dropdown-item>
-        <el-dropdown-item divided>
-          <span style="display:block;" @click="logout">注销</span>
-        </el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
-    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import ResetPwd from '../../system/user/resetPwd'
-import { getProject } from '@/utils/baseConfig'
-
-export default {
-  name: 'AppHeader',
-  components: { ResetPwd },
-  data() {
-    return {
-      title: getProject().title,
-      name: this.$store.getters.name,
-      showSetPwd: false,
-      headerUrl: require('../../../assets/global_images/header.png')// 头部图片
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    },
-    resetPwd() {
-      this.showSetPwd = true
-      this.$refs.retPwd.initDialog(true)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .app-header{
-    height:60px;
-    background-color:#000000;
-    background-repeat: no-repeat;
-    -webkit-background-size: 100% 100%;
-    background-size: 100% 100%;
-    color:white;
-  }
-  h3{
-    margin-left:40px;
-    display: inline-block;
-    float:left;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    float: right;
-    z-index:500;
-    position: fixed;
-    top:5px;
-    right: 35px;
-    .avatar-wrapper {
-      color:#d3dce6;
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        font-size: 12px;
-      }
-    }
-  }
-</style>

diff --git a/config/dev.env.js b/config/dev.env.js
index b654c4c..95e311a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,7 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://111.198.10.15:12204"'
+  // BASE_API: '"http://111.198.10.15:12204"'
+  BASE_API: '"http://111.198.10.15:11409"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/mock/system/area.js b/mock/system/area.js
index 3495001..dd8e88e 100644
--- a/mock/system/area.js
+++ b/mock/system/area.js
@@ -79,5 +79,52 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/levelType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '省级',
+            'id': '166',
+            'value': '1'
+          },
+          {
+            'name': '市级',
+            'id': '167',
+            'value': '2'
+          },
+          {
+            'name': '区级',
+            'id': '168',
+            'value': '3'
+          },
+          {
+            'name': '街道',
+            'id': '169',
+            'value': '4'
+          },
+          {
+            'name': '社区',
+            'id': '170',
+            'value': '5'
+          },
+          {
+            'name': '网格',
+            'id': '171',
+            'value': '6'
+          },
+          {
+            'name': '责任网格',
+            'id': '172',
+            'value': '7'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f17c427 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -176,5 +176,32 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/dataScopeType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '全部',
+            'id': '55',
+            'value': '03'
+          },
+          {
+            'name': '本部门',
+            'id': '56',
+            'value': '04'
+          },
+          {
+            'name': '自定义',
+            'id': '57',
+            'value': '04'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/src/main.js b/src/main.js
index 5630ee7..ae15138 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
  * it will intercept your request, so you won't see the request in the network.
  * If you remove `../mock` it will automatically request easy-mock data.
  */
-// import './../mock' // simulation data
+import './../mock' // simulation data
 // require('./../mock')
 // 兼容IE11
 import 'babel-polyfill'
diff --git a/src/settings.js b/src/settings.js
index b8159bf..b568ce0 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: false,
+  showSettings: true,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/example/tableExample.vue b/src/views/example/tableExample.vue
index a313e57..9d98bb5 100644
--- a/src/views/example/tableExample.vue
+++ b/src/views/example/tableExample.vue
@@ -145,8 +145,8 @@
           needIndex: false // 是否需要序号列
         },
         toolsOption: {
-          selectColumns: false, // 是否需要筛选列
-          refresh: false // 是否需要刷新按钮
+          selectColumns: true, // 是否需要筛选列
+          refresh: true // 是否需要刷新按钮
         }
       } // 表格属性
     }
diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
deleted file mode 100644
index c7b94e7..0000000
--- a/src/views/layout/Layout.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <app-header class="app-header"/>
-    <div class="app-body">
-      <!--侧边栏-->
-      <sidebar class="sidebar-container"/>
-      <!--右半部分-->
-      <div class="main-container">
-        <!--上方导航-->
-        <navbar/>
-        <!--标签栏-->
-        <tags-view/>
-        <!--主页-->
-        <el-scrollbar>
-          <app-main/>
-        </el-scrollbar>
-
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { AppHeader, Navbar, Sidebar, AppMain } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import TagsView from './components/TagsView/index'
-
-export default {
-  name: 'Layout',
-  components: {
-    TagsView,
-    AppHeader,
-    Navbar,
-    Sidebar,
-    AppMain
-  },
-  mixins: [ResizeMixin],
-  computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    device() {
-      return this.$store.state.app.device
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened,
-        withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    }
-  },
-  methods: {
-    handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  @import "src/styles/mixin.scss";
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-    &.mobile.openSidebar{
-      position: fixed;
-      top: 0;
-    }
-  }
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-  .el-scrollbar{
-    height: calc(100vh - 50px);
-  }
-</style>
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
deleted file mode 100644
index 6326221..0000000
--- a/src/views/layout/components/AppHeader.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
-    <h3>{{ title }}</h3>
-    <el-dropdown class="avatar-container" trigger="click">
-      <div class="avatar-wrapper">
-        <span style="line-height:50px;">欢迎您，{{ name }}</span>
-        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
-        <i class="el-icon-caret-bottom"/>
-      </div>
-      <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <!--<router-link class="inlineBlock" to="/">-->
-        <!--<el-dropdown-item>-->
-        <!--主页-->
-        <!--</el-dropdown-item>-->
-        <!--</router-link>-->
-        <el-dropdown-item>
-          <span style="display:block;" @click="resetPwd">修改密码</span>
-        </el-dropdown-item>
-        <el-dropdown-item divided>
-          <span style="display:block;" @click="logout">注销</span>
-        </el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
-    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import ResetPwd from '../../system/user/resetPwd'
-import { getProject } from '@/utils/baseConfig'
-
-export default {
-  name: 'AppHeader',
-  components: { ResetPwd },
-  data() {
-    return {
-      title: getProject().title,
-      name: this.$store.getters.name,
-      showSetPwd: false,
-      headerUrl: require('../../../assets/global_images/header.png')// 头部图片
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    },
-    resetPwd() {
-      this.showSetPwd = true
-      this.$refs.retPwd.initDialog(true)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .app-header{
-    height:60px;
-    background-color:#000000;
-    background-repeat: no-repeat;
-    -webkit-background-size: 100% 100%;
-    background-size: 100% 100%;
-    color:white;
-  }
-  h3{
-    margin-left:40px;
-    display: inline-block;
-    float:left;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    float: right;
-    z-index:500;
-    position: fixed;
-    top:5px;
-    right: 35px;
-    .avatar-wrapper {
-      color:#d3dce6;
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        font-size: 12px;
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
deleted file mode 100644
index 2ea268e..0000000
--- a/src/views/layout/components/AppMain.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <section class="app-main">
-    <transition name="fade-transform" mode="out-in">
-      <!-- or name="fade" -->
-      <!-- <router-view :key="key"></router-view> -->
-      <div>
-        <keep-alive>
-          <router-view v-if="$route.meta.keepAlive" :key="key"/>
-        </keep-alive>
-        <router-view v-if="!$route.meta.keepAlive" :key="key"/>
-      </div>
-    </transition>
-  </section>
-</template>
-
-<script>
-export default {
-  name: 'AppMain',
-  computed: {
-    key() {
-      if (this.$route.meta.keepAlive) {
-        return this.$route.name !== undefined ? this.$route.name : this.$route
-      } else {
-        return this.$route.name !== undefined ? this.$route.name + new Date() : this.$route + new Date()
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.app-main {
-  /*50 = navbar  */
-  /*min-height: calc(100vh - 50px);*/
-  position: relative;
-  overflow: hidden;
-}
-</style>

diff --git a/config/dev.env.js b/config/dev.env.js
index b654c4c..95e311a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,7 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://111.198.10.15:12204"'
+  // BASE_API: '"http://111.198.10.15:12204"'
+  BASE_API: '"http://111.198.10.15:11409"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/mock/system/area.js b/mock/system/area.js
index 3495001..dd8e88e 100644
--- a/mock/system/area.js
+++ b/mock/system/area.js
@@ -79,5 +79,52 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/levelType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '省级',
+            'id': '166',
+            'value': '1'
+          },
+          {
+            'name': '市级',
+            'id': '167',
+            'value': '2'
+          },
+          {
+            'name': '区级',
+            'id': '168',
+            'value': '3'
+          },
+          {
+            'name': '街道',
+            'id': '169',
+            'value': '4'
+          },
+          {
+            'name': '社区',
+            'id': '170',
+            'value': '5'
+          },
+          {
+            'name': '网格',
+            'id': '171',
+            'value': '6'
+          },
+          {
+            'name': '责任网格',
+            'id': '172',
+            'value': '7'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f17c427 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -176,5 +176,32 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/dataScopeType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '全部',
+            'id': '55',
+            'value': '03'
+          },
+          {
+            'name': '本部门',
+            'id': '56',
+            'value': '04'
+          },
+          {
+            'name': '自定义',
+            'id': '57',
+            'value': '04'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/src/main.js b/src/main.js
index 5630ee7..ae15138 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
  * it will intercept your request, so you won't see the request in the network.
  * If you remove `../mock` it will automatically request easy-mock data.
  */
-// import './../mock' // simulation data
+import './../mock' // simulation data
 // require('./../mock')
 // 兼容IE11
 import 'babel-polyfill'
diff --git a/src/settings.js b/src/settings.js
index b8159bf..b568ce0 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: false,
+  showSettings: true,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/example/tableExample.vue b/src/views/example/tableExample.vue
index a313e57..9d98bb5 100644
--- a/src/views/example/tableExample.vue
+++ b/src/views/example/tableExample.vue
@@ -145,8 +145,8 @@
           needIndex: false // 是否需要序号列
         },
         toolsOption: {
-          selectColumns: false, // 是否需要筛选列
-          refresh: false // 是否需要刷新按钮
+          selectColumns: true, // 是否需要筛选列
+          refresh: true // 是否需要刷新按钮
         }
       } // 表格属性
     }
diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
deleted file mode 100644
index c7b94e7..0000000
--- a/src/views/layout/Layout.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <app-header class="app-header"/>
-    <div class="app-body">
-      <!--侧边栏-->
-      <sidebar class="sidebar-container"/>
-      <!--右半部分-->
-      <div class="main-container">
-        <!--上方导航-->
-        <navbar/>
-        <!--标签栏-->
-        <tags-view/>
-        <!--主页-->
-        <el-scrollbar>
-          <app-main/>
-        </el-scrollbar>
-
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { AppHeader, Navbar, Sidebar, AppMain } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import TagsView from './components/TagsView/index'
-
-export default {
-  name: 'Layout',
-  components: {
-    TagsView,
-    AppHeader,
-    Navbar,
-    Sidebar,
-    AppMain
-  },
-  mixins: [ResizeMixin],
-  computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    device() {
-      return this.$store.state.app.device
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened,
-        withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    }
-  },
-  methods: {
-    handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  @import "src/styles/mixin.scss";
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-    &.mobile.openSidebar{
-      position: fixed;
-      top: 0;
-    }
-  }
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-  .el-scrollbar{
-    height: calc(100vh - 50px);
-  }
-</style>
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
deleted file mode 100644
index 6326221..0000000
--- a/src/views/layout/components/AppHeader.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
-    <h3>{{ title }}</h3>
-    <el-dropdown class="avatar-container" trigger="click">
-      <div class="avatar-wrapper">
-        <span style="line-height:50px;">欢迎您，{{ name }}</span>
-        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
-        <i class="el-icon-caret-bottom"/>
-      </div>
-      <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <!--<router-link class="inlineBlock" to="/">-->
-        <!--<el-dropdown-item>-->
-        <!--主页-->
-        <!--</el-dropdown-item>-->
-        <!--</router-link>-->
-        <el-dropdown-item>
-          <span style="display:block;" @click="resetPwd">修改密码</span>
-        </el-dropdown-item>
-        <el-dropdown-item divided>
-          <span style="display:block;" @click="logout">注销</span>
-        </el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
-    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import ResetPwd from '../../system/user/resetPwd'
-import { getProject } from '@/utils/baseConfig'
-
-export default {
-  name: 'AppHeader',
-  components: { ResetPwd },
-  data() {
-    return {
-      title: getProject().title,
-      name: this.$store.getters.name,
-      showSetPwd: false,
-      headerUrl: require('../../../assets/global_images/header.png')// 头部图片
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    },
-    resetPwd() {
-      this.showSetPwd = true
-      this.$refs.retPwd.initDialog(true)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .app-header{
-    height:60px;
-    background-color:#000000;
-    background-repeat: no-repeat;
-    -webkit-background-size: 100% 100%;
-    background-size: 100% 100%;
-    color:white;
-  }
-  h3{
-    margin-left:40px;
-    display: inline-block;
-    float:left;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    float: right;
-    z-index:500;
-    position: fixed;
-    top:5px;
-    right: 35px;
-    .avatar-wrapper {
-      color:#d3dce6;
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        font-size: 12px;
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
deleted file mode 100644
index 2ea268e..0000000
--- a/src/views/layout/components/AppMain.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <section class="app-main">
-    <transition name="fade-transform" mode="out-in">
-      <!-- or name="fade" -->
-      <!-- <router-view :key="key"></router-view> -->
-      <div>
-        <keep-alive>
-          <router-view v-if="$route.meta.keepAlive" :key="key"/>
-        </keep-alive>
-        <router-view v-if="!$route.meta.keepAlive" :key="key"/>
-      </div>
-    </transition>
-  </section>
-</template>
-
-<script>
-export default {
-  name: 'AppMain',
-  computed: {
-    key() {
-      if (this.$route.meta.keepAlive) {
-        return this.$route.name !== undefined ? this.$route.name : this.$route
-      } else {
-        return this.$route.name !== undefined ? this.$route.name + new Date() : this.$route + new Date()
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.app-main {
-  /*50 = navbar  */
-  /*min-height: calc(100vh - 50px);*/
-  position: relative;
-  overflow: hidden;
-}
-</style>
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
deleted file mode 100644
index 193b604..0000000
--- a/src/views/layout/components/Navbar.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <div class="navbar">
-    <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
-    <breadcrumb />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import Hamburger from '@/components/Hamburger'
-
-export default {
-  components: {
-    Breadcrumb,
-    Hamburger
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.navbar {
-  height: 50px;
-  line-height: 50px;
-  box-shadow: 0 1px 3px 0 rgba(0,0,0,.12), 0 0 3px 0 rgba(0,0,0,.04);
-  .hamburger-container {
-    line-height: 58px;
-    height: 50px;
-    float: left;
-    padding: 0 10px;
-  }
-  .screenfull {
-    position: absolute;
-    right: 90px;
-    top: 16px;
-    color: red;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    position: absolute;
-    right: 35px;
-    .avatar-wrapper {
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        position: absolute;
-        right: -20px;
-        top: 25px;
-        font-size: 12px;
-      }
-    }
-  }
-}
-</style>
-

diff --git a/config/dev.env.js b/config/dev.env.js
index b654c4c..95e311a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,7 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://111.198.10.15:12204"'
+  // BASE_API: '"http://111.198.10.15:12204"'
+  BASE_API: '"http://111.198.10.15:11409"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/mock/system/area.js b/mock/system/area.js
index 3495001..dd8e88e 100644
--- a/mock/system/area.js
+++ b/mock/system/area.js
@@ -79,5 +79,52 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/levelType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '省级',
+            'id': '166',
+            'value': '1'
+          },
+          {
+            'name': '市级',
+            'id': '167',
+            'value': '2'
+          },
+          {
+            'name': '区级',
+            'id': '168',
+            'value': '3'
+          },
+          {
+            'name': '街道',
+            'id': '169',
+            'value': '4'
+          },
+          {
+            'name': '社区',
+            'id': '170',
+            'value': '5'
+          },
+          {
+            'name': '网格',
+            'id': '171',
+            'value': '6'
+          },
+          {
+            'name': '责任网格',
+            'id': '172',
+            'value': '7'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f17c427 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -176,5 +176,32 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/dataScopeType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '全部',
+            'id': '55',
+            'value': '03'
+          },
+          {
+            'name': '本部门',
+            'id': '56',
+            'value': '04'
+          },
+          {
+            'name': '自定义',
+            'id': '57',
+            'value': '04'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/src/main.js b/src/main.js
index 5630ee7..ae15138 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
  * it will intercept your request, so you won't see the request in the network.
  * If you remove `../mock` it will automatically request easy-mock data.
  */
-// import './../mock' // simulation data
+import './../mock' // simulation data
 // require('./../mock')
 // 兼容IE11
 import 'babel-polyfill'
diff --git a/src/settings.js b/src/settings.js
index b8159bf..b568ce0 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: false,
+  showSettings: true,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/example/tableExample.vue b/src/views/example/tableExample.vue
index a313e57..9d98bb5 100644
--- a/src/views/example/tableExample.vue
+++ b/src/views/example/tableExample.vue
@@ -145,8 +145,8 @@
           needIndex: false // 是否需要序号列
         },
         toolsOption: {
-          selectColumns: false, // 是否需要筛选列
-          refresh: false // 是否需要刷新按钮
+          selectColumns: true, // 是否需要筛选列
+          refresh: true // 是否需要刷新按钮
         }
       } // 表格属性
     }
diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
deleted file mode 100644
index c7b94e7..0000000
--- a/src/views/layout/Layout.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <app-header class="app-header"/>
-    <div class="app-body">
-      <!--侧边栏-->
-      <sidebar class="sidebar-container"/>
-      <!--右半部分-->
-      <div class="main-container">
-        <!--上方导航-->
-        <navbar/>
-        <!--标签栏-->
-        <tags-view/>
-        <!--主页-->
-        <el-scrollbar>
-          <app-main/>
-        </el-scrollbar>
-
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { AppHeader, Navbar, Sidebar, AppMain } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import TagsView from './components/TagsView/index'
-
-export default {
-  name: 'Layout',
-  components: {
-    TagsView,
-    AppHeader,
-    Navbar,
-    Sidebar,
-    AppMain
-  },
-  mixins: [ResizeMixin],
-  computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    device() {
-      return this.$store.state.app.device
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened,
-        withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    }
-  },
-  methods: {
-    handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  @import "src/styles/mixin.scss";
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-    &.mobile.openSidebar{
-      position: fixed;
-      top: 0;
-    }
-  }
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-  .el-scrollbar{
-    height: calc(100vh - 50px);
-  }
-</style>
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
deleted file mode 100644
index 6326221..0000000
--- a/src/views/layout/components/AppHeader.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
-    <h3>{{ title }}</h3>
-    <el-dropdown class="avatar-container" trigger="click">
-      <div class="avatar-wrapper">
-        <span style="line-height:50px;">欢迎您，{{ name }}</span>
-        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
-        <i class="el-icon-caret-bottom"/>
-      </div>
-      <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <!--<router-link class="inlineBlock" to="/">-->
-        <!--<el-dropdown-item>-->
-        <!--主页-->
-        <!--</el-dropdown-item>-->
-        <!--</router-link>-->
-        <el-dropdown-item>
-          <span style="display:block;" @click="resetPwd">修改密码</span>
-        </el-dropdown-item>
-        <el-dropdown-item divided>
-          <span style="display:block;" @click="logout">注销</span>
-        </el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
-    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import ResetPwd from '../../system/user/resetPwd'
-import { getProject } from '@/utils/baseConfig'
-
-export default {
-  name: 'AppHeader',
-  components: { ResetPwd },
-  data() {
-    return {
-      title: getProject().title,
-      name: this.$store.getters.name,
-      showSetPwd: false,
-      headerUrl: require('../../../assets/global_images/header.png')// 头部图片
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    },
-    resetPwd() {
-      this.showSetPwd = true
-      this.$refs.retPwd.initDialog(true)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .app-header{
-    height:60px;
-    background-color:#000000;
-    background-repeat: no-repeat;
-    -webkit-background-size: 100% 100%;
-    background-size: 100% 100%;
-    color:white;
-  }
-  h3{
-    margin-left:40px;
-    display: inline-block;
-    float:left;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    float: right;
-    z-index:500;
-    position: fixed;
-    top:5px;
-    right: 35px;
-    .avatar-wrapper {
-      color:#d3dce6;
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        font-size: 12px;
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
deleted file mode 100644
index 2ea268e..0000000
--- a/src/views/layout/components/AppMain.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <section class="app-main">
-    <transition name="fade-transform" mode="out-in">
-      <!-- or name="fade" -->
-      <!-- <router-view :key="key"></router-view> -->
-      <div>
-        <keep-alive>
-          <router-view v-if="$route.meta.keepAlive" :key="key"/>
-        </keep-alive>
-        <router-view v-if="!$route.meta.keepAlive" :key="key"/>
-      </div>
-    </transition>
-  </section>
-</template>
-
-<script>
-export default {
-  name: 'AppMain',
-  computed: {
-    key() {
-      if (this.$route.meta.keepAlive) {
-        return this.$route.name !== undefined ? this.$route.name : this.$route
-      } else {
-        return this.$route.name !== undefined ? this.$route.name + new Date() : this.$route + new Date()
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.app-main {
-  /*50 = navbar  */
-  /*min-height: calc(100vh - 50px);*/
-  position: relative;
-  overflow: hidden;
-}
-</style>
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
deleted file mode 100644
index 193b604..0000000
--- a/src/views/layout/components/Navbar.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <div class="navbar">
-    <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
-    <breadcrumb />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import Hamburger from '@/components/Hamburger'
-
-export default {
-  components: {
-    Breadcrumb,
-    Hamburger
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.navbar {
-  height: 50px;
-  line-height: 50px;
-  box-shadow: 0 1px 3px 0 rgba(0,0,0,.12), 0 0 3px 0 rgba(0,0,0,.04);
-  .hamburger-container {
-    line-height: 58px;
-    height: 50px;
-    float: left;
-    padding: 0 10px;
-  }
-  .screenfull {
-    position: absolute;
-    right: 90px;
-    top: 16px;
-    color: red;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    position: absolute;
-    right: 35px;
-    .avatar-wrapper {
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        position: absolute;
-        right: -20px;
-        top: 25px;
-        font-size: 12px;
-      }
-    }
-  }
-}
-</style>
-
diff --git a/src/views/layout/components/Sidebar/Item.vue b/src/views/layout/components/Sidebar/Item.vue
deleted file mode 100644
index b515f61..0000000
--- a/src/views/layout/components/Sidebar/Item.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<script>
-export default {
-  name: 'MenuItem',
-  functional: true,
-  props: {
-    icon: {
-      type: String,
-      default: ''
-    },
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  render(h, context) {
-    const { icon, title } = context.props
-    const vnodes = []
-
-    if (icon) {
-      vnodes.push(<svg-icon icon-class={icon}/>)
-    }
-
-    if (title) {
-      vnodes.push(<span slot='title'>{(title)}</span>)
-    }
-    return vnodes
-  }
-}
-</script>

diff --git a/config/dev.env.js b/config/dev.env.js
index b654c4c..95e311a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,7 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://111.198.10.15:12204"'
+  // BASE_API: '"http://111.198.10.15:12204"'
+  BASE_API: '"http://111.198.10.15:11409"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/mock/system/area.js b/mock/system/area.js
index 3495001..dd8e88e 100644
--- a/mock/system/area.js
+++ b/mock/system/area.js
@@ -79,5 +79,52 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/levelType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '省级',
+            'id': '166',
+            'value': '1'
+          },
+          {
+            'name': '市级',
+            'id': '167',
+            'value': '2'
+          },
+          {
+            'name': '区级',
+            'id': '168',
+            'value': '3'
+          },
+          {
+            'name': '街道',
+            'id': '169',
+            'value': '4'
+          },
+          {
+            'name': '社区',
+            'id': '170',
+            'value': '5'
+          },
+          {
+            'name': '网格',
+            'id': '171',
+            'value': '6'
+          },
+          {
+            'name': '责任网格',
+            'id': '172',
+            'value': '7'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f17c427 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -176,5 +176,32 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/dataScopeType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '全部',
+            'id': '55',
+            'value': '03'
+          },
+          {
+            'name': '本部门',
+            'id': '56',
+            'value': '04'
+          },
+          {
+            'name': '自定义',
+            'id': '57',
+            'value': '04'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/src/main.js b/src/main.js
index 5630ee7..ae15138 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
  * it will intercept your request, so you won't see the request in the network.
  * If you remove `../mock` it will automatically request easy-mock data.
  */
-// import './../mock' // simulation data
+import './../mock' // simulation data
 // require('./../mock')
 // 兼容IE11
 import 'babel-polyfill'
diff --git a/src/settings.js b/src/settings.js
index b8159bf..b568ce0 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: false,
+  showSettings: true,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/example/tableExample.vue b/src/views/example/tableExample.vue
index a313e57..9d98bb5 100644
--- a/src/views/example/tableExample.vue
+++ b/src/views/example/tableExample.vue
@@ -145,8 +145,8 @@
           needIndex: false // 是否需要序号列
         },
         toolsOption: {
-          selectColumns: false, // 是否需要筛选列
-          refresh: false // 是否需要刷新按钮
+          selectColumns: true, // 是否需要筛选列
+          refresh: true // 是否需要刷新按钮
         }
       } // 表格属性
     }
diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
deleted file mode 100644
index c7b94e7..0000000
--- a/src/views/layout/Layout.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <app-header class="app-header"/>
-    <div class="app-body">
-      <!--侧边栏-->
-      <sidebar class="sidebar-container"/>
-      <!--右半部分-->
-      <div class="main-container">
-        <!--上方导航-->
-        <navbar/>
-        <!--标签栏-->
-        <tags-view/>
-        <!--主页-->
-        <el-scrollbar>
-          <app-main/>
-        </el-scrollbar>
-
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { AppHeader, Navbar, Sidebar, AppMain } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import TagsView from './components/TagsView/index'
-
-export default {
-  name: 'Layout',
-  components: {
-    TagsView,
-    AppHeader,
-    Navbar,
-    Sidebar,
-    AppMain
-  },
-  mixins: [ResizeMixin],
-  computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    device() {
-      return this.$store.state.app.device
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened,
-        withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    }
-  },
-  methods: {
-    handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  @import "src/styles/mixin.scss";
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-    &.mobile.openSidebar{
-      position: fixed;
-      top: 0;
-    }
-  }
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-  .el-scrollbar{
-    height: calc(100vh - 50px);
-  }
-</style>
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
deleted file mode 100644
index 6326221..0000000
--- a/src/views/layout/components/AppHeader.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
-    <h3>{{ title }}</h3>
-    <el-dropdown class="avatar-container" trigger="click">
-      <div class="avatar-wrapper">
-        <span style="line-height:50px;">欢迎您，{{ name }}</span>
-        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
-        <i class="el-icon-caret-bottom"/>
-      </div>
-      <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <!--<router-link class="inlineBlock" to="/">-->
-        <!--<el-dropdown-item>-->
-        <!--主页-->
-        <!--</el-dropdown-item>-->
-        <!--</router-link>-->
-        <el-dropdown-item>
-          <span style="display:block;" @click="resetPwd">修改密码</span>
-        </el-dropdown-item>
-        <el-dropdown-item divided>
-          <span style="display:block;" @click="logout">注销</span>
-        </el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
-    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import ResetPwd from '../../system/user/resetPwd'
-import { getProject } from '@/utils/baseConfig'
-
-export default {
-  name: 'AppHeader',
-  components: { ResetPwd },
-  data() {
-    return {
-      title: getProject().title,
-      name: this.$store.getters.name,
-      showSetPwd: false,
-      headerUrl: require('../../../assets/global_images/header.png')// 头部图片
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    },
-    resetPwd() {
-      this.showSetPwd = true
-      this.$refs.retPwd.initDialog(true)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .app-header{
-    height:60px;
-    background-color:#000000;
-    background-repeat: no-repeat;
-    -webkit-background-size: 100% 100%;
-    background-size: 100% 100%;
-    color:white;
-  }
-  h3{
-    margin-left:40px;
-    display: inline-block;
-    float:left;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    float: right;
-    z-index:500;
-    position: fixed;
-    top:5px;
-    right: 35px;
-    .avatar-wrapper {
-      color:#d3dce6;
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        font-size: 12px;
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
deleted file mode 100644
index 2ea268e..0000000
--- a/src/views/layout/components/AppMain.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <section class="app-main">
-    <transition name="fade-transform" mode="out-in">
-      <!-- or name="fade" -->
-      <!-- <router-view :key="key"></router-view> -->
-      <div>
-        <keep-alive>
-          <router-view v-if="$route.meta.keepAlive" :key="key"/>
-        </keep-alive>
-        <router-view v-if="!$route.meta.keepAlive" :key="key"/>
-      </div>
-    </transition>
-  </section>
-</template>
-
-<script>
-export default {
-  name: 'AppMain',
-  computed: {
-    key() {
-      if (this.$route.meta.keepAlive) {
-        return this.$route.name !== undefined ? this.$route.name : this.$route
-      } else {
-        return this.$route.name !== undefined ? this.$route.name + new Date() : this.$route + new Date()
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.app-main {
-  /*50 = navbar  */
-  /*min-height: calc(100vh - 50px);*/
-  position: relative;
-  overflow: hidden;
-}
-</style>
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
deleted file mode 100644
index 193b604..0000000
--- a/src/views/layout/components/Navbar.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <div class="navbar">
-    <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
-    <breadcrumb />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import Hamburger from '@/components/Hamburger'
-
-export default {
-  components: {
-    Breadcrumb,
-    Hamburger
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.navbar {
-  height: 50px;
-  line-height: 50px;
-  box-shadow: 0 1px 3px 0 rgba(0,0,0,.12), 0 0 3px 0 rgba(0,0,0,.04);
-  .hamburger-container {
-    line-height: 58px;
-    height: 50px;
-    float: left;
-    padding: 0 10px;
-  }
-  .screenfull {
-    position: absolute;
-    right: 90px;
-    top: 16px;
-    color: red;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    position: absolute;
-    right: 35px;
-    .avatar-wrapper {
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        position: absolute;
-        right: -20px;
-        top: 25px;
-        font-size: 12px;
-      }
-    }
-  }
-}
-</style>
-
diff --git a/src/views/layout/components/Sidebar/Item.vue b/src/views/layout/components/Sidebar/Item.vue
deleted file mode 100644
index b515f61..0000000
--- a/src/views/layout/components/Sidebar/Item.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<script>
-export default {
-  name: 'MenuItem',
-  functional: true,
-  props: {
-    icon: {
-      type: String,
-      default: ''
-    },
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  render(h, context) {
-    const { icon, title } = context.props
-    const vnodes = []
-
-    if (icon) {
-      vnodes.push(<svg-icon icon-class={icon}/>)
-    }
-
-    if (title) {
-      vnodes.push(<span slot='title'>{(title)}</span>)
-    }
-    return vnodes
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/Link.vue b/src/views/layout/components/Sidebar/Link.vue
deleted file mode 100644
index bff45cd..0000000
--- a/src/views/layout/components/Sidebar/Link.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-<template>
-  <!-- eslint-disable vue/require-component-is -->
-  <component v-bind="linkProps(to)">
-    <slot/>
-  </component>
-</template>
-
-<script>
-import { isExternal } from '@/utils/validate'
-
-export default {
-  props: {
-    to: {
-      type: String,
-      required: true
-    }
-  },
-  methods: {
-    linkProps(url) {
-      if (isExternal(url)) {
-        return {
-          is: 'a',
-          href: url,
-          target: '_blank',
-          rel: 'noopener'
-        }
-      }
-      return {
-        is: 'router-link',
-        to: url
-      }
-    }
-  }
-}
-</script>

diff --git a/config/dev.env.js b/config/dev.env.js
index b654c4c..95e311a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,7 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://111.198.10.15:12204"'
+  // BASE_API: '"http://111.198.10.15:12204"'
+  BASE_API: '"http://111.198.10.15:11409"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/mock/system/area.js b/mock/system/area.js
index 3495001..dd8e88e 100644
--- a/mock/system/area.js
+++ b/mock/system/area.js
@@ -79,5 +79,52 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/levelType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '省级',
+            'id': '166',
+            'value': '1'
+          },
+          {
+            'name': '市级',
+            'id': '167',
+            'value': '2'
+          },
+          {
+            'name': '区级',
+            'id': '168',
+            'value': '3'
+          },
+          {
+            'name': '街道',
+            'id': '169',
+            'value': '4'
+          },
+          {
+            'name': '社区',
+            'id': '170',
+            'value': '5'
+          },
+          {
+            'name': '网格',
+            'id': '171',
+            'value': '6'
+          },
+          {
+            'name': '责任网格',
+            'id': '172',
+            'value': '7'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f17c427 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -176,5 +176,32 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/dataScopeType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '全部',
+            'id': '55',
+            'value': '03'
+          },
+          {
+            'name': '本部门',
+            'id': '56',
+            'value': '04'
+          },
+          {
+            'name': '自定义',
+            'id': '57',
+            'value': '04'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/src/main.js b/src/main.js
index 5630ee7..ae15138 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
  * it will intercept your request, so you won't see the request in the network.
  * If you remove `../mock` it will automatically request easy-mock data.
  */
-// import './../mock' // simulation data
+import './../mock' // simulation data
 // require('./../mock')
 // 兼容IE11
 import 'babel-polyfill'
diff --git a/src/settings.js b/src/settings.js
index b8159bf..b568ce0 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: false,
+  showSettings: true,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/example/tableExample.vue b/src/views/example/tableExample.vue
index a313e57..9d98bb5 100644
--- a/src/views/example/tableExample.vue
+++ b/src/views/example/tableExample.vue
@@ -145,8 +145,8 @@
           needIndex: false // 是否需要序号列
         },
         toolsOption: {
-          selectColumns: false, // 是否需要筛选列
-          refresh: false // 是否需要刷新按钮
+          selectColumns: true, // 是否需要筛选列
+          refresh: true // 是否需要刷新按钮
         }
       } // 表格属性
     }
diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
deleted file mode 100644
index c7b94e7..0000000
--- a/src/views/layout/Layout.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <app-header class="app-header"/>
-    <div class="app-body">
-      <!--侧边栏-->
-      <sidebar class="sidebar-container"/>
-      <!--右半部分-->
-      <div class="main-container">
-        <!--上方导航-->
-        <navbar/>
-        <!--标签栏-->
-        <tags-view/>
-        <!--主页-->
-        <el-scrollbar>
-          <app-main/>
-        </el-scrollbar>
-
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { AppHeader, Navbar, Sidebar, AppMain } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import TagsView from './components/TagsView/index'
-
-export default {
-  name: 'Layout',
-  components: {
-    TagsView,
-    AppHeader,
-    Navbar,
-    Sidebar,
-    AppMain
-  },
-  mixins: [ResizeMixin],
-  computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    device() {
-      return this.$store.state.app.device
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened,
-        withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    }
-  },
-  methods: {
-    handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  @import "src/styles/mixin.scss";
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-    &.mobile.openSidebar{
-      position: fixed;
-      top: 0;
-    }
-  }
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-  .el-scrollbar{
-    height: calc(100vh - 50px);
-  }
-</style>
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
deleted file mode 100644
index 6326221..0000000
--- a/src/views/layout/components/AppHeader.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
-    <h3>{{ title }}</h3>
-    <el-dropdown class="avatar-container" trigger="click">
-      <div class="avatar-wrapper">
-        <span style="line-height:50px;">欢迎您，{{ name }}</span>
-        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
-        <i class="el-icon-caret-bottom"/>
-      </div>
-      <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <!--<router-link class="inlineBlock" to="/">-->
-        <!--<el-dropdown-item>-->
-        <!--主页-->
-        <!--</el-dropdown-item>-->
-        <!--</router-link>-->
-        <el-dropdown-item>
-          <span style="display:block;" @click="resetPwd">修改密码</span>
-        </el-dropdown-item>
-        <el-dropdown-item divided>
-          <span style="display:block;" @click="logout">注销</span>
-        </el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
-    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import ResetPwd from '../../system/user/resetPwd'
-import { getProject } from '@/utils/baseConfig'
-
-export default {
-  name: 'AppHeader',
-  components: { ResetPwd },
-  data() {
-    return {
-      title: getProject().title,
-      name: this.$store.getters.name,
-      showSetPwd: false,
-      headerUrl: require('../../../assets/global_images/header.png')// 头部图片
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    },
-    resetPwd() {
-      this.showSetPwd = true
-      this.$refs.retPwd.initDialog(true)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .app-header{
-    height:60px;
-    background-color:#000000;
-    background-repeat: no-repeat;
-    -webkit-background-size: 100% 100%;
-    background-size: 100% 100%;
-    color:white;
-  }
-  h3{
-    margin-left:40px;
-    display: inline-block;
-    float:left;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    float: right;
-    z-index:500;
-    position: fixed;
-    top:5px;
-    right: 35px;
-    .avatar-wrapper {
-      color:#d3dce6;
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        font-size: 12px;
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
deleted file mode 100644
index 2ea268e..0000000
--- a/src/views/layout/components/AppMain.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <section class="app-main">
-    <transition name="fade-transform" mode="out-in">
-      <!-- or name="fade" -->
-      <!-- <router-view :key="key"></router-view> -->
-      <div>
-        <keep-alive>
-          <router-view v-if="$route.meta.keepAlive" :key="key"/>
-        </keep-alive>
-        <router-view v-if="!$route.meta.keepAlive" :key="key"/>
-      </div>
-    </transition>
-  </section>
-</template>
-
-<script>
-export default {
-  name: 'AppMain',
-  computed: {
-    key() {
-      if (this.$route.meta.keepAlive) {
-        return this.$route.name !== undefined ? this.$route.name : this.$route
-      } else {
-        return this.$route.name !== undefined ? this.$route.name + new Date() : this.$route + new Date()
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.app-main {
-  /*50 = navbar  */
-  /*min-height: calc(100vh - 50px);*/
-  position: relative;
-  overflow: hidden;
-}
-</style>
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
deleted file mode 100644
index 193b604..0000000
--- a/src/views/layout/components/Navbar.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <div class="navbar">
-    <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
-    <breadcrumb />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import Hamburger from '@/components/Hamburger'
-
-export default {
-  components: {
-    Breadcrumb,
-    Hamburger
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.navbar {
-  height: 50px;
-  line-height: 50px;
-  box-shadow: 0 1px 3px 0 rgba(0,0,0,.12), 0 0 3px 0 rgba(0,0,0,.04);
-  .hamburger-container {
-    line-height: 58px;
-    height: 50px;
-    float: left;
-    padding: 0 10px;
-  }
-  .screenfull {
-    position: absolute;
-    right: 90px;
-    top: 16px;
-    color: red;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    position: absolute;
-    right: 35px;
-    .avatar-wrapper {
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        position: absolute;
-        right: -20px;
-        top: 25px;
-        font-size: 12px;
-      }
-    }
-  }
-}
-</style>
-
diff --git a/src/views/layout/components/Sidebar/Item.vue b/src/views/layout/components/Sidebar/Item.vue
deleted file mode 100644
index b515f61..0000000
--- a/src/views/layout/components/Sidebar/Item.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<script>
-export default {
-  name: 'MenuItem',
-  functional: true,
-  props: {
-    icon: {
-      type: String,
-      default: ''
-    },
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  render(h, context) {
-    const { icon, title } = context.props
-    const vnodes = []
-
-    if (icon) {
-      vnodes.push(<svg-icon icon-class={icon}/>)
-    }
-
-    if (title) {
-      vnodes.push(<span slot='title'>{(title)}</span>)
-    }
-    return vnodes
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/Link.vue b/src/views/layout/components/Sidebar/Link.vue
deleted file mode 100644
index bff45cd..0000000
--- a/src/views/layout/components/Sidebar/Link.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-<template>
-  <!-- eslint-disable vue/require-component-is -->
-  <component v-bind="linkProps(to)">
-    <slot/>
-  </component>
-</template>
-
-<script>
-import { isExternal } from '@/utils/validate'
-
-export default {
-  props: {
-    to: {
-      type: String,
-      required: true
-    }
-  },
-  methods: {
-    linkProps(url) {
-      if (isExternal(url)) {
-        return {
-          is: 'a',
-          href: url,
-          target: '_blank',
-          rel: 'noopener'
-        }
-      }
-      return {
-        is: 'router-link',
-        to: url
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue
deleted file mode 100644
index 988d662..0000000
--- a/src/views/layout/components/Sidebar/SidebarItem.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <div v-if="!item.hidden&&item.children" class="menu-wrapper">
-
-    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
-      <a :href="onlyOneChild.path" target="_blank" @click="clickLink(onlyOneChild.path,$event)">
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
-          <item v-if="onlyOneChild.meta" :icon="onlyOneChild.meta.icon||item.meta.icon" :title="onlyOneChild.meta.title" />
-        </el-menu-item>
-      </a>
-    </template>
-
-    <el-submenu v-else :index="item.name||item.path">
-      <template slot="title">
-        <item v-if="item.meta" :icon="item.meta.icon" :title="item.meta.title" />
-      </template>
-
-      <template v-for="child in item.children" v-if="!child.hidden">
-        <sidebar-item
-          v-if="child.children&&child.children.length>0"
-          :is-nest="true"
-          :item="child"
-          :key="child.path"
-          :base-path="resolvePath(child.path)"
-          class="nest-menu" />
-
-        <a v-else :href="child.path" :key="child.name" target="_blank" @click="clickLink(child.path,$event)">
-          <el-menu-item :index="resolvePath(child.path)">
-            <span class="light-line"/>
-            <item v-if="child.meta" :icon="child.meta.icon" :title="child.meta.title" />
-          </el-menu-item>
-        </a>
-      </template>
-    </el-submenu>
-
-  </div>
-</template>
-
-<script>
-import path from 'path'
-import { validateURL } from '@/utils/validate'
-import Item from './Item'
-
-export default {
-  name: 'SidebarItem',
-  components: { Item },
-  props: {
-    // route object
-    item: {
-      type: Object,
-      required: true
-    },
-    isNest: {
-      type: Boolean,
-      default: false
-    },
-    basePath: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      onlyOneChild: null
-    }
-  },
-  methods: {
-    hasOneShowingChild(children, parent) {
-      const showingChildren = children.filter(item => {
-        if (item.hidden) {
-          return false
-        } else {
-          // Temp set(will be used if only has one showing child)
-          this.onlyOneChild = item
-          return true
-        }
-      })
-
-      // When there is only one child router, the child router is displayed by default
-      if (showingChildren.length === 1) {
-        return true
-      }
-
-      // Show parent if there are no child router to display
-      if (showingChildren.length === 0) {
-        this.onlyOneChild = { ... parent, path: '', noShowingChildren: true }
-        return true
-      }
-
-      return false
-    },
-    resolvePath(routePath) {
-      return path.resolve(this.basePath, routePath)
-    },
-    isExternalLink(routePath) {
-      return validateURL(routePath)
-    },
-    clickLink(routePath, e) {
-      if (!this.isExternalLink(routePath)) {
-        e.preventDefault()
-        const path = this.resolvePath(routePath)
-        this.$router.push({ path, query: { t: +new Date() }})
-        // this.$router.push(path)
-      }
-    }
-  }
-}
-</script>

diff --git a/config/dev.env.js b/config/dev.env.js
index b654c4c..95e311a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,7 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://111.198.10.15:12204"'
+  // BASE_API: '"http://111.198.10.15:12204"'
+  BASE_API: '"http://111.198.10.15:11409"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/mock/system/area.js b/mock/system/area.js
index 3495001..dd8e88e 100644
--- a/mock/system/area.js
+++ b/mock/system/area.js
@@ -79,5 +79,52 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/levelType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '省级',
+            'id': '166',
+            'value': '1'
+          },
+          {
+            'name': '市级',
+            'id': '167',
+            'value': '2'
+          },
+          {
+            'name': '区级',
+            'id': '168',
+            'value': '3'
+          },
+          {
+            'name': '街道',
+            'id': '169',
+            'value': '4'
+          },
+          {
+            'name': '社区',
+            'id': '170',
+            'value': '5'
+          },
+          {
+            'name': '网格',
+            'id': '171',
+            'value': '6'
+          },
+          {
+            'name': '责任网格',
+            'id': '172',
+            'value': '7'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f17c427 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -176,5 +176,32 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/dataScopeType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '全部',
+            'id': '55',
+            'value': '03'
+          },
+          {
+            'name': '本部门',
+            'id': '56',
+            'value': '04'
+          },
+          {
+            'name': '自定义',
+            'id': '57',
+            'value': '04'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/src/main.js b/src/main.js
index 5630ee7..ae15138 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
  * it will intercept your request, so you won't see the request in the network.
  * If you remove `../mock` it will automatically request easy-mock data.
  */
-// import './../mock' // simulation data
+import './../mock' // simulation data
 // require('./../mock')
 // 兼容IE11
 import 'babel-polyfill'
diff --git a/src/settings.js b/src/settings.js
index b8159bf..b568ce0 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: false,
+  showSettings: true,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/example/tableExample.vue b/src/views/example/tableExample.vue
index a313e57..9d98bb5 100644
--- a/src/views/example/tableExample.vue
+++ b/src/views/example/tableExample.vue
@@ -145,8 +145,8 @@
           needIndex: false // 是否需要序号列
         },
         toolsOption: {
-          selectColumns: false, // 是否需要筛选列
-          refresh: false // 是否需要刷新按钮
+          selectColumns: true, // 是否需要筛选列
+          refresh: true // 是否需要刷新按钮
         }
       } // 表格属性
     }
diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
deleted file mode 100644
index c7b94e7..0000000
--- a/src/views/layout/Layout.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <app-header class="app-header"/>
-    <div class="app-body">
-      <!--侧边栏-->
-      <sidebar class="sidebar-container"/>
-      <!--右半部分-->
-      <div class="main-container">
-        <!--上方导航-->
-        <navbar/>
-        <!--标签栏-->
-        <tags-view/>
-        <!--主页-->
-        <el-scrollbar>
-          <app-main/>
-        </el-scrollbar>
-
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { AppHeader, Navbar, Sidebar, AppMain } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import TagsView from './components/TagsView/index'
-
-export default {
-  name: 'Layout',
-  components: {
-    TagsView,
-    AppHeader,
-    Navbar,
-    Sidebar,
-    AppMain
-  },
-  mixins: [ResizeMixin],
-  computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    device() {
-      return this.$store.state.app.device
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened,
-        withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    }
-  },
-  methods: {
-    handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  @import "src/styles/mixin.scss";
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-    &.mobile.openSidebar{
-      position: fixed;
-      top: 0;
-    }
-  }
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-  .el-scrollbar{
-    height: calc(100vh - 50px);
-  }
-</style>
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
deleted file mode 100644
index 6326221..0000000
--- a/src/views/layout/components/AppHeader.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
-    <h3>{{ title }}</h3>
-    <el-dropdown class="avatar-container" trigger="click">
-      <div class="avatar-wrapper">
-        <span style="line-height:50px;">欢迎您，{{ name }}</span>
-        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
-        <i class="el-icon-caret-bottom"/>
-      </div>
-      <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <!--<router-link class="inlineBlock" to="/">-->
-        <!--<el-dropdown-item>-->
-        <!--主页-->
-        <!--</el-dropdown-item>-->
-        <!--</router-link>-->
-        <el-dropdown-item>
-          <span style="display:block;" @click="resetPwd">修改密码</span>
-        </el-dropdown-item>
-        <el-dropdown-item divided>
-          <span style="display:block;" @click="logout">注销</span>
-        </el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
-    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import ResetPwd from '../../system/user/resetPwd'
-import { getProject } from '@/utils/baseConfig'
-
-export default {
-  name: 'AppHeader',
-  components: { ResetPwd },
-  data() {
-    return {
-      title: getProject().title,
-      name: this.$store.getters.name,
-      showSetPwd: false,
-      headerUrl: require('../../../assets/global_images/header.png')// 头部图片
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    },
-    resetPwd() {
-      this.showSetPwd = true
-      this.$refs.retPwd.initDialog(true)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .app-header{
-    height:60px;
-    background-color:#000000;
-    background-repeat: no-repeat;
-    -webkit-background-size: 100% 100%;
-    background-size: 100% 100%;
-    color:white;
-  }
-  h3{
-    margin-left:40px;
-    display: inline-block;
-    float:left;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    float: right;
-    z-index:500;
-    position: fixed;
-    top:5px;
-    right: 35px;
-    .avatar-wrapper {
-      color:#d3dce6;
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        font-size: 12px;
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
deleted file mode 100644
index 2ea268e..0000000
--- a/src/views/layout/components/AppMain.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <section class="app-main">
-    <transition name="fade-transform" mode="out-in">
-      <!-- or name="fade" -->
-      <!-- <router-view :key="key"></router-view> -->
-      <div>
-        <keep-alive>
-          <router-view v-if="$route.meta.keepAlive" :key="key"/>
-        </keep-alive>
-        <router-view v-if="!$route.meta.keepAlive" :key="key"/>
-      </div>
-    </transition>
-  </section>
-</template>
-
-<script>
-export default {
-  name: 'AppMain',
-  computed: {
-    key() {
-      if (this.$route.meta.keepAlive) {
-        return this.$route.name !== undefined ? this.$route.name : this.$route
-      } else {
-        return this.$route.name !== undefined ? this.$route.name + new Date() : this.$route + new Date()
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.app-main {
-  /*50 = navbar  */
-  /*min-height: calc(100vh - 50px);*/
-  position: relative;
-  overflow: hidden;
-}
-</style>
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
deleted file mode 100644
index 193b604..0000000
--- a/src/views/layout/components/Navbar.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <div class="navbar">
-    <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
-    <breadcrumb />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import Hamburger from '@/components/Hamburger'
-
-export default {
-  components: {
-    Breadcrumb,
-    Hamburger
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.navbar {
-  height: 50px;
-  line-height: 50px;
-  box-shadow: 0 1px 3px 0 rgba(0,0,0,.12), 0 0 3px 0 rgba(0,0,0,.04);
-  .hamburger-container {
-    line-height: 58px;
-    height: 50px;
-    float: left;
-    padding: 0 10px;
-  }
-  .screenfull {
-    position: absolute;
-    right: 90px;
-    top: 16px;
-    color: red;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    position: absolute;
-    right: 35px;
-    .avatar-wrapper {
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        position: absolute;
-        right: -20px;
-        top: 25px;
-        font-size: 12px;
-      }
-    }
-  }
-}
-</style>
-
diff --git a/src/views/layout/components/Sidebar/Item.vue b/src/views/layout/components/Sidebar/Item.vue
deleted file mode 100644
index b515f61..0000000
--- a/src/views/layout/components/Sidebar/Item.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<script>
-export default {
-  name: 'MenuItem',
-  functional: true,
-  props: {
-    icon: {
-      type: String,
-      default: ''
-    },
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  render(h, context) {
-    const { icon, title } = context.props
-    const vnodes = []
-
-    if (icon) {
-      vnodes.push(<svg-icon icon-class={icon}/>)
-    }
-
-    if (title) {
-      vnodes.push(<span slot='title'>{(title)}</span>)
-    }
-    return vnodes
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/Link.vue b/src/views/layout/components/Sidebar/Link.vue
deleted file mode 100644
index bff45cd..0000000
--- a/src/views/layout/components/Sidebar/Link.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-<template>
-  <!-- eslint-disable vue/require-component-is -->
-  <component v-bind="linkProps(to)">
-    <slot/>
-  </component>
-</template>
-
-<script>
-import { isExternal } from '@/utils/validate'
-
-export default {
-  props: {
-    to: {
-      type: String,
-      required: true
-    }
-  },
-  methods: {
-    linkProps(url) {
-      if (isExternal(url)) {
-        return {
-          is: 'a',
-          href: url,
-          target: '_blank',
-          rel: 'noopener'
-        }
-      }
-      return {
-        is: 'router-link',
-        to: url
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue
deleted file mode 100644
index 988d662..0000000
--- a/src/views/layout/components/Sidebar/SidebarItem.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <div v-if="!item.hidden&&item.children" class="menu-wrapper">
-
-    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
-      <a :href="onlyOneChild.path" target="_blank" @click="clickLink(onlyOneChild.path,$event)">
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
-          <item v-if="onlyOneChild.meta" :icon="onlyOneChild.meta.icon||item.meta.icon" :title="onlyOneChild.meta.title" />
-        </el-menu-item>
-      </a>
-    </template>
-
-    <el-submenu v-else :index="item.name||item.path">
-      <template slot="title">
-        <item v-if="item.meta" :icon="item.meta.icon" :title="item.meta.title" />
-      </template>
-
-      <template v-for="child in item.children" v-if="!child.hidden">
-        <sidebar-item
-          v-if="child.children&&child.children.length>0"
-          :is-nest="true"
-          :item="child"
-          :key="child.path"
-          :base-path="resolvePath(child.path)"
-          class="nest-menu" />
-
-        <a v-else :href="child.path" :key="child.name" target="_blank" @click="clickLink(child.path,$event)">
-          <el-menu-item :index="resolvePath(child.path)">
-            <span class="light-line"/>
-            <item v-if="child.meta" :icon="child.meta.icon" :title="child.meta.title" />
-          </el-menu-item>
-        </a>
-      </template>
-    </el-submenu>
-
-  </div>
-</template>
-
-<script>
-import path from 'path'
-import { validateURL } from '@/utils/validate'
-import Item from './Item'
-
-export default {
-  name: 'SidebarItem',
-  components: { Item },
-  props: {
-    // route object
-    item: {
-      type: Object,
-      required: true
-    },
-    isNest: {
-      type: Boolean,
-      default: false
-    },
-    basePath: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      onlyOneChild: null
-    }
-  },
-  methods: {
-    hasOneShowingChild(children, parent) {
-      const showingChildren = children.filter(item => {
-        if (item.hidden) {
-          return false
-        } else {
-          // Temp set(will be used if only has one showing child)
-          this.onlyOneChild = item
-          return true
-        }
-      })
-
-      // When there is only one child router, the child router is displayed by default
-      if (showingChildren.length === 1) {
-        return true
-      }
-
-      // Show parent if there are no child router to display
-      if (showingChildren.length === 0) {
-        this.onlyOneChild = { ... parent, path: '', noShowingChildren: true }
-        return true
-      }
-
-      return false
-    },
-    resolvePath(routePath) {
-      return path.resolve(this.basePath, routePath)
-    },
-    isExternalLink(routePath) {
-      return validateURL(routePath)
-    },
-    clickLink(routePath, e) {
-      if (!this.isExternalLink(routePath)) {
-        e.preventDefault()
-        const path = this.resolvePath(routePath)
-        this.$router.push({ path, query: { t: +new Date() }})
-        // this.$router.push(path)
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
deleted file mode 100644
index 5dcf730..0000000
--- a/src/views/layout/components/Sidebar/index.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<template>
-  <el-scrollbar wrap-class="scrollbar-wrapper">
-    <el-menu
-      :show-timeout="200"
-      :default-active="activeMenu"
-      :collapse="isCollapse"
-      mode="vertical"
-      background-color="#304156"
-      text-color="#bfcbd9"
-      active-text-color="#1bb1a5"
-    >
-      <sidebar-item v-for="route in permission_routers" :key="route.name" :item="route" :base-path="route.path"/>
-    </el-menu>
-  </el-scrollbar>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import SidebarItem from './SidebarItem'
-
-export default {
-  components: { SidebarItem },
-  computed: {
-    ...mapGetters([
-      'permission_routers',
-      'sidebar'
-    ]),
-    activeMenu() {
-      const route = this.$route
-      const { meta, path } = route
-      // 如果meta中上设置activeMenu，按照meta中设置高亮
-      if (meta.activeMenu) {
-        return meta.activeMenu
-      }
-      return path
-    },
-    isCollapse() {
-      return !this.sidebar.opened
-    }
-  }
-}
-</script>

diff --git a/config/dev.env.js b/config/dev.env.js
index b654c4c..95e311a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,7 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://111.198.10.15:12204"'
+  // BASE_API: '"http://111.198.10.15:12204"'
+  BASE_API: '"http://111.198.10.15:11409"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/mock/system/area.js b/mock/system/area.js
index 3495001..dd8e88e 100644
--- a/mock/system/area.js
+++ b/mock/system/area.js
@@ -79,5 +79,52 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/levelType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '省级',
+            'id': '166',
+            'value': '1'
+          },
+          {
+            'name': '市级',
+            'id': '167',
+            'value': '2'
+          },
+          {
+            'name': '区级',
+            'id': '168',
+            'value': '3'
+          },
+          {
+            'name': '街道',
+            'id': '169',
+            'value': '4'
+          },
+          {
+            'name': '社区',
+            'id': '170',
+            'value': '5'
+          },
+          {
+            'name': '网格',
+            'id': '171',
+            'value': '6'
+          },
+          {
+            'name': '责任网格',
+            'id': '172',
+            'value': '7'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f17c427 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -176,5 +176,32 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/dataScopeType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '全部',
+            'id': '55',
+            'value': '03'
+          },
+          {
+            'name': '本部门',
+            'id': '56',
+            'value': '04'
+          },
+          {
+            'name': '自定义',
+            'id': '57',
+            'value': '04'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/src/main.js b/src/main.js
index 5630ee7..ae15138 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
  * it will intercept your request, so you won't see the request in the network.
  * If you remove `../mock` it will automatically request easy-mock data.
  */
-// import './../mock' // simulation data
+import './../mock' // simulation data
 // require('./../mock')
 // 兼容IE11
 import 'babel-polyfill'
diff --git a/src/settings.js b/src/settings.js
index b8159bf..b568ce0 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: false,
+  showSettings: true,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/example/tableExample.vue b/src/views/example/tableExample.vue
index a313e57..9d98bb5 100644
--- a/src/views/example/tableExample.vue
+++ b/src/views/example/tableExample.vue
@@ -145,8 +145,8 @@
           needIndex: false // 是否需要序号列
         },
         toolsOption: {
-          selectColumns: false, // 是否需要筛选列
-          refresh: false // 是否需要刷新按钮
+          selectColumns: true, // 是否需要筛选列
+          refresh: true // 是否需要刷新按钮
         }
       } // 表格属性
     }
diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
deleted file mode 100644
index c7b94e7..0000000
--- a/src/views/layout/Layout.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <app-header class="app-header"/>
-    <div class="app-body">
-      <!--侧边栏-->
-      <sidebar class="sidebar-container"/>
-      <!--右半部分-->
-      <div class="main-container">
-        <!--上方导航-->
-        <navbar/>
-        <!--标签栏-->
-        <tags-view/>
-        <!--主页-->
-        <el-scrollbar>
-          <app-main/>
-        </el-scrollbar>
-
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { AppHeader, Navbar, Sidebar, AppMain } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import TagsView from './components/TagsView/index'
-
-export default {
-  name: 'Layout',
-  components: {
-    TagsView,
-    AppHeader,
-    Navbar,
-    Sidebar,
-    AppMain
-  },
-  mixins: [ResizeMixin],
-  computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    device() {
-      return this.$store.state.app.device
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened,
-        withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    }
-  },
-  methods: {
-    handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  @import "src/styles/mixin.scss";
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-    &.mobile.openSidebar{
-      position: fixed;
-      top: 0;
-    }
-  }
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-  .el-scrollbar{
-    height: calc(100vh - 50px);
-  }
-</style>
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
deleted file mode 100644
index 6326221..0000000
--- a/src/views/layout/components/AppHeader.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
-    <h3>{{ title }}</h3>
-    <el-dropdown class="avatar-container" trigger="click">
-      <div class="avatar-wrapper">
-        <span style="line-height:50px;">欢迎您，{{ name }}</span>
-        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
-        <i class="el-icon-caret-bottom"/>
-      </div>
-      <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <!--<router-link class="inlineBlock" to="/">-->
-        <!--<el-dropdown-item>-->
-        <!--主页-->
-        <!--</el-dropdown-item>-->
-        <!--</router-link>-->
-        <el-dropdown-item>
-          <span style="display:block;" @click="resetPwd">修改密码</span>
-        </el-dropdown-item>
-        <el-dropdown-item divided>
-          <span style="display:block;" @click="logout">注销</span>
-        </el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
-    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import ResetPwd from '../../system/user/resetPwd'
-import { getProject } from '@/utils/baseConfig'
-
-export default {
-  name: 'AppHeader',
-  components: { ResetPwd },
-  data() {
-    return {
-      title: getProject().title,
-      name: this.$store.getters.name,
-      showSetPwd: false,
-      headerUrl: require('../../../assets/global_images/header.png')// 头部图片
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    },
-    resetPwd() {
-      this.showSetPwd = true
-      this.$refs.retPwd.initDialog(true)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .app-header{
-    height:60px;
-    background-color:#000000;
-    background-repeat: no-repeat;
-    -webkit-background-size: 100% 100%;
-    background-size: 100% 100%;
-    color:white;
-  }
-  h3{
-    margin-left:40px;
-    display: inline-block;
-    float:left;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    float: right;
-    z-index:500;
-    position: fixed;
-    top:5px;
-    right: 35px;
-    .avatar-wrapper {
-      color:#d3dce6;
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        font-size: 12px;
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
deleted file mode 100644
index 2ea268e..0000000
--- a/src/views/layout/components/AppMain.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <section class="app-main">
-    <transition name="fade-transform" mode="out-in">
-      <!-- or name="fade" -->
-      <!-- <router-view :key="key"></router-view> -->
-      <div>
-        <keep-alive>
-          <router-view v-if="$route.meta.keepAlive" :key="key"/>
-        </keep-alive>
-        <router-view v-if="!$route.meta.keepAlive" :key="key"/>
-      </div>
-    </transition>
-  </section>
-</template>
-
-<script>
-export default {
-  name: 'AppMain',
-  computed: {
-    key() {
-      if (this.$route.meta.keepAlive) {
-        return this.$route.name !== undefined ? this.$route.name : this.$route
-      } else {
-        return this.$route.name !== undefined ? this.$route.name + new Date() : this.$route + new Date()
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.app-main {
-  /*50 = navbar  */
-  /*min-height: calc(100vh - 50px);*/
-  position: relative;
-  overflow: hidden;
-}
-</style>
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
deleted file mode 100644
index 193b604..0000000
--- a/src/views/layout/components/Navbar.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <div class="navbar">
-    <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
-    <breadcrumb />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import Hamburger from '@/components/Hamburger'
-
-export default {
-  components: {
-    Breadcrumb,
-    Hamburger
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.navbar {
-  height: 50px;
-  line-height: 50px;
-  box-shadow: 0 1px 3px 0 rgba(0,0,0,.12), 0 0 3px 0 rgba(0,0,0,.04);
-  .hamburger-container {
-    line-height: 58px;
-    height: 50px;
-    float: left;
-    padding: 0 10px;
-  }
-  .screenfull {
-    position: absolute;
-    right: 90px;
-    top: 16px;
-    color: red;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    position: absolute;
-    right: 35px;
-    .avatar-wrapper {
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        position: absolute;
-        right: -20px;
-        top: 25px;
-        font-size: 12px;
-      }
-    }
-  }
-}
-</style>
-
diff --git a/src/views/layout/components/Sidebar/Item.vue b/src/views/layout/components/Sidebar/Item.vue
deleted file mode 100644
index b515f61..0000000
--- a/src/views/layout/components/Sidebar/Item.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<script>
-export default {
-  name: 'MenuItem',
-  functional: true,
-  props: {
-    icon: {
-      type: String,
-      default: ''
-    },
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  render(h, context) {
-    const { icon, title } = context.props
-    const vnodes = []
-
-    if (icon) {
-      vnodes.push(<svg-icon icon-class={icon}/>)
-    }
-
-    if (title) {
-      vnodes.push(<span slot='title'>{(title)}</span>)
-    }
-    return vnodes
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/Link.vue b/src/views/layout/components/Sidebar/Link.vue
deleted file mode 100644
index bff45cd..0000000
--- a/src/views/layout/components/Sidebar/Link.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-<template>
-  <!-- eslint-disable vue/require-component-is -->
-  <component v-bind="linkProps(to)">
-    <slot/>
-  </component>
-</template>
-
-<script>
-import { isExternal } from '@/utils/validate'
-
-export default {
-  props: {
-    to: {
-      type: String,
-      required: true
-    }
-  },
-  methods: {
-    linkProps(url) {
-      if (isExternal(url)) {
-        return {
-          is: 'a',
-          href: url,
-          target: '_blank',
-          rel: 'noopener'
-        }
-      }
-      return {
-        is: 'router-link',
-        to: url
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue
deleted file mode 100644
index 988d662..0000000
--- a/src/views/layout/components/Sidebar/SidebarItem.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <div v-if="!item.hidden&&item.children" class="menu-wrapper">
-
-    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
-      <a :href="onlyOneChild.path" target="_blank" @click="clickLink(onlyOneChild.path,$event)">
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
-          <item v-if="onlyOneChild.meta" :icon="onlyOneChild.meta.icon||item.meta.icon" :title="onlyOneChild.meta.title" />
-        </el-menu-item>
-      </a>
-    </template>
-
-    <el-submenu v-else :index="item.name||item.path">
-      <template slot="title">
-        <item v-if="item.meta" :icon="item.meta.icon" :title="item.meta.title" />
-      </template>
-
-      <template v-for="child in item.children" v-if="!child.hidden">
-        <sidebar-item
-          v-if="child.children&&child.children.length>0"
-          :is-nest="true"
-          :item="child"
-          :key="child.path"
-          :base-path="resolvePath(child.path)"
-          class="nest-menu" />
-
-        <a v-else :href="child.path" :key="child.name" target="_blank" @click="clickLink(child.path,$event)">
-          <el-menu-item :index="resolvePath(child.path)">
-            <span class="light-line"/>
-            <item v-if="child.meta" :icon="child.meta.icon" :title="child.meta.title" />
-          </el-menu-item>
-        </a>
-      </template>
-    </el-submenu>
-
-  </div>
-</template>
-
-<script>
-import path from 'path'
-import { validateURL } from '@/utils/validate'
-import Item from './Item'
-
-export default {
-  name: 'SidebarItem',
-  components: { Item },
-  props: {
-    // route object
-    item: {
-      type: Object,
-      required: true
-    },
-    isNest: {
-      type: Boolean,
-      default: false
-    },
-    basePath: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      onlyOneChild: null
-    }
-  },
-  methods: {
-    hasOneShowingChild(children, parent) {
-      const showingChildren = children.filter(item => {
-        if (item.hidden) {
-          return false
-        } else {
-          // Temp set(will be used if only has one showing child)
-          this.onlyOneChild = item
-          return true
-        }
-      })
-
-      // When there is only one child router, the child router is displayed by default
-      if (showingChildren.length === 1) {
-        return true
-      }
-
-      // Show parent if there are no child router to display
-      if (showingChildren.length === 0) {
-        this.onlyOneChild = { ... parent, path: '', noShowingChildren: true }
-        return true
-      }
-
-      return false
-    },
-    resolvePath(routePath) {
-      return path.resolve(this.basePath, routePath)
-    },
-    isExternalLink(routePath) {
-      return validateURL(routePath)
-    },
-    clickLink(routePath, e) {
-      if (!this.isExternalLink(routePath)) {
-        e.preventDefault()
-        const path = this.resolvePath(routePath)
-        this.$router.push({ path, query: { t: +new Date() }})
-        // this.$router.push(path)
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
deleted file mode 100644
index 5dcf730..0000000
--- a/src/views/layout/components/Sidebar/index.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<template>
-  <el-scrollbar wrap-class="scrollbar-wrapper">
-    <el-menu
-      :show-timeout="200"
-      :default-active="activeMenu"
-      :collapse="isCollapse"
-      mode="vertical"
-      background-color="#304156"
-      text-color="#bfcbd9"
-      active-text-color="#1bb1a5"
-    >
-      <sidebar-item v-for="route in permission_routers" :key="route.name" :item="route" :base-path="route.path"/>
-    </el-menu>
-  </el-scrollbar>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import SidebarItem from './SidebarItem'
-
-export default {
-  components: { SidebarItem },
-  computed: {
-    ...mapGetters([
-      'permission_routers',
-      'sidebar'
-    ]),
-    activeMenu() {
-      const route = this.$route
-      const { meta, path } = route
-      // 如果meta中上设置activeMenu，按照meta中设置高亮
-      if (meta.activeMenu) {
-        return meta.activeMenu
-      }
-      return path
-    },
-    isCollapse() {
-      return !this.sidebar.opened
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/TagsView/ScrollPane.vue b/src/views/layout/components/TagsView/ScrollPane.vue
deleted file mode 100644
index 0ec76e7..0000000
--- a/src/views/layout/components/TagsView/ScrollPane.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-<template>
-  <el-scrollbar ref="scrollContainer" :vertical="false" class="scroll-container" @wheel.native.prevent="handleScroll">
-    <slot />
-  </el-scrollbar>
-</template>
-
-<script>
-const tagAndTagSpacing = 4 // tagAndTagSpacing
-
-export default {
-  name: 'ScrollPane',
-  data() {
-    return {
-      left: 0
-    }
-  },
-  computed: {
-    scrollWrapper() {
-      return this.$refs.scrollContainer.$refs.wrap
-    }
-  },
-  methods: {
-    handleScroll(e) {
-      const eventDelta = e.wheelDelta || -e.deltaY * 40
-      const $scrollWrapper = this.scrollWrapper
-      $scrollWrapper.scrollLeft = $scrollWrapper.scrollLeft + eventDelta / 4
-    },
-    moveToTarget(currentTag) {
-      const $container = this.$refs.scrollContainer.$el
-      const $containerWidth = $container.offsetWidth
-      const $scrollWrapper = this.scrollWrapper
-      const tagList = this.$parent.$refs.tag
-
-      let firstTag = null
-      let lastTag = null
-
-      // find first tag and last tag
-      if (tagList.length > 0) {
-        firstTag = tagList[0]
-        lastTag = tagList[tagList.length - 1]
-      }
-
-      if (firstTag === currentTag) {
-        $scrollWrapper.scrollLeft = 0
-      } else if (lastTag === currentTag) {
-        $scrollWrapper.scrollLeft = $scrollWrapper.scrollWidth - $containerWidth
-      } else {
-        // find preTag and nextTag
-        const currentIndex = tagList.findIndex(item => item === currentTag)
-        const prevTag = tagList[currentIndex - 1]
-        const nextTag = tagList[currentIndex + 1]
-
-        // the tag's offsetLeft after of nextTag
-        const afterNextTagOffsetLeft = nextTag.$el.offsetLeft + nextTag.$el.offsetWidth + tagAndTagSpacing
-
-        // the tag's offsetLeft before of prevTag
-        const beforePrevTagOffsetLeft = prevTag.$el.offsetLeft - tagAndTagSpacing
-
-        if (afterNextTagOffsetLeft > $scrollWrapper.scrollLeft + $containerWidth) {
-          $scrollWrapper.scrollLeft = afterNextTagOffsetLeft - $containerWidth
-        } else if (beforePrevTagOffsetLeft < $scrollWrapper.scrollLeft) {
-          $scrollWrapper.scrollLeft = beforePrevTagOffsetLeft
-        }
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.scroll-container {
-  white-space: nowrap;
-  position: relative;
-  overflow: hidden;
-  width: 100%;
-  /deep/ {
-    .el-scrollbar__bar {
-      bottom: 0px;
-    }
-    .el-scrollbar__wrap {
-      height: 49px;
-    }
-  }
-}
-</style>

diff --git a/config/dev.env.js b/config/dev.env.js
index b654c4c..95e311a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,7 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://111.198.10.15:12204"'
+  // BASE_API: '"http://111.198.10.15:12204"'
+  BASE_API: '"http://111.198.10.15:11409"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/mock/system/area.js b/mock/system/area.js
index 3495001..dd8e88e 100644
--- a/mock/system/area.js
+++ b/mock/system/area.js
@@ -79,5 +79,52 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/levelType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '省级',
+            'id': '166',
+            'value': '1'
+          },
+          {
+            'name': '市级',
+            'id': '167',
+            'value': '2'
+          },
+          {
+            'name': '区级',
+            'id': '168',
+            'value': '3'
+          },
+          {
+            'name': '街道',
+            'id': '169',
+            'value': '4'
+          },
+          {
+            'name': '社区',
+            'id': '170',
+            'value': '5'
+          },
+          {
+            'name': '网格',
+            'id': '171',
+            'value': '6'
+          },
+          {
+            'name': '责任网格',
+            'id': '172',
+            'value': '7'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f17c427 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -176,5 +176,32 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/dataScopeType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '全部',
+            'id': '55',
+            'value': '03'
+          },
+          {
+            'name': '本部门',
+            'id': '56',
+            'value': '04'
+          },
+          {
+            'name': '自定义',
+            'id': '57',
+            'value': '04'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/src/main.js b/src/main.js
index 5630ee7..ae15138 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
  * it will intercept your request, so you won't see the request in the network.
  * If you remove `../mock` it will automatically request easy-mock data.
  */
-// import './../mock' // simulation data
+import './../mock' // simulation data
 // require('./../mock')
 // 兼容IE11
 import 'babel-polyfill'
diff --git a/src/settings.js b/src/settings.js
index b8159bf..b568ce0 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: false,
+  showSettings: true,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/example/tableExample.vue b/src/views/example/tableExample.vue
index a313e57..9d98bb5 100644
--- a/src/views/example/tableExample.vue
+++ b/src/views/example/tableExample.vue
@@ -145,8 +145,8 @@
           needIndex: false // 是否需要序号列
         },
         toolsOption: {
-          selectColumns: false, // 是否需要筛选列
-          refresh: false // 是否需要刷新按钮
+          selectColumns: true, // 是否需要筛选列
+          refresh: true // 是否需要刷新按钮
         }
       } // 表格属性
     }
diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
deleted file mode 100644
index c7b94e7..0000000
--- a/src/views/layout/Layout.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <app-header class="app-header"/>
-    <div class="app-body">
-      <!--侧边栏-->
-      <sidebar class="sidebar-container"/>
-      <!--右半部分-->
-      <div class="main-container">
-        <!--上方导航-->
-        <navbar/>
-        <!--标签栏-->
-        <tags-view/>
-        <!--主页-->
-        <el-scrollbar>
-          <app-main/>
-        </el-scrollbar>
-
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { AppHeader, Navbar, Sidebar, AppMain } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import TagsView from './components/TagsView/index'
-
-export default {
-  name: 'Layout',
-  components: {
-    TagsView,
-    AppHeader,
-    Navbar,
-    Sidebar,
-    AppMain
-  },
-  mixins: [ResizeMixin],
-  computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    device() {
-      return this.$store.state.app.device
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened,
-        withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    }
-  },
-  methods: {
-    handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  @import "src/styles/mixin.scss";
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-    &.mobile.openSidebar{
-      position: fixed;
-      top: 0;
-    }
-  }
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-  .el-scrollbar{
-    height: calc(100vh - 50px);
-  }
-</style>
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
deleted file mode 100644
index 6326221..0000000
--- a/src/views/layout/components/AppHeader.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
-    <h3>{{ title }}</h3>
-    <el-dropdown class="avatar-container" trigger="click">
-      <div class="avatar-wrapper">
-        <span style="line-height:50px;">欢迎您，{{ name }}</span>
-        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
-        <i class="el-icon-caret-bottom"/>
-      </div>
-      <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <!--<router-link class="inlineBlock" to="/">-->
-        <!--<el-dropdown-item>-->
-        <!--主页-->
-        <!--</el-dropdown-item>-->
-        <!--</router-link>-->
-        <el-dropdown-item>
-          <span style="display:block;" @click="resetPwd">修改密码</span>
-        </el-dropdown-item>
-        <el-dropdown-item divided>
-          <span style="display:block;" @click="logout">注销</span>
-        </el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
-    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import ResetPwd from '../../system/user/resetPwd'
-import { getProject } from '@/utils/baseConfig'
-
-export default {
-  name: 'AppHeader',
-  components: { ResetPwd },
-  data() {
-    return {
-      title: getProject().title,
-      name: this.$store.getters.name,
-      showSetPwd: false,
-      headerUrl: require('../../../assets/global_images/header.png')// 头部图片
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    },
-    resetPwd() {
-      this.showSetPwd = true
-      this.$refs.retPwd.initDialog(true)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .app-header{
-    height:60px;
-    background-color:#000000;
-    background-repeat: no-repeat;
-    -webkit-background-size: 100% 100%;
-    background-size: 100% 100%;
-    color:white;
-  }
-  h3{
-    margin-left:40px;
-    display: inline-block;
-    float:left;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    float: right;
-    z-index:500;
-    position: fixed;
-    top:5px;
-    right: 35px;
-    .avatar-wrapper {
-      color:#d3dce6;
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        font-size: 12px;
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
deleted file mode 100644
index 2ea268e..0000000
--- a/src/views/layout/components/AppMain.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <section class="app-main">
-    <transition name="fade-transform" mode="out-in">
-      <!-- or name="fade" -->
-      <!-- <router-view :key="key"></router-view> -->
-      <div>
-        <keep-alive>
-          <router-view v-if="$route.meta.keepAlive" :key="key"/>
-        </keep-alive>
-        <router-view v-if="!$route.meta.keepAlive" :key="key"/>
-      </div>
-    </transition>
-  </section>
-</template>
-
-<script>
-export default {
-  name: 'AppMain',
-  computed: {
-    key() {
-      if (this.$route.meta.keepAlive) {
-        return this.$route.name !== undefined ? this.$route.name : this.$route
-      } else {
-        return this.$route.name !== undefined ? this.$route.name + new Date() : this.$route + new Date()
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.app-main {
-  /*50 = navbar  */
-  /*min-height: calc(100vh - 50px);*/
-  position: relative;
-  overflow: hidden;
-}
-</style>
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
deleted file mode 100644
index 193b604..0000000
--- a/src/views/layout/components/Navbar.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <div class="navbar">
-    <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
-    <breadcrumb />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import Hamburger from '@/components/Hamburger'
-
-export default {
-  components: {
-    Breadcrumb,
-    Hamburger
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.navbar {
-  height: 50px;
-  line-height: 50px;
-  box-shadow: 0 1px 3px 0 rgba(0,0,0,.12), 0 0 3px 0 rgba(0,0,0,.04);
-  .hamburger-container {
-    line-height: 58px;
-    height: 50px;
-    float: left;
-    padding: 0 10px;
-  }
-  .screenfull {
-    position: absolute;
-    right: 90px;
-    top: 16px;
-    color: red;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    position: absolute;
-    right: 35px;
-    .avatar-wrapper {
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        position: absolute;
-        right: -20px;
-        top: 25px;
-        font-size: 12px;
-      }
-    }
-  }
-}
-</style>
-
diff --git a/src/views/layout/components/Sidebar/Item.vue b/src/views/layout/components/Sidebar/Item.vue
deleted file mode 100644
index b515f61..0000000
--- a/src/views/layout/components/Sidebar/Item.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<script>
-export default {
-  name: 'MenuItem',
-  functional: true,
-  props: {
-    icon: {
-      type: String,
-      default: ''
-    },
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  render(h, context) {
-    const { icon, title } = context.props
-    const vnodes = []
-
-    if (icon) {
-      vnodes.push(<svg-icon icon-class={icon}/>)
-    }
-
-    if (title) {
-      vnodes.push(<span slot='title'>{(title)}</span>)
-    }
-    return vnodes
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/Link.vue b/src/views/layout/components/Sidebar/Link.vue
deleted file mode 100644
index bff45cd..0000000
--- a/src/views/layout/components/Sidebar/Link.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-<template>
-  <!-- eslint-disable vue/require-component-is -->
-  <component v-bind="linkProps(to)">
-    <slot/>
-  </component>
-</template>
-
-<script>
-import { isExternal } from '@/utils/validate'
-
-export default {
-  props: {
-    to: {
-      type: String,
-      required: true
-    }
-  },
-  methods: {
-    linkProps(url) {
-      if (isExternal(url)) {
-        return {
-          is: 'a',
-          href: url,
-          target: '_blank',
-          rel: 'noopener'
-        }
-      }
-      return {
-        is: 'router-link',
-        to: url
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue
deleted file mode 100644
index 988d662..0000000
--- a/src/views/layout/components/Sidebar/SidebarItem.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <div v-if="!item.hidden&&item.children" class="menu-wrapper">
-
-    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
-      <a :href="onlyOneChild.path" target="_blank" @click="clickLink(onlyOneChild.path,$event)">
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
-          <item v-if="onlyOneChild.meta" :icon="onlyOneChild.meta.icon||item.meta.icon" :title="onlyOneChild.meta.title" />
-        </el-menu-item>
-      </a>
-    </template>
-
-    <el-submenu v-else :index="item.name||item.path">
-      <template slot="title">
-        <item v-if="item.meta" :icon="item.meta.icon" :title="item.meta.title" />
-      </template>
-
-      <template v-for="child in item.children" v-if="!child.hidden">
-        <sidebar-item
-          v-if="child.children&&child.children.length>0"
-          :is-nest="true"
-          :item="child"
-          :key="child.path"
-          :base-path="resolvePath(child.path)"
-          class="nest-menu" />
-
-        <a v-else :href="child.path" :key="child.name" target="_blank" @click="clickLink(child.path,$event)">
-          <el-menu-item :index="resolvePath(child.path)">
-            <span class="light-line"/>
-            <item v-if="child.meta" :icon="child.meta.icon" :title="child.meta.title" />
-          </el-menu-item>
-        </a>
-      </template>
-    </el-submenu>
-
-  </div>
-</template>
-
-<script>
-import path from 'path'
-import { validateURL } from '@/utils/validate'
-import Item from './Item'
-
-export default {
-  name: 'SidebarItem',
-  components: { Item },
-  props: {
-    // route object
-    item: {
-      type: Object,
-      required: true
-    },
-    isNest: {
-      type: Boolean,
-      default: false
-    },
-    basePath: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      onlyOneChild: null
-    }
-  },
-  methods: {
-    hasOneShowingChild(children, parent) {
-      const showingChildren = children.filter(item => {
-        if (item.hidden) {
-          return false
-        } else {
-          // Temp set(will be used if only has one showing child)
-          this.onlyOneChild = item
-          return true
-        }
-      })
-
-      // When there is only one child router, the child router is displayed by default
-      if (showingChildren.length === 1) {
-        return true
-      }
-
-      // Show parent if there are no child router to display
-      if (showingChildren.length === 0) {
-        this.onlyOneChild = { ... parent, path: '', noShowingChildren: true }
-        return true
-      }
-
-      return false
-    },
-    resolvePath(routePath) {
-      return path.resolve(this.basePath, routePath)
-    },
-    isExternalLink(routePath) {
-      return validateURL(routePath)
-    },
-    clickLink(routePath, e) {
-      if (!this.isExternalLink(routePath)) {
-        e.preventDefault()
-        const path = this.resolvePath(routePath)
-        this.$router.push({ path, query: { t: +new Date() }})
-        // this.$router.push(path)
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
deleted file mode 100644
index 5dcf730..0000000
--- a/src/views/layout/components/Sidebar/index.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<template>
-  <el-scrollbar wrap-class="scrollbar-wrapper">
-    <el-menu
-      :show-timeout="200"
-      :default-active="activeMenu"
-      :collapse="isCollapse"
-      mode="vertical"
-      background-color="#304156"
-      text-color="#bfcbd9"
-      active-text-color="#1bb1a5"
-    >
-      <sidebar-item v-for="route in permission_routers" :key="route.name" :item="route" :base-path="route.path"/>
-    </el-menu>
-  </el-scrollbar>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import SidebarItem from './SidebarItem'
-
-export default {
-  components: { SidebarItem },
-  computed: {
-    ...mapGetters([
-      'permission_routers',
-      'sidebar'
-    ]),
-    activeMenu() {
-      const route = this.$route
-      const { meta, path } = route
-      // 如果meta中上设置activeMenu，按照meta中设置高亮
-      if (meta.activeMenu) {
-        return meta.activeMenu
-      }
-      return path
-    },
-    isCollapse() {
-      return !this.sidebar.opened
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/TagsView/ScrollPane.vue b/src/views/layout/components/TagsView/ScrollPane.vue
deleted file mode 100644
index 0ec76e7..0000000
--- a/src/views/layout/components/TagsView/ScrollPane.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-<template>
-  <el-scrollbar ref="scrollContainer" :vertical="false" class="scroll-container" @wheel.native.prevent="handleScroll">
-    <slot />
-  </el-scrollbar>
-</template>
-
-<script>
-const tagAndTagSpacing = 4 // tagAndTagSpacing
-
-export default {
-  name: 'ScrollPane',
-  data() {
-    return {
-      left: 0
-    }
-  },
-  computed: {
-    scrollWrapper() {
-      return this.$refs.scrollContainer.$refs.wrap
-    }
-  },
-  methods: {
-    handleScroll(e) {
-      const eventDelta = e.wheelDelta || -e.deltaY * 40
-      const $scrollWrapper = this.scrollWrapper
-      $scrollWrapper.scrollLeft = $scrollWrapper.scrollLeft + eventDelta / 4
-    },
-    moveToTarget(currentTag) {
-      const $container = this.$refs.scrollContainer.$el
-      const $containerWidth = $container.offsetWidth
-      const $scrollWrapper = this.scrollWrapper
-      const tagList = this.$parent.$refs.tag
-
-      let firstTag = null
-      let lastTag = null
-
-      // find first tag and last tag
-      if (tagList.length > 0) {
-        firstTag = tagList[0]
-        lastTag = tagList[tagList.length - 1]
-      }
-
-      if (firstTag === currentTag) {
-        $scrollWrapper.scrollLeft = 0
-      } else if (lastTag === currentTag) {
-        $scrollWrapper.scrollLeft = $scrollWrapper.scrollWidth - $containerWidth
-      } else {
-        // find preTag and nextTag
-        const currentIndex = tagList.findIndex(item => item === currentTag)
-        const prevTag = tagList[currentIndex - 1]
-        const nextTag = tagList[currentIndex + 1]
-
-        // the tag's offsetLeft after of nextTag
-        const afterNextTagOffsetLeft = nextTag.$el.offsetLeft + nextTag.$el.offsetWidth + tagAndTagSpacing
-
-        // the tag's offsetLeft before of prevTag
-        const beforePrevTagOffsetLeft = prevTag.$el.offsetLeft - tagAndTagSpacing
-
-        if (afterNextTagOffsetLeft > $scrollWrapper.scrollLeft + $containerWidth) {
-          $scrollWrapper.scrollLeft = afterNextTagOffsetLeft - $containerWidth
-        } else if (beforePrevTagOffsetLeft < $scrollWrapper.scrollLeft) {
-          $scrollWrapper.scrollLeft = beforePrevTagOffsetLeft
-        }
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.scroll-container {
-  white-space: nowrap;
-  position: relative;
-  overflow: hidden;
-  width: 100%;
-  /deep/ {
-    .el-scrollbar__bar {
-      bottom: 0px;
-    }
-    .el-scrollbar__wrap {
-      height: 49px;
-    }
-  }
-}
-</style>
diff --git a/src/views/layout/components/TagsView/index.vue b/src/views/layout/components/TagsView/index.vue
deleted file mode 100644
index 325c815..0000000
--- a/src/views/layout/components/TagsView/index.vue
+++ /dev/null
@@ -1,287 +0,0 @@
-<template>
-  <div id="tags-view-container" class="tags-view-container">
-    <scroll-pane ref="scrollPane" class="tags-view-wrapper">
-      <router-link
-        v-for="tag in visitedViews"
-        ref="tag"
-        :key="tag.path"
-        :class="isActive(tag)?'active':''"
-        :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
-        tag="span"
-        class="tags-view-item"
-        @click.middle.native="closeSelectedTag(tag)"
-        @contextmenu.prevent.native="openMenu(tag,$event)"
-      >
-        {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
-      </router-link>
-    </scroll-pane>
-    <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
-      <li @click="refreshSelectedTag(selectedTag)">刷新页面</li>
-      <li v-if="!(selectedTag.meta&&selectedTag.meta.affix)" @click="closeSelectedTag(selectedTag)">关闭当前标签页</li>
-      <li @click="closeOthersTags">关闭其他标签页</li>
-      <li @click="closeAllTags(selectedTag)">关闭全部标签页</li>
-    </ul>
-  </div>
-</template>
-
-<script>
-import ScrollPane from './ScrollPane'
-import path from 'path'
-
-export default {
-  name: 'TagsView',
-  components: { ScrollPane },
-  data() {
-    return {
-      visible: false,
-      top: 0,
-      left: 0,
-      selectedTag: {},
-      affixTags: []
-    }
-  },
-  computed: {
-    visitedViews() {
-      return this.$store.state.tagsView.visitedViews
-    },
-    routes() {
-      return this.$store.state.permission.routers
-    }
-  },
-  watch: {
-    $route() {
-      this.addTags()
-      this.moveToCurrentTag()
-    },
-    visible(value) {
-      if (value) {
-        document.body.addEventListener('click', this.closeMenu)
-      } else {
-        document.body.removeEventListener('click', this.closeMenu)
-      }
-    }
-  },
-  mounted() {
-    this.initTags()
-    this.addTags()
-  },
-  methods: {
-    isActive(route) {
-      return route.path === this.$route.path
-    },
-    filterAffixTags(routes, basePath = '/') {
-      let tags = []
-      routes.forEach(route => {
-        if (route.meta && route.meta.affix) {
-          const tagPath = path.resolve(basePath, route.path)
-          tags.push({
-            fullPath: tagPath,
-            path: tagPath,
-            name: route.name,
-            meta: { ...route.meta }
-          })
-        }
-        if (route.children) {
-          const tempTags = this.filterAffixTags(route.children, route.path)
-          if (tempTags.length >= 1) {
-            tags = [...tags, ...tempTags]
-          }
-        }
-      })
-      return tags
-    },
-    initTags() {
-      const affixTags = this.affixTags = this.filterAffixTags(this.routes)
-      for (const tag of affixTags) {
-        // Must have tag name
-        if (tag.name) {
-          this.$store.dispatch('tagsView/addVisitedView', tag)
-        }
-      }
-    },
-    addTags() {
-      const { name } = this.$route
-      if (name) {
-        this.$store.dispatch('tagsView/addView', this.$route)
-      }
-      return false
-    },
-    moveToCurrentTag() {
-      const tags = this.$refs.tag
-      this.$nextTick(() => {
-        for (const tag of tags) {
-          if (tag.to.path === this.$route.path) {
-            this.$refs.scrollPane.moveToTarget(tag)
-            // when query is different then update
-            if (tag.to.fullPath !== this.$route.fullPath) {
-              this.$store.dispatch('tagsView/updateVisitedView', this.$route)
-            }
-            break
-          }
-        }
-      })
-    },
-    refreshSelectedTag(view) {
-      this.$store.dispatch('tagsView/delCachedView', view).then(() => {
-        const { fullPath } = view
-        this.$nextTick(() => {
-          this.$router.replace({
-            path: '/redirect' + fullPath
-          })
-        })
-      })
-    },
-    closeSelectedTag(view) {
-      this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
-        if (this.isActive(view)) {
-          this.toLastView(visitedViews, view)
-        }
-      })
-    },
-    closeOthersTags() {
-      this.$router.push(this.selectedTag)
-      this.$store.dispatch('tagsView/delOthersViews', this.selectedTag).then(() => {
-        this.moveToCurrentTag()
-      })
-    },
-    closeAllTags(view) {
-      this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => {
-        if (this.affixTags.some(tag => tag.path === view.path)) {
-          return
-        }
-        this.toLastView(visitedViews, view)
-      })
-    },
-    toLastView(visitedViews, view) {
-      const latestView = visitedViews.slice(-1)[0]
-      if (latestView) {
-        this.$router.push(latestView)
-      } else {
-        // now the default is to redirect to the home page if there is no tags-view,
-        // you can adjust it according to your needs.
-        if (view.name === 'Dashboard') {
-          // to reload home page
-          this.$router.replace({ path: '/redirect' + view.fullPath })
-        } else {
-          this.$router.push('/')
-        }
-      }
-    },
-    openMenu(tag, e) {
-      const menuMinWidth = 105
-      const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
-      const offsetWidth = this.$el.offsetWidth // container width
-      const maxLeft = offsetWidth - menuMinWidth // left boundary
-      const left = e.clientX - offsetLeft + 15 // 15: margin right
-
-      if (left > maxLeft) {
-        this.left = maxLeft
-      } else {
-        this.left = left
-      }
-
-      this.top = e.clientY - 40
-      this.visible = true
-      this.selectedTag = tag
-    },
-    closeMenu() {
-      this.visible = false
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-  .tags-view-container {
-    height: 34px;
-    width: 100%;
-    background: #fff;
-    border-bottom: 1px solid #d8dce5;
-    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
-    .tags-view-wrapper {
-      .tags-view-item {
-        display: inline-block;
-        position: relative;
-        cursor: pointer;
-        height: 26px;
-        line-height: 26px;
-        border: 1px solid #d8dce5;
-        color: #495060;
-        background: #fff;
-        padding: 0 8px;
-        font-size: 12px;
-        margin-left: 5px;
-        margin-top: 4px;
-        &:first-of-type {
-          margin-left: 15px;
-        }
-        &:last-of-type {
-          margin-right: 15px;
-        }
-        &.active {
-          background-color: #42b983;
-          color: #fff;
-          border-color: #42b983;
-          &::before {
-            content: '';
-            background: #fff;
-            display: inline-block;
-            width: 8px;
-            height: 8px;
-            border-radius: 50%;
-            position: relative;
-            margin-right: 2px;
-          }
-        }
-      }
-    }
-    .contextmenu {
-      margin: 0;
-      background: #fff;
-      z-index: 3000;
-      position: absolute;
-      list-style-type: none;
-      padding: 5px 0;
-      border-radius: 4px;
-      font-size: 12px;
-      font-weight: 400;
-      color: #333;
-      box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
-      li {
-        margin: 0;
-        padding: 7px 16px;
-        cursor: pointer;
-        &:hover {
-          background: #eee;
-        }
-      }
-    }
-  }
-</style>
-
-<style lang="scss">
-  //reset element css of el-icon-close
-  .tags-view-wrapper {
-    .tags-view-item {
-      .el-icon-close {
-        width: 16px;
-        height: 16px;
-        vertical-align: 2px;
-        border-radius: 50%;
-        text-align: center;
-        transition: all .3s cubic-bezier(.645, .045, .355, 1);
-        transform-origin: 100% 50%;
-        &:before {
-          transform: scale(.6);
-          display: inline-block;
-          vertical-align: -3px;
-        }
-        &:hover {
-          background-color: #b4bccc;
-          color: #fff;
-        }
-      }
-    }
-  }
-</style>

diff --git a/config/dev.env.js b/config/dev.env.js
index b654c4c..95e311a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,7 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://111.198.10.15:12204"'
+  // BASE_API: '"http://111.198.10.15:12204"'
+  BASE_API: '"http://111.198.10.15:11409"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/mock/system/area.js b/mock/system/area.js
index 3495001..dd8e88e 100644
--- a/mock/system/area.js
+++ b/mock/system/area.js
@@ -79,5 +79,52 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/levelType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '省级',
+            'id': '166',
+            'value': '1'
+          },
+          {
+            'name': '市级',
+            'id': '167',
+            'value': '2'
+          },
+          {
+            'name': '区级',
+            'id': '168',
+            'value': '3'
+          },
+          {
+            'name': '街道',
+            'id': '169',
+            'value': '4'
+          },
+          {
+            'name': '社区',
+            'id': '170',
+            'value': '5'
+          },
+          {
+            'name': '网格',
+            'id': '171',
+            'value': '6'
+          },
+          {
+            'name': '责任网格',
+            'id': '172',
+            'value': '7'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f17c427 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -176,5 +176,32 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/dataScopeType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '全部',
+            'id': '55',
+            'value': '03'
+          },
+          {
+            'name': '本部门',
+            'id': '56',
+            'value': '04'
+          },
+          {
+            'name': '自定义',
+            'id': '57',
+            'value': '04'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/src/main.js b/src/main.js
index 5630ee7..ae15138 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
  * it will intercept your request, so you won't see the request in the network.
  * If you remove `../mock` it will automatically request easy-mock data.
  */
-// import './../mock' // simulation data
+import './../mock' // simulation data
 // require('./../mock')
 // 兼容IE11
 import 'babel-polyfill'
diff --git a/src/settings.js b/src/settings.js
index b8159bf..b568ce0 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: false,
+  showSettings: true,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/example/tableExample.vue b/src/views/example/tableExample.vue
index a313e57..9d98bb5 100644
--- a/src/views/example/tableExample.vue
+++ b/src/views/example/tableExample.vue
@@ -145,8 +145,8 @@
           needIndex: false // 是否需要序号列
         },
         toolsOption: {
-          selectColumns: false, // 是否需要筛选列
-          refresh: false // 是否需要刷新按钮
+          selectColumns: true, // 是否需要筛选列
+          refresh: true // 是否需要刷新按钮
         }
       } // 表格属性
     }
diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
deleted file mode 100644
index c7b94e7..0000000
--- a/src/views/layout/Layout.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <app-header class="app-header"/>
-    <div class="app-body">
-      <!--侧边栏-->
-      <sidebar class="sidebar-container"/>
-      <!--右半部分-->
-      <div class="main-container">
-        <!--上方导航-->
-        <navbar/>
-        <!--标签栏-->
-        <tags-view/>
-        <!--主页-->
-        <el-scrollbar>
-          <app-main/>
-        </el-scrollbar>
-
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { AppHeader, Navbar, Sidebar, AppMain } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import TagsView from './components/TagsView/index'
-
-export default {
-  name: 'Layout',
-  components: {
-    TagsView,
-    AppHeader,
-    Navbar,
-    Sidebar,
-    AppMain
-  },
-  mixins: [ResizeMixin],
-  computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    device() {
-      return this.$store.state.app.device
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened,
-        withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    }
-  },
-  methods: {
-    handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  @import "src/styles/mixin.scss";
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-    &.mobile.openSidebar{
-      position: fixed;
-      top: 0;
-    }
-  }
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-  .el-scrollbar{
-    height: calc(100vh - 50px);
-  }
-</style>
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
deleted file mode 100644
index 6326221..0000000
--- a/src/views/layout/components/AppHeader.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
-    <h3>{{ title }}</h3>
-    <el-dropdown class="avatar-container" trigger="click">
-      <div class="avatar-wrapper">
-        <span style="line-height:50px;">欢迎您，{{ name }}</span>
-        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
-        <i class="el-icon-caret-bottom"/>
-      </div>
-      <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <!--<router-link class="inlineBlock" to="/">-->
-        <!--<el-dropdown-item>-->
-        <!--主页-->
-        <!--</el-dropdown-item>-->
-        <!--</router-link>-->
-        <el-dropdown-item>
-          <span style="display:block;" @click="resetPwd">修改密码</span>
-        </el-dropdown-item>
-        <el-dropdown-item divided>
-          <span style="display:block;" @click="logout">注销</span>
-        </el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
-    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import ResetPwd from '../../system/user/resetPwd'
-import { getProject } from '@/utils/baseConfig'
-
-export default {
-  name: 'AppHeader',
-  components: { ResetPwd },
-  data() {
-    return {
-      title: getProject().title,
-      name: this.$store.getters.name,
-      showSetPwd: false,
-      headerUrl: require('../../../assets/global_images/header.png')// 头部图片
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    },
-    resetPwd() {
-      this.showSetPwd = true
-      this.$refs.retPwd.initDialog(true)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .app-header{
-    height:60px;
-    background-color:#000000;
-    background-repeat: no-repeat;
-    -webkit-background-size: 100% 100%;
-    background-size: 100% 100%;
-    color:white;
-  }
-  h3{
-    margin-left:40px;
-    display: inline-block;
-    float:left;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    float: right;
-    z-index:500;
-    position: fixed;
-    top:5px;
-    right: 35px;
-    .avatar-wrapper {
-      color:#d3dce6;
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        font-size: 12px;
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
deleted file mode 100644
index 2ea268e..0000000
--- a/src/views/layout/components/AppMain.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <section class="app-main">
-    <transition name="fade-transform" mode="out-in">
-      <!-- or name="fade" -->
-      <!-- <router-view :key="key"></router-view> -->
-      <div>
-        <keep-alive>
-          <router-view v-if="$route.meta.keepAlive" :key="key"/>
-        </keep-alive>
-        <router-view v-if="!$route.meta.keepAlive" :key="key"/>
-      </div>
-    </transition>
-  </section>
-</template>
-
-<script>
-export default {
-  name: 'AppMain',
-  computed: {
-    key() {
-      if (this.$route.meta.keepAlive) {
-        return this.$route.name !== undefined ? this.$route.name : this.$route
-      } else {
-        return this.$route.name !== undefined ? this.$route.name + new Date() : this.$route + new Date()
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.app-main {
-  /*50 = navbar  */
-  /*min-height: calc(100vh - 50px);*/
-  position: relative;
-  overflow: hidden;
-}
-</style>
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
deleted file mode 100644
index 193b604..0000000
--- a/src/views/layout/components/Navbar.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <div class="navbar">
-    <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
-    <breadcrumb />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import Hamburger from '@/components/Hamburger'
-
-export default {
-  components: {
-    Breadcrumb,
-    Hamburger
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.navbar {
-  height: 50px;
-  line-height: 50px;
-  box-shadow: 0 1px 3px 0 rgba(0,0,0,.12), 0 0 3px 0 rgba(0,0,0,.04);
-  .hamburger-container {
-    line-height: 58px;
-    height: 50px;
-    float: left;
-    padding: 0 10px;
-  }
-  .screenfull {
-    position: absolute;
-    right: 90px;
-    top: 16px;
-    color: red;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    position: absolute;
-    right: 35px;
-    .avatar-wrapper {
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        position: absolute;
-        right: -20px;
-        top: 25px;
-        font-size: 12px;
-      }
-    }
-  }
-}
-</style>
-
diff --git a/src/views/layout/components/Sidebar/Item.vue b/src/views/layout/components/Sidebar/Item.vue
deleted file mode 100644
index b515f61..0000000
--- a/src/views/layout/components/Sidebar/Item.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<script>
-export default {
-  name: 'MenuItem',
-  functional: true,
-  props: {
-    icon: {
-      type: String,
-      default: ''
-    },
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  render(h, context) {
-    const { icon, title } = context.props
-    const vnodes = []
-
-    if (icon) {
-      vnodes.push(<svg-icon icon-class={icon}/>)
-    }
-
-    if (title) {
-      vnodes.push(<span slot='title'>{(title)}</span>)
-    }
-    return vnodes
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/Link.vue b/src/views/layout/components/Sidebar/Link.vue
deleted file mode 100644
index bff45cd..0000000
--- a/src/views/layout/components/Sidebar/Link.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-<template>
-  <!-- eslint-disable vue/require-component-is -->
-  <component v-bind="linkProps(to)">
-    <slot/>
-  </component>
-</template>
-
-<script>
-import { isExternal } from '@/utils/validate'
-
-export default {
-  props: {
-    to: {
-      type: String,
-      required: true
-    }
-  },
-  methods: {
-    linkProps(url) {
-      if (isExternal(url)) {
-        return {
-          is: 'a',
-          href: url,
-          target: '_blank',
-          rel: 'noopener'
-        }
-      }
-      return {
-        is: 'router-link',
-        to: url
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue
deleted file mode 100644
index 988d662..0000000
--- a/src/views/layout/components/Sidebar/SidebarItem.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <div v-if="!item.hidden&&item.children" class="menu-wrapper">
-
-    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
-      <a :href="onlyOneChild.path" target="_blank" @click="clickLink(onlyOneChild.path,$event)">
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
-          <item v-if="onlyOneChild.meta" :icon="onlyOneChild.meta.icon||item.meta.icon" :title="onlyOneChild.meta.title" />
-        </el-menu-item>
-      </a>
-    </template>
-
-    <el-submenu v-else :index="item.name||item.path">
-      <template slot="title">
-        <item v-if="item.meta" :icon="item.meta.icon" :title="item.meta.title" />
-      </template>
-
-      <template v-for="child in item.children" v-if="!child.hidden">
-        <sidebar-item
-          v-if="child.children&&child.children.length>0"
-          :is-nest="true"
-          :item="child"
-          :key="child.path"
-          :base-path="resolvePath(child.path)"
-          class="nest-menu" />
-
-        <a v-else :href="child.path" :key="child.name" target="_blank" @click="clickLink(child.path,$event)">
-          <el-menu-item :index="resolvePath(child.path)">
-            <span class="light-line"/>
-            <item v-if="child.meta" :icon="child.meta.icon" :title="child.meta.title" />
-          </el-menu-item>
-        </a>
-      </template>
-    </el-submenu>
-
-  </div>
-</template>
-
-<script>
-import path from 'path'
-import { validateURL } from '@/utils/validate'
-import Item from './Item'
-
-export default {
-  name: 'SidebarItem',
-  components: { Item },
-  props: {
-    // route object
-    item: {
-      type: Object,
-      required: true
-    },
-    isNest: {
-      type: Boolean,
-      default: false
-    },
-    basePath: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      onlyOneChild: null
-    }
-  },
-  methods: {
-    hasOneShowingChild(children, parent) {
-      const showingChildren = children.filter(item => {
-        if (item.hidden) {
-          return false
-        } else {
-          // Temp set(will be used if only has one showing child)
-          this.onlyOneChild = item
-          return true
-        }
-      })
-
-      // When there is only one child router, the child router is displayed by default
-      if (showingChildren.length === 1) {
-        return true
-      }
-
-      // Show parent if there are no child router to display
-      if (showingChildren.length === 0) {
-        this.onlyOneChild = { ... parent, path: '', noShowingChildren: true }
-        return true
-      }
-
-      return false
-    },
-    resolvePath(routePath) {
-      return path.resolve(this.basePath, routePath)
-    },
-    isExternalLink(routePath) {
-      return validateURL(routePath)
-    },
-    clickLink(routePath, e) {
-      if (!this.isExternalLink(routePath)) {
-        e.preventDefault()
-        const path = this.resolvePath(routePath)
-        this.$router.push({ path, query: { t: +new Date() }})
-        // this.$router.push(path)
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
deleted file mode 100644
index 5dcf730..0000000
--- a/src/views/layout/components/Sidebar/index.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<template>
-  <el-scrollbar wrap-class="scrollbar-wrapper">
-    <el-menu
-      :show-timeout="200"
-      :default-active="activeMenu"
-      :collapse="isCollapse"
-      mode="vertical"
-      background-color="#304156"
-      text-color="#bfcbd9"
-      active-text-color="#1bb1a5"
-    >
-      <sidebar-item v-for="route in permission_routers" :key="route.name" :item="route" :base-path="route.path"/>
-    </el-menu>
-  </el-scrollbar>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import SidebarItem from './SidebarItem'
-
-export default {
-  components: { SidebarItem },
-  computed: {
-    ...mapGetters([
-      'permission_routers',
-      'sidebar'
-    ]),
-    activeMenu() {
-      const route = this.$route
-      const { meta, path } = route
-      // 如果meta中上设置activeMenu，按照meta中设置高亮
-      if (meta.activeMenu) {
-        return meta.activeMenu
-      }
-      return path
-    },
-    isCollapse() {
-      return !this.sidebar.opened
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/TagsView/ScrollPane.vue b/src/views/layout/components/TagsView/ScrollPane.vue
deleted file mode 100644
index 0ec76e7..0000000
--- a/src/views/layout/components/TagsView/ScrollPane.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-<template>
-  <el-scrollbar ref="scrollContainer" :vertical="false" class="scroll-container" @wheel.native.prevent="handleScroll">
-    <slot />
-  </el-scrollbar>
-</template>
-
-<script>
-const tagAndTagSpacing = 4 // tagAndTagSpacing
-
-export default {
-  name: 'ScrollPane',
-  data() {
-    return {
-      left: 0
-    }
-  },
-  computed: {
-    scrollWrapper() {
-      return this.$refs.scrollContainer.$refs.wrap
-    }
-  },
-  methods: {
-    handleScroll(e) {
-      const eventDelta = e.wheelDelta || -e.deltaY * 40
-      const $scrollWrapper = this.scrollWrapper
-      $scrollWrapper.scrollLeft = $scrollWrapper.scrollLeft + eventDelta / 4
-    },
-    moveToTarget(currentTag) {
-      const $container = this.$refs.scrollContainer.$el
-      const $containerWidth = $container.offsetWidth
-      const $scrollWrapper = this.scrollWrapper
-      const tagList = this.$parent.$refs.tag
-
-      let firstTag = null
-      let lastTag = null
-
-      // find first tag and last tag
-      if (tagList.length > 0) {
-        firstTag = tagList[0]
-        lastTag = tagList[tagList.length - 1]
-      }
-
-      if (firstTag === currentTag) {
-        $scrollWrapper.scrollLeft = 0
-      } else if (lastTag === currentTag) {
-        $scrollWrapper.scrollLeft = $scrollWrapper.scrollWidth - $containerWidth
-      } else {
-        // find preTag and nextTag
-        const currentIndex = tagList.findIndex(item => item === currentTag)
-        const prevTag = tagList[currentIndex - 1]
-        const nextTag = tagList[currentIndex + 1]
-
-        // the tag's offsetLeft after of nextTag
-        const afterNextTagOffsetLeft = nextTag.$el.offsetLeft + nextTag.$el.offsetWidth + tagAndTagSpacing
-
-        // the tag's offsetLeft before of prevTag
-        const beforePrevTagOffsetLeft = prevTag.$el.offsetLeft - tagAndTagSpacing
-
-        if (afterNextTagOffsetLeft > $scrollWrapper.scrollLeft + $containerWidth) {
-          $scrollWrapper.scrollLeft = afterNextTagOffsetLeft - $containerWidth
-        } else if (beforePrevTagOffsetLeft < $scrollWrapper.scrollLeft) {
-          $scrollWrapper.scrollLeft = beforePrevTagOffsetLeft
-        }
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.scroll-container {
-  white-space: nowrap;
-  position: relative;
-  overflow: hidden;
-  width: 100%;
-  /deep/ {
-    .el-scrollbar__bar {
-      bottom: 0px;
-    }
-    .el-scrollbar__wrap {
-      height: 49px;
-    }
-  }
-}
-</style>
diff --git a/src/views/layout/components/TagsView/index.vue b/src/views/layout/components/TagsView/index.vue
deleted file mode 100644
index 325c815..0000000
--- a/src/views/layout/components/TagsView/index.vue
+++ /dev/null
@@ -1,287 +0,0 @@
-<template>
-  <div id="tags-view-container" class="tags-view-container">
-    <scroll-pane ref="scrollPane" class="tags-view-wrapper">
-      <router-link
-        v-for="tag in visitedViews"
-        ref="tag"
-        :key="tag.path"
-        :class="isActive(tag)?'active':''"
-        :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
-        tag="span"
-        class="tags-view-item"
-        @click.middle.native="closeSelectedTag(tag)"
-        @contextmenu.prevent.native="openMenu(tag,$event)"
-      >
-        {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
-      </router-link>
-    </scroll-pane>
-    <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
-      <li @click="refreshSelectedTag(selectedTag)">刷新页面</li>
-      <li v-if="!(selectedTag.meta&&selectedTag.meta.affix)" @click="closeSelectedTag(selectedTag)">关闭当前标签页</li>
-      <li @click="closeOthersTags">关闭其他标签页</li>
-      <li @click="closeAllTags(selectedTag)">关闭全部标签页</li>
-    </ul>
-  </div>
-</template>
-
-<script>
-import ScrollPane from './ScrollPane'
-import path from 'path'
-
-export default {
-  name: 'TagsView',
-  components: { ScrollPane },
-  data() {
-    return {
-      visible: false,
-      top: 0,
-      left: 0,
-      selectedTag: {},
-      affixTags: []
-    }
-  },
-  computed: {
-    visitedViews() {
-      return this.$store.state.tagsView.visitedViews
-    },
-    routes() {
-      return this.$store.state.permission.routers
-    }
-  },
-  watch: {
-    $route() {
-      this.addTags()
-      this.moveToCurrentTag()
-    },
-    visible(value) {
-      if (value) {
-        document.body.addEventListener('click', this.closeMenu)
-      } else {
-        document.body.removeEventListener('click', this.closeMenu)
-      }
-    }
-  },
-  mounted() {
-    this.initTags()
-    this.addTags()
-  },
-  methods: {
-    isActive(route) {
-      return route.path === this.$route.path
-    },
-    filterAffixTags(routes, basePath = '/') {
-      let tags = []
-      routes.forEach(route => {
-        if (route.meta && route.meta.affix) {
-          const tagPath = path.resolve(basePath, route.path)
-          tags.push({
-            fullPath: tagPath,
-            path: tagPath,
-            name: route.name,
-            meta: { ...route.meta }
-          })
-        }
-        if (route.children) {
-          const tempTags = this.filterAffixTags(route.children, route.path)
-          if (tempTags.length >= 1) {
-            tags = [...tags, ...tempTags]
-          }
-        }
-      })
-      return tags
-    },
-    initTags() {
-      const affixTags = this.affixTags = this.filterAffixTags(this.routes)
-      for (const tag of affixTags) {
-        // Must have tag name
-        if (tag.name) {
-          this.$store.dispatch('tagsView/addVisitedView', tag)
-        }
-      }
-    },
-    addTags() {
-      const { name } = this.$route
-      if (name) {
-        this.$store.dispatch('tagsView/addView', this.$route)
-      }
-      return false
-    },
-    moveToCurrentTag() {
-      const tags = this.$refs.tag
-      this.$nextTick(() => {
-        for (const tag of tags) {
-          if (tag.to.path === this.$route.path) {
-            this.$refs.scrollPane.moveToTarget(tag)
-            // when query is different then update
-            if (tag.to.fullPath !== this.$route.fullPath) {
-              this.$store.dispatch('tagsView/updateVisitedView', this.$route)
-            }
-            break
-          }
-        }
-      })
-    },
-    refreshSelectedTag(view) {
-      this.$store.dispatch('tagsView/delCachedView', view).then(() => {
-        const { fullPath } = view
-        this.$nextTick(() => {
-          this.$router.replace({
-            path: '/redirect' + fullPath
-          })
-        })
-      })
-    },
-    closeSelectedTag(view) {
-      this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
-        if (this.isActive(view)) {
-          this.toLastView(visitedViews, view)
-        }
-      })
-    },
-    closeOthersTags() {
-      this.$router.push(this.selectedTag)
-      this.$store.dispatch('tagsView/delOthersViews', this.selectedTag).then(() => {
-        this.moveToCurrentTag()
-      })
-    },
-    closeAllTags(view) {
-      this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => {
-        if (this.affixTags.some(tag => tag.path === view.path)) {
-          return
-        }
-        this.toLastView(visitedViews, view)
-      })
-    },
-    toLastView(visitedViews, view) {
-      const latestView = visitedViews.slice(-1)[0]
-      if (latestView) {
-        this.$router.push(latestView)
-      } else {
-        // now the default is to redirect to the home page if there is no tags-view,
-        // you can adjust it according to your needs.
-        if (view.name === 'Dashboard') {
-          // to reload home page
-          this.$router.replace({ path: '/redirect' + view.fullPath })
-        } else {
-          this.$router.push('/')
-        }
-      }
-    },
-    openMenu(tag, e) {
-      const menuMinWidth = 105
-      const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
-      const offsetWidth = this.$el.offsetWidth // container width
-      const maxLeft = offsetWidth - menuMinWidth // left boundary
-      const left = e.clientX - offsetLeft + 15 // 15: margin right
-
-      if (left > maxLeft) {
-        this.left = maxLeft
-      } else {
-        this.left = left
-      }
-
-      this.top = e.clientY - 40
-      this.visible = true
-      this.selectedTag = tag
-    },
-    closeMenu() {
-      this.visible = false
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-  .tags-view-container {
-    height: 34px;
-    width: 100%;
-    background: #fff;
-    border-bottom: 1px solid #d8dce5;
-    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
-    .tags-view-wrapper {
-      .tags-view-item {
-        display: inline-block;
-        position: relative;
-        cursor: pointer;
-        height: 26px;
-        line-height: 26px;
-        border: 1px solid #d8dce5;
-        color: #495060;
-        background: #fff;
-        padding: 0 8px;
-        font-size: 12px;
-        margin-left: 5px;
-        margin-top: 4px;
-        &:first-of-type {
-          margin-left: 15px;
-        }
-        &:last-of-type {
-          margin-right: 15px;
-        }
-        &.active {
-          background-color: #42b983;
-          color: #fff;
-          border-color: #42b983;
-          &::before {
-            content: '';
-            background: #fff;
-            display: inline-block;
-            width: 8px;
-            height: 8px;
-            border-radius: 50%;
-            position: relative;
-            margin-right: 2px;
-          }
-        }
-      }
-    }
-    .contextmenu {
-      margin: 0;
-      background: #fff;
-      z-index: 3000;
-      position: absolute;
-      list-style-type: none;
-      padding: 5px 0;
-      border-radius: 4px;
-      font-size: 12px;
-      font-weight: 400;
-      color: #333;
-      box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
-      li {
-        margin: 0;
-        padding: 7px 16px;
-        cursor: pointer;
-        &:hover {
-          background: #eee;
-        }
-      }
-    }
-  }
-</style>
-
-<style lang="scss">
-  //reset element css of el-icon-close
-  .tags-view-wrapper {
-    .tags-view-item {
-      .el-icon-close {
-        width: 16px;
-        height: 16px;
-        vertical-align: 2px;
-        border-radius: 50%;
-        text-align: center;
-        transition: all .3s cubic-bezier(.645, .045, .355, 1);
-        transform-origin: 100% 50%;
-        &:before {
-          transform: scale(.6);
-          display: inline-block;
-          vertical-align: -3px;
-        }
-        &:hover {
-          background-color: #b4bccc;
-          color: #fff;
-        }
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/index.js b/src/views/layout/components/index.js
deleted file mode 100644
index 52d35e3..0000000
--- a/src/views/layout/components/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export { default as Navbar } from './Navbar'
-export { default as Sidebar } from './Sidebar'
-export { default as AppMain } from './AppMain'
-export { default as AppHeader } from './AppHeader'

diff --git a/config/dev.env.js b/config/dev.env.js
index b654c4c..95e311a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,7 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://111.198.10.15:12204"'
+  // BASE_API: '"http://111.198.10.15:12204"'
+  BASE_API: '"http://111.198.10.15:11409"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/mock/system/area.js b/mock/system/area.js
index 3495001..dd8e88e 100644
--- a/mock/system/area.js
+++ b/mock/system/area.js
@@ -79,5 +79,52 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/levelType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '省级',
+            'id': '166',
+            'value': '1'
+          },
+          {
+            'name': '市级',
+            'id': '167',
+            'value': '2'
+          },
+          {
+            'name': '区级',
+            'id': '168',
+            'value': '3'
+          },
+          {
+            'name': '街道',
+            'id': '169',
+            'value': '4'
+          },
+          {
+            'name': '社区',
+            'id': '170',
+            'value': '5'
+          },
+          {
+            'name': '网格',
+            'id': '171',
+            'value': '6'
+          },
+          {
+            'name': '责任网格',
+            'id': '172',
+            'value': '7'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f17c427 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -176,5 +176,32 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/dataScopeType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '全部',
+            'id': '55',
+            'value': '03'
+          },
+          {
+            'name': '本部门',
+            'id': '56',
+            'value': '04'
+          },
+          {
+            'name': '自定义',
+            'id': '57',
+            'value': '04'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/src/main.js b/src/main.js
index 5630ee7..ae15138 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
  * it will intercept your request, so you won't see the request in the network.
  * If you remove `../mock` it will automatically request easy-mock data.
  */
-// import './../mock' // simulation data
+import './../mock' // simulation data
 // require('./../mock')
 // 兼容IE11
 import 'babel-polyfill'
diff --git a/src/settings.js b/src/settings.js
index b8159bf..b568ce0 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: false,
+  showSettings: true,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/example/tableExample.vue b/src/views/example/tableExample.vue
index a313e57..9d98bb5 100644
--- a/src/views/example/tableExample.vue
+++ b/src/views/example/tableExample.vue
@@ -145,8 +145,8 @@
           needIndex: false // 是否需要序号列
         },
         toolsOption: {
-          selectColumns: false, // 是否需要筛选列
-          refresh: false // 是否需要刷新按钮
+          selectColumns: true, // 是否需要筛选列
+          refresh: true // 是否需要刷新按钮
         }
       } // 表格属性
     }
diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
deleted file mode 100644
index c7b94e7..0000000
--- a/src/views/layout/Layout.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <app-header class="app-header"/>
-    <div class="app-body">
-      <!--侧边栏-->
-      <sidebar class="sidebar-container"/>
-      <!--右半部分-->
-      <div class="main-container">
-        <!--上方导航-->
-        <navbar/>
-        <!--标签栏-->
-        <tags-view/>
-        <!--主页-->
-        <el-scrollbar>
-          <app-main/>
-        </el-scrollbar>
-
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { AppHeader, Navbar, Sidebar, AppMain } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import TagsView from './components/TagsView/index'
-
-export default {
-  name: 'Layout',
-  components: {
-    TagsView,
-    AppHeader,
-    Navbar,
-    Sidebar,
-    AppMain
-  },
-  mixins: [ResizeMixin],
-  computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    device() {
-      return this.$store.state.app.device
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened,
-        withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    }
-  },
-  methods: {
-    handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  @import "src/styles/mixin.scss";
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-    &.mobile.openSidebar{
-      position: fixed;
-      top: 0;
-    }
-  }
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-  .el-scrollbar{
-    height: calc(100vh - 50px);
-  }
-</style>
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
deleted file mode 100644
index 6326221..0000000
--- a/src/views/layout/components/AppHeader.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
-    <h3>{{ title }}</h3>
-    <el-dropdown class="avatar-container" trigger="click">
-      <div class="avatar-wrapper">
-        <span style="line-height:50px;">欢迎您，{{ name }}</span>
-        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
-        <i class="el-icon-caret-bottom"/>
-      </div>
-      <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <!--<router-link class="inlineBlock" to="/">-->
-        <!--<el-dropdown-item>-->
-        <!--主页-->
-        <!--</el-dropdown-item>-->
-        <!--</router-link>-->
-        <el-dropdown-item>
-          <span style="display:block;" @click="resetPwd">修改密码</span>
-        </el-dropdown-item>
-        <el-dropdown-item divided>
-          <span style="display:block;" @click="logout">注销</span>
-        </el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
-    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import ResetPwd from '../../system/user/resetPwd'
-import { getProject } from '@/utils/baseConfig'
-
-export default {
-  name: 'AppHeader',
-  components: { ResetPwd },
-  data() {
-    return {
-      title: getProject().title,
-      name: this.$store.getters.name,
-      showSetPwd: false,
-      headerUrl: require('../../../assets/global_images/header.png')// 头部图片
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    },
-    resetPwd() {
-      this.showSetPwd = true
-      this.$refs.retPwd.initDialog(true)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .app-header{
-    height:60px;
-    background-color:#000000;
-    background-repeat: no-repeat;
-    -webkit-background-size: 100% 100%;
-    background-size: 100% 100%;
-    color:white;
-  }
-  h3{
-    margin-left:40px;
-    display: inline-block;
-    float:left;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    float: right;
-    z-index:500;
-    position: fixed;
-    top:5px;
-    right: 35px;
-    .avatar-wrapper {
-      color:#d3dce6;
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        font-size: 12px;
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
deleted file mode 100644
index 2ea268e..0000000
--- a/src/views/layout/components/AppMain.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <section class="app-main">
-    <transition name="fade-transform" mode="out-in">
-      <!-- or name="fade" -->
-      <!-- <router-view :key="key"></router-view> -->
-      <div>
-        <keep-alive>
-          <router-view v-if="$route.meta.keepAlive" :key="key"/>
-        </keep-alive>
-        <router-view v-if="!$route.meta.keepAlive" :key="key"/>
-      </div>
-    </transition>
-  </section>
-</template>
-
-<script>
-export default {
-  name: 'AppMain',
-  computed: {
-    key() {
-      if (this.$route.meta.keepAlive) {
-        return this.$route.name !== undefined ? this.$route.name : this.$route
-      } else {
-        return this.$route.name !== undefined ? this.$route.name + new Date() : this.$route + new Date()
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.app-main {
-  /*50 = navbar  */
-  /*min-height: calc(100vh - 50px);*/
-  position: relative;
-  overflow: hidden;
-}
-</style>
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
deleted file mode 100644
index 193b604..0000000
--- a/src/views/layout/components/Navbar.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <div class="navbar">
-    <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
-    <breadcrumb />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import Hamburger from '@/components/Hamburger'
-
-export default {
-  components: {
-    Breadcrumb,
-    Hamburger
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.navbar {
-  height: 50px;
-  line-height: 50px;
-  box-shadow: 0 1px 3px 0 rgba(0,0,0,.12), 0 0 3px 0 rgba(0,0,0,.04);
-  .hamburger-container {
-    line-height: 58px;
-    height: 50px;
-    float: left;
-    padding: 0 10px;
-  }
-  .screenfull {
-    position: absolute;
-    right: 90px;
-    top: 16px;
-    color: red;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    position: absolute;
-    right: 35px;
-    .avatar-wrapper {
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        position: absolute;
-        right: -20px;
-        top: 25px;
-        font-size: 12px;
-      }
-    }
-  }
-}
-</style>
-
diff --git a/src/views/layout/components/Sidebar/Item.vue b/src/views/layout/components/Sidebar/Item.vue
deleted file mode 100644
index b515f61..0000000
--- a/src/views/layout/components/Sidebar/Item.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<script>
-export default {
-  name: 'MenuItem',
-  functional: true,
-  props: {
-    icon: {
-      type: String,
-      default: ''
-    },
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  render(h, context) {
-    const { icon, title } = context.props
-    const vnodes = []
-
-    if (icon) {
-      vnodes.push(<svg-icon icon-class={icon}/>)
-    }
-
-    if (title) {
-      vnodes.push(<span slot='title'>{(title)}</span>)
-    }
-    return vnodes
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/Link.vue b/src/views/layout/components/Sidebar/Link.vue
deleted file mode 100644
index bff45cd..0000000
--- a/src/views/layout/components/Sidebar/Link.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-<template>
-  <!-- eslint-disable vue/require-component-is -->
-  <component v-bind="linkProps(to)">
-    <slot/>
-  </component>
-</template>
-
-<script>
-import { isExternal } from '@/utils/validate'
-
-export default {
-  props: {
-    to: {
-      type: String,
-      required: true
-    }
-  },
-  methods: {
-    linkProps(url) {
-      if (isExternal(url)) {
-        return {
-          is: 'a',
-          href: url,
-          target: '_blank',
-          rel: 'noopener'
-        }
-      }
-      return {
-        is: 'router-link',
-        to: url
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue
deleted file mode 100644
index 988d662..0000000
--- a/src/views/layout/components/Sidebar/SidebarItem.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <div v-if="!item.hidden&&item.children" class="menu-wrapper">
-
-    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
-      <a :href="onlyOneChild.path" target="_blank" @click="clickLink(onlyOneChild.path,$event)">
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
-          <item v-if="onlyOneChild.meta" :icon="onlyOneChild.meta.icon||item.meta.icon" :title="onlyOneChild.meta.title" />
-        </el-menu-item>
-      </a>
-    </template>
-
-    <el-submenu v-else :index="item.name||item.path">
-      <template slot="title">
-        <item v-if="item.meta" :icon="item.meta.icon" :title="item.meta.title" />
-      </template>
-
-      <template v-for="child in item.children" v-if="!child.hidden">
-        <sidebar-item
-          v-if="child.children&&child.children.length>0"
-          :is-nest="true"
-          :item="child"
-          :key="child.path"
-          :base-path="resolvePath(child.path)"
-          class="nest-menu" />
-
-        <a v-else :href="child.path" :key="child.name" target="_blank" @click="clickLink(child.path,$event)">
-          <el-menu-item :index="resolvePath(child.path)">
-            <span class="light-line"/>
-            <item v-if="child.meta" :icon="child.meta.icon" :title="child.meta.title" />
-          </el-menu-item>
-        </a>
-      </template>
-    </el-submenu>
-
-  </div>
-</template>
-
-<script>
-import path from 'path'
-import { validateURL } from '@/utils/validate'
-import Item from './Item'
-
-export default {
-  name: 'SidebarItem',
-  components: { Item },
-  props: {
-    // route object
-    item: {
-      type: Object,
-      required: true
-    },
-    isNest: {
-      type: Boolean,
-      default: false
-    },
-    basePath: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      onlyOneChild: null
-    }
-  },
-  methods: {
-    hasOneShowingChild(children, parent) {
-      const showingChildren = children.filter(item => {
-        if (item.hidden) {
-          return false
-        } else {
-          // Temp set(will be used if only has one showing child)
-          this.onlyOneChild = item
-          return true
-        }
-      })
-
-      // When there is only one child router, the child router is displayed by default
-      if (showingChildren.length === 1) {
-        return true
-      }
-
-      // Show parent if there are no child router to display
-      if (showingChildren.length === 0) {
-        this.onlyOneChild = { ... parent, path: '', noShowingChildren: true }
-        return true
-      }
-
-      return false
-    },
-    resolvePath(routePath) {
-      return path.resolve(this.basePath, routePath)
-    },
-    isExternalLink(routePath) {
-      return validateURL(routePath)
-    },
-    clickLink(routePath, e) {
-      if (!this.isExternalLink(routePath)) {
-        e.preventDefault()
-        const path = this.resolvePath(routePath)
-        this.$router.push({ path, query: { t: +new Date() }})
-        // this.$router.push(path)
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
deleted file mode 100644
index 5dcf730..0000000
--- a/src/views/layout/components/Sidebar/index.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<template>
-  <el-scrollbar wrap-class="scrollbar-wrapper">
-    <el-menu
-      :show-timeout="200"
-      :default-active="activeMenu"
-      :collapse="isCollapse"
-      mode="vertical"
-      background-color="#304156"
-      text-color="#bfcbd9"
-      active-text-color="#1bb1a5"
-    >
-      <sidebar-item v-for="route in permission_routers" :key="route.name" :item="route" :base-path="route.path"/>
-    </el-menu>
-  </el-scrollbar>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import SidebarItem from './SidebarItem'
-
-export default {
-  components: { SidebarItem },
-  computed: {
-    ...mapGetters([
-      'permission_routers',
-      'sidebar'
-    ]),
-    activeMenu() {
-      const route = this.$route
-      const { meta, path } = route
-      // 如果meta中上设置activeMenu，按照meta中设置高亮
-      if (meta.activeMenu) {
-        return meta.activeMenu
-      }
-      return path
-    },
-    isCollapse() {
-      return !this.sidebar.opened
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/TagsView/ScrollPane.vue b/src/views/layout/components/TagsView/ScrollPane.vue
deleted file mode 100644
index 0ec76e7..0000000
--- a/src/views/layout/components/TagsView/ScrollPane.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-<template>
-  <el-scrollbar ref="scrollContainer" :vertical="false" class="scroll-container" @wheel.native.prevent="handleScroll">
-    <slot />
-  </el-scrollbar>
-</template>
-
-<script>
-const tagAndTagSpacing = 4 // tagAndTagSpacing
-
-export default {
-  name: 'ScrollPane',
-  data() {
-    return {
-      left: 0
-    }
-  },
-  computed: {
-    scrollWrapper() {
-      return this.$refs.scrollContainer.$refs.wrap
-    }
-  },
-  methods: {
-    handleScroll(e) {
-      const eventDelta = e.wheelDelta || -e.deltaY * 40
-      const $scrollWrapper = this.scrollWrapper
-      $scrollWrapper.scrollLeft = $scrollWrapper.scrollLeft + eventDelta / 4
-    },
-    moveToTarget(currentTag) {
-      const $container = this.$refs.scrollContainer.$el
-      const $containerWidth = $container.offsetWidth
-      const $scrollWrapper = this.scrollWrapper
-      const tagList = this.$parent.$refs.tag
-
-      let firstTag = null
-      let lastTag = null
-
-      // find first tag and last tag
-      if (tagList.length > 0) {
-        firstTag = tagList[0]
-        lastTag = tagList[tagList.length - 1]
-      }
-
-      if (firstTag === currentTag) {
-        $scrollWrapper.scrollLeft = 0
-      } else if (lastTag === currentTag) {
-        $scrollWrapper.scrollLeft = $scrollWrapper.scrollWidth - $containerWidth
-      } else {
-        // find preTag and nextTag
-        const currentIndex = tagList.findIndex(item => item === currentTag)
-        const prevTag = tagList[currentIndex - 1]
-        const nextTag = tagList[currentIndex + 1]
-
-        // the tag's offsetLeft after of nextTag
-        const afterNextTagOffsetLeft = nextTag.$el.offsetLeft + nextTag.$el.offsetWidth + tagAndTagSpacing
-
-        // the tag's offsetLeft before of prevTag
-        const beforePrevTagOffsetLeft = prevTag.$el.offsetLeft - tagAndTagSpacing
-
-        if (afterNextTagOffsetLeft > $scrollWrapper.scrollLeft + $containerWidth) {
-          $scrollWrapper.scrollLeft = afterNextTagOffsetLeft - $containerWidth
-        } else if (beforePrevTagOffsetLeft < $scrollWrapper.scrollLeft) {
-          $scrollWrapper.scrollLeft = beforePrevTagOffsetLeft
-        }
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.scroll-container {
-  white-space: nowrap;
-  position: relative;
-  overflow: hidden;
-  width: 100%;
-  /deep/ {
-    .el-scrollbar__bar {
-      bottom: 0px;
-    }
-    .el-scrollbar__wrap {
-      height: 49px;
-    }
-  }
-}
-</style>
diff --git a/src/views/layout/components/TagsView/index.vue b/src/views/layout/components/TagsView/index.vue
deleted file mode 100644
index 325c815..0000000
--- a/src/views/layout/components/TagsView/index.vue
+++ /dev/null
@@ -1,287 +0,0 @@
-<template>
-  <div id="tags-view-container" class="tags-view-container">
-    <scroll-pane ref="scrollPane" class="tags-view-wrapper">
-      <router-link
-        v-for="tag in visitedViews"
-        ref="tag"
-        :key="tag.path"
-        :class="isActive(tag)?'active':''"
-        :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
-        tag="span"
-        class="tags-view-item"
-        @click.middle.native="closeSelectedTag(tag)"
-        @contextmenu.prevent.native="openMenu(tag,$event)"
-      >
-        {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
-      </router-link>
-    </scroll-pane>
-    <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
-      <li @click="refreshSelectedTag(selectedTag)">刷新页面</li>
-      <li v-if="!(selectedTag.meta&&selectedTag.meta.affix)" @click="closeSelectedTag(selectedTag)">关闭当前标签页</li>
-      <li @click="closeOthersTags">关闭其他标签页</li>
-      <li @click="closeAllTags(selectedTag)">关闭全部标签页</li>
-    </ul>
-  </div>
-</template>
-
-<script>
-import ScrollPane from './ScrollPane'
-import path from 'path'
-
-export default {
-  name: 'TagsView',
-  components: { ScrollPane },
-  data() {
-    return {
-      visible: false,
-      top: 0,
-      left: 0,
-      selectedTag: {},
-      affixTags: []
-    }
-  },
-  computed: {
-    visitedViews() {
-      return this.$store.state.tagsView.visitedViews
-    },
-    routes() {
-      return this.$store.state.permission.routers
-    }
-  },
-  watch: {
-    $route() {
-      this.addTags()
-      this.moveToCurrentTag()
-    },
-    visible(value) {
-      if (value) {
-        document.body.addEventListener('click', this.closeMenu)
-      } else {
-        document.body.removeEventListener('click', this.closeMenu)
-      }
-    }
-  },
-  mounted() {
-    this.initTags()
-    this.addTags()
-  },
-  methods: {
-    isActive(route) {
-      return route.path === this.$route.path
-    },
-    filterAffixTags(routes, basePath = '/') {
-      let tags = []
-      routes.forEach(route => {
-        if (route.meta && route.meta.affix) {
-          const tagPath = path.resolve(basePath, route.path)
-          tags.push({
-            fullPath: tagPath,
-            path: tagPath,
-            name: route.name,
-            meta: { ...route.meta }
-          })
-        }
-        if (route.children) {
-          const tempTags = this.filterAffixTags(route.children, route.path)
-          if (tempTags.length >= 1) {
-            tags = [...tags, ...tempTags]
-          }
-        }
-      })
-      return tags
-    },
-    initTags() {
-      const affixTags = this.affixTags = this.filterAffixTags(this.routes)
-      for (const tag of affixTags) {
-        // Must have tag name
-        if (tag.name) {
-          this.$store.dispatch('tagsView/addVisitedView', tag)
-        }
-      }
-    },
-    addTags() {
-      const { name } = this.$route
-      if (name) {
-        this.$store.dispatch('tagsView/addView', this.$route)
-      }
-      return false
-    },
-    moveToCurrentTag() {
-      const tags = this.$refs.tag
-      this.$nextTick(() => {
-        for (const tag of tags) {
-          if (tag.to.path === this.$route.path) {
-            this.$refs.scrollPane.moveToTarget(tag)
-            // when query is different then update
-            if (tag.to.fullPath !== this.$route.fullPath) {
-              this.$store.dispatch('tagsView/updateVisitedView', this.$route)
-            }
-            break
-          }
-        }
-      })
-    },
-    refreshSelectedTag(view) {
-      this.$store.dispatch('tagsView/delCachedView', view).then(() => {
-        const { fullPath } = view
-        this.$nextTick(() => {
-          this.$router.replace({
-            path: '/redirect' + fullPath
-          })
-        })
-      })
-    },
-    closeSelectedTag(view) {
-      this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
-        if (this.isActive(view)) {
-          this.toLastView(visitedViews, view)
-        }
-      })
-    },
-    closeOthersTags() {
-      this.$router.push(this.selectedTag)
-      this.$store.dispatch('tagsView/delOthersViews', this.selectedTag).then(() => {
-        this.moveToCurrentTag()
-      })
-    },
-    closeAllTags(view) {
-      this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => {
-        if (this.affixTags.some(tag => tag.path === view.path)) {
-          return
-        }
-        this.toLastView(visitedViews, view)
-      })
-    },
-    toLastView(visitedViews, view) {
-      const latestView = visitedViews.slice(-1)[0]
-      if (latestView) {
-        this.$router.push(latestView)
-      } else {
-        // now the default is to redirect to the home page if there is no tags-view,
-        // you can adjust it according to your needs.
-        if (view.name === 'Dashboard') {
-          // to reload home page
-          this.$router.replace({ path: '/redirect' + view.fullPath })
-        } else {
-          this.$router.push('/')
-        }
-      }
-    },
-    openMenu(tag, e) {
-      const menuMinWidth = 105
-      const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
-      const offsetWidth = this.$el.offsetWidth // container width
-      const maxLeft = offsetWidth - menuMinWidth // left boundary
-      const left = e.clientX - offsetLeft + 15 // 15: margin right
-
-      if (left > maxLeft) {
-        this.left = maxLeft
-      } else {
-        this.left = left
-      }
-
-      this.top = e.clientY - 40
-      this.visible = true
-      this.selectedTag = tag
-    },
-    closeMenu() {
-      this.visible = false
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-  .tags-view-container {
-    height: 34px;
-    width: 100%;
-    background: #fff;
-    border-bottom: 1px solid #d8dce5;
-    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
-    .tags-view-wrapper {
-      .tags-view-item {
-        display: inline-block;
-        position: relative;
-        cursor: pointer;
-        height: 26px;
-        line-height: 26px;
-        border: 1px solid #d8dce5;
-        color: #495060;
-        background: #fff;
-        padding: 0 8px;
-        font-size: 12px;
-        margin-left: 5px;
-        margin-top: 4px;
-        &:first-of-type {
-          margin-left: 15px;
-        }
-        &:last-of-type {
-          margin-right: 15px;
-        }
-        &.active {
-          background-color: #42b983;
-          color: #fff;
-          border-color: #42b983;
-          &::before {
-            content: '';
-            background: #fff;
-            display: inline-block;
-            width: 8px;
-            height: 8px;
-            border-radius: 50%;
-            position: relative;
-            margin-right: 2px;
-          }
-        }
-      }
-    }
-    .contextmenu {
-      margin: 0;
-      background: #fff;
-      z-index: 3000;
-      position: absolute;
-      list-style-type: none;
-      padding: 5px 0;
-      border-radius: 4px;
-      font-size: 12px;
-      font-weight: 400;
-      color: #333;
-      box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
-      li {
-        margin: 0;
-        padding: 7px 16px;
-        cursor: pointer;
-        &:hover {
-          background: #eee;
-        }
-      }
-    }
-  }
-</style>
-
-<style lang="scss">
-  //reset element css of el-icon-close
-  .tags-view-wrapper {
-    .tags-view-item {
-      .el-icon-close {
-        width: 16px;
-        height: 16px;
-        vertical-align: 2px;
-        border-radius: 50%;
-        text-align: center;
-        transition: all .3s cubic-bezier(.645, .045, .355, 1);
-        transform-origin: 100% 50%;
-        &:before {
-          transform: scale(.6);
-          display: inline-block;
-          vertical-align: -3px;
-        }
-        &:hover {
-          background-color: #b4bccc;
-          color: #fff;
-        }
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/index.js b/src/views/layout/components/index.js
deleted file mode 100644
index 52d35e3..0000000
--- a/src/views/layout/components/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export { default as Navbar } from './Navbar'
-export { default as Sidebar } from './Sidebar'
-export { default as AppMain } from './AppMain'
-export { default as AppHeader } from './AppHeader'
diff --git a/src/views/layout/mixin/ResizeHandler.js b/src/views/layout/mixin/ResizeHandler.js
deleted file mode 100644
index 604fe3d..0000000
--- a/src/views/layout/mixin/ResizeHandler.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import store from '@/store'
-
-const { body } = document
-const WIDTH = 992 // refer to Bootstrap's responsive design
-
-export default {
-  watch: {
-    $route(route) {
-      if (this.device === 'mobile' && this.sidebar.opened) {
-        store.dispatch('CloseSideBar', { withoutAnimation: false })
-      }
-    }
-  },
-  beforeMount() {
-    window.addEventListener('resize', this.resizeHandler)
-  },
-  mounted() {
-    const isMobile = this.isMobile()
-    if (isMobile) {
-      store.dispatch('ToggleDevice', 'mobile')
-      store.dispatch('CloseSideBar', { withoutAnimation: true })
-    }
-  },
-  methods: {
-    isMobile() {
-      const rect = body.getBoundingClientRect()
-      return rect.width - 1 < WIDTH
-    },
-    resizeHandler() {
-      if (!document.hidden) {
-        const isMobile = this.isMobile()
-        store.dispatch('ToggleDevice', isMobile ? 'mobile' : 'desktop')
-
-        if (isMobile) {
-          store.dispatch('CloseSideBar', { withoutAnimation: true })
-        }
-      }
-    }
-  }
-}

diff --git a/config/dev.env.js b/config/dev.env.js
index b654c4c..95e311a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,7 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://111.198.10.15:12204"'
+  // BASE_API: '"http://111.198.10.15:12204"'
+  BASE_API: '"http://111.198.10.15:11409"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/mock/system/area.js b/mock/system/area.js
index 3495001..dd8e88e 100644
--- a/mock/system/area.js
+++ b/mock/system/area.js
@@ -79,5 +79,52 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/levelType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '省级',
+            'id': '166',
+            'value': '1'
+          },
+          {
+            'name': '市级',
+            'id': '167',
+            'value': '2'
+          },
+          {
+            'name': '区级',
+            'id': '168',
+            'value': '3'
+          },
+          {
+            'name': '街道',
+            'id': '169',
+            'value': '4'
+          },
+          {
+            'name': '社区',
+            'id': '170',
+            'value': '5'
+          },
+          {
+            'name': '网格',
+            'id': '171',
+            'value': '6'
+          },
+          {
+            'name': '责任网格',
+            'id': '172',
+            'value': '7'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f17c427 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -176,5 +176,32 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/dataScopeType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '全部',
+            'id': '55',
+            'value': '03'
+          },
+          {
+            'name': '本部门',
+            'id': '56',
+            'value': '04'
+          },
+          {
+            'name': '自定义',
+            'id': '57',
+            'value': '04'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/src/main.js b/src/main.js
index 5630ee7..ae15138 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
  * it will intercept your request, so you won't see the request in the network.
  * If you remove `../mock` it will automatically request easy-mock data.
  */
-// import './../mock' // simulation data
+import './../mock' // simulation data
 // require('./../mock')
 // 兼容IE11
 import 'babel-polyfill'
diff --git a/src/settings.js b/src/settings.js
index b8159bf..b568ce0 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: false,
+  showSettings: true,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/example/tableExample.vue b/src/views/example/tableExample.vue
index a313e57..9d98bb5 100644
--- a/src/views/example/tableExample.vue
+++ b/src/views/example/tableExample.vue
@@ -145,8 +145,8 @@
           needIndex: false // 是否需要序号列
         },
         toolsOption: {
-          selectColumns: false, // 是否需要筛选列
-          refresh: false // 是否需要刷新按钮
+          selectColumns: true, // 是否需要筛选列
+          refresh: true // 是否需要刷新按钮
         }
       } // 表格属性
     }
diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
deleted file mode 100644
index c7b94e7..0000000
--- a/src/views/layout/Layout.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <app-header class="app-header"/>
-    <div class="app-body">
-      <!--侧边栏-->
-      <sidebar class="sidebar-container"/>
-      <!--右半部分-->
-      <div class="main-container">
-        <!--上方导航-->
-        <navbar/>
-        <!--标签栏-->
-        <tags-view/>
-        <!--主页-->
-        <el-scrollbar>
-          <app-main/>
-        </el-scrollbar>
-
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { AppHeader, Navbar, Sidebar, AppMain } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import TagsView from './components/TagsView/index'
-
-export default {
-  name: 'Layout',
-  components: {
-    TagsView,
-    AppHeader,
-    Navbar,
-    Sidebar,
-    AppMain
-  },
-  mixins: [ResizeMixin],
-  computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    device() {
-      return this.$store.state.app.device
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened,
-        withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    }
-  },
-  methods: {
-    handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  @import "src/styles/mixin.scss";
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-    &.mobile.openSidebar{
-      position: fixed;
-      top: 0;
-    }
-  }
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-  .el-scrollbar{
-    height: calc(100vh - 50px);
-  }
-</style>
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
deleted file mode 100644
index 6326221..0000000
--- a/src/views/layout/components/AppHeader.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
-    <h3>{{ title }}</h3>
-    <el-dropdown class="avatar-container" trigger="click">
-      <div class="avatar-wrapper">
-        <span style="line-height:50px;">欢迎您，{{ name }}</span>
-        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
-        <i class="el-icon-caret-bottom"/>
-      </div>
-      <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <!--<router-link class="inlineBlock" to="/">-->
-        <!--<el-dropdown-item>-->
-        <!--主页-->
-        <!--</el-dropdown-item>-->
-        <!--</router-link>-->
-        <el-dropdown-item>
-          <span style="display:block;" @click="resetPwd">修改密码</span>
-        </el-dropdown-item>
-        <el-dropdown-item divided>
-          <span style="display:block;" @click="logout">注销</span>
-        </el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
-    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import ResetPwd from '../../system/user/resetPwd'
-import { getProject } from '@/utils/baseConfig'
-
-export default {
-  name: 'AppHeader',
-  components: { ResetPwd },
-  data() {
-    return {
-      title: getProject().title,
-      name: this.$store.getters.name,
-      showSetPwd: false,
-      headerUrl: require('../../../assets/global_images/header.png')// 头部图片
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    },
-    resetPwd() {
-      this.showSetPwd = true
-      this.$refs.retPwd.initDialog(true)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .app-header{
-    height:60px;
-    background-color:#000000;
-    background-repeat: no-repeat;
-    -webkit-background-size: 100% 100%;
-    background-size: 100% 100%;
-    color:white;
-  }
-  h3{
-    margin-left:40px;
-    display: inline-block;
-    float:left;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    float: right;
-    z-index:500;
-    position: fixed;
-    top:5px;
-    right: 35px;
-    .avatar-wrapper {
-      color:#d3dce6;
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        font-size: 12px;
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
deleted file mode 100644
index 2ea268e..0000000
--- a/src/views/layout/components/AppMain.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <section class="app-main">
-    <transition name="fade-transform" mode="out-in">
-      <!-- or name="fade" -->
-      <!-- <router-view :key="key"></router-view> -->
-      <div>
-        <keep-alive>
-          <router-view v-if="$route.meta.keepAlive" :key="key"/>
-        </keep-alive>
-        <router-view v-if="!$route.meta.keepAlive" :key="key"/>
-      </div>
-    </transition>
-  </section>
-</template>
-
-<script>
-export default {
-  name: 'AppMain',
-  computed: {
-    key() {
-      if (this.$route.meta.keepAlive) {
-        return this.$route.name !== undefined ? this.$route.name : this.$route
-      } else {
-        return this.$route.name !== undefined ? this.$route.name + new Date() : this.$route + new Date()
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.app-main {
-  /*50 = navbar  */
-  /*min-height: calc(100vh - 50px);*/
-  position: relative;
-  overflow: hidden;
-}
-</style>
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
deleted file mode 100644
index 193b604..0000000
--- a/src/views/layout/components/Navbar.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <div class="navbar">
-    <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
-    <breadcrumb />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import Hamburger from '@/components/Hamburger'
-
-export default {
-  components: {
-    Breadcrumb,
-    Hamburger
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.navbar {
-  height: 50px;
-  line-height: 50px;
-  box-shadow: 0 1px 3px 0 rgba(0,0,0,.12), 0 0 3px 0 rgba(0,0,0,.04);
-  .hamburger-container {
-    line-height: 58px;
-    height: 50px;
-    float: left;
-    padding: 0 10px;
-  }
-  .screenfull {
-    position: absolute;
-    right: 90px;
-    top: 16px;
-    color: red;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    position: absolute;
-    right: 35px;
-    .avatar-wrapper {
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        position: absolute;
-        right: -20px;
-        top: 25px;
-        font-size: 12px;
-      }
-    }
-  }
-}
-</style>
-
diff --git a/src/views/layout/components/Sidebar/Item.vue b/src/views/layout/components/Sidebar/Item.vue
deleted file mode 100644
index b515f61..0000000
--- a/src/views/layout/components/Sidebar/Item.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<script>
-export default {
-  name: 'MenuItem',
-  functional: true,
-  props: {
-    icon: {
-      type: String,
-      default: ''
-    },
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  render(h, context) {
-    const { icon, title } = context.props
-    const vnodes = []
-
-    if (icon) {
-      vnodes.push(<svg-icon icon-class={icon}/>)
-    }
-
-    if (title) {
-      vnodes.push(<span slot='title'>{(title)}</span>)
-    }
-    return vnodes
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/Link.vue b/src/views/layout/components/Sidebar/Link.vue
deleted file mode 100644
index bff45cd..0000000
--- a/src/views/layout/components/Sidebar/Link.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-<template>
-  <!-- eslint-disable vue/require-component-is -->
-  <component v-bind="linkProps(to)">
-    <slot/>
-  </component>
-</template>
-
-<script>
-import { isExternal } from '@/utils/validate'
-
-export default {
-  props: {
-    to: {
-      type: String,
-      required: true
-    }
-  },
-  methods: {
-    linkProps(url) {
-      if (isExternal(url)) {
-        return {
-          is: 'a',
-          href: url,
-          target: '_blank',
-          rel: 'noopener'
-        }
-      }
-      return {
-        is: 'router-link',
-        to: url
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue
deleted file mode 100644
index 988d662..0000000
--- a/src/views/layout/components/Sidebar/SidebarItem.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <div v-if="!item.hidden&&item.children" class="menu-wrapper">
-
-    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
-      <a :href="onlyOneChild.path" target="_blank" @click="clickLink(onlyOneChild.path,$event)">
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
-          <item v-if="onlyOneChild.meta" :icon="onlyOneChild.meta.icon||item.meta.icon" :title="onlyOneChild.meta.title" />
-        </el-menu-item>
-      </a>
-    </template>
-
-    <el-submenu v-else :index="item.name||item.path">
-      <template slot="title">
-        <item v-if="item.meta" :icon="item.meta.icon" :title="item.meta.title" />
-      </template>
-
-      <template v-for="child in item.children" v-if="!child.hidden">
-        <sidebar-item
-          v-if="child.children&&child.children.length>0"
-          :is-nest="true"
-          :item="child"
-          :key="child.path"
-          :base-path="resolvePath(child.path)"
-          class="nest-menu" />
-
-        <a v-else :href="child.path" :key="child.name" target="_blank" @click="clickLink(child.path,$event)">
-          <el-menu-item :index="resolvePath(child.path)">
-            <span class="light-line"/>
-            <item v-if="child.meta" :icon="child.meta.icon" :title="child.meta.title" />
-          </el-menu-item>
-        </a>
-      </template>
-    </el-submenu>
-
-  </div>
-</template>
-
-<script>
-import path from 'path'
-import { validateURL } from '@/utils/validate'
-import Item from './Item'
-
-export default {
-  name: 'SidebarItem',
-  components: { Item },
-  props: {
-    // route object
-    item: {
-      type: Object,
-      required: true
-    },
-    isNest: {
-      type: Boolean,
-      default: false
-    },
-    basePath: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      onlyOneChild: null
-    }
-  },
-  methods: {
-    hasOneShowingChild(children, parent) {
-      const showingChildren = children.filter(item => {
-        if (item.hidden) {
-          return false
-        } else {
-          // Temp set(will be used if only has one showing child)
-          this.onlyOneChild = item
-          return true
-        }
-      })
-
-      // When there is only one child router, the child router is displayed by default
-      if (showingChildren.length === 1) {
-        return true
-      }
-
-      // Show parent if there are no child router to display
-      if (showingChildren.length === 0) {
-        this.onlyOneChild = { ... parent, path: '', noShowingChildren: true }
-        return true
-      }
-
-      return false
-    },
-    resolvePath(routePath) {
-      return path.resolve(this.basePath, routePath)
-    },
-    isExternalLink(routePath) {
-      return validateURL(routePath)
-    },
-    clickLink(routePath, e) {
-      if (!this.isExternalLink(routePath)) {
-        e.preventDefault()
-        const path = this.resolvePath(routePath)
-        this.$router.push({ path, query: { t: +new Date() }})
-        // this.$router.push(path)
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
deleted file mode 100644
index 5dcf730..0000000
--- a/src/views/layout/components/Sidebar/index.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<template>
-  <el-scrollbar wrap-class="scrollbar-wrapper">
-    <el-menu
-      :show-timeout="200"
-      :default-active="activeMenu"
-      :collapse="isCollapse"
-      mode="vertical"
-      background-color="#304156"
-      text-color="#bfcbd9"
-      active-text-color="#1bb1a5"
-    >
-      <sidebar-item v-for="route in permission_routers" :key="route.name" :item="route" :base-path="route.path"/>
-    </el-menu>
-  </el-scrollbar>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import SidebarItem from './SidebarItem'
-
-export default {
-  components: { SidebarItem },
-  computed: {
-    ...mapGetters([
-      'permission_routers',
-      'sidebar'
-    ]),
-    activeMenu() {
-      const route = this.$route
-      const { meta, path } = route
-      // 如果meta中上设置activeMenu，按照meta中设置高亮
-      if (meta.activeMenu) {
-        return meta.activeMenu
-      }
-      return path
-    },
-    isCollapse() {
-      return !this.sidebar.opened
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/TagsView/ScrollPane.vue b/src/views/layout/components/TagsView/ScrollPane.vue
deleted file mode 100644
index 0ec76e7..0000000
--- a/src/views/layout/components/TagsView/ScrollPane.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-<template>
-  <el-scrollbar ref="scrollContainer" :vertical="false" class="scroll-container" @wheel.native.prevent="handleScroll">
-    <slot />
-  </el-scrollbar>
-</template>
-
-<script>
-const tagAndTagSpacing = 4 // tagAndTagSpacing
-
-export default {
-  name: 'ScrollPane',
-  data() {
-    return {
-      left: 0
-    }
-  },
-  computed: {
-    scrollWrapper() {
-      return this.$refs.scrollContainer.$refs.wrap
-    }
-  },
-  methods: {
-    handleScroll(e) {
-      const eventDelta = e.wheelDelta || -e.deltaY * 40
-      const $scrollWrapper = this.scrollWrapper
-      $scrollWrapper.scrollLeft = $scrollWrapper.scrollLeft + eventDelta / 4
-    },
-    moveToTarget(currentTag) {
-      const $container = this.$refs.scrollContainer.$el
-      const $containerWidth = $container.offsetWidth
-      const $scrollWrapper = this.scrollWrapper
-      const tagList = this.$parent.$refs.tag
-
-      let firstTag = null
-      let lastTag = null
-
-      // find first tag and last tag
-      if (tagList.length > 0) {
-        firstTag = tagList[0]
-        lastTag = tagList[tagList.length - 1]
-      }
-
-      if (firstTag === currentTag) {
-        $scrollWrapper.scrollLeft = 0
-      } else if (lastTag === currentTag) {
-        $scrollWrapper.scrollLeft = $scrollWrapper.scrollWidth - $containerWidth
-      } else {
-        // find preTag and nextTag
-        const currentIndex = tagList.findIndex(item => item === currentTag)
-        const prevTag = tagList[currentIndex - 1]
-        const nextTag = tagList[currentIndex + 1]
-
-        // the tag's offsetLeft after of nextTag
-        const afterNextTagOffsetLeft = nextTag.$el.offsetLeft + nextTag.$el.offsetWidth + tagAndTagSpacing
-
-        // the tag's offsetLeft before of prevTag
-        const beforePrevTagOffsetLeft = prevTag.$el.offsetLeft - tagAndTagSpacing
-
-        if (afterNextTagOffsetLeft > $scrollWrapper.scrollLeft + $containerWidth) {
-          $scrollWrapper.scrollLeft = afterNextTagOffsetLeft - $containerWidth
-        } else if (beforePrevTagOffsetLeft < $scrollWrapper.scrollLeft) {
-          $scrollWrapper.scrollLeft = beforePrevTagOffsetLeft
-        }
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.scroll-container {
-  white-space: nowrap;
-  position: relative;
-  overflow: hidden;
-  width: 100%;
-  /deep/ {
-    .el-scrollbar__bar {
-      bottom: 0px;
-    }
-    .el-scrollbar__wrap {
-      height: 49px;
-    }
-  }
-}
-</style>
diff --git a/src/views/layout/components/TagsView/index.vue b/src/views/layout/components/TagsView/index.vue
deleted file mode 100644
index 325c815..0000000
--- a/src/views/layout/components/TagsView/index.vue
+++ /dev/null
@@ -1,287 +0,0 @@
-<template>
-  <div id="tags-view-container" class="tags-view-container">
-    <scroll-pane ref="scrollPane" class="tags-view-wrapper">
-      <router-link
-        v-for="tag in visitedViews"
-        ref="tag"
-        :key="tag.path"
-        :class="isActive(tag)?'active':''"
-        :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
-        tag="span"
-        class="tags-view-item"
-        @click.middle.native="closeSelectedTag(tag)"
-        @contextmenu.prevent.native="openMenu(tag,$event)"
-      >
-        {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
-      </router-link>
-    </scroll-pane>
-    <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
-      <li @click="refreshSelectedTag(selectedTag)">刷新页面</li>
-      <li v-if="!(selectedTag.meta&&selectedTag.meta.affix)" @click="closeSelectedTag(selectedTag)">关闭当前标签页</li>
-      <li @click="closeOthersTags">关闭其他标签页</li>
-      <li @click="closeAllTags(selectedTag)">关闭全部标签页</li>
-    </ul>
-  </div>
-</template>
-
-<script>
-import ScrollPane from './ScrollPane'
-import path from 'path'
-
-export default {
-  name: 'TagsView',
-  components: { ScrollPane },
-  data() {
-    return {
-      visible: false,
-      top: 0,
-      left: 0,
-      selectedTag: {},
-      affixTags: []
-    }
-  },
-  computed: {
-    visitedViews() {
-      return this.$store.state.tagsView.visitedViews
-    },
-    routes() {
-      return this.$store.state.permission.routers
-    }
-  },
-  watch: {
-    $route() {
-      this.addTags()
-      this.moveToCurrentTag()
-    },
-    visible(value) {
-      if (value) {
-        document.body.addEventListener('click', this.closeMenu)
-      } else {
-        document.body.removeEventListener('click', this.closeMenu)
-      }
-    }
-  },
-  mounted() {
-    this.initTags()
-    this.addTags()
-  },
-  methods: {
-    isActive(route) {
-      return route.path === this.$route.path
-    },
-    filterAffixTags(routes, basePath = '/') {
-      let tags = []
-      routes.forEach(route => {
-        if (route.meta && route.meta.affix) {
-          const tagPath = path.resolve(basePath, route.path)
-          tags.push({
-            fullPath: tagPath,
-            path: tagPath,
-            name: route.name,
-            meta: { ...route.meta }
-          })
-        }
-        if (route.children) {
-          const tempTags = this.filterAffixTags(route.children, route.path)
-          if (tempTags.length >= 1) {
-            tags = [...tags, ...tempTags]
-          }
-        }
-      })
-      return tags
-    },
-    initTags() {
-      const affixTags = this.affixTags = this.filterAffixTags(this.routes)
-      for (const tag of affixTags) {
-        // Must have tag name
-        if (tag.name) {
-          this.$store.dispatch('tagsView/addVisitedView', tag)
-        }
-      }
-    },
-    addTags() {
-      const { name } = this.$route
-      if (name) {
-        this.$store.dispatch('tagsView/addView', this.$route)
-      }
-      return false
-    },
-    moveToCurrentTag() {
-      const tags = this.$refs.tag
-      this.$nextTick(() => {
-        for (const tag of tags) {
-          if (tag.to.path === this.$route.path) {
-            this.$refs.scrollPane.moveToTarget(tag)
-            // when query is different then update
-            if (tag.to.fullPath !== this.$route.fullPath) {
-              this.$store.dispatch('tagsView/updateVisitedView', this.$route)
-            }
-            break
-          }
-        }
-      })
-    },
-    refreshSelectedTag(view) {
-      this.$store.dispatch('tagsView/delCachedView', view).then(() => {
-        const { fullPath } = view
-        this.$nextTick(() => {
-          this.$router.replace({
-            path: '/redirect' + fullPath
-          })
-        })
-      })
-    },
-    closeSelectedTag(view) {
-      this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
-        if (this.isActive(view)) {
-          this.toLastView(visitedViews, view)
-        }
-      })
-    },
-    closeOthersTags() {
-      this.$router.push(this.selectedTag)
-      this.$store.dispatch('tagsView/delOthersViews', this.selectedTag).then(() => {
-        this.moveToCurrentTag()
-      })
-    },
-    closeAllTags(view) {
-      this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => {
-        if (this.affixTags.some(tag => tag.path === view.path)) {
-          return
-        }
-        this.toLastView(visitedViews, view)
-      })
-    },
-    toLastView(visitedViews, view) {
-      const latestView = visitedViews.slice(-1)[0]
-      if (latestView) {
-        this.$router.push(latestView)
-      } else {
-        // now the default is to redirect to the home page if there is no tags-view,
-        // you can adjust it according to your needs.
-        if (view.name === 'Dashboard') {
-          // to reload home page
-          this.$router.replace({ path: '/redirect' + view.fullPath })
-        } else {
-          this.$router.push('/')
-        }
-      }
-    },
-    openMenu(tag, e) {
-      const menuMinWidth = 105
-      const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
-      const offsetWidth = this.$el.offsetWidth // container width
-      const maxLeft = offsetWidth - menuMinWidth // left boundary
-      const left = e.clientX - offsetLeft + 15 // 15: margin right
-
-      if (left > maxLeft) {
-        this.left = maxLeft
-      } else {
-        this.left = left
-      }
-
-      this.top = e.clientY - 40
-      this.visible = true
-      this.selectedTag = tag
-    },
-    closeMenu() {
-      this.visible = false
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-  .tags-view-container {
-    height: 34px;
-    width: 100%;
-    background: #fff;
-    border-bottom: 1px solid #d8dce5;
-    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
-    .tags-view-wrapper {
-      .tags-view-item {
-        display: inline-block;
-        position: relative;
-        cursor: pointer;
-        height: 26px;
-        line-height: 26px;
-        border: 1px solid #d8dce5;
-        color: #495060;
-        background: #fff;
-        padding: 0 8px;
-        font-size: 12px;
-        margin-left: 5px;
-        margin-top: 4px;
-        &:first-of-type {
-          margin-left: 15px;
-        }
-        &:last-of-type {
-          margin-right: 15px;
-        }
-        &.active {
-          background-color: #42b983;
-          color: #fff;
-          border-color: #42b983;
-          &::before {
-            content: '';
-            background: #fff;
-            display: inline-block;
-            width: 8px;
-            height: 8px;
-            border-radius: 50%;
-            position: relative;
-            margin-right: 2px;
-          }
-        }
-      }
-    }
-    .contextmenu {
-      margin: 0;
-      background: #fff;
-      z-index: 3000;
-      position: absolute;
-      list-style-type: none;
-      padding: 5px 0;
-      border-radius: 4px;
-      font-size: 12px;
-      font-weight: 400;
-      color: #333;
-      box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
-      li {
-        margin: 0;
-        padding: 7px 16px;
-        cursor: pointer;
-        &:hover {
-          background: #eee;
-        }
-      }
-    }
-  }
-</style>
-
-<style lang="scss">
-  //reset element css of el-icon-close
-  .tags-view-wrapper {
-    .tags-view-item {
-      .el-icon-close {
-        width: 16px;
-        height: 16px;
-        vertical-align: 2px;
-        border-radius: 50%;
-        text-align: center;
-        transition: all .3s cubic-bezier(.645, .045, .355, 1);
-        transform-origin: 100% 50%;
-        &:before {
-          transform: scale(.6);
-          display: inline-block;
-          vertical-align: -3px;
-        }
-        &:hover {
-          background-color: #b4bccc;
-          color: #fff;
-        }
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/index.js b/src/views/layout/components/index.js
deleted file mode 100644
index 52d35e3..0000000
--- a/src/views/layout/components/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export { default as Navbar } from './Navbar'
-export { default as Sidebar } from './Sidebar'
-export { default as AppMain } from './AppMain'
-export { default as AppHeader } from './AppHeader'
diff --git a/src/views/layout/mixin/ResizeHandler.js b/src/views/layout/mixin/ResizeHandler.js
deleted file mode 100644
index 604fe3d..0000000
--- a/src/views/layout/mixin/ResizeHandler.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import store from '@/store'
-
-const { body } = document
-const WIDTH = 992 // refer to Bootstrap's responsive design
-
-export default {
-  watch: {
-    $route(route) {
-      if (this.device === 'mobile' && this.sidebar.opened) {
-        store.dispatch('CloseSideBar', { withoutAnimation: false })
-      }
-    }
-  },
-  beforeMount() {
-    window.addEventListener('resize', this.resizeHandler)
-  },
-  mounted() {
-    const isMobile = this.isMobile()
-    if (isMobile) {
-      store.dispatch('ToggleDevice', 'mobile')
-      store.dispatch('CloseSideBar', { withoutAnimation: true })
-    }
-  },
-  methods: {
-    isMobile() {
-      const rect = body.getBoundingClientRect()
-      return rect.width - 1 < WIDTH
-    },
-    resizeHandler() {
-      if (!document.hidden) {
-        const isMobile = this.isMobile()
-        store.dispatch('ToggleDevice', isMobile ? 'mobile' : 'desktop')
-
-        if (isMobile) {
-          store.dispatch('CloseSideBar', { withoutAnimation: true })
-        }
-      }
-    }
-  }
-}
diff --git a/src/views/nested/menu1/index.vue b/src/views/nested/menu1/index.vue
deleted file mode 100644
index fdba73a..0000000
--- a/src/views/nested/menu1/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template >
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1">
-      <router-view />
-    </el-alert>
-  </div>
-</template>

diff --git a/config/dev.env.js b/config/dev.env.js
index b654c4c..95e311a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,7 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://111.198.10.15:12204"'
+  // BASE_API: '"http://111.198.10.15:12204"'
+  BASE_API: '"http://111.198.10.15:11409"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/mock/system/area.js b/mock/system/area.js
index 3495001..dd8e88e 100644
--- a/mock/system/area.js
+++ b/mock/system/area.js
@@ -79,5 +79,52 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/levelType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '省级',
+            'id': '166',
+            'value': '1'
+          },
+          {
+            'name': '市级',
+            'id': '167',
+            'value': '2'
+          },
+          {
+            'name': '区级',
+            'id': '168',
+            'value': '3'
+          },
+          {
+            'name': '街道',
+            'id': '169',
+            'value': '4'
+          },
+          {
+            'name': '社区',
+            'id': '170',
+            'value': '5'
+          },
+          {
+            'name': '网格',
+            'id': '171',
+            'value': '6'
+          },
+          {
+            'name': '责任网格',
+            'id': '172',
+            'value': '7'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f17c427 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -176,5 +176,32 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/dataScopeType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '全部',
+            'id': '55',
+            'value': '03'
+          },
+          {
+            'name': '本部门',
+            'id': '56',
+            'value': '04'
+          },
+          {
+            'name': '自定义',
+            'id': '57',
+            'value': '04'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/src/main.js b/src/main.js
index 5630ee7..ae15138 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
  * it will intercept your request, so you won't see the request in the network.
  * If you remove `../mock` it will automatically request easy-mock data.
  */
-// import './../mock' // simulation data
+import './../mock' // simulation data
 // require('./../mock')
 // 兼容IE11
 import 'babel-polyfill'
diff --git a/src/settings.js b/src/settings.js
index b8159bf..b568ce0 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: false,
+  showSettings: true,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/example/tableExample.vue b/src/views/example/tableExample.vue
index a313e57..9d98bb5 100644
--- a/src/views/example/tableExample.vue
+++ b/src/views/example/tableExample.vue
@@ -145,8 +145,8 @@
           needIndex: false // 是否需要序号列
         },
         toolsOption: {
-          selectColumns: false, // 是否需要筛选列
-          refresh: false // 是否需要刷新按钮
+          selectColumns: true, // 是否需要筛选列
+          refresh: true // 是否需要刷新按钮
         }
       } // 表格属性
     }
diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
deleted file mode 100644
index c7b94e7..0000000
--- a/src/views/layout/Layout.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <app-header class="app-header"/>
-    <div class="app-body">
-      <!--侧边栏-->
-      <sidebar class="sidebar-container"/>
-      <!--右半部分-->
-      <div class="main-container">
-        <!--上方导航-->
-        <navbar/>
-        <!--标签栏-->
-        <tags-view/>
-        <!--主页-->
-        <el-scrollbar>
-          <app-main/>
-        </el-scrollbar>
-
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { AppHeader, Navbar, Sidebar, AppMain } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import TagsView from './components/TagsView/index'
-
-export default {
-  name: 'Layout',
-  components: {
-    TagsView,
-    AppHeader,
-    Navbar,
-    Sidebar,
-    AppMain
-  },
-  mixins: [ResizeMixin],
-  computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    device() {
-      return this.$store.state.app.device
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened,
-        withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    }
-  },
-  methods: {
-    handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  @import "src/styles/mixin.scss";
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-    &.mobile.openSidebar{
-      position: fixed;
-      top: 0;
-    }
-  }
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-  .el-scrollbar{
-    height: calc(100vh - 50px);
-  }
-</style>
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
deleted file mode 100644
index 6326221..0000000
--- a/src/views/layout/components/AppHeader.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
-    <h3>{{ title }}</h3>
-    <el-dropdown class="avatar-container" trigger="click">
-      <div class="avatar-wrapper">
-        <span style="line-height:50px;">欢迎您，{{ name }}</span>
-        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
-        <i class="el-icon-caret-bottom"/>
-      </div>
-      <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <!--<router-link class="inlineBlock" to="/">-->
-        <!--<el-dropdown-item>-->
-        <!--主页-->
-        <!--</el-dropdown-item>-->
-        <!--</router-link>-->
-        <el-dropdown-item>
-          <span style="display:block;" @click="resetPwd">修改密码</span>
-        </el-dropdown-item>
-        <el-dropdown-item divided>
-          <span style="display:block;" @click="logout">注销</span>
-        </el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
-    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import ResetPwd from '../../system/user/resetPwd'
-import { getProject } from '@/utils/baseConfig'
-
-export default {
-  name: 'AppHeader',
-  components: { ResetPwd },
-  data() {
-    return {
-      title: getProject().title,
-      name: this.$store.getters.name,
-      showSetPwd: false,
-      headerUrl: require('../../../assets/global_images/header.png')// 头部图片
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    },
-    resetPwd() {
-      this.showSetPwd = true
-      this.$refs.retPwd.initDialog(true)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .app-header{
-    height:60px;
-    background-color:#000000;
-    background-repeat: no-repeat;
-    -webkit-background-size: 100% 100%;
-    background-size: 100% 100%;
-    color:white;
-  }
-  h3{
-    margin-left:40px;
-    display: inline-block;
-    float:left;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    float: right;
-    z-index:500;
-    position: fixed;
-    top:5px;
-    right: 35px;
-    .avatar-wrapper {
-      color:#d3dce6;
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        font-size: 12px;
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
deleted file mode 100644
index 2ea268e..0000000
--- a/src/views/layout/components/AppMain.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <section class="app-main">
-    <transition name="fade-transform" mode="out-in">
-      <!-- or name="fade" -->
-      <!-- <router-view :key="key"></router-view> -->
-      <div>
-        <keep-alive>
-          <router-view v-if="$route.meta.keepAlive" :key="key"/>
-        </keep-alive>
-        <router-view v-if="!$route.meta.keepAlive" :key="key"/>
-      </div>
-    </transition>
-  </section>
-</template>
-
-<script>
-export default {
-  name: 'AppMain',
-  computed: {
-    key() {
-      if (this.$route.meta.keepAlive) {
-        return this.$route.name !== undefined ? this.$route.name : this.$route
-      } else {
-        return this.$route.name !== undefined ? this.$route.name + new Date() : this.$route + new Date()
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.app-main {
-  /*50 = navbar  */
-  /*min-height: calc(100vh - 50px);*/
-  position: relative;
-  overflow: hidden;
-}
-</style>
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
deleted file mode 100644
index 193b604..0000000
--- a/src/views/layout/components/Navbar.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <div class="navbar">
-    <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
-    <breadcrumb />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import Hamburger from '@/components/Hamburger'
-
-export default {
-  components: {
-    Breadcrumb,
-    Hamburger
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.navbar {
-  height: 50px;
-  line-height: 50px;
-  box-shadow: 0 1px 3px 0 rgba(0,0,0,.12), 0 0 3px 0 rgba(0,0,0,.04);
-  .hamburger-container {
-    line-height: 58px;
-    height: 50px;
-    float: left;
-    padding: 0 10px;
-  }
-  .screenfull {
-    position: absolute;
-    right: 90px;
-    top: 16px;
-    color: red;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    position: absolute;
-    right: 35px;
-    .avatar-wrapper {
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        position: absolute;
-        right: -20px;
-        top: 25px;
-        font-size: 12px;
-      }
-    }
-  }
-}
-</style>
-
diff --git a/src/views/layout/components/Sidebar/Item.vue b/src/views/layout/components/Sidebar/Item.vue
deleted file mode 100644
index b515f61..0000000
--- a/src/views/layout/components/Sidebar/Item.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<script>
-export default {
-  name: 'MenuItem',
-  functional: true,
-  props: {
-    icon: {
-      type: String,
-      default: ''
-    },
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  render(h, context) {
-    const { icon, title } = context.props
-    const vnodes = []
-
-    if (icon) {
-      vnodes.push(<svg-icon icon-class={icon}/>)
-    }
-
-    if (title) {
-      vnodes.push(<span slot='title'>{(title)}</span>)
-    }
-    return vnodes
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/Link.vue b/src/views/layout/components/Sidebar/Link.vue
deleted file mode 100644
index bff45cd..0000000
--- a/src/views/layout/components/Sidebar/Link.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-<template>
-  <!-- eslint-disable vue/require-component-is -->
-  <component v-bind="linkProps(to)">
-    <slot/>
-  </component>
-</template>
-
-<script>
-import { isExternal } from '@/utils/validate'
-
-export default {
-  props: {
-    to: {
-      type: String,
-      required: true
-    }
-  },
-  methods: {
-    linkProps(url) {
-      if (isExternal(url)) {
-        return {
-          is: 'a',
-          href: url,
-          target: '_blank',
-          rel: 'noopener'
-        }
-      }
-      return {
-        is: 'router-link',
-        to: url
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue
deleted file mode 100644
index 988d662..0000000
--- a/src/views/layout/components/Sidebar/SidebarItem.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <div v-if="!item.hidden&&item.children" class="menu-wrapper">
-
-    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
-      <a :href="onlyOneChild.path" target="_blank" @click="clickLink(onlyOneChild.path,$event)">
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
-          <item v-if="onlyOneChild.meta" :icon="onlyOneChild.meta.icon||item.meta.icon" :title="onlyOneChild.meta.title" />
-        </el-menu-item>
-      </a>
-    </template>
-
-    <el-submenu v-else :index="item.name||item.path">
-      <template slot="title">
-        <item v-if="item.meta" :icon="item.meta.icon" :title="item.meta.title" />
-      </template>
-
-      <template v-for="child in item.children" v-if="!child.hidden">
-        <sidebar-item
-          v-if="child.children&&child.children.length>0"
-          :is-nest="true"
-          :item="child"
-          :key="child.path"
-          :base-path="resolvePath(child.path)"
-          class="nest-menu" />
-
-        <a v-else :href="child.path" :key="child.name" target="_blank" @click="clickLink(child.path,$event)">
-          <el-menu-item :index="resolvePath(child.path)">
-            <span class="light-line"/>
-            <item v-if="child.meta" :icon="child.meta.icon" :title="child.meta.title" />
-          </el-menu-item>
-        </a>
-      </template>
-    </el-submenu>
-
-  </div>
-</template>
-
-<script>
-import path from 'path'
-import { validateURL } from '@/utils/validate'
-import Item from './Item'
-
-export default {
-  name: 'SidebarItem',
-  components: { Item },
-  props: {
-    // route object
-    item: {
-      type: Object,
-      required: true
-    },
-    isNest: {
-      type: Boolean,
-      default: false
-    },
-    basePath: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      onlyOneChild: null
-    }
-  },
-  methods: {
-    hasOneShowingChild(children, parent) {
-      const showingChildren = children.filter(item => {
-        if (item.hidden) {
-          return false
-        } else {
-          // Temp set(will be used if only has one showing child)
-          this.onlyOneChild = item
-          return true
-        }
-      })
-
-      // When there is only one child router, the child router is displayed by default
-      if (showingChildren.length === 1) {
-        return true
-      }
-
-      // Show parent if there are no child router to display
-      if (showingChildren.length === 0) {
-        this.onlyOneChild = { ... parent, path: '', noShowingChildren: true }
-        return true
-      }
-
-      return false
-    },
-    resolvePath(routePath) {
-      return path.resolve(this.basePath, routePath)
-    },
-    isExternalLink(routePath) {
-      return validateURL(routePath)
-    },
-    clickLink(routePath, e) {
-      if (!this.isExternalLink(routePath)) {
-        e.preventDefault()
-        const path = this.resolvePath(routePath)
-        this.$router.push({ path, query: { t: +new Date() }})
-        // this.$router.push(path)
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
deleted file mode 100644
index 5dcf730..0000000
--- a/src/views/layout/components/Sidebar/index.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<template>
-  <el-scrollbar wrap-class="scrollbar-wrapper">
-    <el-menu
-      :show-timeout="200"
-      :default-active="activeMenu"
-      :collapse="isCollapse"
-      mode="vertical"
-      background-color="#304156"
-      text-color="#bfcbd9"
-      active-text-color="#1bb1a5"
-    >
-      <sidebar-item v-for="route in permission_routers" :key="route.name" :item="route" :base-path="route.path"/>
-    </el-menu>
-  </el-scrollbar>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import SidebarItem from './SidebarItem'
-
-export default {
-  components: { SidebarItem },
-  computed: {
-    ...mapGetters([
-      'permission_routers',
-      'sidebar'
-    ]),
-    activeMenu() {
-      const route = this.$route
-      const { meta, path } = route
-      // 如果meta中上设置activeMenu，按照meta中设置高亮
-      if (meta.activeMenu) {
-        return meta.activeMenu
-      }
-      return path
-    },
-    isCollapse() {
-      return !this.sidebar.opened
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/TagsView/ScrollPane.vue b/src/views/layout/components/TagsView/ScrollPane.vue
deleted file mode 100644
index 0ec76e7..0000000
--- a/src/views/layout/components/TagsView/ScrollPane.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-<template>
-  <el-scrollbar ref="scrollContainer" :vertical="false" class="scroll-container" @wheel.native.prevent="handleScroll">
-    <slot />
-  </el-scrollbar>
-</template>
-
-<script>
-const tagAndTagSpacing = 4 // tagAndTagSpacing
-
-export default {
-  name: 'ScrollPane',
-  data() {
-    return {
-      left: 0
-    }
-  },
-  computed: {
-    scrollWrapper() {
-      return this.$refs.scrollContainer.$refs.wrap
-    }
-  },
-  methods: {
-    handleScroll(e) {
-      const eventDelta = e.wheelDelta || -e.deltaY * 40
-      const $scrollWrapper = this.scrollWrapper
-      $scrollWrapper.scrollLeft = $scrollWrapper.scrollLeft + eventDelta / 4
-    },
-    moveToTarget(currentTag) {
-      const $container = this.$refs.scrollContainer.$el
-      const $containerWidth = $container.offsetWidth
-      const $scrollWrapper = this.scrollWrapper
-      const tagList = this.$parent.$refs.tag
-
-      let firstTag = null
-      let lastTag = null
-
-      // find first tag and last tag
-      if (tagList.length > 0) {
-        firstTag = tagList[0]
-        lastTag = tagList[tagList.length - 1]
-      }
-
-      if (firstTag === currentTag) {
-        $scrollWrapper.scrollLeft = 0
-      } else if (lastTag === currentTag) {
-        $scrollWrapper.scrollLeft = $scrollWrapper.scrollWidth - $containerWidth
-      } else {
-        // find preTag and nextTag
-        const currentIndex = tagList.findIndex(item => item === currentTag)
-        const prevTag = tagList[currentIndex - 1]
-        const nextTag = tagList[currentIndex + 1]
-
-        // the tag's offsetLeft after of nextTag
-        const afterNextTagOffsetLeft = nextTag.$el.offsetLeft + nextTag.$el.offsetWidth + tagAndTagSpacing
-
-        // the tag's offsetLeft before of prevTag
-        const beforePrevTagOffsetLeft = prevTag.$el.offsetLeft - tagAndTagSpacing
-
-        if (afterNextTagOffsetLeft > $scrollWrapper.scrollLeft + $containerWidth) {
-          $scrollWrapper.scrollLeft = afterNextTagOffsetLeft - $containerWidth
-        } else if (beforePrevTagOffsetLeft < $scrollWrapper.scrollLeft) {
-          $scrollWrapper.scrollLeft = beforePrevTagOffsetLeft
-        }
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.scroll-container {
-  white-space: nowrap;
-  position: relative;
-  overflow: hidden;
-  width: 100%;
-  /deep/ {
-    .el-scrollbar__bar {
-      bottom: 0px;
-    }
-    .el-scrollbar__wrap {
-      height: 49px;
-    }
-  }
-}
-</style>
diff --git a/src/views/layout/components/TagsView/index.vue b/src/views/layout/components/TagsView/index.vue
deleted file mode 100644
index 325c815..0000000
--- a/src/views/layout/components/TagsView/index.vue
+++ /dev/null
@@ -1,287 +0,0 @@
-<template>
-  <div id="tags-view-container" class="tags-view-container">
-    <scroll-pane ref="scrollPane" class="tags-view-wrapper">
-      <router-link
-        v-for="tag in visitedViews"
-        ref="tag"
-        :key="tag.path"
-        :class="isActive(tag)?'active':''"
-        :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
-        tag="span"
-        class="tags-view-item"
-        @click.middle.native="closeSelectedTag(tag)"
-        @contextmenu.prevent.native="openMenu(tag,$event)"
-      >
-        {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
-      </router-link>
-    </scroll-pane>
-    <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
-      <li @click="refreshSelectedTag(selectedTag)">刷新页面</li>
-      <li v-if="!(selectedTag.meta&&selectedTag.meta.affix)" @click="closeSelectedTag(selectedTag)">关闭当前标签页</li>
-      <li @click="closeOthersTags">关闭其他标签页</li>
-      <li @click="closeAllTags(selectedTag)">关闭全部标签页</li>
-    </ul>
-  </div>
-</template>
-
-<script>
-import ScrollPane from './ScrollPane'
-import path from 'path'
-
-export default {
-  name: 'TagsView',
-  components: { ScrollPane },
-  data() {
-    return {
-      visible: false,
-      top: 0,
-      left: 0,
-      selectedTag: {},
-      affixTags: []
-    }
-  },
-  computed: {
-    visitedViews() {
-      return this.$store.state.tagsView.visitedViews
-    },
-    routes() {
-      return this.$store.state.permission.routers
-    }
-  },
-  watch: {
-    $route() {
-      this.addTags()
-      this.moveToCurrentTag()
-    },
-    visible(value) {
-      if (value) {
-        document.body.addEventListener('click', this.closeMenu)
-      } else {
-        document.body.removeEventListener('click', this.closeMenu)
-      }
-    }
-  },
-  mounted() {
-    this.initTags()
-    this.addTags()
-  },
-  methods: {
-    isActive(route) {
-      return route.path === this.$route.path
-    },
-    filterAffixTags(routes, basePath = '/') {
-      let tags = []
-      routes.forEach(route => {
-        if (route.meta && route.meta.affix) {
-          const tagPath = path.resolve(basePath, route.path)
-          tags.push({
-            fullPath: tagPath,
-            path: tagPath,
-            name: route.name,
-            meta: { ...route.meta }
-          })
-        }
-        if (route.children) {
-          const tempTags = this.filterAffixTags(route.children, route.path)
-          if (tempTags.length >= 1) {
-            tags = [...tags, ...tempTags]
-          }
-        }
-      })
-      return tags
-    },
-    initTags() {
-      const affixTags = this.affixTags = this.filterAffixTags(this.routes)
-      for (const tag of affixTags) {
-        // Must have tag name
-        if (tag.name) {
-          this.$store.dispatch('tagsView/addVisitedView', tag)
-        }
-      }
-    },
-    addTags() {
-      const { name } = this.$route
-      if (name) {
-        this.$store.dispatch('tagsView/addView', this.$route)
-      }
-      return false
-    },
-    moveToCurrentTag() {
-      const tags = this.$refs.tag
-      this.$nextTick(() => {
-        for (const tag of tags) {
-          if (tag.to.path === this.$route.path) {
-            this.$refs.scrollPane.moveToTarget(tag)
-            // when query is different then update
-            if (tag.to.fullPath !== this.$route.fullPath) {
-              this.$store.dispatch('tagsView/updateVisitedView', this.$route)
-            }
-            break
-          }
-        }
-      })
-    },
-    refreshSelectedTag(view) {
-      this.$store.dispatch('tagsView/delCachedView', view).then(() => {
-        const { fullPath } = view
-        this.$nextTick(() => {
-          this.$router.replace({
-            path: '/redirect' + fullPath
-          })
-        })
-      })
-    },
-    closeSelectedTag(view) {
-      this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
-        if (this.isActive(view)) {
-          this.toLastView(visitedViews, view)
-        }
-      })
-    },
-    closeOthersTags() {
-      this.$router.push(this.selectedTag)
-      this.$store.dispatch('tagsView/delOthersViews', this.selectedTag).then(() => {
-        this.moveToCurrentTag()
-      })
-    },
-    closeAllTags(view) {
-      this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => {
-        if (this.affixTags.some(tag => tag.path === view.path)) {
-          return
-        }
-        this.toLastView(visitedViews, view)
-      })
-    },
-    toLastView(visitedViews, view) {
-      const latestView = visitedViews.slice(-1)[0]
-      if (latestView) {
-        this.$router.push(latestView)
-      } else {
-        // now the default is to redirect to the home page if there is no tags-view,
-        // you can adjust it according to your needs.
-        if (view.name === 'Dashboard') {
-          // to reload home page
-          this.$router.replace({ path: '/redirect' + view.fullPath })
-        } else {
-          this.$router.push('/')
-        }
-      }
-    },
-    openMenu(tag, e) {
-      const menuMinWidth = 105
-      const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
-      const offsetWidth = this.$el.offsetWidth // container width
-      const maxLeft = offsetWidth - menuMinWidth // left boundary
-      const left = e.clientX - offsetLeft + 15 // 15: margin right
-
-      if (left > maxLeft) {
-        this.left = maxLeft
-      } else {
-        this.left = left
-      }
-
-      this.top = e.clientY - 40
-      this.visible = true
-      this.selectedTag = tag
-    },
-    closeMenu() {
-      this.visible = false
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-  .tags-view-container {
-    height: 34px;
-    width: 100%;
-    background: #fff;
-    border-bottom: 1px solid #d8dce5;
-    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
-    .tags-view-wrapper {
-      .tags-view-item {
-        display: inline-block;
-        position: relative;
-        cursor: pointer;
-        height: 26px;
-        line-height: 26px;
-        border: 1px solid #d8dce5;
-        color: #495060;
-        background: #fff;
-        padding: 0 8px;
-        font-size: 12px;
-        margin-left: 5px;
-        margin-top: 4px;
-        &:first-of-type {
-          margin-left: 15px;
-        }
-        &:last-of-type {
-          margin-right: 15px;
-        }
-        &.active {
-          background-color: #42b983;
-          color: #fff;
-          border-color: #42b983;
-          &::before {
-            content: '';
-            background: #fff;
-            display: inline-block;
-            width: 8px;
-            height: 8px;
-            border-radius: 50%;
-            position: relative;
-            margin-right: 2px;
-          }
-        }
-      }
-    }
-    .contextmenu {
-      margin: 0;
-      background: #fff;
-      z-index: 3000;
-      position: absolute;
-      list-style-type: none;
-      padding: 5px 0;
-      border-radius: 4px;
-      font-size: 12px;
-      font-weight: 400;
-      color: #333;
-      box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
-      li {
-        margin: 0;
-        padding: 7px 16px;
-        cursor: pointer;
-        &:hover {
-          background: #eee;
-        }
-      }
-    }
-  }
-</style>
-
-<style lang="scss">
-  //reset element css of el-icon-close
-  .tags-view-wrapper {
-    .tags-view-item {
-      .el-icon-close {
-        width: 16px;
-        height: 16px;
-        vertical-align: 2px;
-        border-radius: 50%;
-        text-align: center;
-        transition: all .3s cubic-bezier(.645, .045, .355, 1);
-        transform-origin: 100% 50%;
-        &:before {
-          transform: scale(.6);
-          display: inline-block;
-          vertical-align: -3px;
-        }
-        &:hover {
-          background-color: #b4bccc;
-          color: #fff;
-        }
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/index.js b/src/views/layout/components/index.js
deleted file mode 100644
index 52d35e3..0000000
--- a/src/views/layout/components/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export { default as Navbar } from './Navbar'
-export { default as Sidebar } from './Sidebar'
-export { default as AppMain } from './AppMain'
-export { default as AppHeader } from './AppHeader'
diff --git a/src/views/layout/mixin/ResizeHandler.js b/src/views/layout/mixin/ResizeHandler.js
deleted file mode 100644
index 604fe3d..0000000
--- a/src/views/layout/mixin/ResizeHandler.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import store from '@/store'
-
-const { body } = document
-const WIDTH = 992 // refer to Bootstrap's responsive design
-
-export default {
-  watch: {
-    $route(route) {
-      if (this.device === 'mobile' && this.sidebar.opened) {
-        store.dispatch('CloseSideBar', { withoutAnimation: false })
-      }
-    }
-  },
-  beforeMount() {
-    window.addEventListener('resize', this.resizeHandler)
-  },
-  mounted() {
-    const isMobile = this.isMobile()
-    if (isMobile) {
-      store.dispatch('ToggleDevice', 'mobile')
-      store.dispatch('CloseSideBar', { withoutAnimation: true })
-    }
-  },
-  methods: {
-    isMobile() {
-      const rect = body.getBoundingClientRect()
-      return rect.width - 1 < WIDTH
-    },
-    resizeHandler() {
-      if (!document.hidden) {
-        const isMobile = this.isMobile()
-        store.dispatch('ToggleDevice', isMobile ? 'mobile' : 'desktop')
-
-        if (isMobile) {
-          store.dispatch('CloseSideBar', { withoutAnimation: true })
-        }
-      }
-    }
-  }
-}
diff --git a/src/views/nested/menu1/index.vue b/src/views/nested/menu1/index.vue
deleted file mode 100644
index fdba73a..0000000
--- a/src/views/nested/menu1/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template >
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1">
-      <router-view />
-    </el-alert>
-  </div>
-</template>
diff --git a/src/views/nested/menu1/menu1-1/index.vue b/src/views/nested/menu1/menu1-1/index.vue
deleted file mode 100644
index 824b2cb..0000000
--- a/src/views/nested/menu1/menu1-1/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template >
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-1" type="success">
-      <router-view />
-    </el-alert>
-  </div>
-</template>

diff --git a/config/dev.env.js b/config/dev.env.js
index b654c4c..95e311a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,7 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://111.198.10.15:12204"'
+  // BASE_API: '"http://111.198.10.15:12204"'
+  BASE_API: '"http://111.198.10.15:11409"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/mock/system/area.js b/mock/system/area.js
index 3495001..dd8e88e 100644
--- a/mock/system/area.js
+++ b/mock/system/area.js
@@ -79,5 +79,52 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/levelType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '省级',
+            'id': '166',
+            'value': '1'
+          },
+          {
+            'name': '市级',
+            'id': '167',
+            'value': '2'
+          },
+          {
+            'name': '区级',
+            'id': '168',
+            'value': '3'
+          },
+          {
+            'name': '街道',
+            'id': '169',
+            'value': '4'
+          },
+          {
+            'name': '社区',
+            'id': '170',
+            'value': '5'
+          },
+          {
+            'name': '网格',
+            'id': '171',
+            'value': '6'
+          },
+          {
+            'name': '责任网格',
+            'id': '172',
+            'value': '7'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f17c427 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -176,5 +176,32 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/dataScopeType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '全部',
+            'id': '55',
+            'value': '03'
+          },
+          {
+            'name': '本部门',
+            'id': '56',
+            'value': '04'
+          },
+          {
+            'name': '自定义',
+            'id': '57',
+            'value': '04'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/src/main.js b/src/main.js
index 5630ee7..ae15138 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
  * it will intercept your request, so you won't see the request in the network.
  * If you remove `../mock` it will automatically request easy-mock data.
  */
-// import './../mock' // simulation data
+import './../mock' // simulation data
 // require('./../mock')
 // 兼容IE11
 import 'babel-polyfill'
diff --git a/src/settings.js b/src/settings.js
index b8159bf..b568ce0 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: false,
+  showSettings: true,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/example/tableExample.vue b/src/views/example/tableExample.vue
index a313e57..9d98bb5 100644
--- a/src/views/example/tableExample.vue
+++ b/src/views/example/tableExample.vue
@@ -145,8 +145,8 @@
           needIndex: false // 是否需要序号列
         },
         toolsOption: {
-          selectColumns: false, // 是否需要筛选列
-          refresh: false // 是否需要刷新按钮
+          selectColumns: true, // 是否需要筛选列
+          refresh: true // 是否需要刷新按钮
         }
       } // 表格属性
     }
diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
deleted file mode 100644
index c7b94e7..0000000
--- a/src/views/layout/Layout.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <app-header class="app-header"/>
-    <div class="app-body">
-      <!--侧边栏-->
-      <sidebar class="sidebar-container"/>
-      <!--右半部分-->
-      <div class="main-container">
-        <!--上方导航-->
-        <navbar/>
-        <!--标签栏-->
-        <tags-view/>
-        <!--主页-->
-        <el-scrollbar>
-          <app-main/>
-        </el-scrollbar>
-
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { AppHeader, Navbar, Sidebar, AppMain } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import TagsView from './components/TagsView/index'
-
-export default {
-  name: 'Layout',
-  components: {
-    TagsView,
-    AppHeader,
-    Navbar,
-    Sidebar,
-    AppMain
-  },
-  mixins: [ResizeMixin],
-  computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    device() {
-      return this.$store.state.app.device
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened,
-        withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    }
-  },
-  methods: {
-    handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  @import "src/styles/mixin.scss";
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-    &.mobile.openSidebar{
-      position: fixed;
-      top: 0;
-    }
-  }
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-  .el-scrollbar{
-    height: calc(100vh - 50px);
-  }
-</style>
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
deleted file mode 100644
index 6326221..0000000
--- a/src/views/layout/components/AppHeader.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
-    <h3>{{ title }}</h3>
-    <el-dropdown class="avatar-container" trigger="click">
-      <div class="avatar-wrapper">
-        <span style="line-height:50px;">欢迎您，{{ name }}</span>
-        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
-        <i class="el-icon-caret-bottom"/>
-      </div>
-      <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <!--<router-link class="inlineBlock" to="/">-->
-        <!--<el-dropdown-item>-->
-        <!--主页-->
-        <!--</el-dropdown-item>-->
-        <!--</router-link>-->
-        <el-dropdown-item>
-          <span style="display:block;" @click="resetPwd">修改密码</span>
-        </el-dropdown-item>
-        <el-dropdown-item divided>
-          <span style="display:block;" @click="logout">注销</span>
-        </el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
-    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import ResetPwd from '../../system/user/resetPwd'
-import { getProject } from '@/utils/baseConfig'
-
-export default {
-  name: 'AppHeader',
-  components: { ResetPwd },
-  data() {
-    return {
-      title: getProject().title,
-      name: this.$store.getters.name,
-      showSetPwd: false,
-      headerUrl: require('../../../assets/global_images/header.png')// 头部图片
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    },
-    resetPwd() {
-      this.showSetPwd = true
-      this.$refs.retPwd.initDialog(true)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .app-header{
-    height:60px;
-    background-color:#000000;
-    background-repeat: no-repeat;
-    -webkit-background-size: 100% 100%;
-    background-size: 100% 100%;
-    color:white;
-  }
-  h3{
-    margin-left:40px;
-    display: inline-block;
-    float:left;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    float: right;
-    z-index:500;
-    position: fixed;
-    top:5px;
-    right: 35px;
-    .avatar-wrapper {
-      color:#d3dce6;
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        font-size: 12px;
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
deleted file mode 100644
index 2ea268e..0000000
--- a/src/views/layout/components/AppMain.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <section class="app-main">
-    <transition name="fade-transform" mode="out-in">
-      <!-- or name="fade" -->
-      <!-- <router-view :key="key"></router-view> -->
-      <div>
-        <keep-alive>
-          <router-view v-if="$route.meta.keepAlive" :key="key"/>
-        </keep-alive>
-        <router-view v-if="!$route.meta.keepAlive" :key="key"/>
-      </div>
-    </transition>
-  </section>
-</template>
-
-<script>
-export default {
-  name: 'AppMain',
-  computed: {
-    key() {
-      if (this.$route.meta.keepAlive) {
-        return this.$route.name !== undefined ? this.$route.name : this.$route
-      } else {
-        return this.$route.name !== undefined ? this.$route.name + new Date() : this.$route + new Date()
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.app-main {
-  /*50 = navbar  */
-  /*min-height: calc(100vh - 50px);*/
-  position: relative;
-  overflow: hidden;
-}
-</style>
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
deleted file mode 100644
index 193b604..0000000
--- a/src/views/layout/components/Navbar.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <div class="navbar">
-    <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
-    <breadcrumb />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import Hamburger from '@/components/Hamburger'
-
-export default {
-  components: {
-    Breadcrumb,
-    Hamburger
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.navbar {
-  height: 50px;
-  line-height: 50px;
-  box-shadow: 0 1px 3px 0 rgba(0,0,0,.12), 0 0 3px 0 rgba(0,0,0,.04);
-  .hamburger-container {
-    line-height: 58px;
-    height: 50px;
-    float: left;
-    padding: 0 10px;
-  }
-  .screenfull {
-    position: absolute;
-    right: 90px;
-    top: 16px;
-    color: red;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    position: absolute;
-    right: 35px;
-    .avatar-wrapper {
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        position: absolute;
-        right: -20px;
-        top: 25px;
-        font-size: 12px;
-      }
-    }
-  }
-}
-</style>
-
diff --git a/src/views/layout/components/Sidebar/Item.vue b/src/views/layout/components/Sidebar/Item.vue
deleted file mode 100644
index b515f61..0000000
--- a/src/views/layout/components/Sidebar/Item.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<script>
-export default {
-  name: 'MenuItem',
-  functional: true,
-  props: {
-    icon: {
-      type: String,
-      default: ''
-    },
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  render(h, context) {
-    const { icon, title } = context.props
-    const vnodes = []
-
-    if (icon) {
-      vnodes.push(<svg-icon icon-class={icon}/>)
-    }
-
-    if (title) {
-      vnodes.push(<span slot='title'>{(title)}</span>)
-    }
-    return vnodes
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/Link.vue b/src/views/layout/components/Sidebar/Link.vue
deleted file mode 100644
index bff45cd..0000000
--- a/src/views/layout/components/Sidebar/Link.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-<template>
-  <!-- eslint-disable vue/require-component-is -->
-  <component v-bind="linkProps(to)">
-    <slot/>
-  </component>
-</template>
-
-<script>
-import { isExternal } from '@/utils/validate'
-
-export default {
-  props: {
-    to: {
-      type: String,
-      required: true
-    }
-  },
-  methods: {
-    linkProps(url) {
-      if (isExternal(url)) {
-        return {
-          is: 'a',
-          href: url,
-          target: '_blank',
-          rel: 'noopener'
-        }
-      }
-      return {
-        is: 'router-link',
-        to: url
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue
deleted file mode 100644
index 988d662..0000000
--- a/src/views/layout/components/Sidebar/SidebarItem.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <div v-if="!item.hidden&&item.children" class="menu-wrapper">
-
-    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
-      <a :href="onlyOneChild.path" target="_blank" @click="clickLink(onlyOneChild.path,$event)">
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
-          <item v-if="onlyOneChild.meta" :icon="onlyOneChild.meta.icon||item.meta.icon" :title="onlyOneChild.meta.title" />
-        </el-menu-item>
-      </a>
-    </template>
-
-    <el-submenu v-else :index="item.name||item.path">
-      <template slot="title">
-        <item v-if="item.meta" :icon="item.meta.icon" :title="item.meta.title" />
-      </template>
-
-      <template v-for="child in item.children" v-if="!child.hidden">
-        <sidebar-item
-          v-if="child.children&&child.children.length>0"
-          :is-nest="true"
-          :item="child"
-          :key="child.path"
-          :base-path="resolvePath(child.path)"
-          class="nest-menu" />
-
-        <a v-else :href="child.path" :key="child.name" target="_blank" @click="clickLink(child.path,$event)">
-          <el-menu-item :index="resolvePath(child.path)">
-            <span class="light-line"/>
-            <item v-if="child.meta" :icon="child.meta.icon" :title="child.meta.title" />
-          </el-menu-item>
-        </a>
-      </template>
-    </el-submenu>
-
-  </div>
-</template>
-
-<script>
-import path from 'path'
-import { validateURL } from '@/utils/validate'
-import Item from './Item'
-
-export default {
-  name: 'SidebarItem',
-  components: { Item },
-  props: {
-    // route object
-    item: {
-      type: Object,
-      required: true
-    },
-    isNest: {
-      type: Boolean,
-      default: false
-    },
-    basePath: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      onlyOneChild: null
-    }
-  },
-  methods: {
-    hasOneShowingChild(children, parent) {
-      const showingChildren = children.filter(item => {
-        if (item.hidden) {
-          return false
-        } else {
-          // Temp set(will be used if only has one showing child)
-          this.onlyOneChild = item
-          return true
-        }
-      })
-
-      // When there is only one child router, the child router is displayed by default
-      if (showingChildren.length === 1) {
-        return true
-      }
-
-      // Show parent if there are no child router to display
-      if (showingChildren.length === 0) {
-        this.onlyOneChild = { ... parent, path: '', noShowingChildren: true }
-        return true
-      }
-
-      return false
-    },
-    resolvePath(routePath) {
-      return path.resolve(this.basePath, routePath)
-    },
-    isExternalLink(routePath) {
-      return validateURL(routePath)
-    },
-    clickLink(routePath, e) {
-      if (!this.isExternalLink(routePath)) {
-        e.preventDefault()
-        const path = this.resolvePath(routePath)
-        this.$router.push({ path, query: { t: +new Date() }})
-        // this.$router.push(path)
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
deleted file mode 100644
index 5dcf730..0000000
--- a/src/views/layout/components/Sidebar/index.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<template>
-  <el-scrollbar wrap-class="scrollbar-wrapper">
-    <el-menu
-      :show-timeout="200"
-      :default-active="activeMenu"
-      :collapse="isCollapse"
-      mode="vertical"
-      background-color="#304156"
-      text-color="#bfcbd9"
-      active-text-color="#1bb1a5"
-    >
-      <sidebar-item v-for="route in permission_routers" :key="route.name" :item="route" :base-path="route.path"/>
-    </el-menu>
-  </el-scrollbar>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import SidebarItem from './SidebarItem'
-
-export default {
-  components: { SidebarItem },
-  computed: {
-    ...mapGetters([
-      'permission_routers',
-      'sidebar'
-    ]),
-    activeMenu() {
-      const route = this.$route
-      const { meta, path } = route
-      // 如果meta中上设置activeMenu，按照meta中设置高亮
-      if (meta.activeMenu) {
-        return meta.activeMenu
-      }
-      return path
-    },
-    isCollapse() {
-      return !this.sidebar.opened
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/TagsView/ScrollPane.vue b/src/views/layout/components/TagsView/ScrollPane.vue
deleted file mode 100644
index 0ec76e7..0000000
--- a/src/views/layout/components/TagsView/ScrollPane.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-<template>
-  <el-scrollbar ref="scrollContainer" :vertical="false" class="scroll-container" @wheel.native.prevent="handleScroll">
-    <slot />
-  </el-scrollbar>
-</template>
-
-<script>
-const tagAndTagSpacing = 4 // tagAndTagSpacing
-
-export default {
-  name: 'ScrollPane',
-  data() {
-    return {
-      left: 0
-    }
-  },
-  computed: {
-    scrollWrapper() {
-      return this.$refs.scrollContainer.$refs.wrap
-    }
-  },
-  methods: {
-    handleScroll(e) {
-      const eventDelta = e.wheelDelta || -e.deltaY * 40
-      const $scrollWrapper = this.scrollWrapper
-      $scrollWrapper.scrollLeft = $scrollWrapper.scrollLeft + eventDelta / 4
-    },
-    moveToTarget(currentTag) {
-      const $container = this.$refs.scrollContainer.$el
-      const $containerWidth = $container.offsetWidth
-      const $scrollWrapper = this.scrollWrapper
-      const tagList = this.$parent.$refs.tag
-
-      let firstTag = null
-      let lastTag = null
-
-      // find first tag and last tag
-      if (tagList.length > 0) {
-        firstTag = tagList[0]
-        lastTag = tagList[tagList.length - 1]
-      }
-
-      if (firstTag === currentTag) {
-        $scrollWrapper.scrollLeft = 0
-      } else if (lastTag === currentTag) {
-        $scrollWrapper.scrollLeft = $scrollWrapper.scrollWidth - $containerWidth
-      } else {
-        // find preTag and nextTag
-        const currentIndex = tagList.findIndex(item => item === currentTag)
-        const prevTag = tagList[currentIndex - 1]
-        const nextTag = tagList[currentIndex + 1]
-
-        // the tag's offsetLeft after of nextTag
-        const afterNextTagOffsetLeft = nextTag.$el.offsetLeft + nextTag.$el.offsetWidth + tagAndTagSpacing
-
-        // the tag's offsetLeft before of prevTag
-        const beforePrevTagOffsetLeft = prevTag.$el.offsetLeft - tagAndTagSpacing
-
-        if (afterNextTagOffsetLeft > $scrollWrapper.scrollLeft + $containerWidth) {
-          $scrollWrapper.scrollLeft = afterNextTagOffsetLeft - $containerWidth
-        } else if (beforePrevTagOffsetLeft < $scrollWrapper.scrollLeft) {
-          $scrollWrapper.scrollLeft = beforePrevTagOffsetLeft
-        }
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.scroll-container {
-  white-space: nowrap;
-  position: relative;
-  overflow: hidden;
-  width: 100%;
-  /deep/ {
-    .el-scrollbar__bar {
-      bottom: 0px;
-    }
-    .el-scrollbar__wrap {
-      height: 49px;
-    }
-  }
-}
-</style>
diff --git a/src/views/layout/components/TagsView/index.vue b/src/views/layout/components/TagsView/index.vue
deleted file mode 100644
index 325c815..0000000
--- a/src/views/layout/components/TagsView/index.vue
+++ /dev/null
@@ -1,287 +0,0 @@
-<template>
-  <div id="tags-view-container" class="tags-view-container">
-    <scroll-pane ref="scrollPane" class="tags-view-wrapper">
-      <router-link
-        v-for="tag in visitedViews"
-        ref="tag"
-        :key="tag.path"
-        :class="isActive(tag)?'active':''"
-        :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
-        tag="span"
-        class="tags-view-item"
-        @click.middle.native="closeSelectedTag(tag)"
-        @contextmenu.prevent.native="openMenu(tag,$event)"
-      >
-        {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
-      </router-link>
-    </scroll-pane>
-    <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
-      <li @click="refreshSelectedTag(selectedTag)">刷新页面</li>
-      <li v-if="!(selectedTag.meta&&selectedTag.meta.affix)" @click="closeSelectedTag(selectedTag)">关闭当前标签页</li>
-      <li @click="closeOthersTags">关闭其他标签页</li>
-      <li @click="closeAllTags(selectedTag)">关闭全部标签页</li>
-    </ul>
-  </div>
-</template>
-
-<script>
-import ScrollPane from './ScrollPane'
-import path from 'path'
-
-export default {
-  name: 'TagsView',
-  components: { ScrollPane },
-  data() {
-    return {
-      visible: false,
-      top: 0,
-      left: 0,
-      selectedTag: {},
-      affixTags: []
-    }
-  },
-  computed: {
-    visitedViews() {
-      return this.$store.state.tagsView.visitedViews
-    },
-    routes() {
-      return this.$store.state.permission.routers
-    }
-  },
-  watch: {
-    $route() {
-      this.addTags()
-      this.moveToCurrentTag()
-    },
-    visible(value) {
-      if (value) {
-        document.body.addEventListener('click', this.closeMenu)
-      } else {
-        document.body.removeEventListener('click', this.closeMenu)
-      }
-    }
-  },
-  mounted() {
-    this.initTags()
-    this.addTags()
-  },
-  methods: {
-    isActive(route) {
-      return route.path === this.$route.path
-    },
-    filterAffixTags(routes, basePath = '/') {
-      let tags = []
-      routes.forEach(route => {
-        if (route.meta && route.meta.affix) {
-          const tagPath = path.resolve(basePath, route.path)
-          tags.push({
-            fullPath: tagPath,
-            path: tagPath,
-            name: route.name,
-            meta: { ...route.meta }
-          })
-        }
-        if (route.children) {
-          const tempTags = this.filterAffixTags(route.children, route.path)
-          if (tempTags.length >= 1) {
-            tags = [...tags, ...tempTags]
-          }
-        }
-      })
-      return tags
-    },
-    initTags() {
-      const affixTags = this.affixTags = this.filterAffixTags(this.routes)
-      for (const tag of affixTags) {
-        // Must have tag name
-        if (tag.name) {
-          this.$store.dispatch('tagsView/addVisitedView', tag)
-        }
-      }
-    },
-    addTags() {
-      const { name } = this.$route
-      if (name) {
-        this.$store.dispatch('tagsView/addView', this.$route)
-      }
-      return false
-    },
-    moveToCurrentTag() {
-      const tags = this.$refs.tag
-      this.$nextTick(() => {
-        for (const tag of tags) {
-          if (tag.to.path === this.$route.path) {
-            this.$refs.scrollPane.moveToTarget(tag)
-            // when query is different then update
-            if (tag.to.fullPath !== this.$route.fullPath) {
-              this.$store.dispatch('tagsView/updateVisitedView', this.$route)
-            }
-            break
-          }
-        }
-      })
-    },
-    refreshSelectedTag(view) {
-      this.$store.dispatch('tagsView/delCachedView', view).then(() => {
-        const { fullPath } = view
-        this.$nextTick(() => {
-          this.$router.replace({
-            path: '/redirect' + fullPath
-          })
-        })
-      })
-    },
-    closeSelectedTag(view) {
-      this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
-        if (this.isActive(view)) {
-          this.toLastView(visitedViews, view)
-        }
-      })
-    },
-    closeOthersTags() {
-      this.$router.push(this.selectedTag)
-      this.$store.dispatch('tagsView/delOthersViews', this.selectedTag).then(() => {
-        this.moveToCurrentTag()
-      })
-    },
-    closeAllTags(view) {
-      this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => {
-        if (this.affixTags.some(tag => tag.path === view.path)) {
-          return
-        }
-        this.toLastView(visitedViews, view)
-      })
-    },
-    toLastView(visitedViews, view) {
-      const latestView = visitedViews.slice(-1)[0]
-      if (latestView) {
-        this.$router.push(latestView)
-      } else {
-        // now the default is to redirect to the home page if there is no tags-view,
-        // you can adjust it according to your needs.
-        if (view.name === 'Dashboard') {
-          // to reload home page
-          this.$router.replace({ path: '/redirect' + view.fullPath })
-        } else {
-          this.$router.push('/')
-        }
-      }
-    },
-    openMenu(tag, e) {
-      const menuMinWidth = 105
-      const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
-      const offsetWidth = this.$el.offsetWidth // container width
-      const maxLeft = offsetWidth - menuMinWidth // left boundary
-      const left = e.clientX - offsetLeft + 15 // 15: margin right
-
-      if (left > maxLeft) {
-        this.left = maxLeft
-      } else {
-        this.left = left
-      }
-
-      this.top = e.clientY - 40
-      this.visible = true
-      this.selectedTag = tag
-    },
-    closeMenu() {
-      this.visible = false
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-  .tags-view-container {
-    height: 34px;
-    width: 100%;
-    background: #fff;
-    border-bottom: 1px solid #d8dce5;
-    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
-    .tags-view-wrapper {
-      .tags-view-item {
-        display: inline-block;
-        position: relative;
-        cursor: pointer;
-        height: 26px;
-        line-height: 26px;
-        border: 1px solid #d8dce5;
-        color: #495060;
-        background: #fff;
-        padding: 0 8px;
-        font-size: 12px;
-        margin-left: 5px;
-        margin-top: 4px;
-        &:first-of-type {
-          margin-left: 15px;
-        }
-        &:last-of-type {
-          margin-right: 15px;
-        }
-        &.active {
-          background-color: #42b983;
-          color: #fff;
-          border-color: #42b983;
-          &::before {
-            content: '';
-            background: #fff;
-            display: inline-block;
-            width: 8px;
-            height: 8px;
-            border-radius: 50%;
-            position: relative;
-            margin-right: 2px;
-          }
-        }
-      }
-    }
-    .contextmenu {
-      margin: 0;
-      background: #fff;
-      z-index: 3000;
-      position: absolute;
-      list-style-type: none;
-      padding: 5px 0;
-      border-radius: 4px;
-      font-size: 12px;
-      font-weight: 400;
-      color: #333;
-      box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
-      li {
-        margin: 0;
-        padding: 7px 16px;
-        cursor: pointer;
-        &:hover {
-          background: #eee;
-        }
-      }
-    }
-  }
-</style>
-
-<style lang="scss">
-  //reset element css of el-icon-close
-  .tags-view-wrapper {
-    .tags-view-item {
-      .el-icon-close {
-        width: 16px;
-        height: 16px;
-        vertical-align: 2px;
-        border-radius: 50%;
-        text-align: center;
-        transition: all .3s cubic-bezier(.645, .045, .355, 1);
-        transform-origin: 100% 50%;
-        &:before {
-          transform: scale(.6);
-          display: inline-block;
-          vertical-align: -3px;
-        }
-        &:hover {
-          background-color: #b4bccc;
-          color: #fff;
-        }
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/index.js b/src/views/layout/components/index.js
deleted file mode 100644
index 52d35e3..0000000
--- a/src/views/layout/components/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export { default as Navbar } from './Navbar'
-export { default as Sidebar } from './Sidebar'
-export { default as AppMain } from './AppMain'
-export { default as AppHeader } from './AppHeader'
diff --git a/src/views/layout/mixin/ResizeHandler.js b/src/views/layout/mixin/ResizeHandler.js
deleted file mode 100644
index 604fe3d..0000000
--- a/src/views/layout/mixin/ResizeHandler.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import store from '@/store'
-
-const { body } = document
-const WIDTH = 992 // refer to Bootstrap's responsive design
-
-export default {
-  watch: {
-    $route(route) {
-      if (this.device === 'mobile' && this.sidebar.opened) {
-        store.dispatch('CloseSideBar', { withoutAnimation: false })
-      }
-    }
-  },
-  beforeMount() {
-    window.addEventListener('resize', this.resizeHandler)
-  },
-  mounted() {
-    const isMobile = this.isMobile()
-    if (isMobile) {
-      store.dispatch('ToggleDevice', 'mobile')
-      store.dispatch('CloseSideBar', { withoutAnimation: true })
-    }
-  },
-  methods: {
-    isMobile() {
-      const rect = body.getBoundingClientRect()
-      return rect.width - 1 < WIDTH
-    },
-    resizeHandler() {
-      if (!document.hidden) {
-        const isMobile = this.isMobile()
-        store.dispatch('ToggleDevice', isMobile ? 'mobile' : 'desktop')
-
-        if (isMobile) {
-          store.dispatch('CloseSideBar', { withoutAnimation: true })
-        }
-      }
-    }
-  }
-}
diff --git a/src/views/nested/menu1/index.vue b/src/views/nested/menu1/index.vue
deleted file mode 100644
index fdba73a..0000000
--- a/src/views/nested/menu1/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template >
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1">
-      <router-view />
-    </el-alert>
-  </div>
-</template>
diff --git a/src/views/nested/menu1/menu1-1/index.vue b/src/views/nested/menu1/menu1-1/index.vue
deleted file mode 100644
index 824b2cb..0000000
--- a/src/views/nested/menu1/menu1-1/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template >
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-1" type="success">
-      <router-view />
-    </el-alert>
-  </div>
-</template>
diff --git a/src/views/nested/menu1/menu1-2/index.vue b/src/views/nested/menu1/menu1-2/index.vue
deleted file mode 100644
index 0c86276..0000000
--- a/src/views/nested/menu1/menu1-2/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-2" type="success">
-      <router-view />
-    </el-alert>
-  </div>
-</template>

diff --git a/config/dev.env.js b/config/dev.env.js
index b654c4c..95e311a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,7 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://111.198.10.15:12204"'
+  // BASE_API: '"http://111.198.10.15:12204"'
+  BASE_API: '"http://111.198.10.15:11409"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/mock/system/area.js b/mock/system/area.js
index 3495001..dd8e88e 100644
--- a/mock/system/area.js
+++ b/mock/system/area.js
@@ -79,5 +79,52 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/levelType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '省级',
+            'id': '166',
+            'value': '1'
+          },
+          {
+            'name': '市级',
+            'id': '167',
+            'value': '2'
+          },
+          {
+            'name': '区级',
+            'id': '168',
+            'value': '3'
+          },
+          {
+            'name': '街道',
+            'id': '169',
+            'value': '4'
+          },
+          {
+            'name': '社区',
+            'id': '170',
+            'value': '5'
+          },
+          {
+            'name': '网格',
+            'id': '171',
+            'value': '6'
+          },
+          {
+            'name': '责任网格',
+            'id': '172',
+            'value': '7'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f17c427 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -176,5 +176,32 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/dataScopeType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '全部',
+            'id': '55',
+            'value': '03'
+          },
+          {
+            'name': '本部门',
+            'id': '56',
+            'value': '04'
+          },
+          {
+            'name': '自定义',
+            'id': '57',
+            'value': '04'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/src/main.js b/src/main.js
index 5630ee7..ae15138 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
  * it will intercept your request, so you won't see the request in the network.
  * If you remove `../mock` it will automatically request easy-mock data.
  */
-// import './../mock' // simulation data
+import './../mock' // simulation data
 // require('./../mock')
 // 兼容IE11
 import 'babel-polyfill'
diff --git a/src/settings.js b/src/settings.js
index b8159bf..b568ce0 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: false,
+  showSettings: true,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/example/tableExample.vue b/src/views/example/tableExample.vue
index a313e57..9d98bb5 100644
--- a/src/views/example/tableExample.vue
+++ b/src/views/example/tableExample.vue
@@ -145,8 +145,8 @@
           needIndex: false // 是否需要序号列
         },
         toolsOption: {
-          selectColumns: false, // 是否需要筛选列
-          refresh: false // 是否需要刷新按钮
+          selectColumns: true, // 是否需要筛选列
+          refresh: true // 是否需要刷新按钮
         }
       } // 表格属性
     }
diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
deleted file mode 100644
index c7b94e7..0000000
--- a/src/views/layout/Layout.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <app-header class="app-header"/>
-    <div class="app-body">
-      <!--侧边栏-->
-      <sidebar class="sidebar-container"/>
-      <!--右半部分-->
-      <div class="main-container">
-        <!--上方导航-->
-        <navbar/>
-        <!--标签栏-->
-        <tags-view/>
-        <!--主页-->
-        <el-scrollbar>
-          <app-main/>
-        </el-scrollbar>
-
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { AppHeader, Navbar, Sidebar, AppMain } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import TagsView from './components/TagsView/index'
-
-export default {
-  name: 'Layout',
-  components: {
-    TagsView,
-    AppHeader,
-    Navbar,
-    Sidebar,
-    AppMain
-  },
-  mixins: [ResizeMixin],
-  computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    device() {
-      return this.$store.state.app.device
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened,
-        withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    }
-  },
-  methods: {
-    handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  @import "src/styles/mixin.scss";
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-    &.mobile.openSidebar{
-      position: fixed;
-      top: 0;
-    }
-  }
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-  .el-scrollbar{
-    height: calc(100vh - 50px);
-  }
-</style>
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
deleted file mode 100644
index 6326221..0000000
--- a/src/views/layout/components/AppHeader.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
-    <h3>{{ title }}</h3>
-    <el-dropdown class="avatar-container" trigger="click">
-      <div class="avatar-wrapper">
-        <span style="line-height:50px;">欢迎您，{{ name }}</span>
-        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
-        <i class="el-icon-caret-bottom"/>
-      </div>
-      <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <!--<router-link class="inlineBlock" to="/">-->
-        <!--<el-dropdown-item>-->
-        <!--主页-->
-        <!--</el-dropdown-item>-->
-        <!--</router-link>-->
-        <el-dropdown-item>
-          <span style="display:block;" @click="resetPwd">修改密码</span>
-        </el-dropdown-item>
-        <el-dropdown-item divided>
-          <span style="display:block;" @click="logout">注销</span>
-        </el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
-    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import ResetPwd from '../../system/user/resetPwd'
-import { getProject } from '@/utils/baseConfig'
-
-export default {
-  name: 'AppHeader',
-  components: { ResetPwd },
-  data() {
-    return {
-      title: getProject().title,
-      name: this.$store.getters.name,
-      showSetPwd: false,
-      headerUrl: require('../../../assets/global_images/header.png')// 头部图片
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    },
-    resetPwd() {
-      this.showSetPwd = true
-      this.$refs.retPwd.initDialog(true)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .app-header{
-    height:60px;
-    background-color:#000000;
-    background-repeat: no-repeat;
-    -webkit-background-size: 100% 100%;
-    background-size: 100% 100%;
-    color:white;
-  }
-  h3{
-    margin-left:40px;
-    display: inline-block;
-    float:left;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    float: right;
-    z-index:500;
-    position: fixed;
-    top:5px;
-    right: 35px;
-    .avatar-wrapper {
-      color:#d3dce6;
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        font-size: 12px;
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
deleted file mode 100644
index 2ea268e..0000000
--- a/src/views/layout/components/AppMain.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <section class="app-main">
-    <transition name="fade-transform" mode="out-in">
-      <!-- or name="fade" -->
-      <!-- <router-view :key="key"></router-view> -->
-      <div>
-        <keep-alive>
-          <router-view v-if="$route.meta.keepAlive" :key="key"/>
-        </keep-alive>
-        <router-view v-if="!$route.meta.keepAlive" :key="key"/>
-      </div>
-    </transition>
-  </section>
-</template>
-
-<script>
-export default {
-  name: 'AppMain',
-  computed: {
-    key() {
-      if (this.$route.meta.keepAlive) {
-        return this.$route.name !== undefined ? this.$route.name : this.$route
-      } else {
-        return this.$route.name !== undefined ? this.$route.name + new Date() : this.$route + new Date()
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.app-main {
-  /*50 = navbar  */
-  /*min-height: calc(100vh - 50px);*/
-  position: relative;
-  overflow: hidden;
-}
-</style>
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
deleted file mode 100644
index 193b604..0000000
--- a/src/views/layout/components/Navbar.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <div class="navbar">
-    <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
-    <breadcrumb />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import Hamburger from '@/components/Hamburger'
-
-export default {
-  components: {
-    Breadcrumb,
-    Hamburger
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.navbar {
-  height: 50px;
-  line-height: 50px;
-  box-shadow: 0 1px 3px 0 rgba(0,0,0,.12), 0 0 3px 0 rgba(0,0,0,.04);
-  .hamburger-container {
-    line-height: 58px;
-    height: 50px;
-    float: left;
-    padding: 0 10px;
-  }
-  .screenfull {
-    position: absolute;
-    right: 90px;
-    top: 16px;
-    color: red;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    position: absolute;
-    right: 35px;
-    .avatar-wrapper {
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        position: absolute;
-        right: -20px;
-        top: 25px;
-        font-size: 12px;
-      }
-    }
-  }
-}
-</style>
-
diff --git a/src/views/layout/components/Sidebar/Item.vue b/src/views/layout/components/Sidebar/Item.vue
deleted file mode 100644
index b515f61..0000000
--- a/src/views/layout/components/Sidebar/Item.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<script>
-export default {
-  name: 'MenuItem',
-  functional: true,
-  props: {
-    icon: {
-      type: String,
-      default: ''
-    },
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  render(h, context) {
-    const { icon, title } = context.props
-    const vnodes = []
-
-    if (icon) {
-      vnodes.push(<svg-icon icon-class={icon}/>)
-    }
-
-    if (title) {
-      vnodes.push(<span slot='title'>{(title)}</span>)
-    }
-    return vnodes
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/Link.vue b/src/views/layout/components/Sidebar/Link.vue
deleted file mode 100644
index bff45cd..0000000
--- a/src/views/layout/components/Sidebar/Link.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-<template>
-  <!-- eslint-disable vue/require-component-is -->
-  <component v-bind="linkProps(to)">
-    <slot/>
-  </component>
-</template>
-
-<script>
-import { isExternal } from '@/utils/validate'
-
-export default {
-  props: {
-    to: {
-      type: String,
-      required: true
-    }
-  },
-  methods: {
-    linkProps(url) {
-      if (isExternal(url)) {
-        return {
-          is: 'a',
-          href: url,
-          target: '_blank',
-          rel: 'noopener'
-        }
-      }
-      return {
-        is: 'router-link',
-        to: url
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue
deleted file mode 100644
index 988d662..0000000
--- a/src/views/layout/components/Sidebar/SidebarItem.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <div v-if="!item.hidden&&item.children" class="menu-wrapper">
-
-    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
-      <a :href="onlyOneChild.path" target="_blank" @click="clickLink(onlyOneChild.path,$event)">
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
-          <item v-if="onlyOneChild.meta" :icon="onlyOneChild.meta.icon||item.meta.icon" :title="onlyOneChild.meta.title" />
-        </el-menu-item>
-      </a>
-    </template>
-
-    <el-submenu v-else :index="item.name||item.path">
-      <template slot="title">
-        <item v-if="item.meta" :icon="item.meta.icon" :title="item.meta.title" />
-      </template>
-
-      <template v-for="child in item.children" v-if="!child.hidden">
-        <sidebar-item
-          v-if="child.children&&child.children.length>0"
-          :is-nest="true"
-          :item="child"
-          :key="child.path"
-          :base-path="resolvePath(child.path)"
-          class="nest-menu" />
-
-        <a v-else :href="child.path" :key="child.name" target="_blank" @click="clickLink(child.path,$event)">
-          <el-menu-item :index="resolvePath(child.path)">
-            <span class="light-line"/>
-            <item v-if="child.meta" :icon="child.meta.icon" :title="child.meta.title" />
-          </el-menu-item>
-        </a>
-      </template>
-    </el-submenu>
-
-  </div>
-</template>
-
-<script>
-import path from 'path'
-import { validateURL } from '@/utils/validate'
-import Item from './Item'
-
-export default {
-  name: 'SidebarItem',
-  components: { Item },
-  props: {
-    // route object
-    item: {
-      type: Object,
-      required: true
-    },
-    isNest: {
-      type: Boolean,
-      default: false
-    },
-    basePath: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      onlyOneChild: null
-    }
-  },
-  methods: {
-    hasOneShowingChild(children, parent) {
-      const showingChildren = children.filter(item => {
-        if (item.hidden) {
-          return false
-        } else {
-          // Temp set(will be used if only has one showing child)
-          this.onlyOneChild = item
-          return true
-        }
-      })
-
-      // When there is only one child router, the child router is displayed by default
-      if (showingChildren.length === 1) {
-        return true
-      }
-
-      // Show parent if there are no child router to display
-      if (showingChildren.length === 0) {
-        this.onlyOneChild = { ... parent, path: '', noShowingChildren: true }
-        return true
-      }
-
-      return false
-    },
-    resolvePath(routePath) {
-      return path.resolve(this.basePath, routePath)
-    },
-    isExternalLink(routePath) {
-      return validateURL(routePath)
-    },
-    clickLink(routePath, e) {
-      if (!this.isExternalLink(routePath)) {
-        e.preventDefault()
-        const path = this.resolvePath(routePath)
-        this.$router.push({ path, query: { t: +new Date() }})
-        // this.$router.push(path)
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
deleted file mode 100644
index 5dcf730..0000000
--- a/src/views/layout/components/Sidebar/index.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<template>
-  <el-scrollbar wrap-class="scrollbar-wrapper">
-    <el-menu
-      :show-timeout="200"
-      :default-active="activeMenu"
-      :collapse="isCollapse"
-      mode="vertical"
-      background-color="#304156"
-      text-color="#bfcbd9"
-      active-text-color="#1bb1a5"
-    >
-      <sidebar-item v-for="route in permission_routers" :key="route.name" :item="route" :base-path="route.path"/>
-    </el-menu>
-  </el-scrollbar>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import SidebarItem from './SidebarItem'
-
-export default {
-  components: { SidebarItem },
-  computed: {
-    ...mapGetters([
-      'permission_routers',
-      'sidebar'
-    ]),
-    activeMenu() {
-      const route = this.$route
-      const { meta, path } = route
-      // 如果meta中上设置activeMenu，按照meta中设置高亮
-      if (meta.activeMenu) {
-        return meta.activeMenu
-      }
-      return path
-    },
-    isCollapse() {
-      return !this.sidebar.opened
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/TagsView/ScrollPane.vue b/src/views/layout/components/TagsView/ScrollPane.vue
deleted file mode 100644
index 0ec76e7..0000000
--- a/src/views/layout/components/TagsView/ScrollPane.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-<template>
-  <el-scrollbar ref="scrollContainer" :vertical="false" class="scroll-container" @wheel.native.prevent="handleScroll">
-    <slot />
-  </el-scrollbar>
-</template>
-
-<script>
-const tagAndTagSpacing = 4 // tagAndTagSpacing
-
-export default {
-  name: 'ScrollPane',
-  data() {
-    return {
-      left: 0
-    }
-  },
-  computed: {
-    scrollWrapper() {
-      return this.$refs.scrollContainer.$refs.wrap
-    }
-  },
-  methods: {
-    handleScroll(e) {
-      const eventDelta = e.wheelDelta || -e.deltaY * 40
-      const $scrollWrapper = this.scrollWrapper
-      $scrollWrapper.scrollLeft = $scrollWrapper.scrollLeft + eventDelta / 4
-    },
-    moveToTarget(currentTag) {
-      const $container = this.$refs.scrollContainer.$el
-      const $containerWidth = $container.offsetWidth
-      const $scrollWrapper = this.scrollWrapper
-      const tagList = this.$parent.$refs.tag
-
-      let firstTag = null
-      let lastTag = null
-
-      // find first tag and last tag
-      if (tagList.length > 0) {
-        firstTag = tagList[0]
-        lastTag = tagList[tagList.length - 1]
-      }
-
-      if (firstTag === currentTag) {
-        $scrollWrapper.scrollLeft = 0
-      } else if (lastTag === currentTag) {
-        $scrollWrapper.scrollLeft = $scrollWrapper.scrollWidth - $containerWidth
-      } else {
-        // find preTag and nextTag
-        const currentIndex = tagList.findIndex(item => item === currentTag)
-        const prevTag = tagList[currentIndex - 1]
-        const nextTag = tagList[currentIndex + 1]
-
-        // the tag's offsetLeft after of nextTag
-        const afterNextTagOffsetLeft = nextTag.$el.offsetLeft + nextTag.$el.offsetWidth + tagAndTagSpacing
-
-        // the tag's offsetLeft before of prevTag
-        const beforePrevTagOffsetLeft = prevTag.$el.offsetLeft - tagAndTagSpacing
-
-        if (afterNextTagOffsetLeft > $scrollWrapper.scrollLeft + $containerWidth) {
-          $scrollWrapper.scrollLeft = afterNextTagOffsetLeft - $containerWidth
-        } else if (beforePrevTagOffsetLeft < $scrollWrapper.scrollLeft) {
-          $scrollWrapper.scrollLeft = beforePrevTagOffsetLeft
-        }
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.scroll-container {
-  white-space: nowrap;
-  position: relative;
-  overflow: hidden;
-  width: 100%;
-  /deep/ {
-    .el-scrollbar__bar {
-      bottom: 0px;
-    }
-    .el-scrollbar__wrap {
-      height: 49px;
-    }
-  }
-}
-</style>
diff --git a/src/views/layout/components/TagsView/index.vue b/src/views/layout/components/TagsView/index.vue
deleted file mode 100644
index 325c815..0000000
--- a/src/views/layout/components/TagsView/index.vue
+++ /dev/null
@@ -1,287 +0,0 @@
-<template>
-  <div id="tags-view-container" class="tags-view-container">
-    <scroll-pane ref="scrollPane" class="tags-view-wrapper">
-      <router-link
-        v-for="tag in visitedViews"
-        ref="tag"
-        :key="tag.path"
-        :class="isActive(tag)?'active':''"
-        :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
-        tag="span"
-        class="tags-view-item"
-        @click.middle.native="closeSelectedTag(tag)"
-        @contextmenu.prevent.native="openMenu(tag,$event)"
-      >
-        {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
-      </router-link>
-    </scroll-pane>
-    <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
-      <li @click="refreshSelectedTag(selectedTag)">刷新页面</li>
-      <li v-if="!(selectedTag.meta&&selectedTag.meta.affix)" @click="closeSelectedTag(selectedTag)">关闭当前标签页</li>
-      <li @click="closeOthersTags">关闭其他标签页</li>
-      <li @click="closeAllTags(selectedTag)">关闭全部标签页</li>
-    </ul>
-  </div>
-</template>
-
-<script>
-import ScrollPane from './ScrollPane'
-import path from 'path'
-
-export default {
-  name: 'TagsView',
-  components: { ScrollPane },
-  data() {
-    return {
-      visible: false,
-      top: 0,
-      left: 0,
-      selectedTag: {},
-      affixTags: []
-    }
-  },
-  computed: {
-    visitedViews() {
-      return this.$store.state.tagsView.visitedViews
-    },
-    routes() {
-      return this.$store.state.permission.routers
-    }
-  },
-  watch: {
-    $route() {
-      this.addTags()
-      this.moveToCurrentTag()
-    },
-    visible(value) {
-      if (value) {
-        document.body.addEventListener('click', this.closeMenu)
-      } else {
-        document.body.removeEventListener('click', this.closeMenu)
-      }
-    }
-  },
-  mounted() {
-    this.initTags()
-    this.addTags()
-  },
-  methods: {
-    isActive(route) {
-      return route.path === this.$route.path
-    },
-    filterAffixTags(routes, basePath = '/') {
-      let tags = []
-      routes.forEach(route => {
-        if (route.meta && route.meta.affix) {
-          const tagPath = path.resolve(basePath, route.path)
-          tags.push({
-            fullPath: tagPath,
-            path: tagPath,
-            name: route.name,
-            meta: { ...route.meta }
-          })
-        }
-        if (route.children) {
-          const tempTags = this.filterAffixTags(route.children, route.path)
-          if (tempTags.length >= 1) {
-            tags = [...tags, ...tempTags]
-          }
-        }
-      })
-      return tags
-    },
-    initTags() {
-      const affixTags = this.affixTags = this.filterAffixTags(this.routes)
-      for (const tag of affixTags) {
-        // Must have tag name
-        if (tag.name) {
-          this.$store.dispatch('tagsView/addVisitedView', tag)
-        }
-      }
-    },
-    addTags() {
-      const { name } = this.$route
-      if (name) {
-        this.$store.dispatch('tagsView/addView', this.$route)
-      }
-      return false
-    },
-    moveToCurrentTag() {
-      const tags = this.$refs.tag
-      this.$nextTick(() => {
-        for (const tag of tags) {
-          if (tag.to.path === this.$route.path) {
-            this.$refs.scrollPane.moveToTarget(tag)
-            // when query is different then update
-            if (tag.to.fullPath !== this.$route.fullPath) {
-              this.$store.dispatch('tagsView/updateVisitedView', this.$route)
-            }
-            break
-          }
-        }
-      })
-    },
-    refreshSelectedTag(view) {
-      this.$store.dispatch('tagsView/delCachedView', view).then(() => {
-        const { fullPath } = view
-        this.$nextTick(() => {
-          this.$router.replace({
-            path: '/redirect' + fullPath
-          })
-        })
-      })
-    },
-    closeSelectedTag(view) {
-      this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
-        if (this.isActive(view)) {
-          this.toLastView(visitedViews, view)
-        }
-      })
-    },
-    closeOthersTags() {
-      this.$router.push(this.selectedTag)
-      this.$store.dispatch('tagsView/delOthersViews', this.selectedTag).then(() => {
-        this.moveToCurrentTag()
-      })
-    },
-    closeAllTags(view) {
-      this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => {
-        if (this.affixTags.some(tag => tag.path === view.path)) {
-          return
-        }
-        this.toLastView(visitedViews, view)
-      })
-    },
-    toLastView(visitedViews, view) {
-      const latestView = visitedViews.slice(-1)[0]
-      if (latestView) {
-        this.$router.push(latestView)
-      } else {
-        // now the default is to redirect to the home page if there is no tags-view,
-        // you can adjust it according to your needs.
-        if (view.name === 'Dashboard') {
-          // to reload home page
-          this.$router.replace({ path: '/redirect' + view.fullPath })
-        } else {
-          this.$router.push('/')
-        }
-      }
-    },
-    openMenu(tag, e) {
-      const menuMinWidth = 105
-      const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
-      const offsetWidth = this.$el.offsetWidth // container width
-      const maxLeft = offsetWidth - menuMinWidth // left boundary
-      const left = e.clientX - offsetLeft + 15 // 15: margin right
-
-      if (left > maxLeft) {
-        this.left = maxLeft
-      } else {
-        this.left = left
-      }
-
-      this.top = e.clientY - 40
-      this.visible = true
-      this.selectedTag = tag
-    },
-    closeMenu() {
-      this.visible = false
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-  .tags-view-container {
-    height: 34px;
-    width: 100%;
-    background: #fff;
-    border-bottom: 1px solid #d8dce5;
-    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
-    .tags-view-wrapper {
-      .tags-view-item {
-        display: inline-block;
-        position: relative;
-        cursor: pointer;
-        height: 26px;
-        line-height: 26px;
-        border: 1px solid #d8dce5;
-        color: #495060;
-        background: #fff;
-        padding: 0 8px;
-        font-size: 12px;
-        margin-left: 5px;
-        margin-top: 4px;
-        &:first-of-type {
-          margin-left: 15px;
-        }
-        &:last-of-type {
-          margin-right: 15px;
-        }
-        &.active {
-          background-color: #42b983;
-          color: #fff;
-          border-color: #42b983;
-          &::before {
-            content: '';
-            background: #fff;
-            display: inline-block;
-            width: 8px;
-            height: 8px;
-            border-radius: 50%;
-            position: relative;
-            margin-right: 2px;
-          }
-        }
-      }
-    }
-    .contextmenu {
-      margin: 0;
-      background: #fff;
-      z-index: 3000;
-      position: absolute;
-      list-style-type: none;
-      padding: 5px 0;
-      border-radius: 4px;
-      font-size: 12px;
-      font-weight: 400;
-      color: #333;
-      box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
-      li {
-        margin: 0;
-        padding: 7px 16px;
-        cursor: pointer;
-        &:hover {
-          background: #eee;
-        }
-      }
-    }
-  }
-</style>
-
-<style lang="scss">
-  //reset element css of el-icon-close
-  .tags-view-wrapper {
-    .tags-view-item {
-      .el-icon-close {
-        width: 16px;
-        height: 16px;
-        vertical-align: 2px;
-        border-radius: 50%;
-        text-align: center;
-        transition: all .3s cubic-bezier(.645, .045, .355, 1);
-        transform-origin: 100% 50%;
-        &:before {
-          transform: scale(.6);
-          display: inline-block;
-          vertical-align: -3px;
-        }
-        &:hover {
-          background-color: #b4bccc;
-          color: #fff;
-        }
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/index.js b/src/views/layout/components/index.js
deleted file mode 100644
index 52d35e3..0000000
--- a/src/views/layout/components/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export { default as Navbar } from './Navbar'
-export { default as Sidebar } from './Sidebar'
-export { default as AppMain } from './AppMain'
-export { default as AppHeader } from './AppHeader'
diff --git a/src/views/layout/mixin/ResizeHandler.js b/src/views/layout/mixin/ResizeHandler.js
deleted file mode 100644
index 604fe3d..0000000
--- a/src/views/layout/mixin/ResizeHandler.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import store from '@/store'
-
-const { body } = document
-const WIDTH = 992 // refer to Bootstrap's responsive design
-
-export default {
-  watch: {
-    $route(route) {
-      if (this.device === 'mobile' && this.sidebar.opened) {
-        store.dispatch('CloseSideBar', { withoutAnimation: false })
-      }
-    }
-  },
-  beforeMount() {
-    window.addEventListener('resize', this.resizeHandler)
-  },
-  mounted() {
-    const isMobile = this.isMobile()
-    if (isMobile) {
-      store.dispatch('ToggleDevice', 'mobile')
-      store.dispatch('CloseSideBar', { withoutAnimation: true })
-    }
-  },
-  methods: {
-    isMobile() {
-      const rect = body.getBoundingClientRect()
-      return rect.width - 1 < WIDTH
-    },
-    resizeHandler() {
-      if (!document.hidden) {
-        const isMobile = this.isMobile()
-        store.dispatch('ToggleDevice', isMobile ? 'mobile' : 'desktop')
-
-        if (isMobile) {
-          store.dispatch('CloseSideBar', { withoutAnimation: true })
-        }
-      }
-    }
-  }
-}
diff --git a/src/views/nested/menu1/index.vue b/src/views/nested/menu1/index.vue
deleted file mode 100644
index fdba73a..0000000
--- a/src/views/nested/menu1/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template >
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1">
-      <router-view />
-    </el-alert>
-  </div>
-</template>
diff --git a/src/views/nested/menu1/menu1-1/index.vue b/src/views/nested/menu1/menu1-1/index.vue
deleted file mode 100644
index 824b2cb..0000000
--- a/src/views/nested/menu1/menu1-1/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template >
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-1" type="success">
-      <router-view />
-    </el-alert>
-  </div>
-</template>
diff --git a/src/views/nested/menu1/menu1-2/index.vue b/src/views/nested/menu1/menu1-2/index.vue
deleted file mode 100644
index 0c86276..0000000
--- a/src/views/nested/menu1/menu1-2/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-2" type="success">
-      <router-view />
-    </el-alert>
-  </div>
-</template>
diff --git a/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue b/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue
deleted file mode 100644
index f87d88f..0000000
--- a/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<template functional>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-2-1" type="warning" />
-  </div>
-</template>

diff --git a/config/dev.env.js b/config/dev.env.js
index b654c4c..95e311a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,7 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://111.198.10.15:12204"'
+  // BASE_API: '"http://111.198.10.15:12204"'
+  BASE_API: '"http://111.198.10.15:11409"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/mock/system/area.js b/mock/system/area.js
index 3495001..dd8e88e 100644
--- a/mock/system/area.js
+++ b/mock/system/area.js
@@ -79,5 +79,52 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/levelType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '省级',
+            'id': '166',
+            'value': '1'
+          },
+          {
+            'name': '市级',
+            'id': '167',
+            'value': '2'
+          },
+          {
+            'name': '区级',
+            'id': '168',
+            'value': '3'
+          },
+          {
+            'name': '街道',
+            'id': '169',
+            'value': '4'
+          },
+          {
+            'name': '社区',
+            'id': '170',
+            'value': '5'
+          },
+          {
+            'name': '网格',
+            'id': '171',
+            'value': '6'
+          },
+          {
+            'name': '责任网格',
+            'id': '172',
+            'value': '7'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f17c427 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -176,5 +176,32 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/dataScopeType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '全部',
+            'id': '55',
+            'value': '03'
+          },
+          {
+            'name': '本部门',
+            'id': '56',
+            'value': '04'
+          },
+          {
+            'name': '自定义',
+            'id': '57',
+            'value': '04'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/src/main.js b/src/main.js
index 5630ee7..ae15138 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
  * it will intercept your request, so you won't see the request in the network.
  * If you remove `../mock` it will automatically request easy-mock data.
  */
-// import './../mock' // simulation data
+import './../mock' // simulation data
 // require('./../mock')
 // 兼容IE11
 import 'babel-polyfill'
diff --git a/src/settings.js b/src/settings.js
index b8159bf..b568ce0 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: false,
+  showSettings: true,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/example/tableExample.vue b/src/views/example/tableExample.vue
index a313e57..9d98bb5 100644
--- a/src/views/example/tableExample.vue
+++ b/src/views/example/tableExample.vue
@@ -145,8 +145,8 @@
           needIndex: false // 是否需要序号列
         },
         toolsOption: {
-          selectColumns: false, // 是否需要筛选列
-          refresh: false // 是否需要刷新按钮
+          selectColumns: true, // 是否需要筛选列
+          refresh: true // 是否需要刷新按钮
         }
       } // 表格属性
     }
diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
deleted file mode 100644
index c7b94e7..0000000
--- a/src/views/layout/Layout.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <app-header class="app-header"/>
-    <div class="app-body">
-      <!--侧边栏-->
-      <sidebar class="sidebar-container"/>
-      <!--右半部分-->
-      <div class="main-container">
-        <!--上方导航-->
-        <navbar/>
-        <!--标签栏-->
-        <tags-view/>
-        <!--主页-->
-        <el-scrollbar>
-          <app-main/>
-        </el-scrollbar>
-
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { AppHeader, Navbar, Sidebar, AppMain } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import TagsView from './components/TagsView/index'
-
-export default {
-  name: 'Layout',
-  components: {
-    TagsView,
-    AppHeader,
-    Navbar,
-    Sidebar,
-    AppMain
-  },
-  mixins: [ResizeMixin],
-  computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    device() {
-      return this.$store.state.app.device
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened,
-        withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    }
-  },
-  methods: {
-    handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  @import "src/styles/mixin.scss";
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-    &.mobile.openSidebar{
-      position: fixed;
-      top: 0;
-    }
-  }
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-  .el-scrollbar{
-    height: calc(100vh - 50px);
-  }
-</style>
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
deleted file mode 100644
index 6326221..0000000
--- a/src/views/layout/components/AppHeader.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
-    <h3>{{ title }}</h3>
-    <el-dropdown class="avatar-container" trigger="click">
-      <div class="avatar-wrapper">
-        <span style="line-height:50px;">欢迎您，{{ name }}</span>
-        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
-        <i class="el-icon-caret-bottom"/>
-      </div>
-      <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <!--<router-link class="inlineBlock" to="/">-->
-        <!--<el-dropdown-item>-->
-        <!--主页-->
-        <!--</el-dropdown-item>-->
-        <!--</router-link>-->
-        <el-dropdown-item>
-          <span style="display:block;" @click="resetPwd">修改密码</span>
-        </el-dropdown-item>
-        <el-dropdown-item divided>
-          <span style="display:block;" @click="logout">注销</span>
-        </el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
-    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import ResetPwd from '../../system/user/resetPwd'
-import { getProject } from '@/utils/baseConfig'
-
-export default {
-  name: 'AppHeader',
-  components: { ResetPwd },
-  data() {
-    return {
-      title: getProject().title,
-      name: this.$store.getters.name,
-      showSetPwd: false,
-      headerUrl: require('../../../assets/global_images/header.png')// 头部图片
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    },
-    resetPwd() {
-      this.showSetPwd = true
-      this.$refs.retPwd.initDialog(true)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .app-header{
-    height:60px;
-    background-color:#000000;
-    background-repeat: no-repeat;
-    -webkit-background-size: 100% 100%;
-    background-size: 100% 100%;
-    color:white;
-  }
-  h3{
-    margin-left:40px;
-    display: inline-block;
-    float:left;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    float: right;
-    z-index:500;
-    position: fixed;
-    top:5px;
-    right: 35px;
-    .avatar-wrapper {
-      color:#d3dce6;
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        font-size: 12px;
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
deleted file mode 100644
index 2ea268e..0000000
--- a/src/views/layout/components/AppMain.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <section class="app-main">
-    <transition name="fade-transform" mode="out-in">
-      <!-- or name="fade" -->
-      <!-- <router-view :key="key"></router-view> -->
-      <div>
-        <keep-alive>
-          <router-view v-if="$route.meta.keepAlive" :key="key"/>
-        </keep-alive>
-        <router-view v-if="!$route.meta.keepAlive" :key="key"/>
-      </div>
-    </transition>
-  </section>
-</template>
-
-<script>
-export default {
-  name: 'AppMain',
-  computed: {
-    key() {
-      if (this.$route.meta.keepAlive) {
-        return this.$route.name !== undefined ? this.$route.name : this.$route
-      } else {
-        return this.$route.name !== undefined ? this.$route.name + new Date() : this.$route + new Date()
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.app-main {
-  /*50 = navbar  */
-  /*min-height: calc(100vh - 50px);*/
-  position: relative;
-  overflow: hidden;
-}
-</style>
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
deleted file mode 100644
index 193b604..0000000
--- a/src/views/layout/components/Navbar.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <div class="navbar">
-    <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
-    <breadcrumb />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import Hamburger from '@/components/Hamburger'
-
-export default {
-  components: {
-    Breadcrumb,
-    Hamburger
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.navbar {
-  height: 50px;
-  line-height: 50px;
-  box-shadow: 0 1px 3px 0 rgba(0,0,0,.12), 0 0 3px 0 rgba(0,0,0,.04);
-  .hamburger-container {
-    line-height: 58px;
-    height: 50px;
-    float: left;
-    padding: 0 10px;
-  }
-  .screenfull {
-    position: absolute;
-    right: 90px;
-    top: 16px;
-    color: red;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    position: absolute;
-    right: 35px;
-    .avatar-wrapper {
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        position: absolute;
-        right: -20px;
-        top: 25px;
-        font-size: 12px;
-      }
-    }
-  }
-}
-</style>
-
diff --git a/src/views/layout/components/Sidebar/Item.vue b/src/views/layout/components/Sidebar/Item.vue
deleted file mode 100644
index b515f61..0000000
--- a/src/views/layout/components/Sidebar/Item.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<script>
-export default {
-  name: 'MenuItem',
-  functional: true,
-  props: {
-    icon: {
-      type: String,
-      default: ''
-    },
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  render(h, context) {
-    const { icon, title } = context.props
-    const vnodes = []
-
-    if (icon) {
-      vnodes.push(<svg-icon icon-class={icon}/>)
-    }
-
-    if (title) {
-      vnodes.push(<span slot='title'>{(title)}</span>)
-    }
-    return vnodes
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/Link.vue b/src/views/layout/components/Sidebar/Link.vue
deleted file mode 100644
index bff45cd..0000000
--- a/src/views/layout/components/Sidebar/Link.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-<template>
-  <!-- eslint-disable vue/require-component-is -->
-  <component v-bind="linkProps(to)">
-    <slot/>
-  </component>
-</template>
-
-<script>
-import { isExternal } from '@/utils/validate'
-
-export default {
-  props: {
-    to: {
-      type: String,
-      required: true
-    }
-  },
-  methods: {
-    linkProps(url) {
-      if (isExternal(url)) {
-        return {
-          is: 'a',
-          href: url,
-          target: '_blank',
-          rel: 'noopener'
-        }
-      }
-      return {
-        is: 'router-link',
-        to: url
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue
deleted file mode 100644
index 988d662..0000000
--- a/src/views/layout/components/Sidebar/SidebarItem.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <div v-if="!item.hidden&&item.children" class="menu-wrapper">
-
-    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
-      <a :href="onlyOneChild.path" target="_blank" @click="clickLink(onlyOneChild.path,$event)">
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
-          <item v-if="onlyOneChild.meta" :icon="onlyOneChild.meta.icon||item.meta.icon" :title="onlyOneChild.meta.title" />
-        </el-menu-item>
-      </a>
-    </template>
-
-    <el-submenu v-else :index="item.name||item.path">
-      <template slot="title">
-        <item v-if="item.meta" :icon="item.meta.icon" :title="item.meta.title" />
-      </template>
-
-      <template v-for="child in item.children" v-if="!child.hidden">
-        <sidebar-item
-          v-if="child.children&&child.children.length>0"
-          :is-nest="true"
-          :item="child"
-          :key="child.path"
-          :base-path="resolvePath(child.path)"
-          class="nest-menu" />
-
-        <a v-else :href="child.path" :key="child.name" target="_blank" @click="clickLink(child.path,$event)">
-          <el-menu-item :index="resolvePath(child.path)">
-            <span class="light-line"/>
-            <item v-if="child.meta" :icon="child.meta.icon" :title="child.meta.title" />
-          </el-menu-item>
-        </a>
-      </template>
-    </el-submenu>
-
-  </div>
-</template>
-
-<script>
-import path from 'path'
-import { validateURL } from '@/utils/validate'
-import Item from './Item'
-
-export default {
-  name: 'SidebarItem',
-  components: { Item },
-  props: {
-    // route object
-    item: {
-      type: Object,
-      required: true
-    },
-    isNest: {
-      type: Boolean,
-      default: false
-    },
-    basePath: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      onlyOneChild: null
-    }
-  },
-  methods: {
-    hasOneShowingChild(children, parent) {
-      const showingChildren = children.filter(item => {
-        if (item.hidden) {
-          return false
-        } else {
-          // Temp set(will be used if only has one showing child)
-          this.onlyOneChild = item
-          return true
-        }
-      })
-
-      // When there is only one child router, the child router is displayed by default
-      if (showingChildren.length === 1) {
-        return true
-      }
-
-      // Show parent if there are no child router to display
-      if (showingChildren.length === 0) {
-        this.onlyOneChild = { ... parent, path: '', noShowingChildren: true }
-        return true
-      }
-
-      return false
-    },
-    resolvePath(routePath) {
-      return path.resolve(this.basePath, routePath)
-    },
-    isExternalLink(routePath) {
-      return validateURL(routePath)
-    },
-    clickLink(routePath, e) {
-      if (!this.isExternalLink(routePath)) {
-        e.preventDefault()
-        const path = this.resolvePath(routePath)
-        this.$router.push({ path, query: { t: +new Date() }})
-        // this.$router.push(path)
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
deleted file mode 100644
index 5dcf730..0000000
--- a/src/views/layout/components/Sidebar/index.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<template>
-  <el-scrollbar wrap-class="scrollbar-wrapper">
-    <el-menu
-      :show-timeout="200"
-      :default-active="activeMenu"
-      :collapse="isCollapse"
-      mode="vertical"
-      background-color="#304156"
-      text-color="#bfcbd9"
-      active-text-color="#1bb1a5"
-    >
-      <sidebar-item v-for="route in permission_routers" :key="route.name" :item="route" :base-path="route.path"/>
-    </el-menu>
-  </el-scrollbar>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import SidebarItem from './SidebarItem'
-
-export default {
-  components: { SidebarItem },
-  computed: {
-    ...mapGetters([
-      'permission_routers',
-      'sidebar'
-    ]),
-    activeMenu() {
-      const route = this.$route
-      const { meta, path } = route
-      // 如果meta中上设置activeMenu，按照meta中设置高亮
-      if (meta.activeMenu) {
-        return meta.activeMenu
-      }
-      return path
-    },
-    isCollapse() {
-      return !this.sidebar.opened
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/TagsView/ScrollPane.vue b/src/views/layout/components/TagsView/ScrollPane.vue
deleted file mode 100644
index 0ec76e7..0000000
--- a/src/views/layout/components/TagsView/ScrollPane.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-<template>
-  <el-scrollbar ref="scrollContainer" :vertical="false" class="scroll-container" @wheel.native.prevent="handleScroll">
-    <slot />
-  </el-scrollbar>
-</template>
-
-<script>
-const tagAndTagSpacing = 4 // tagAndTagSpacing
-
-export default {
-  name: 'ScrollPane',
-  data() {
-    return {
-      left: 0
-    }
-  },
-  computed: {
-    scrollWrapper() {
-      return this.$refs.scrollContainer.$refs.wrap
-    }
-  },
-  methods: {
-    handleScroll(e) {
-      const eventDelta = e.wheelDelta || -e.deltaY * 40
-      const $scrollWrapper = this.scrollWrapper
-      $scrollWrapper.scrollLeft = $scrollWrapper.scrollLeft + eventDelta / 4
-    },
-    moveToTarget(currentTag) {
-      const $container = this.$refs.scrollContainer.$el
-      const $containerWidth = $container.offsetWidth
-      const $scrollWrapper = this.scrollWrapper
-      const tagList = this.$parent.$refs.tag
-
-      let firstTag = null
-      let lastTag = null
-
-      // find first tag and last tag
-      if (tagList.length > 0) {
-        firstTag = tagList[0]
-        lastTag = tagList[tagList.length - 1]
-      }
-
-      if (firstTag === currentTag) {
-        $scrollWrapper.scrollLeft = 0
-      } else if (lastTag === currentTag) {
-        $scrollWrapper.scrollLeft = $scrollWrapper.scrollWidth - $containerWidth
-      } else {
-        // find preTag and nextTag
-        const currentIndex = tagList.findIndex(item => item === currentTag)
-        const prevTag = tagList[currentIndex - 1]
-        const nextTag = tagList[currentIndex + 1]
-
-        // the tag's offsetLeft after of nextTag
-        const afterNextTagOffsetLeft = nextTag.$el.offsetLeft + nextTag.$el.offsetWidth + tagAndTagSpacing
-
-        // the tag's offsetLeft before of prevTag
-        const beforePrevTagOffsetLeft = prevTag.$el.offsetLeft - tagAndTagSpacing
-
-        if (afterNextTagOffsetLeft > $scrollWrapper.scrollLeft + $containerWidth) {
-          $scrollWrapper.scrollLeft = afterNextTagOffsetLeft - $containerWidth
-        } else if (beforePrevTagOffsetLeft < $scrollWrapper.scrollLeft) {
-          $scrollWrapper.scrollLeft = beforePrevTagOffsetLeft
-        }
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.scroll-container {
-  white-space: nowrap;
-  position: relative;
-  overflow: hidden;
-  width: 100%;
-  /deep/ {
-    .el-scrollbar__bar {
-      bottom: 0px;
-    }
-    .el-scrollbar__wrap {
-      height: 49px;
-    }
-  }
-}
-</style>
diff --git a/src/views/layout/components/TagsView/index.vue b/src/views/layout/components/TagsView/index.vue
deleted file mode 100644
index 325c815..0000000
--- a/src/views/layout/components/TagsView/index.vue
+++ /dev/null
@@ -1,287 +0,0 @@
-<template>
-  <div id="tags-view-container" class="tags-view-container">
-    <scroll-pane ref="scrollPane" class="tags-view-wrapper">
-      <router-link
-        v-for="tag in visitedViews"
-        ref="tag"
-        :key="tag.path"
-        :class="isActive(tag)?'active':''"
-        :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
-        tag="span"
-        class="tags-view-item"
-        @click.middle.native="closeSelectedTag(tag)"
-        @contextmenu.prevent.native="openMenu(tag,$event)"
-      >
-        {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
-      </router-link>
-    </scroll-pane>
-    <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
-      <li @click="refreshSelectedTag(selectedTag)">刷新页面</li>
-      <li v-if="!(selectedTag.meta&&selectedTag.meta.affix)" @click="closeSelectedTag(selectedTag)">关闭当前标签页</li>
-      <li @click="closeOthersTags">关闭其他标签页</li>
-      <li @click="closeAllTags(selectedTag)">关闭全部标签页</li>
-    </ul>
-  </div>
-</template>
-
-<script>
-import ScrollPane from './ScrollPane'
-import path from 'path'
-
-export default {
-  name: 'TagsView',
-  components: { ScrollPane },
-  data() {
-    return {
-      visible: false,
-      top: 0,
-      left: 0,
-      selectedTag: {},
-      affixTags: []
-    }
-  },
-  computed: {
-    visitedViews() {
-      return this.$store.state.tagsView.visitedViews
-    },
-    routes() {
-      return this.$store.state.permission.routers
-    }
-  },
-  watch: {
-    $route() {
-      this.addTags()
-      this.moveToCurrentTag()
-    },
-    visible(value) {
-      if (value) {
-        document.body.addEventListener('click', this.closeMenu)
-      } else {
-        document.body.removeEventListener('click', this.closeMenu)
-      }
-    }
-  },
-  mounted() {
-    this.initTags()
-    this.addTags()
-  },
-  methods: {
-    isActive(route) {
-      return route.path === this.$route.path
-    },
-    filterAffixTags(routes, basePath = '/') {
-      let tags = []
-      routes.forEach(route => {
-        if (route.meta && route.meta.affix) {
-          const tagPath = path.resolve(basePath, route.path)
-          tags.push({
-            fullPath: tagPath,
-            path: tagPath,
-            name: route.name,
-            meta: { ...route.meta }
-          })
-        }
-        if (route.children) {
-          const tempTags = this.filterAffixTags(route.children, route.path)
-          if (tempTags.length >= 1) {
-            tags = [...tags, ...tempTags]
-          }
-        }
-      })
-      return tags
-    },
-    initTags() {
-      const affixTags = this.affixTags = this.filterAffixTags(this.routes)
-      for (const tag of affixTags) {
-        // Must have tag name
-        if (tag.name) {
-          this.$store.dispatch('tagsView/addVisitedView', tag)
-        }
-      }
-    },
-    addTags() {
-      const { name } = this.$route
-      if (name) {
-        this.$store.dispatch('tagsView/addView', this.$route)
-      }
-      return false
-    },
-    moveToCurrentTag() {
-      const tags = this.$refs.tag
-      this.$nextTick(() => {
-        for (const tag of tags) {
-          if (tag.to.path === this.$route.path) {
-            this.$refs.scrollPane.moveToTarget(tag)
-            // when query is different then update
-            if (tag.to.fullPath !== this.$route.fullPath) {
-              this.$store.dispatch('tagsView/updateVisitedView', this.$route)
-            }
-            break
-          }
-        }
-      })
-    },
-    refreshSelectedTag(view) {
-      this.$store.dispatch('tagsView/delCachedView', view).then(() => {
-        const { fullPath } = view
-        this.$nextTick(() => {
-          this.$router.replace({
-            path: '/redirect' + fullPath
-          })
-        })
-      })
-    },
-    closeSelectedTag(view) {
-      this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
-        if (this.isActive(view)) {
-          this.toLastView(visitedViews, view)
-        }
-      })
-    },
-    closeOthersTags() {
-      this.$router.push(this.selectedTag)
-      this.$store.dispatch('tagsView/delOthersViews', this.selectedTag).then(() => {
-        this.moveToCurrentTag()
-      })
-    },
-    closeAllTags(view) {
-      this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => {
-        if (this.affixTags.some(tag => tag.path === view.path)) {
-          return
-        }
-        this.toLastView(visitedViews, view)
-      })
-    },
-    toLastView(visitedViews, view) {
-      const latestView = visitedViews.slice(-1)[0]
-      if (latestView) {
-        this.$router.push(latestView)
-      } else {
-        // now the default is to redirect to the home page if there is no tags-view,
-        // you can adjust it according to your needs.
-        if (view.name === 'Dashboard') {
-          // to reload home page
-          this.$router.replace({ path: '/redirect' + view.fullPath })
-        } else {
-          this.$router.push('/')
-        }
-      }
-    },
-    openMenu(tag, e) {
-      const menuMinWidth = 105
-      const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
-      const offsetWidth = this.$el.offsetWidth // container width
-      const maxLeft = offsetWidth - menuMinWidth // left boundary
-      const left = e.clientX - offsetLeft + 15 // 15: margin right
-
-      if (left > maxLeft) {
-        this.left = maxLeft
-      } else {
-        this.left = left
-      }
-
-      this.top = e.clientY - 40
-      this.visible = true
-      this.selectedTag = tag
-    },
-    closeMenu() {
-      this.visible = false
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-  .tags-view-container {
-    height: 34px;
-    width: 100%;
-    background: #fff;
-    border-bottom: 1px solid #d8dce5;
-    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
-    .tags-view-wrapper {
-      .tags-view-item {
-        display: inline-block;
-        position: relative;
-        cursor: pointer;
-        height: 26px;
-        line-height: 26px;
-        border: 1px solid #d8dce5;
-        color: #495060;
-        background: #fff;
-        padding: 0 8px;
-        font-size: 12px;
-        margin-left: 5px;
-        margin-top: 4px;
-        &:first-of-type {
-          margin-left: 15px;
-        }
-        &:last-of-type {
-          margin-right: 15px;
-        }
-        &.active {
-          background-color: #42b983;
-          color: #fff;
-          border-color: #42b983;
-          &::before {
-            content: '';
-            background: #fff;
-            display: inline-block;
-            width: 8px;
-            height: 8px;
-            border-radius: 50%;
-            position: relative;
-            margin-right: 2px;
-          }
-        }
-      }
-    }
-    .contextmenu {
-      margin: 0;
-      background: #fff;
-      z-index: 3000;
-      position: absolute;
-      list-style-type: none;
-      padding: 5px 0;
-      border-radius: 4px;
-      font-size: 12px;
-      font-weight: 400;
-      color: #333;
-      box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
-      li {
-        margin: 0;
-        padding: 7px 16px;
-        cursor: pointer;
-        &:hover {
-          background: #eee;
-        }
-      }
-    }
-  }
-</style>
-
-<style lang="scss">
-  //reset element css of el-icon-close
-  .tags-view-wrapper {
-    .tags-view-item {
-      .el-icon-close {
-        width: 16px;
-        height: 16px;
-        vertical-align: 2px;
-        border-radius: 50%;
-        text-align: center;
-        transition: all .3s cubic-bezier(.645, .045, .355, 1);
-        transform-origin: 100% 50%;
-        &:before {
-          transform: scale(.6);
-          display: inline-block;
-          vertical-align: -3px;
-        }
-        &:hover {
-          background-color: #b4bccc;
-          color: #fff;
-        }
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/index.js b/src/views/layout/components/index.js
deleted file mode 100644
index 52d35e3..0000000
--- a/src/views/layout/components/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export { default as Navbar } from './Navbar'
-export { default as Sidebar } from './Sidebar'
-export { default as AppMain } from './AppMain'
-export { default as AppHeader } from './AppHeader'
diff --git a/src/views/layout/mixin/ResizeHandler.js b/src/views/layout/mixin/ResizeHandler.js
deleted file mode 100644
index 604fe3d..0000000
--- a/src/views/layout/mixin/ResizeHandler.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import store from '@/store'
-
-const { body } = document
-const WIDTH = 992 // refer to Bootstrap's responsive design
-
-export default {
-  watch: {
-    $route(route) {
-      if (this.device === 'mobile' && this.sidebar.opened) {
-        store.dispatch('CloseSideBar', { withoutAnimation: false })
-      }
-    }
-  },
-  beforeMount() {
-    window.addEventListener('resize', this.resizeHandler)
-  },
-  mounted() {
-    const isMobile = this.isMobile()
-    if (isMobile) {
-      store.dispatch('ToggleDevice', 'mobile')
-      store.dispatch('CloseSideBar', { withoutAnimation: true })
-    }
-  },
-  methods: {
-    isMobile() {
-      const rect = body.getBoundingClientRect()
-      return rect.width - 1 < WIDTH
-    },
-    resizeHandler() {
-      if (!document.hidden) {
-        const isMobile = this.isMobile()
-        store.dispatch('ToggleDevice', isMobile ? 'mobile' : 'desktop')
-
-        if (isMobile) {
-          store.dispatch('CloseSideBar', { withoutAnimation: true })
-        }
-      }
-    }
-  }
-}
diff --git a/src/views/nested/menu1/index.vue b/src/views/nested/menu1/index.vue
deleted file mode 100644
index fdba73a..0000000
--- a/src/views/nested/menu1/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template >
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1">
-      <router-view />
-    </el-alert>
-  </div>
-</template>
diff --git a/src/views/nested/menu1/menu1-1/index.vue b/src/views/nested/menu1/menu1-1/index.vue
deleted file mode 100644
index 824b2cb..0000000
--- a/src/views/nested/menu1/menu1-1/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template >
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-1" type="success">
-      <router-view />
-    </el-alert>
-  </div>
-</template>
diff --git a/src/views/nested/menu1/menu1-2/index.vue b/src/views/nested/menu1/menu1-2/index.vue
deleted file mode 100644
index 0c86276..0000000
--- a/src/views/nested/menu1/menu1-2/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-2" type="success">
-      <router-view />
-    </el-alert>
-  </div>
-</template>
diff --git a/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue b/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue
deleted file mode 100644
index f87d88f..0000000
--- a/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<template functional>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-2-1" type="warning" />
-  </div>
-</template>
diff --git a/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue b/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue
deleted file mode 100644
index d88789f..0000000
--- a/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<template functional>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-2-2" type="warning" />
-  </div>
-</template>

diff --git a/config/dev.env.js b/config/dev.env.js
index b654c4c..95e311a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,7 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://111.198.10.15:12204"'
+  // BASE_API: '"http://111.198.10.15:12204"'
+  BASE_API: '"http://111.198.10.15:11409"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/mock/system/area.js b/mock/system/area.js
index 3495001..dd8e88e 100644
--- a/mock/system/area.js
+++ b/mock/system/area.js
@@ -79,5 +79,52 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/levelType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '省级',
+            'id': '166',
+            'value': '1'
+          },
+          {
+            'name': '市级',
+            'id': '167',
+            'value': '2'
+          },
+          {
+            'name': '区级',
+            'id': '168',
+            'value': '3'
+          },
+          {
+            'name': '街道',
+            'id': '169',
+            'value': '4'
+          },
+          {
+            'name': '社区',
+            'id': '170',
+            'value': '5'
+          },
+          {
+            'name': '网格',
+            'id': '171',
+            'value': '6'
+          },
+          {
+            'name': '责任网格',
+            'id': '172',
+            'value': '7'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f17c427 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -176,5 +176,32 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/dataScopeType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '全部',
+            'id': '55',
+            'value': '03'
+          },
+          {
+            'name': '本部门',
+            'id': '56',
+            'value': '04'
+          },
+          {
+            'name': '自定义',
+            'id': '57',
+            'value': '04'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/src/main.js b/src/main.js
index 5630ee7..ae15138 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
  * it will intercept your request, so you won't see the request in the network.
  * If you remove `../mock` it will automatically request easy-mock data.
  */
-// import './../mock' // simulation data
+import './../mock' // simulation data
 // require('./../mock')
 // 兼容IE11
 import 'babel-polyfill'
diff --git a/src/settings.js b/src/settings.js
index b8159bf..b568ce0 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: false,
+  showSettings: true,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/example/tableExample.vue b/src/views/example/tableExample.vue
index a313e57..9d98bb5 100644
--- a/src/views/example/tableExample.vue
+++ b/src/views/example/tableExample.vue
@@ -145,8 +145,8 @@
           needIndex: false // 是否需要序号列
         },
         toolsOption: {
-          selectColumns: false, // 是否需要筛选列
-          refresh: false // 是否需要刷新按钮
+          selectColumns: true, // 是否需要筛选列
+          refresh: true // 是否需要刷新按钮
         }
       } // 表格属性
     }
diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
deleted file mode 100644
index c7b94e7..0000000
--- a/src/views/layout/Layout.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <app-header class="app-header"/>
-    <div class="app-body">
-      <!--侧边栏-->
-      <sidebar class="sidebar-container"/>
-      <!--右半部分-->
-      <div class="main-container">
-        <!--上方导航-->
-        <navbar/>
-        <!--标签栏-->
-        <tags-view/>
-        <!--主页-->
-        <el-scrollbar>
-          <app-main/>
-        </el-scrollbar>
-
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { AppHeader, Navbar, Sidebar, AppMain } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import TagsView from './components/TagsView/index'
-
-export default {
-  name: 'Layout',
-  components: {
-    TagsView,
-    AppHeader,
-    Navbar,
-    Sidebar,
-    AppMain
-  },
-  mixins: [ResizeMixin],
-  computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    device() {
-      return this.$store.state.app.device
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened,
-        withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    }
-  },
-  methods: {
-    handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  @import "src/styles/mixin.scss";
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-    &.mobile.openSidebar{
-      position: fixed;
-      top: 0;
-    }
-  }
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-  .el-scrollbar{
-    height: calc(100vh - 50px);
-  }
-</style>
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
deleted file mode 100644
index 6326221..0000000
--- a/src/views/layout/components/AppHeader.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
-    <h3>{{ title }}</h3>
-    <el-dropdown class="avatar-container" trigger="click">
-      <div class="avatar-wrapper">
-        <span style="line-height:50px;">欢迎您，{{ name }}</span>
-        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
-        <i class="el-icon-caret-bottom"/>
-      </div>
-      <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <!--<router-link class="inlineBlock" to="/">-->
-        <!--<el-dropdown-item>-->
-        <!--主页-->
-        <!--</el-dropdown-item>-->
-        <!--</router-link>-->
-        <el-dropdown-item>
-          <span style="display:block;" @click="resetPwd">修改密码</span>
-        </el-dropdown-item>
-        <el-dropdown-item divided>
-          <span style="display:block;" @click="logout">注销</span>
-        </el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
-    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import ResetPwd from '../../system/user/resetPwd'
-import { getProject } from '@/utils/baseConfig'
-
-export default {
-  name: 'AppHeader',
-  components: { ResetPwd },
-  data() {
-    return {
-      title: getProject().title,
-      name: this.$store.getters.name,
-      showSetPwd: false,
-      headerUrl: require('../../../assets/global_images/header.png')// 头部图片
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    },
-    resetPwd() {
-      this.showSetPwd = true
-      this.$refs.retPwd.initDialog(true)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .app-header{
-    height:60px;
-    background-color:#000000;
-    background-repeat: no-repeat;
-    -webkit-background-size: 100% 100%;
-    background-size: 100% 100%;
-    color:white;
-  }
-  h3{
-    margin-left:40px;
-    display: inline-block;
-    float:left;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    float: right;
-    z-index:500;
-    position: fixed;
-    top:5px;
-    right: 35px;
-    .avatar-wrapper {
-      color:#d3dce6;
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        font-size: 12px;
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
deleted file mode 100644
index 2ea268e..0000000
--- a/src/views/layout/components/AppMain.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <section class="app-main">
-    <transition name="fade-transform" mode="out-in">
-      <!-- or name="fade" -->
-      <!-- <router-view :key="key"></router-view> -->
-      <div>
-        <keep-alive>
-          <router-view v-if="$route.meta.keepAlive" :key="key"/>
-        </keep-alive>
-        <router-view v-if="!$route.meta.keepAlive" :key="key"/>
-      </div>
-    </transition>
-  </section>
-</template>
-
-<script>
-export default {
-  name: 'AppMain',
-  computed: {
-    key() {
-      if (this.$route.meta.keepAlive) {
-        return this.$route.name !== undefined ? this.$route.name : this.$route
-      } else {
-        return this.$route.name !== undefined ? this.$route.name + new Date() : this.$route + new Date()
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.app-main {
-  /*50 = navbar  */
-  /*min-height: calc(100vh - 50px);*/
-  position: relative;
-  overflow: hidden;
-}
-</style>
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
deleted file mode 100644
index 193b604..0000000
--- a/src/views/layout/components/Navbar.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <div class="navbar">
-    <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
-    <breadcrumb />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import Hamburger from '@/components/Hamburger'
-
-export default {
-  components: {
-    Breadcrumb,
-    Hamburger
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.navbar {
-  height: 50px;
-  line-height: 50px;
-  box-shadow: 0 1px 3px 0 rgba(0,0,0,.12), 0 0 3px 0 rgba(0,0,0,.04);
-  .hamburger-container {
-    line-height: 58px;
-    height: 50px;
-    float: left;
-    padding: 0 10px;
-  }
-  .screenfull {
-    position: absolute;
-    right: 90px;
-    top: 16px;
-    color: red;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    position: absolute;
-    right: 35px;
-    .avatar-wrapper {
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        position: absolute;
-        right: -20px;
-        top: 25px;
-        font-size: 12px;
-      }
-    }
-  }
-}
-</style>
-
diff --git a/src/views/layout/components/Sidebar/Item.vue b/src/views/layout/components/Sidebar/Item.vue
deleted file mode 100644
index b515f61..0000000
--- a/src/views/layout/components/Sidebar/Item.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<script>
-export default {
-  name: 'MenuItem',
-  functional: true,
-  props: {
-    icon: {
-      type: String,
-      default: ''
-    },
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  render(h, context) {
-    const { icon, title } = context.props
-    const vnodes = []
-
-    if (icon) {
-      vnodes.push(<svg-icon icon-class={icon}/>)
-    }
-
-    if (title) {
-      vnodes.push(<span slot='title'>{(title)}</span>)
-    }
-    return vnodes
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/Link.vue b/src/views/layout/components/Sidebar/Link.vue
deleted file mode 100644
index bff45cd..0000000
--- a/src/views/layout/components/Sidebar/Link.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-<template>
-  <!-- eslint-disable vue/require-component-is -->
-  <component v-bind="linkProps(to)">
-    <slot/>
-  </component>
-</template>
-
-<script>
-import { isExternal } from '@/utils/validate'
-
-export default {
-  props: {
-    to: {
-      type: String,
-      required: true
-    }
-  },
-  methods: {
-    linkProps(url) {
-      if (isExternal(url)) {
-        return {
-          is: 'a',
-          href: url,
-          target: '_blank',
-          rel: 'noopener'
-        }
-      }
-      return {
-        is: 'router-link',
-        to: url
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue
deleted file mode 100644
index 988d662..0000000
--- a/src/views/layout/components/Sidebar/SidebarItem.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <div v-if="!item.hidden&&item.children" class="menu-wrapper">
-
-    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
-      <a :href="onlyOneChild.path" target="_blank" @click="clickLink(onlyOneChild.path,$event)">
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
-          <item v-if="onlyOneChild.meta" :icon="onlyOneChild.meta.icon||item.meta.icon" :title="onlyOneChild.meta.title" />
-        </el-menu-item>
-      </a>
-    </template>
-
-    <el-submenu v-else :index="item.name||item.path">
-      <template slot="title">
-        <item v-if="item.meta" :icon="item.meta.icon" :title="item.meta.title" />
-      </template>
-
-      <template v-for="child in item.children" v-if="!child.hidden">
-        <sidebar-item
-          v-if="child.children&&child.children.length>0"
-          :is-nest="true"
-          :item="child"
-          :key="child.path"
-          :base-path="resolvePath(child.path)"
-          class="nest-menu" />
-
-        <a v-else :href="child.path" :key="child.name" target="_blank" @click="clickLink(child.path,$event)">
-          <el-menu-item :index="resolvePath(child.path)">
-            <span class="light-line"/>
-            <item v-if="child.meta" :icon="child.meta.icon" :title="child.meta.title" />
-          </el-menu-item>
-        </a>
-      </template>
-    </el-submenu>
-
-  </div>
-</template>
-
-<script>
-import path from 'path'
-import { validateURL } from '@/utils/validate'
-import Item from './Item'
-
-export default {
-  name: 'SidebarItem',
-  components: { Item },
-  props: {
-    // route object
-    item: {
-      type: Object,
-      required: true
-    },
-    isNest: {
-      type: Boolean,
-      default: false
-    },
-    basePath: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      onlyOneChild: null
-    }
-  },
-  methods: {
-    hasOneShowingChild(children, parent) {
-      const showingChildren = children.filter(item => {
-        if (item.hidden) {
-          return false
-        } else {
-          // Temp set(will be used if only has one showing child)
-          this.onlyOneChild = item
-          return true
-        }
-      })
-
-      // When there is only one child router, the child router is displayed by default
-      if (showingChildren.length === 1) {
-        return true
-      }
-
-      // Show parent if there are no child router to display
-      if (showingChildren.length === 0) {
-        this.onlyOneChild = { ... parent, path: '', noShowingChildren: true }
-        return true
-      }
-
-      return false
-    },
-    resolvePath(routePath) {
-      return path.resolve(this.basePath, routePath)
-    },
-    isExternalLink(routePath) {
-      return validateURL(routePath)
-    },
-    clickLink(routePath, e) {
-      if (!this.isExternalLink(routePath)) {
-        e.preventDefault()
-        const path = this.resolvePath(routePath)
-        this.$router.push({ path, query: { t: +new Date() }})
-        // this.$router.push(path)
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
deleted file mode 100644
index 5dcf730..0000000
--- a/src/views/layout/components/Sidebar/index.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<template>
-  <el-scrollbar wrap-class="scrollbar-wrapper">
-    <el-menu
-      :show-timeout="200"
-      :default-active="activeMenu"
-      :collapse="isCollapse"
-      mode="vertical"
-      background-color="#304156"
-      text-color="#bfcbd9"
-      active-text-color="#1bb1a5"
-    >
-      <sidebar-item v-for="route in permission_routers" :key="route.name" :item="route" :base-path="route.path"/>
-    </el-menu>
-  </el-scrollbar>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import SidebarItem from './SidebarItem'
-
-export default {
-  components: { SidebarItem },
-  computed: {
-    ...mapGetters([
-      'permission_routers',
-      'sidebar'
-    ]),
-    activeMenu() {
-      const route = this.$route
-      const { meta, path } = route
-      // 如果meta中上设置activeMenu，按照meta中设置高亮
-      if (meta.activeMenu) {
-        return meta.activeMenu
-      }
-      return path
-    },
-    isCollapse() {
-      return !this.sidebar.opened
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/TagsView/ScrollPane.vue b/src/views/layout/components/TagsView/ScrollPane.vue
deleted file mode 100644
index 0ec76e7..0000000
--- a/src/views/layout/components/TagsView/ScrollPane.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-<template>
-  <el-scrollbar ref="scrollContainer" :vertical="false" class="scroll-container" @wheel.native.prevent="handleScroll">
-    <slot />
-  </el-scrollbar>
-</template>
-
-<script>
-const tagAndTagSpacing = 4 // tagAndTagSpacing
-
-export default {
-  name: 'ScrollPane',
-  data() {
-    return {
-      left: 0
-    }
-  },
-  computed: {
-    scrollWrapper() {
-      return this.$refs.scrollContainer.$refs.wrap
-    }
-  },
-  methods: {
-    handleScroll(e) {
-      const eventDelta = e.wheelDelta || -e.deltaY * 40
-      const $scrollWrapper = this.scrollWrapper
-      $scrollWrapper.scrollLeft = $scrollWrapper.scrollLeft + eventDelta / 4
-    },
-    moveToTarget(currentTag) {
-      const $container = this.$refs.scrollContainer.$el
-      const $containerWidth = $container.offsetWidth
-      const $scrollWrapper = this.scrollWrapper
-      const tagList = this.$parent.$refs.tag
-
-      let firstTag = null
-      let lastTag = null
-
-      // find first tag and last tag
-      if (tagList.length > 0) {
-        firstTag = tagList[0]
-        lastTag = tagList[tagList.length - 1]
-      }
-
-      if (firstTag === currentTag) {
-        $scrollWrapper.scrollLeft = 0
-      } else if (lastTag === currentTag) {
-        $scrollWrapper.scrollLeft = $scrollWrapper.scrollWidth - $containerWidth
-      } else {
-        // find preTag and nextTag
-        const currentIndex = tagList.findIndex(item => item === currentTag)
-        const prevTag = tagList[currentIndex - 1]
-        const nextTag = tagList[currentIndex + 1]
-
-        // the tag's offsetLeft after of nextTag
-        const afterNextTagOffsetLeft = nextTag.$el.offsetLeft + nextTag.$el.offsetWidth + tagAndTagSpacing
-
-        // the tag's offsetLeft before of prevTag
-        const beforePrevTagOffsetLeft = prevTag.$el.offsetLeft - tagAndTagSpacing
-
-        if (afterNextTagOffsetLeft > $scrollWrapper.scrollLeft + $containerWidth) {
-          $scrollWrapper.scrollLeft = afterNextTagOffsetLeft - $containerWidth
-        } else if (beforePrevTagOffsetLeft < $scrollWrapper.scrollLeft) {
-          $scrollWrapper.scrollLeft = beforePrevTagOffsetLeft
-        }
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.scroll-container {
-  white-space: nowrap;
-  position: relative;
-  overflow: hidden;
-  width: 100%;
-  /deep/ {
-    .el-scrollbar__bar {
-      bottom: 0px;
-    }
-    .el-scrollbar__wrap {
-      height: 49px;
-    }
-  }
-}
-</style>
diff --git a/src/views/layout/components/TagsView/index.vue b/src/views/layout/components/TagsView/index.vue
deleted file mode 100644
index 325c815..0000000
--- a/src/views/layout/components/TagsView/index.vue
+++ /dev/null
@@ -1,287 +0,0 @@
-<template>
-  <div id="tags-view-container" class="tags-view-container">
-    <scroll-pane ref="scrollPane" class="tags-view-wrapper">
-      <router-link
-        v-for="tag in visitedViews"
-        ref="tag"
-        :key="tag.path"
-        :class="isActive(tag)?'active':''"
-        :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
-        tag="span"
-        class="tags-view-item"
-        @click.middle.native="closeSelectedTag(tag)"
-        @contextmenu.prevent.native="openMenu(tag,$event)"
-      >
-        {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
-      </router-link>
-    </scroll-pane>
-    <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
-      <li @click="refreshSelectedTag(selectedTag)">刷新页面</li>
-      <li v-if="!(selectedTag.meta&&selectedTag.meta.affix)" @click="closeSelectedTag(selectedTag)">关闭当前标签页</li>
-      <li @click="closeOthersTags">关闭其他标签页</li>
-      <li @click="closeAllTags(selectedTag)">关闭全部标签页</li>
-    </ul>
-  </div>
-</template>
-
-<script>
-import ScrollPane from './ScrollPane'
-import path from 'path'
-
-export default {
-  name: 'TagsView',
-  components: { ScrollPane },
-  data() {
-    return {
-      visible: false,
-      top: 0,
-      left: 0,
-      selectedTag: {},
-      affixTags: []
-    }
-  },
-  computed: {
-    visitedViews() {
-      return this.$store.state.tagsView.visitedViews
-    },
-    routes() {
-      return this.$store.state.permission.routers
-    }
-  },
-  watch: {
-    $route() {
-      this.addTags()
-      this.moveToCurrentTag()
-    },
-    visible(value) {
-      if (value) {
-        document.body.addEventListener('click', this.closeMenu)
-      } else {
-        document.body.removeEventListener('click', this.closeMenu)
-      }
-    }
-  },
-  mounted() {
-    this.initTags()
-    this.addTags()
-  },
-  methods: {
-    isActive(route) {
-      return route.path === this.$route.path
-    },
-    filterAffixTags(routes, basePath = '/') {
-      let tags = []
-      routes.forEach(route => {
-        if (route.meta && route.meta.affix) {
-          const tagPath = path.resolve(basePath, route.path)
-          tags.push({
-            fullPath: tagPath,
-            path: tagPath,
-            name: route.name,
-            meta: { ...route.meta }
-          })
-        }
-        if (route.children) {
-          const tempTags = this.filterAffixTags(route.children, route.path)
-          if (tempTags.length >= 1) {
-            tags = [...tags, ...tempTags]
-          }
-        }
-      })
-      return tags
-    },
-    initTags() {
-      const affixTags = this.affixTags = this.filterAffixTags(this.routes)
-      for (const tag of affixTags) {
-        // Must have tag name
-        if (tag.name) {
-          this.$store.dispatch('tagsView/addVisitedView', tag)
-        }
-      }
-    },
-    addTags() {
-      const { name } = this.$route
-      if (name) {
-        this.$store.dispatch('tagsView/addView', this.$route)
-      }
-      return false
-    },
-    moveToCurrentTag() {
-      const tags = this.$refs.tag
-      this.$nextTick(() => {
-        for (const tag of tags) {
-          if (tag.to.path === this.$route.path) {
-            this.$refs.scrollPane.moveToTarget(tag)
-            // when query is different then update
-            if (tag.to.fullPath !== this.$route.fullPath) {
-              this.$store.dispatch('tagsView/updateVisitedView', this.$route)
-            }
-            break
-          }
-        }
-      })
-    },
-    refreshSelectedTag(view) {
-      this.$store.dispatch('tagsView/delCachedView', view).then(() => {
-        const { fullPath } = view
-        this.$nextTick(() => {
-          this.$router.replace({
-            path: '/redirect' + fullPath
-          })
-        })
-      })
-    },
-    closeSelectedTag(view) {
-      this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
-        if (this.isActive(view)) {
-          this.toLastView(visitedViews, view)
-        }
-      })
-    },
-    closeOthersTags() {
-      this.$router.push(this.selectedTag)
-      this.$store.dispatch('tagsView/delOthersViews', this.selectedTag).then(() => {
-        this.moveToCurrentTag()
-      })
-    },
-    closeAllTags(view) {
-      this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => {
-        if (this.affixTags.some(tag => tag.path === view.path)) {
-          return
-        }
-        this.toLastView(visitedViews, view)
-      })
-    },
-    toLastView(visitedViews, view) {
-      const latestView = visitedViews.slice(-1)[0]
-      if (latestView) {
-        this.$router.push(latestView)
-      } else {
-        // now the default is to redirect to the home page if there is no tags-view,
-        // you can adjust it according to your needs.
-        if (view.name === 'Dashboard') {
-          // to reload home page
-          this.$router.replace({ path: '/redirect' + view.fullPath })
-        } else {
-          this.$router.push('/')
-        }
-      }
-    },
-    openMenu(tag, e) {
-      const menuMinWidth = 105
-      const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
-      const offsetWidth = this.$el.offsetWidth // container width
-      const maxLeft = offsetWidth - menuMinWidth // left boundary
-      const left = e.clientX - offsetLeft + 15 // 15: margin right
-
-      if (left > maxLeft) {
-        this.left = maxLeft
-      } else {
-        this.left = left
-      }
-
-      this.top = e.clientY - 40
-      this.visible = true
-      this.selectedTag = tag
-    },
-    closeMenu() {
-      this.visible = false
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-  .tags-view-container {
-    height: 34px;
-    width: 100%;
-    background: #fff;
-    border-bottom: 1px solid #d8dce5;
-    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
-    .tags-view-wrapper {
-      .tags-view-item {
-        display: inline-block;
-        position: relative;
-        cursor: pointer;
-        height: 26px;
-        line-height: 26px;
-        border: 1px solid #d8dce5;
-        color: #495060;
-        background: #fff;
-        padding: 0 8px;
-        font-size: 12px;
-        margin-left: 5px;
-        margin-top: 4px;
-        &:first-of-type {
-          margin-left: 15px;
-        }
-        &:last-of-type {
-          margin-right: 15px;
-        }
-        &.active {
-          background-color: #42b983;
-          color: #fff;
-          border-color: #42b983;
-          &::before {
-            content: '';
-            background: #fff;
-            display: inline-block;
-            width: 8px;
-            height: 8px;
-            border-radius: 50%;
-            position: relative;
-            margin-right: 2px;
-          }
-        }
-      }
-    }
-    .contextmenu {
-      margin: 0;
-      background: #fff;
-      z-index: 3000;
-      position: absolute;
-      list-style-type: none;
-      padding: 5px 0;
-      border-radius: 4px;
-      font-size: 12px;
-      font-weight: 400;
-      color: #333;
-      box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
-      li {
-        margin: 0;
-        padding: 7px 16px;
-        cursor: pointer;
-        &:hover {
-          background: #eee;
-        }
-      }
-    }
-  }
-</style>
-
-<style lang="scss">
-  //reset element css of el-icon-close
-  .tags-view-wrapper {
-    .tags-view-item {
-      .el-icon-close {
-        width: 16px;
-        height: 16px;
-        vertical-align: 2px;
-        border-radius: 50%;
-        text-align: center;
-        transition: all .3s cubic-bezier(.645, .045, .355, 1);
-        transform-origin: 100% 50%;
-        &:before {
-          transform: scale(.6);
-          display: inline-block;
-          vertical-align: -3px;
-        }
-        &:hover {
-          background-color: #b4bccc;
-          color: #fff;
-        }
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/index.js b/src/views/layout/components/index.js
deleted file mode 100644
index 52d35e3..0000000
--- a/src/views/layout/components/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export { default as Navbar } from './Navbar'
-export { default as Sidebar } from './Sidebar'
-export { default as AppMain } from './AppMain'
-export { default as AppHeader } from './AppHeader'
diff --git a/src/views/layout/mixin/ResizeHandler.js b/src/views/layout/mixin/ResizeHandler.js
deleted file mode 100644
index 604fe3d..0000000
--- a/src/views/layout/mixin/ResizeHandler.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import store from '@/store'
-
-const { body } = document
-const WIDTH = 992 // refer to Bootstrap's responsive design
-
-export default {
-  watch: {
-    $route(route) {
-      if (this.device === 'mobile' && this.sidebar.opened) {
-        store.dispatch('CloseSideBar', { withoutAnimation: false })
-      }
-    }
-  },
-  beforeMount() {
-    window.addEventListener('resize', this.resizeHandler)
-  },
-  mounted() {
-    const isMobile = this.isMobile()
-    if (isMobile) {
-      store.dispatch('ToggleDevice', 'mobile')
-      store.dispatch('CloseSideBar', { withoutAnimation: true })
-    }
-  },
-  methods: {
-    isMobile() {
-      const rect = body.getBoundingClientRect()
-      return rect.width - 1 < WIDTH
-    },
-    resizeHandler() {
-      if (!document.hidden) {
-        const isMobile = this.isMobile()
-        store.dispatch('ToggleDevice', isMobile ? 'mobile' : 'desktop')
-
-        if (isMobile) {
-          store.dispatch('CloseSideBar', { withoutAnimation: true })
-        }
-      }
-    }
-  }
-}
diff --git a/src/views/nested/menu1/index.vue b/src/views/nested/menu1/index.vue
deleted file mode 100644
index fdba73a..0000000
--- a/src/views/nested/menu1/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template >
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1">
-      <router-view />
-    </el-alert>
-  </div>
-</template>
diff --git a/src/views/nested/menu1/menu1-1/index.vue b/src/views/nested/menu1/menu1-1/index.vue
deleted file mode 100644
index 824b2cb..0000000
--- a/src/views/nested/menu1/menu1-1/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template >
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-1" type="success">
-      <router-view />
-    </el-alert>
-  </div>
-</template>
diff --git a/src/views/nested/menu1/menu1-2/index.vue b/src/views/nested/menu1/menu1-2/index.vue
deleted file mode 100644
index 0c86276..0000000
--- a/src/views/nested/menu1/menu1-2/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-2" type="success">
-      <router-view />
-    </el-alert>
-  </div>
-</template>
diff --git a/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue b/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue
deleted file mode 100644
index f87d88f..0000000
--- a/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<template functional>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-2-1" type="warning" />
-  </div>
-</template>
diff --git a/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue b/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue
deleted file mode 100644
index d88789f..0000000
--- a/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<template functional>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-2-2" type="warning" />
-  </div>
-</template>
diff --git a/src/views/nested/menu1/menu1-3/index.vue b/src/views/nested/menu1/menu1-3/index.vue
deleted file mode 100644
index f7cd073..0000000
--- a/src/views/nested/menu1/menu1-3/index.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<template functional>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-3" type="success" />
-  </div>
-</template>

diff --git a/config/dev.env.js b/config/dev.env.js
index b654c4c..95e311a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,7 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://111.198.10.15:12204"'
+  // BASE_API: '"http://111.198.10.15:12204"'
+  BASE_API: '"http://111.198.10.15:11409"'
   // BASE_API: '"http://139.198.16.38:20005"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
diff --git a/mock/system/area.js b/mock/system/area.js
index 3495001..dd8e88e 100644
--- a/mock/system/area.js
+++ b/mock/system/area.js
@@ -79,5 +79,52 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/levelType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '省级',
+            'id': '166',
+            'value': '1'
+          },
+          {
+            'name': '市级',
+            'id': '167',
+            'value': '2'
+          },
+          {
+            'name': '区级',
+            'id': '168',
+            'value': '3'
+          },
+          {
+            'name': '街道',
+            'id': '169',
+            'value': '4'
+          },
+          {
+            'name': '社区',
+            'id': '170',
+            'value': '5'
+          },
+          {
+            'name': '网格',
+            'id': '171',
+            'value': '6'
+          },
+          {
+            'name': '责任网格',
+            'id': '172',
+            'value': '7'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/mock/system/role.js b/mock/system/role.js
index f555ddf..f17c427 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -176,5 +176,32 @@
         data: {}
       }
     }
+  },
+  {
+    url: '/dict/code/dataScopeType',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [
+          {
+            'name': '全部',
+            'id': '55',
+            'value': '03'
+          },
+          {
+            'name': '本部门',
+            'id': '56',
+            'value': '04'
+          },
+          {
+            'name': '自定义',
+            'id': '57',
+            'value': '04'
+          }
+        ]
+      }
+    }
   }
 ]
diff --git a/src/main.js b/src/main.js
index 5630ee7..ae15138 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
  * it will intercept your request, so you won't see the request in the network.
  * If you remove `../mock` it will automatically request easy-mock data.
  */
-// import './../mock' // simulation data
+import './../mock' // simulation data
 // require('./../mock')
 // 兼容IE11
 import 'babel-polyfill'
diff --git a/src/settings.js b/src/settings.js
index b8159bf..b568ce0 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: false,
+  showSettings: true,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/example/tableExample.vue b/src/views/example/tableExample.vue
index a313e57..9d98bb5 100644
--- a/src/views/example/tableExample.vue
+++ b/src/views/example/tableExample.vue
@@ -145,8 +145,8 @@
           needIndex: false // 是否需要序号列
         },
         toolsOption: {
-          selectColumns: false, // 是否需要筛选列
-          refresh: false // 是否需要刷新按钮
+          selectColumns: true, // 是否需要筛选列
+          refresh: true // 是否需要刷新按钮
         }
       } // 表格属性
     }
diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
deleted file mode 100644
index c7b94e7..0000000
--- a/src/views/layout/Layout.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <app-header class="app-header"/>
-    <div class="app-body">
-      <!--侧边栏-->
-      <sidebar class="sidebar-container"/>
-      <!--右半部分-->
-      <div class="main-container">
-        <!--上方导航-->
-        <navbar/>
-        <!--标签栏-->
-        <tags-view/>
-        <!--主页-->
-        <el-scrollbar>
-          <app-main/>
-        </el-scrollbar>
-
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { AppHeader, Navbar, Sidebar, AppMain } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import TagsView from './components/TagsView/index'
-
-export default {
-  name: 'Layout',
-  components: {
-    TagsView,
-    AppHeader,
-    Navbar,
-    Sidebar,
-    AppMain
-  },
-  mixins: [ResizeMixin],
-  computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    device() {
-      return this.$store.state.app.device
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened,
-        withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    }
-  },
-  methods: {
-    handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  @import "src/styles/mixin.scss";
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-    &.mobile.openSidebar{
-      position: fixed;
-      top: 0;
-    }
-  }
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-  .el-scrollbar{
-    height: calc(100vh - 50px);
-  }
-</style>
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
deleted file mode 100644
index 6326221..0000000
--- a/src/views/layout/components/AppHeader.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
-    <h3>{{ title }}</h3>
-    <el-dropdown class="avatar-container" trigger="click">
-      <div class="avatar-wrapper">
-        <span style="line-height:50px;">欢迎您，{{ name }}</span>
-        <!--<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
-        <i class="el-icon-caret-bottom"/>
-      </div>
-      <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <!--<router-link class="inlineBlock" to="/">-->
-        <!--<el-dropdown-item>-->
-        <!--主页-->
-        <!--</el-dropdown-item>-->
-        <!--</router-link>-->
-        <el-dropdown-item>
-          <span style="display:block;" @click="resetPwd">修改密码</span>
-        </el-dropdown-item>
-        <el-dropdown-item divided>
-          <span style="display:block;" @click="logout">注销</span>
-        </el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
-    <reset-pwd v-show="showSetPwd" ref="retPwd"/>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import ResetPwd from '../../system/user/resetPwd'
-import { getProject } from '@/utils/baseConfig'
-
-export default {
-  name: 'AppHeader',
-  components: { ResetPwd },
-  data() {
-    return {
-      title: getProject().title,
-      name: this.$store.getters.name,
-      showSetPwd: false,
-      headerUrl: require('../../../assets/global_images/header.png')// 头部图片
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    },
-    resetPwd() {
-      this.showSetPwd = true
-      this.$refs.retPwd.initDialog(true)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .app-header{
-    height:60px;
-    background-color:#000000;
-    background-repeat: no-repeat;
-    -webkit-background-size: 100% 100%;
-    background-size: 100% 100%;
-    color:white;
-  }
-  h3{
-    margin-left:40px;
-    display: inline-block;
-    float:left;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    float: right;
-    z-index:500;
-    position: fixed;
-    top:5px;
-    right: 35px;
-    .avatar-wrapper {
-      color:#d3dce6;
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        font-size: 12px;
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
deleted file mode 100644
index 2ea268e..0000000
--- a/src/views/layout/components/AppMain.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <section class="app-main">
-    <transition name="fade-transform" mode="out-in">
-      <!-- or name="fade" -->
-      <!-- <router-view :key="key"></router-view> -->
-      <div>
-        <keep-alive>
-          <router-view v-if="$route.meta.keepAlive" :key="key"/>
-        </keep-alive>
-        <router-view v-if="!$route.meta.keepAlive" :key="key"/>
-      </div>
-    </transition>
-  </section>
-</template>
-
-<script>
-export default {
-  name: 'AppMain',
-  computed: {
-    key() {
-      if (this.$route.meta.keepAlive) {
-        return this.$route.name !== undefined ? this.$route.name : this.$route
-      } else {
-        return this.$route.name !== undefined ? this.$route.name + new Date() : this.$route + new Date()
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.app-main {
-  /*50 = navbar  */
-  /*min-height: calc(100vh - 50px);*/
-  position: relative;
-  overflow: hidden;
-}
-</style>
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
deleted file mode 100644
index 193b604..0000000
--- a/src/views/layout/components/Navbar.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <div class="navbar">
-    <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
-    <breadcrumb />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import Hamburger from '@/components/Hamburger'
-
-export default {
-  components: {
-    Breadcrumb,
-    Hamburger
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.navbar {
-  height: 50px;
-  line-height: 50px;
-  box-shadow: 0 1px 3px 0 rgba(0,0,0,.12), 0 0 3px 0 rgba(0,0,0,.04);
-  .hamburger-container {
-    line-height: 58px;
-    height: 50px;
-    float: left;
-    padding: 0 10px;
-  }
-  .screenfull {
-    position: absolute;
-    right: 90px;
-    top: 16px;
-    color: red;
-  }
-  .avatar-container {
-    height: 50px;
-    display: inline-block;
-    position: absolute;
-    right: 35px;
-    .avatar-wrapper {
-      cursor: pointer;
-      margin-top: 5px;
-      position: relative;
-      line-height: initial;
-      .user-avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-      }
-      .el-icon-caret-bottom {
-        position: absolute;
-        right: -20px;
-        top: 25px;
-        font-size: 12px;
-      }
-    }
-  }
-}
-</style>
-
diff --git a/src/views/layout/components/Sidebar/Item.vue b/src/views/layout/components/Sidebar/Item.vue
deleted file mode 100644
index b515f61..0000000
--- a/src/views/layout/components/Sidebar/Item.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<script>
-export default {
-  name: 'MenuItem',
-  functional: true,
-  props: {
-    icon: {
-      type: String,
-      default: ''
-    },
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  render(h, context) {
-    const { icon, title } = context.props
-    const vnodes = []
-
-    if (icon) {
-      vnodes.push(<svg-icon icon-class={icon}/>)
-    }
-
-    if (title) {
-      vnodes.push(<span slot='title'>{(title)}</span>)
-    }
-    return vnodes
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/Link.vue b/src/views/layout/components/Sidebar/Link.vue
deleted file mode 100644
index bff45cd..0000000
--- a/src/views/layout/components/Sidebar/Link.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-<template>
-  <!-- eslint-disable vue/require-component-is -->
-  <component v-bind="linkProps(to)">
-    <slot/>
-  </component>
-</template>
-
-<script>
-import { isExternal } from '@/utils/validate'
-
-export default {
-  props: {
-    to: {
-      type: String,
-      required: true
-    }
-  },
-  methods: {
-    linkProps(url) {
-      if (isExternal(url)) {
-        return {
-          is: 'a',
-          href: url,
-          target: '_blank',
-          rel: 'noopener'
-        }
-      }
-      return {
-        is: 'router-link',
-        to: url
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue
deleted file mode 100644
index 988d662..0000000
--- a/src/views/layout/components/Sidebar/SidebarItem.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <div v-if="!item.hidden&&item.children" class="menu-wrapper">
-
-    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
-      <a :href="onlyOneChild.path" target="_blank" @click="clickLink(onlyOneChild.path,$event)">
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
-          <item v-if="onlyOneChild.meta" :icon="onlyOneChild.meta.icon||item.meta.icon" :title="onlyOneChild.meta.title" />
-        </el-menu-item>
-      </a>
-    </template>
-
-    <el-submenu v-else :index="item.name||item.path">
-      <template slot="title">
-        <item v-if="item.meta" :icon="item.meta.icon" :title="item.meta.title" />
-      </template>
-
-      <template v-for="child in item.children" v-if="!child.hidden">
-        <sidebar-item
-          v-if="child.children&&child.children.length>0"
-          :is-nest="true"
-          :item="child"
-          :key="child.path"
-          :base-path="resolvePath(child.path)"
-          class="nest-menu" />
-
-        <a v-else :href="child.path" :key="child.name" target="_blank" @click="clickLink(child.path,$event)">
-          <el-menu-item :index="resolvePath(child.path)">
-            <span class="light-line"/>
-            <item v-if="child.meta" :icon="child.meta.icon" :title="child.meta.title" />
-          </el-menu-item>
-        </a>
-      </template>
-    </el-submenu>
-
-  </div>
-</template>
-
-<script>
-import path from 'path'
-import { validateURL } from '@/utils/validate'
-import Item from './Item'
-
-export default {
-  name: 'SidebarItem',
-  components: { Item },
-  props: {
-    // route object
-    item: {
-      type: Object,
-      required: true
-    },
-    isNest: {
-      type: Boolean,
-      default: false
-    },
-    basePath: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      onlyOneChild: null
-    }
-  },
-  methods: {
-    hasOneShowingChild(children, parent) {
-      const showingChildren = children.filter(item => {
-        if (item.hidden) {
-          return false
-        } else {
-          // Temp set(will be used if only has one showing child)
-          this.onlyOneChild = item
-          return true
-        }
-      })
-
-      // When there is only one child router, the child router is displayed by default
-      if (showingChildren.length === 1) {
-        return true
-      }
-
-      // Show parent if there are no child router to display
-      if (showingChildren.length === 0) {
-        this.onlyOneChild = { ... parent, path: '', noShowingChildren: true }
-        return true
-      }
-
-      return false
-    },
-    resolvePath(routePath) {
-      return path.resolve(this.basePath, routePath)
-    },
-    isExternalLink(routePath) {
-      return validateURL(routePath)
-    },
-    clickLink(routePath, e) {
-      if (!this.isExternalLink(routePath)) {
-        e.preventDefault()
-        const path = this.resolvePath(routePath)
-        this.$router.push({ path, query: { t: +new Date() }})
-        // this.$router.push(path)
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
deleted file mode 100644
index 5dcf730..0000000
--- a/src/views/layout/components/Sidebar/index.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<template>
-  <el-scrollbar wrap-class="scrollbar-wrapper">
-    <el-menu
-      :show-timeout="200"
-      :default-active="activeMenu"
-      :collapse="isCollapse"
-      mode="vertical"
-      background-color="#304156"
-      text-color="#bfcbd9"
-      active-text-color="#1bb1a5"
-    >
-      <sidebar-item v-for="route in permission_routers" :key="route.name" :item="route" :base-path="route.path"/>
-    </el-menu>
-  </el-scrollbar>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import SidebarItem from './SidebarItem'
-
-export default {
-  components: { SidebarItem },
-  computed: {
-    ...mapGetters([
-      'permission_routers',
-      'sidebar'
-    ]),
-    activeMenu() {
-      const route = this.$route
-      const { meta, path } = route
-      // 如果meta中上设置activeMenu，按照meta中设置高亮
-      if (meta.activeMenu) {
-        return meta.activeMenu
-      }
-      return path
-    },
-    isCollapse() {
-      return !this.sidebar.opened
-    }
-  }
-}
-</script>
diff --git a/src/views/layout/components/TagsView/ScrollPane.vue b/src/views/layout/components/TagsView/ScrollPane.vue
deleted file mode 100644
index 0ec76e7..0000000
--- a/src/views/layout/components/TagsView/ScrollPane.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-<template>
-  <el-scrollbar ref="scrollContainer" :vertical="false" class="scroll-container" @wheel.native.prevent="handleScroll">
-    <slot />
-  </el-scrollbar>
-</template>
-
-<script>
-const tagAndTagSpacing = 4 // tagAndTagSpacing
-
-export default {
-  name: 'ScrollPane',
-  data() {
-    return {
-      left: 0
-    }
-  },
-  computed: {
-    scrollWrapper() {
-      return this.$refs.scrollContainer.$refs.wrap
-    }
-  },
-  methods: {
-    handleScroll(e) {
-      const eventDelta = e.wheelDelta || -e.deltaY * 40
-      const $scrollWrapper = this.scrollWrapper
-      $scrollWrapper.scrollLeft = $scrollWrapper.scrollLeft + eventDelta / 4
-    },
-    moveToTarget(currentTag) {
-      const $container = this.$refs.scrollContainer.$el
-      const $containerWidth = $container.offsetWidth
-      const $scrollWrapper = this.scrollWrapper
-      const tagList = this.$parent.$refs.tag
-
-      let firstTag = null
-      let lastTag = null
-
-      // find first tag and last tag
-      if (tagList.length > 0) {
-        firstTag = tagList[0]
-        lastTag = tagList[tagList.length - 1]
-      }
-
-      if (firstTag === currentTag) {
-        $scrollWrapper.scrollLeft = 0
-      } else if (lastTag === currentTag) {
-        $scrollWrapper.scrollLeft = $scrollWrapper.scrollWidth - $containerWidth
-      } else {
-        // find preTag and nextTag
-        const currentIndex = tagList.findIndex(item => item === currentTag)
-        const prevTag = tagList[currentIndex - 1]
-        const nextTag = tagList[currentIndex + 1]
-
-        // the tag's offsetLeft after of nextTag
-        const afterNextTagOffsetLeft = nextTag.$el.offsetLeft + nextTag.$el.offsetWidth + tagAndTagSpacing
-
-        // the tag's offsetLeft before of prevTag
-        const beforePrevTagOffsetLeft = prevTag.$el.offsetLeft - tagAndTagSpacing
-
-        if (afterNextTagOffsetLeft > $scrollWrapper.scrollLeft + $containerWidth) {
-          $scrollWrapper.scrollLeft = afterNextTagOffsetLeft - $containerWidth
-        } else if (beforePrevTagOffsetLeft < $scrollWrapper.scrollLeft) {
-          $scrollWrapper.scrollLeft = beforePrevTagOffsetLeft
-        }
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.scroll-container {
-  white-space: nowrap;
-  position: relative;
-  overflow: hidden;
-  width: 100%;
-  /deep/ {
-    .el-scrollbar__bar {
-      bottom: 0px;
-    }
-    .el-scrollbar__wrap {
-      height: 49px;
-    }
-  }
-}
-</style>
diff --git a/src/views/layout/components/TagsView/index.vue b/src/views/layout/components/TagsView/index.vue
deleted file mode 100644
index 325c815..0000000
--- a/src/views/layout/components/TagsView/index.vue
+++ /dev/null
@@ -1,287 +0,0 @@
-<template>
-  <div id="tags-view-container" class="tags-view-container">
-    <scroll-pane ref="scrollPane" class="tags-view-wrapper">
-      <router-link
-        v-for="tag in visitedViews"
-        ref="tag"
-        :key="tag.path"
-        :class="isActive(tag)?'active':''"
-        :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
-        tag="span"
-        class="tags-view-item"
-        @click.middle.native="closeSelectedTag(tag)"
-        @contextmenu.prevent.native="openMenu(tag,$event)"
-      >
-        {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
-      </router-link>
-    </scroll-pane>
-    <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
-      <li @click="refreshSelectedTag(selectedTag)">刷新页面</li>
-      <li v-if="!(selectedTag.meta&&selectedTag.meta.affix)" @click="closeSelectedTag(selectedTag)">关闭当前标签页</li>
-      <li @click="closeOthersTags">关闭其他标签页</li>
-      <li @click="closeAllTags(selectedTag)">关闭全部标签页</li>
-    </ul>
-  </div>
-</template>
-
-<script>
-import ScrollPane from './ScrollPane'
-import path from 'path'
-
-export default {
-  name: 'TagsView',
-  components: { ScrollPane },
-  data() {
-    return {
-      visible: false,
-      top: 0,
-      left: 0,
-      selectedTag: {},
-      affixTags: []
-    }
-  },
-  computed: {
-    visitedViews() {
-      return this.$store.state.tagsView.visitedViews
-    },
-    routes() {
-      return this.$store.state.permission.routers
-    }
-  },
-  watch: {
-    $route() {
-      this.addTags()
-      this.moveToCurrentTag()
-    },
-    visible(value) {
-      if (value) {
-        document.body.addEventListener('click', this.closeMenu)
-      } else {
-        document.body.removeEventListener('click', this.closeMenu)
-      }
-    }
-  },
-  mounted() {
-    this.initTags()
-    this.addTags()
-  },
-  methods: {
-    isActive(route) {
-      return route.path === this.$route.path
-    },
-    filterAffixTags(routes, basePath = '/') {
-      let tags = []
-      routes.forEach(route => {
-        if (route.meta && route.meta.affix) {
-          const tagPath = path.resolve(basePath, route.path)
-          tags.push({
-            fullPath: tagPath,
-            path: tagPath,
-            name: route.name,
-            meta: { ...route.meta }
-          })
-        }
-        if (route.children) {
-          const tempTags = this.filterAffixTags(route.children, route.path)
-          if (tempTags.length >= 1) {
-            tags = [...tags, ...tempTags]
-          }
-        }
-      })
-      return tags
-    },
-    initTags() {
-      const affixTags = this.affixTags = this.filterAffixTags(this.routes)
-      for (const tag of affixTags) {
-        // Must have tag name
-        if (tag.name) {
-          this.$store.dispatch('tagsView/addVisitedView', tag)
-        }
-      }
-    },
-    addTags() {
-      const { name } = this.$route
-      if (name) {
-        this.$store.dispatch('tagsView/addView', this.$route)
-      }
-      return false
-    },
-    moveToCurrentTag() {
-      const tags = this.$refs.tag
-      this.$nextTick(() => {
-        for (const tag of tags) {
-          if (tag.to.path === this.$route.path) {
-            this.$refs.scrollPane.moveToTarget(tag)
-            // when query is different then update
-            if (tag.to.fullPath !== this.$route.fullPath) {
-              this.$store.dispatch('tagsView/updateVisitedView', this.$route)
-            }
-            break
-          }
-        }
-      })
-    },
-    refreshSelectedTag(view) {
-      this.$store.dispatch('tagsView/delCachedView', view).then(() => {
-        const { fullPath } = view
-        this.$nextTick(() => {
-          this.$router.replace({
-            path: '/redirect' + fullPath
-          })
-        })
-      })
-    },
-    closeSelectedTag(view) {
-      this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
-        if (this.isActive(view)) {
-          this.toLastView(visitedViews, view)
-        }
-      })
-    },
-    closeOthersTags() {
-      this.$router.push(this.selectedTag)
-      this.$store.dispatch('tagsView/delOthersViews', this.selectedTag).then(() => {
-        this.moveToCurrentTag()
-      })
-    },
-    closeAllTags(view) {
-      this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => {
-        if (this.affixTags.some(tag => tag.path === view.path)) {
-          return
-        }
-        this.toLastView(visitedViews, view)
-      })
-    },
-    toLastView(visitedViews, view) {
-      const latestView = visitedViews.slice(-1)[0]
-      if (latestView) {
-        this.$router.push(latestView)
-      } else {
-        // now the default is to redirect to the home page if there is no tags-view,
-        // you can adjust it according to your needs.
-        if (view.name === 'Dashboard') {
-          // to reload home page
-          this.$router.replace({ path: '/redirect' + view.fullPath })
-        } else {
-          this.$router.push('/')
-        }
-      }
-    },
-    openMenu(tag, e) {
-      const menuMinWidth = 105
-      const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
-      const offsetWidth = this.$el.offsetWidth // container width
-      const maxLeft = offsetWidth - menuMinWidth // left boundary
-      const left = e.clientX - offsetLeft + 15 // 15: margin right
-
-      if (left > maxLeft) {
-        this.left = maxLeft
-      } else {
-        this.left = left
-      }
-
-      this.top = e.clientY - 40
-      this.visible = true
-      this.selectedTag = tag
-    },
-    closeMenu() {
-      this.visible = false
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-  .tags-view-container {
-    height: 34px;
-    width: 100%;
-    background: #fff;
-    border-bottom: 1px solid #d8dce5;
-    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
-    .tags-view-wrapper {
-      .tags-view-item {
-        display: inline-block;
-        position: relative;
-        cursor: pointer;
-        height: 26px;
-        line-height: 26px;
-        border: 1px solid #d8dce5;
-        color: #495060;
-        background: #fff;
-        padding: 0 8px;
-        font-size: 12px;
-        margin-left: 5px;
-        margin-top: 4px;
-        &:first-of-type {
-          margin-left: 15px;
-        }
-        &:last-of-type {
-          margin-right: 15px;
-        }
-        &.active {
-          background-color: #42b983;
-          color: #fff;
-          border-color: #42b983;
-          &::before {
-            content: '';
-            background: #fff;
-            display: inline-block;
-            width: 8px;
-            height: 8px;
-            border-radius: 50%;
-            position: relative;
-            margin-right: 2px;
-          }
-        }
-      }
-    }
-    .contextmenu {
-      margin: 0;
-      background: #fff;
-      z-index: 3000;
-      position: absolute;
-      list-style-type: none;
-      padding: 5px 0;
-      border-radius: 4px;
-      font-size: 12px;
-      font-weight: 400;
-      color: #333;
-      box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
-      li {
-        margin: 0;
-        padding: 7px 16px;
-        cursor: pointer;
-        &:hover {
-          background: #eee;
-        }
-      }
-    }
-  }
-</style>
-
-<style lang="scss">
-  //reset element css of el-icon-close
-  .tags-view-wrapper {
-    .tags-view-item {
-      .el-icon-close {
-        width: 16px;
-        height: 16px;
-        vertical-align: 2px;
-        border-radius: 50%;
-        text-align: center;
-        transition: all .3s cubic-bezier(.645, .045, .355, 1);
-        transform-origin: 100% 50%;
-        &:before {
-          transform: scale(.6);
-          display: inline-block;
-          vertical-align: -3px;
-        }
-        &:hover {
-          background-color: #b4bccc;
-          color: #fff;
-        }
-      }
-    }
-  }
-</style>
diff --git a/src/views/layout/components/index.js b/src/views/layout/components/index.js
deleted file mode 100644
index 52d35e3..0000000
--- a/src/views/layout/components/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export { default as Navbar } from './Navbar'
-export { default as Sidebar } from './Sidebar'
-export { default as AppMain } from './AppMain'
-export { default as AppHeader } from './AppHeader'
diff --git a/src/views/layout/mixin/ResizeHandler.js b/src/views/layout/mixin/ResizeHandler.js
deleted file mode 100644
index 604fe3d..0000000
--- a/src/views/layout/mixin/ResizeHandler.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import store from '@/store'
-
-const { body } = document
-const WIDTH = 992 // refer to Bootstrap's responsive design
-
-export default {
-  watch: {
-    $route(route) {
-      if (this.device === 'mobile' && this.sidebar.opened) {
-        store.dispatch('CloseSideBar', { withoutAnimation: false })
-      }
-    }
-  },
-  beforeMount() {
-    window.addEventListener('resize', this.resizeHandler)
-  },
-  mounted() {
-    const isMobile = this.isMobile()
-    if (isMobile) {
-      store.dispatch('ToggleDevice', 'mobile')
-      store.dispatch('CloseSideBar', { withoutAnimation: true })
-    }
-  },
-  methods: {
-    isMobile() {
-      const rect = body.getBoundingClientRect()
-      return rect.width - 1 < WIDTH
-    },
-    resizeHandler() {
-      if (!document.hidden) {
-        const isMobile = this.isMobile()
-        store.dispatch('ToggleDevice', isMobile ? 'mobile' : 'desktop')
-
-        if (isMobile) {
-          store.dispatch('CloseSideBar', { withoutAnimation: true })
-        }
-      }
-    }
-  }
-}
diff --git a/src/views/nested/menu1/index.vue b/src/views/nested/menu1/index.vue
deleted file mode 100644
index fdba73a..0000000
--- a/src/views/nested/menu1/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template >
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1">
-      <router-view />
-    </el-alert>
-  </div>
-</template>
diff --git a/src/views/nested/menu1/menu1-1/index.vue b/src/views/nested/menu1/menu1-1/index.vue
deleted file mode 100644
index 824b2cb..0000000
--- a/src/views/nested/menu1/menu1-1/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template >
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-1" type="success">
-      <router-view />
-    </el-alert>
-  </div>
-</template>
diff --git a/src/views/nested/menu1/menu1-2/index.vue b/src/views/nested/menu1/menu1-2/index.vue
deleted file mode 100644
index 0c86276..0000000
--- a/src/views/nested/menu1/menu1-2/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-2" type="success">
-      <router-view />
-    </el-alert>
-  </div>
-</template>
diff --git a/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue b/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue
deleted file mode 100644
index f87d88f..0000000
--- a/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<template functional>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-2-1" type="warning" />
-  </div>
-</template>
diff --git a/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue b/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue
deleted file mode 100644
index d88789f..0000000
--- a/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<template functional>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-2-2" type="warning" />
-  </div>
-</template>
diff --git a/src/views/nested/menu1/menu1-3/index.vue b/src/views/nested/menu1/menu1-3/index.vue
deleted file mode 100644
index f7cd073..0000000
--- a/src/views/nested/menu1/menu1-3/index.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<template functional>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-3" type="success" />
-  </div>
-</template>
diff --git a/src/views/nested/menu2/index.vue b/src/views/nested/menu2/index.vue
deleted file mode 100644
index 19dd48f..0000000
--- a/src/views/nested/menu2/index.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<template>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 2" />
-  </div>
-</template>