diff --git a/.env b/.env
index 1f8260292701110a1f94e86394d13792e375e0cb..5351ea07d88499c1f780569874ff412d8e45f78c 100644
--- a/.env
+++ b/.env
@@ -8,4 +8,9 @@ VUE_APP_I18N_LOCALE=zh-chs
 VUE_APP_I18N_FALLBACK_LOCALE=en
 
 # element 颜色
-VUE_APP_ELEMENT_COLOR=#409EFF
\ No newline at end of file
+VUE_APP_ELEMENT_COLOR=#409EFF
+# RSA加解密
+VUE_APP_RSA=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+IUvK/Nzs77ihc5Fs9pIVckiwjeCR8RgWFHwURLMgkzH6LIMHXNP4ZluaNIA2XKBackB9gT7cD+rpTuVauit7JUkQ8AUD/FUAtWBe5sRH3lK1uOBiv1ipE8NTuUJMJhQjvKummNG6C1w8TkPqykTHbV2MfqhwjQ+n0kXTWOg1mwIDAQAB
+
+# 网络请求公用地址
+VUE_APP_API=http://114.117.204.31:1234
\ No newline at end of file
diff --git a/.env.development b/.env.development
index 4edf55cc467985b9bb478d1cc8091ab9f5e42061..dd93fc012eb4141fcb65809162b74bf70a8834d0 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,6 @@
 # 开发环境
-username = 'zero'
-password = 'zero'
+VUE_APP_USERNAME = zero
+VUE_APP_PWD = zero
 # 页面 title 前缀
 VUE_APP_TITLE=ZeroVue Dev
+VUE_APP_TITLE1=ZeroVue Dev
diff --git a/README.md b/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..0beb9f76a65fada630b0ff813c78618885279ce0
--- /dev/null
+++ b/README.md
@@ -0,0 +1,39 @@
+# zero-vue
+
+#### 介绍
+{**以下是 Gitee 平台说明，您可以替换此简介**
+Gitee 是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台
+无论是个人、团队、或是企业，都能够用 Gitee 实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
+
+#### 软件架构
+软件架构说明
+
+
+#### 安装教程
+
+1.  xxxx
+2.  xxxx
+3.  xxxx
+
+#### 使用说明
+
+1.  xxxx
+2.  xxxx
+3.  xxxx
+
+#### 参与贡献
+
+1.  Fork 本仓库
+2.  新建 Feat_xxx 分支
+3.  提交代码
+4.  新建 Pull Request
+
+
+#### 特技
+
+1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
+2.  Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
+3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
+4.  [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目
+5.  Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
+6.  Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) 
diff --git a/package.json b/package.json
index 8fe75c5bcd22bfdbdaf901d5503902310f3aaaa9..399f06d8867adf9c19682cc86bc80ea908ba8bfd 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "better-scroll": "^1.15.2",
     "core-js": "^3.4.3",
     "dayjs": "^1.8.17",
-    "e-icon-picker": "^1.0.15",
+    "e-icon-picker": "~1.1.1",
     "element-ui": "2.13.2",
     "faker": "^4.1.0",
     "flex.css": "^1.1.7",
@@ -62,7 +62,7 @@
     "vue-cli-plugin-i18n": "^1.0.1",
     "vue-template-compiler": "^2.6.10",
     "webpack-bundle-analyzer": "^3.6.0",
-    "webpack-theme-color-replacer": "^1.3.3"
+    "webpack-theme-color-replacer": "1.3.12"
   },
   "config": {
     "commitizen": {
diff --git a/public/config.js b/public/config.js
deleted file mode 100644
index 294b6ed15cde20057c17ba0282376f5a944b95f1..0000000000000000000000000000000000000000
--- a/public/config.js
+++ /dev/null
@@ -1,6 +0,0 @@
-window.config = {
-  // RSA加解密
-  VUE_APP_RSA: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+IUvK/Nzs77ihc5Fs9pIVckiwjeCR8RgWFHwURLMgkzH6LIMHXNP4ZluaNIA2XKBackB9gT7cD+rpTuVauit7JUkQ8AUD/FUAtWBe5sRH3lK1uOBiv1ipE8NTuUJMJhQjvKummNG6C1w8TkPqykTHbV2MfqhwjQ+n0kXTWOg1mwIDAQAB',
-  // 服务器地址
-  VUE_APP_API: 'http://47.106.229.18:1234'
-}
diff --git a/public/index.html b/public/index.html
index cf83809cbf1567d1fe92e91bace0c22dc5e1ba52..f9fb2e04bdc9807f964f328e40f9d04f3c7cf16d 100644
--- a/public/index.html
+++ b/public/index.html
@@ -41,6 +41,5 @@
     <% for (var i in htmlWebpackPlugin.options.cdn&&htmlWebpackPlugin.options.cdn.js) { %>
     <script src="<%= htmlWebpackPlugin.options.cdn.js[i] %>"></script>
     <% } %>
-    <script type="text/javascript" src="./config.js"></script>
   </body>
 </html>
diff --git a/src/api/axios.js b/src/api/axios.js
index 8636db4e2292064acd531fe1df8e606c31ff8026..26961c50dbc9ec53993b150d47e882eed9f5f6cb 100644
--- a/src/api/axios.js
+++ b/src/api/axios.js
@@ -117,7 +117,7 @@ function createRequestFunction (service) {
         'Content-Type': get(config, 'headers.Content-Type', 'application/json')
       },
       timeout: 30000,
-      baseURL: window.config.VUE_APP_API,
+      baseURL: process.env.VUE_APP_API,
       data: {}
     }
     if (token) {
diff --git a/src/api/common.js b/src/api/common.js
index 53486bc764c54e6c411cf8e4e12287e5f7440ef0..0d85073c6fa3c021729e97f1407c51504de627c3 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -59,14 +59,14 @@ export function handleRouter (data) {
       routerArray.children = [{
         path: router.path,
         name: path,
-        meta: { title: router.name, cache: router.cache },
+        meta: { title: router.name, cache: router.cache === 'T' },
         component: _import(path.replace(/([A-Z])/g, '/$1').toLowerCase())
       }]
     } else {
       routerArray.children.push({
         path: router.path,
         name: path,
-        meta: { title: router.name, cache: router.cache },
+        meta: { title: router.name, cache: router.cache === 'T' },
         component: _import(path.replace(/([A-Z])/g, '/$1').toLowerCase())
       })
     }
diff --git a/src/assets/style/theme/chester/setting.scss b/src/assets/style/theme/chester/setting.scss
index 899e0aa69ae34a799d9123fa9eb4682dbcd26121..14c969d1a8088503cbd09a3e5ffca9568e23b30e 100644
--- a/src/assets/style/theme/chester/setting.scss
+++ b/src/assets/style/theme/chester/setting.scss
@@ -16,13 +16,13 @@ $theme-container-header-footer-background-color: #FFF;
 $theme-container-border-inner: 1px solid #CFD7E5;
 $theme-container-border-outer: 1px solid #2A2D2E;
 
-$theme-multiple-page-control-color: #CCCCCC;
-$theme-multiple-page-control-color-active: #242D38;
+$theme-multiple-page-control-color: #606266;
+$theme-multiple-page-control-color-active: #2f74ff;
 $theme-multiple-page-control-nav-prev-color: #CCCCCC;
 $theme-multiple-page-control-nav-next-color: #CCCCCC;
 $theme-multiple-page-control-border-color: #2A2D2E;
 $theme-multiple-page-control-border-color-active: #FFFFFF;
-$theme-multiple-page-control-background-color: #242D38;
+$theme-multiple-page-control-background-color: #2f74ff;
 $theme-multiple-page-control-background-color-active: #FFFFFF;
 
 // 顶栏和侧边栏中展开的菜单 hover 状态下
@@ -52,13 +52,13 @@ $theme-aside-item-background-color-hover: #2A2D2E;
 $theme-aside-item-color-focus: #CCCCCC;
 $theme-aside-item-background-color-focus: #222A34;
 // 侧边栏上的项目在 active 时
-$theme-aside-item-color-active: #FFFFFF;
+$theme-aside-item-color-active: #2f74ff;
 $theme-aside-item-background-color-active: #222A34;
 
 // 侧边栏菜单为空的时候显示的元素
 $theme-aside-menu-empty-icon-color: #CCCCCC;
 $theme-aside-menu-empty-text-color: #CCCCCC;
-$theme-aside-menu-empty-background-color: #242D38;
+$theme-aside-menu-empty-background-color: #2f74ff;
 $theme-aside-menu-empty-icon-color-hover: #FFFFFF;
 $theme-aside-menu-empty-text-color-hover: #FFFFFF;
-$theme-aside-menu-empty-background-color-hover: #242D38;
\ No newline at end of file
+$theme-aside-menu-empty-background-color-hover: #2f74ff;
\ No newline at end of file
diff --git a/src/assets/style/theme/element/setting.scss b/src/assets/style/theme/element/setting.scss
index 93dc8c9fca7affe0db8d4e95027992fe516e2dfe..3890e4bb8081801fb75862c20a4e3c98992cacfd 100644
--- a/src/assets/style/theme/element/setting.scss
+++ b/src/assets/style/theme/element/setting.scss
@@ -16,7 +16,7 @@ $theme-container-header-footer-background-color: #FFF;
 $theme-container-border-inner: 1px solid #CFD7E5;
 $theme-container-border-outer: 1px solid #011527;
 
-$theme-multiple-page-control-color: #BFCBD9;
+$theme-multiple-page-control-color: #606266;
 $theme-multiple-page-control-color-active: #46A0FC;
 $theme-multiple-page-control-nav-prev-color: #BFCBD9;
 $theme-multiple-page-control-nav-next-color: #BFCBD9;
diff --git a/src/assets/style/theme/line/setting.scss b/src/assets/style/theme/line/setting.scss
index 696249976531f604dacbda36c6905414701b7858..810a6b644603a256e043938fbec6607511621c0d 100644
--- a/src/assets/style/theme/line/setting.scss
+++ b/src/assets/style/theme/line/setting.scss
@@ -16,14 +16,14 @@ $theme-container-header-footer-background-color: #FFF;
 $theme-container-border-inner: 1px solid $color-border-2;
 $theme-container-border-outer: 1px solid #cfd7e5;
 
-$theme-multiple-page-control-color: #FFF;
-$theme-multiple-page-control-color-active: $color-text-normal;
+$theme-multiple-page-control-color: #606266;
+$theme-multiple-page-control-color-active: #2f74ff;
 $theme-multiple-page-control-nav-prev-color: #cfd7e5;
 $theme-multiple-page-control-nav-next-color: #cfd7e5;
 $theme-multiple-page-control-border-color: #cfd7e5;
-$theme-multiple-page-control-border-color-active: #FFF;
+$theme-multiple-page-control-border-color-active: #eaedf1;
 $theme-multiple-page-control-background-color: #cfd7e5;
-$theme-multiple-page-control-background-color-active: #FFF;
+$theme-multiple-page-control-background-color-active: #eaedf1;
 
 // 顶栏和侧边栏中展开的菜单 hover 状态下
 $theme-menu-item-color-hover: #293849;
@@ -52,7 +52,7 @@ $theme-aside-item-background-color-hover: rgba(#000, .02);
 $theme-aside-item-color-focus: $color-text-main;
 $theme-aside-item-background-color-focus: rgba(#000, .02);
 // 侧边栏上的项目在 active 时
-$theme-aside-item-color-active: $color-text-main;
+$theme-aside-item-color-active: #2f74ff;
 $theme-aside-item-background-color-active: rgba(#000, .03);
 
 // 侧边栏菜单为空的时候显示的元素
diff --git a/src/assets/style/theme/star/setting.scss b/src/assets/style/theme/star/setting.scss
index 38cf867c158341355f0cf2ef89d32782b012d969..c0cfb223d8c62e93cdeaddac55849775b6a459ad 100644
--- a/src/assets/style/theme/star/setting.scss
+++ b/src/assets/style/theme/star/setting.scss
@@ -16,8 +16,8 @@ $theme-container-header-footer-background-color: #FFF;
 $theme-container-border-inner: 1px solid $color-border-1;
 $theme-container-border-outer: 1px solid #114450;
 
-$theme-multiple-page-control-color: #FFF;
-$theme-multiple-page-control-color-active: $color-text-normal;
+$theme-multiple-page-control-color: $color-text-normal;
+$theme-multiple-page-control-color-active: #2f74ff;
 $theme-multiple-page-control-nav-prev-color: #FFF;
 $theme-multiple-page-control-nav-next-color: #FFF;
 $theme-multiple-page-control-border-color: #114450;
@@ -52,7 +52,7 @@ $theme-aside-item-background-color-hover: rgba(#000, .2);
 $theme-aside-item-color-focus: #FFF;
 $theme-aside-item-background-color-focus: rgba(#000, .2);
 // 侧边栏上的项目在 active 时
-$theme-aside-item-color-active: #FFF;
+$theme-aside-item-color-active: #2f74ff;
 $theme-aside-item-background-color-active: rgba(#000, .3);
 
 // 侧边栏菜单为空的时候显示的元素
diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss
index 0147ea45df63b3424b436704e3e32658da8f9ea3..50a8ade222565d3aa5484a7df16423f8fe0472ac 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -247,17 +247,21 @@
           height: 41px;
           // 多页面控制器
           .zero-multiple-page-control-group {
-            padding-right: 20px;
+            // padding-right: 20px;
             .zero-multiple-page-control-content {
               overflow: auto;
               position: relative;
               .zero-multiple-page-control-content-inner {
                 .zero-multiple-page-control {
                   .el-tabs__header.is-top {
-                    margin: 0px;
+                    background: #fafafa;
+                  }
+                  .el-tabs__nav-wrap.is-top {
+                    margin-bottom: 0px !important;
                   }
                   .el-tabs__nav {
                     overflow: hidden;
+                    border:0px !important
                   }
                 }
               }
@@ -288,15 +292,28 @@
             .zero-container-full {
               position: absolute;
               top: 0px;
-              right: 20px;
+              right: 0px;
               bottom: 0px;
               left: 0px;
               display: flex;
               flex-direction: column;
               overflow: hidden;
+              padding: 10px;
               .zero-container-full__header {
-                padding: 10px;
+                // padding: 10px;
+                height: auto !important;
+                border-radius: 6px;
+                margin-bottom: 10px;
+                box-shadow: 1px 1px 3px rgb(0 0 0 / 20%);
+              }
+              .zero-container-full__tool {
+                // padding: 10px;
                 height: auto !important;
+                border-bottom: 0px;
+                padding: 10px 10px 0px;
+                // padding-bottom: 0px;
+                // text-align: right;
+                border-radius: 6px 6px 0px 0px;
               }
               .zero-container-full__aside {
                 // padding-left: 100px;
@@ -307,17 +324,65 @@
               .zero-container-full__main {
                 // padding: 0px !important;
                 // height: auto;
-                overflow:hidden !important
+                overflow:hidden !important;
+                padding: 10px;
+                // padding-bottom: 0px;
               }
               .zero-container-full__body {
                 flex-grow: 1;
                 height: 100%;
                 position: relative;
                 overflow-y:auto;
+                border-radius:0px 0px 6px 6px;
               }
               .zero-container-full__footer {
+                padding: 0px 10px;
+                height: 50px !important;
+              }
+            }// 填充式布局组件
+            .zero-container-full-zero {
+              position: absolute;
+              top: 0px;
+              right: 0px;
+              bottom: 0px;
+              left: 0px;
+              display: flex;
+              flex-direction: column;
+              overflow: hidden;
+              padding: 10px;
+              .zero-container-full__tool {
+                // padding: 10px;
+                // height: auto !important;    
+                margin-bottom: -18px;
+                border-bottom: 0px;
+                padding: 10px 10px 0px;
+                // padding-bottom: 0px;
+                // text-align: right;
+                border-radius: 6px 6px 0px 0px;
+              }
+              .zero-container-full__aside {
+                // padding-left: 100px;
+                padding: 10px;
+                border-right:1px solid #cfd7e5;
+                // overflow:hidden;
+              }
+              .zero-container-full__main {
+                // padding: 0px !important;
+                // height: auto;
+                overflow:hidden !important;
                 padding: 10px;
-                // border-top: 0px !important
+                // padding-bottom: 0px;
+              }
+              .zero-container-full__body {
+                flex-grow: 1;
+                height: 100%;
+                position: relative;
+                overflow-y:auto;
+                border-radius:0px 0px 6px 6px;
+              }
+              .zero-container-full__footer {
+                padding: 0px 10px;
+                height: 50px !important;
               }
             }
             // 填充式布局组件 - 滚动优化
@@ -497,6 +562,30 @@
 }
 
 //查询输入框长度
-.zero-search-vxe-input{
-  width: 110px !important;
+.zero-search-el-input{
+  width: 150px !important;
+}
+
+// 查询样式
+.zero-search-from {
+  // margin-bottom: -10px;
+  padding-top: 15px;
+}
+.zero-test{
+  padding: 15px;
+  background: #f3f3f4;
+  border-radius: 6px;
+}
+.zero-column-dropdown{
+  border-left-color:#DCDFE6 !important
+}
+//设置取消按钮向右浮动，左magin为10px，即与确定按钮间距为10px
+.btn-custom-cancel {
+  float: right;
+  margin-left: 10px;
+}
+//设置tab标签在右边有条竖线(默认是在左边)
+.el-tabs--card>.el-tabs__header .el-tabs__item{
+  border-left:0px !important;
+  border-right: 1px solid #E4E7ED;
 }
\ No newline at end of file
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index 461ea936cdd8e8b6187da9d9e86b50ebda1226d4..b16d891224f0c45b78997ec5fc0bb1e845616e84 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -248,16 +248,16 @@
       .zero-theme-container-main-header {
         // 多页面控制器
         .zero-multiple-page-control {
-          .el-tabs__header.is-top {
-            border-bottom-color: $theme-multiple-page-control-border-color;
-          }
+          // .el-tabs__header.is-top {
+          //    border-bottom-color: $theme-multiple-page-control-border-color;
+          // }
           .el-tabs__nav {
-            border-color: $theme-multiple-page-control-border-color;
+            // border-color: $theme-multiple-page-control-border-color;
             .el-tabs__item {
               @extend %unable-select;
               color: $theme-multiple-page-control-color;
-              background-color: $theme-multiple-page-control-background-color;
-              border-left-color: $theme-multiple-page-control-border-color;
+              // background-color: #fafafa;
+              // border-left-color: $theme-multiple-page-control-border-color;
               &:first-child {
                 border-left: none;
                 &:hover {
@@ -267,8 +267,11 @@
             }
             .el-tabs__item.is-active {
               color: $theme-multiple-page-control-color-active;
-              background-color: $theme-multiple-page-control-background-color-active;
-              border-bottom-color: $theme-multiple-page-control-border-color-active;
+              // background-color: $theme-multiple-page-control-background-color-active;
+              // border-bottom-color: $theme-multiple-page-control-border-color-active;
+              // color: #23508e;
+              background-color: #eaedf1;
+              border-bottom-color:  #eaedf1;
             }
           }
           %el-tabs__nav {
@@ -296,23 +299,46 @@
       }
       // 主体
       .zero-theme-container-main-body {
+        background: #f3f3f4;
         // 布局组件
         .container-component {
           // [组件]
           // zero-container-full 填充型
           .zero-container-full {
-            border: $theme-container-border-outer;
+            // border: $theme-container-border-outer;
             border-top: none;
             border-bottom: none;
             .zero-container-full__header {
               border-bottom: $theme-container-border-inner;
               background: $theme-container-header-footer-background-color;
             }
+            .zero-container-full__tool {
+              border-bottom: $theme-container-border-inner;
+              background: $theme-container-header-footer-background-color;
+            }
             .zero-container-full__body {
               background: $theme-container-background-color;
             }
             .zero-container-full__footer {
-              border-top: $theme-container-border-inner;
+              // border-top: $theme-container-border-inner;
+              background: $theme-container-header-footer-background-color;
+            }
+          }
+          // [组件]
+          // zero-container-full 填充型
+          .zero-container-full-zero {
+            // border: $theme-container-border-outer;
+            border-top: none;
+            border-bottom: none;
+            .zero-container-full__tool {
+              border-bottom: $theme-container-border-inner;
+              background: $theme-container-header-footer-background-color;
+            }
+            .zero-container-full__body {
+              background: $theme-container-background-color;
+            }
+            .zero-container-full__footer {
+              // border-top: $theme-container-border-inner;
               background: $theme-container-header-footer-background-color;
             }
           }
diff --git a/src/assets/style/theme/tomorrow-night-blue/setting.scss b/src/assets/style/theme/tomorrow-night-blue/setting.scss
index 1f59ca872e0365e1a380fa9ae5686aebc9076b88..776635d5969c717179da8842ca2970b5b6397662 100644
--- a/src/assets/style/theme/tomorrow-night-blue/setting.scss
+++ b/src/assets/style/theme/tomorrow-night-blue/setting.scss
@@ -16,8 +16,8 @@ $theme-container-header-footer-background-color: #FFF;
 $theme-container-border-inner: 1px solid $color-border-1;
 $theme-container-border-outer: 1px solid #002253;
 
-$theme-multiple-page-control-color: #FFF;
-$theme-multiple-page-control-color-active: $color-text-normal;
+$theme-multiple-page-control-color: $color-text-normal;
+$theme-multiple-page-control-color-active: #2f74ff;
 $theme-multiple-page-control-nav-prev-color: #FFF;
 $theme-multiple-page-control-nav-next-color: #FFF;
 $theme-multiple-page-control-border-color: #002253;
diff --git a/src/assets/style/theme/violet/setting.scss b/src/assets/style/theme/violet/setting.scss
index 91010957295f42ec62e59fc29c72b8614b15b632..2a08c98b508cb74d0a71c777d3e489c6ce0b1198 100644
--- a/src/assets/style/theme/violet/setting.scss
+++ b/src/assets/style/theme/violet/setting.scss
@@ -16,8 +16,8 @@ $theme-container-header-footer-background-color: #FFF;
 $theme-container-border-inner: 1px solid $color-border-2;
 $theme-container-border-outer: 1px solid #8C40E2;
 
-$theme-multiple-page-control-color: #FFF;
-$theme-multiple-page-control-color-active: $color-text-normal;
+$theme-multiple-page-control-color: $color-text-normal;
+$theme-multiple-page-control-color-active: #2f74ff;
 $theme-multiple-page-control-nav-prev-color: #FFF;
 $theme-multiple-page-control-nav-next-color: #FFF;
 $theme-multiple-page-control-border-color: #8C40E2;
@@ -52,7 +52,7 @@ $theme-aside-item-background-color-hover: linear-gradient(90deg, rgba(255,255,25
 $theme-aside-item-color-focus: #FFF;
 $theme-aside-item-background-color-focus: linear-gradient(90deg, rgba(255,255,255,0.28) 0%, rgba(255,255,255,0.00) 100%);
 // 侧边栏上的项目在 active 时
-$theme-aside-item-color-active: #FFF;
+$theme-aside-item-color-active: #FFB870;
 $theme-aside-item-background-color-active: linear-gradient(90deg, rgba(255,255,255,0.28) 0%, rgba(255,255,255,0.00) 100%);
 
 // 侧边栏菜单为空的时候显示的元素
diff --git a/src/components/zero-container/components/zero-container-full-zero.vue b/src/components/zero-container/components/zero-container-full-zero.vue
new file mode 100644
index 0000000000000000000000000000000000000000..74135d7271a455164890c1635527914b8f1b8920
--- /dev/null
+++ b/src/components/zero-container/components/zero-container-full-zero.vue
@@ -0,0 +1,30 @@
+<template>
+  <div class="zero-container-full-zero">
+    <div v-if="$slots.tool"
+         class="zero-container-full__tool">
+      <slot name="tool" />
+    </div>
+    <el-container class="zero-container-full__body">
+      <el-aside v-if="$slots.aside"
+                class="zero-container-full__aside">
+        <slot name="aside" />
+      </el-aside>
+      <el-container style="border-radius: 6px;">
+        <el-main v-if="$slots.main"
+                 class="zero-container-full__main">
+          <slot name="main" />
+        </el-main>
+        <el-footer v-if="$slots.footer"
+                   class="zero-container-full__footer">
+          <slot name="footer" />
+        </el-footer>
+      </el-container>
+    </el-container>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'zero-container-full-zero'
+}
+</script>
diff --git a/src/components/zero-container/components/zero-container-full.vue b/src/components/zero-container/components/zero-container-full.vue
index 5be766dc7c6efdee5b5e4eee6a60ad48df48e59d..276fa2df8250085e2eb171da02ea818002470729 100644
--- a/src/components/zero-container/components/zero-container-full.vue
+++ b/src/components/zero-container/components/zero-container-full.vue
@@ -1,18 +1,26 @@
 <template>
   <div class="zero-container-full">
-    <el-header v-if="$slots.header" class="zero-container-full__header">
-      <slot name="header"/>
+    <el-header v-if="$slots.header"
+               class="zero-container-full__header">
+      <slot name="header" />
     </el-header>
+    <div v-if="$slots.tool"
+         class="zero-container-full__tool">
+      <slot name="tool" />
+    </div>
     <el-container class="zero-container-full__body">
-      <el-aside v-if="$slots.aside" class="zero-container-full__aside">
-        <slot name="aside"/>
+      <el-aside v-if="$slots.aside"
+                class="zero-container-full__aside">
+        <slot name="aside" />
       </el-aside>
-      <el-container>
-        <el-main v-if="$slots.main" class="zero-container-full__main">
-          <slot name="main"/>
+      <el-container style="border-radius: 6px;">
+        <el-main v-if="$slots.main"
+                 class="zero-container-full__main">
+          <slot name="main" />
         </el-main>
-        <el-footer v-if="$slots.footer" class="zero-container-full__footer">
-          <slot name="footer"/>
+        <el-footer v-if="$slots.footer"
+                   class="zero-container-full__footer">
+          <slot name="footer" />
         </el-footer>
       </el-container>
     </el-container>
diff --git a/src/components/zero-container/index.js b/src/components/zero-container/index.js
index a73fe6ea83e8f3cd38bc9241349149496536f113..0e4da306be5489676ed569992f3358803fcb7fed 100644
--- a/src/components/zero-container/index.js
+++ b/src/components/zero-container/index.js
@@ -1,6 +1,7 @@
 // 组件
 import zeroContainerFull from './components/zero-container-full.vue'
 import zeroContainerFullBs from './components/zero-container-full-bs.vue'
+import zeroContainerFullZero from './components/zero-container-full-zero.vue'
 import zeroContainerGhost from './components/zero-container-ghost.vue'
 import zeroContainerGhostBs from './components/zero-container-ghost-bs.vue'
 import zeroContainerCard from './components/zero-container-card.vue'
@@ -31,6 +32,7 @@ export default {
       if (this.type === 'ghost' && this.betterScroll) return zeroContainerGhostBs
       if (this.type === 'full' && !this.betterScroll) return zeroContainerFull
       if (this.type === 'full' && this.betterScroll) return zeroContainerFullBs
+      if (this.type === 'zero') return zeroContainerFullZero
       else {
         return 'div'
       }
@@ -39,6 +41,7 @@ export default {
   render (h) {
     const slots = [this.$slots.default]
     if (this.$slots.header) slots.push(h('template', { slot: 'header' }, [this.$slots.header]))
+    if (this.$slots.tool) slots.push(h('template', { slot: 'tool' }, [this.$slots.tool]))
     if (this.$slots.aside) slots.push(h('template', { slot: 'aside' }, [this.$slots.aside]))
     if (this.$slots.main) slots.push(h('template', { slot: 'main' }, [this.$slots.main]))
     if (this.$slots.footer) slots.push(h('template', { slot: 'footer' }, [this.$slots.footer]))
diff --git a/src/components/zero-dialog/ZeroDialog.vue b/src/components/zero-dialog/ZeroDialog.vue
index 3f2766a49b129956f08af4e807f3f7f4c63a75e3..f484ae6e0e32d37ca66658a1d664d1e86d2034ef 100644
--- a/src/components/zero-dialog/ZeroDialog.vue
+++ b/src/components/zero-dialog/ZeroDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="addUpdateFormVisible"
+  <el-dialog :visible.sync="showDialog"
              :fullscreen="fullscreen"
              :show-close="false"
              :width="width"
@@ -12,13 +12,14 @@
       <span>{{title}}</span>
       <span style="float:right;">
         <el-row :gutter="15">
-          <el-col :span="12">
+          <el-col :span="12"
+                  v-if="fullscreen !==null">
             <i :class="[fullscreen?'el-icon-copy-document':'el-icon-full-screen','zero-dialog__title_right'] "
                @click="fullscreenFun" />
           </el-col>
           <el-col :span="12">
             <i class="el-icon-close zero-dialog__title_right"
-               @click="addUpdateFormVisibleFun" />
+               @click="showDialogFun" />
           </el-col>
         </el-row>
       </span>
@@ -28,9 +29,11 @@
          class="dialog-footer">
       <el-button v-if="btnExist"
                  type="primary"
-                 @click="zeroFun"> 确 定 </el-button>
+                 @click="submitFun"
+                 size="small"> 确 定 </el-button>
       <el-button v-if="btnExist"
-                 @click="addUpdateFormVisibleFun"> 取 消 </el-button>
+                 @click="showDialogFun"
+                 size="small"> 取 消 </el-button>
     </div>
   </el-dialog>
 </template>
@@ -39,13 +42,16 @@
 export default {
   name: 'TestModel',
   props: {
-    addUpdateFormVisible: Boolean,
-    fullscreen: Boolean,
+    showDialog: Boolean,
+    fullscreen: {
+      type: Boolean,
+      default: null
+    },
     title: String,
     btnExist: Boolean,
     loading: Boolean,
     width: String,
-    addOrupdate: {
+    submit: {
       type: Function,
       default: null
     }
@@ -55,14 +61,14 @@ export default {
       // 子组件设置父组件值
       this.$emit('update:fullscreen', !this.fullscreen)
     },
-    addUpdateFormVisibleFun () {
-      this.$emit('update:addUpdateFormVisible', !this.addUpdateFormVisible)
+    showDialogFun () {
+      this.$emit('update:showDialog', !this.showDialog)
     },
     escClose () {
-      this.$emit('update:addUpdateFormVisible', !this.addUpdateFormVisible)
+      this.$emit('update:showDialog', !this.showDialog)
     },
-    zeroFun () {
-      this.addOrupdate()
+    submitFun () {
+      this.submit()
     }
   }
 }
@@ -83,21 +89,4 @@ export default {
 .zero-dialog__title_right:hover {
   color: #409eff;
 }
-
-.el-dialog {
-  display: flex;
-  flex-direction: column;
-  margin: 0 !important;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  /*height:600px;*/
-  max-height: calc(100% - 30px);
-  max-width: calc(100% - 30px);
-}
-.el-dialog .el-dialog__body {
-  flex: 1;
-  overflow: auto;
-}
 </style>
diff --git a/src/components/zero-page/ZeroPage.vue b/src/components/zero-page/ZeroPage.vue
new file mode 100644
index 0000000000000000000000000000000000000000..20bc44a5fb2e0f6a86d2d09b4540704034a16135
--- /dev/null
+++ b/src/components/zero-page/ZeroPage.vue
@@ -0,0 +1,71 @@
+<template>
+  <div>
+    <el-pagination :current-page="page"
+                   :page-sizes="limits"
+                   :page-size="limit"
+                   :total="total"
+                   layout="total, sizes, jumper,slot, prev,pager, next"
+                   @size-change="pageSizeChangeHandle"
+                   @current-change="pageCurrentChangeHandle"
+                   class="zero-pagination">
+      <el-link :underline="false"
+               @click="firstPageHandle"
+               :disabled="page === 1">首页</el-link>
+    </el-pagination>
+    <el-pagination :current-page="page"
+                   :page-sizes="limits"
+                   :page-size="limit"
+                   :total="total"
+                   layout="slot"
+                   @size-change="pageSizeChangeHandle"
+                   @current-change="pageCurrentChangeHandle"
+                   class="zero-pagination">
+      <el-link :underline="false"
+               @click="lastPageHandle"
+               :disabled="Math.ceil(total / limit) === 1 || Math.ceil(total / limit) === page">尾页</el-link>
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ZeroPage',
+  props: {
+    page: Number, // 当前页
+    limits: {
+      type: Array,
+      default: () => [10, 15, 20, 50, 100]
+    }, // 一页显示多少条选择
+    limit: Number, // 一页显示多少条
+    total: Number, // 总条数
+    refreshRef: String, // 刷新的表格ref值
+    pageSizeChangeHandle: { // 分页, 每页条数
+      type: Function,
+      default: null
+    },
+    pageCurrentChangeHandle: { // 分页, 当前页
+      type: Function,
+      default: null
+    },
+    firstPageHandle: { // 分页,首页
+      type: Function,
+      default: null
+    },
+    lastPageHandle: { // 分页,首页
+      type: Function,
+      default: null
+    }
+  }
+}
+</script>
+
+<style>
+.zero-pagination {
+  float: left;
+  padding: 10px 5px !important;
+}
+.zero-pagination > .el-pagination__jump {
+  margin-left: 0px;
+  margin-right: 20px;
+}
+</style>
diff --git a/src/components/search-hearder/SearchHearder.vue b/src/components/zero-search/ZeroSearch.vue
similarity index 74%
rename from src/components/search-hearder/SearchHearder.vue
rename to src/components/zero-search/ZeroSearch.vue
index 584c67e0e0a63e54d50ee160fe7d7d63565691d1..02b738372bafeb56f3edbc9533cceb8865fe5e35 100644
--- a/src/components/search-hearder/SearchHearder.vue
+++ b/src/components/zero-search/ZeroSearch.vue
@@ -1,10 +1,11 @@
 <template>
-  <el-button :icon="icon" @click="click">{{open ? '隐藏':'展开'}}</el-button>
+  <el-button :icon="icon"
+             @click="click">{{open ? '隐藏':'展开'}}</el-button>
 </template>
 
 <script>
 export default {
-  name: 'SearchHearder',
+  name: 'ZeroSearch',
   data () {
     return {
       icon: 'el-icon-caret-bottom',
diff --git a/src/layout/header-aside/components/header-theme/index.vue b/src/layout/header-aside/components/header-theme/index.vue
index b05f301728aa9ba63edfeb97c7d815c29baab7a6..578123edfb4e5f07f260c03c56d84c00e2cbb5f3 100644
--- a/src/layout/header-aside/components/header-theme/index.vue
+++ b/src/layout/header-aside/components/header-theme/index.vue
@@ -1,25 +1,23 @@
 <template>
   <div>
-    <el-tooltip
-      effect="dark"
-      content="主题"
-      placement="bottom">
-      <el-button
-        class="zero-ml-0 zero-mr btn-text can-hover"
-        type="text"
-        @click="dialogVisible = true">
-        <zero-icon
-          name="diamond"
-          style="font-size: 16px"/>
+    <el-tooltip effect="dark"
+                content="主题"
+                placement="bottom">
+      <el-button class="zero-ml-0 zero-mr btn-text can-hover"
+                 type="text"
+                 @click="dialogVisible = true">
+        <zero-icon name="diamond"
+                   style="font-size: 16px" />
       </el-button>
     </el-tooltip>
-    <el-dialog
-      title="主题"
-      width="600px"
-      :visible.sync="dialogVisible"
-      :append-to-body="true">
-      <zero-theme-list style="margin-top: -25px;"/>
-    </el-dialog>
+    <zero-dialog title="主题"
+                 width="600px"
+                 :showDialog.sync="dialogVisible"
+                 :append-to-body="true">
+      <div slot="body">
+        <zero-theme-list style="margin-top: -25px;" />
+      </div>
+    </zero-dialog>
   </div>
 </template>
 
diff --git a/src/layout/header-aside/components/tabs/index.vue b/src/layout/header-aside/components/tabs/index.vue
index a017106eb1d75a41b68258bae8172cc0c8dc00b9..179e0a826ef5289abe0d8d29a4e7b036fe589120 100644
--- a/src/layout/header-aside/components/tabs/index.vue
+++ b/src/layout/header-aside/components/tabs/index.vue
@@ -1,68 +1,65 @@
 <template>
-  <div class="zero-multiple-page-control-group" flex>
-    <div class="zero-multiple-page-control-content" flex-box="1">
+  <div class="zero-multiple-page-control-group"
+       flex>
+    <div class="zero-multiple-page-control-content"
+         flex-box="1">
       <div class="zero-multiple-page-control-content-inner">
-        <zero-contextmenu
-          :visible.sync="contextmenuFlag"
-          :x="contentmenuX"
-          :y="contentmenuY"
-        >
-          <zero-contextmenu-list
-            :menulist="
+        <zero-contextmenu :visible.sync="contextmenuFlag"
+                          :x="contentmenuX"
+                          :y="contentmenuY">
+          <zero-contextmenu-list :menulist="
               tagName === indexPath ? contextmenuListIndex : contextmenuList
             "
-            @rowClick="contextmenuClick"
-          />
+                                 @rowClick="contextmenuClick" />
         </zero-contextmenu>
-        <el-tabs
-          class="zero-multiple-page-control zero-multiple-page-sort"
-          :value="current"
-          type="card"
-          @tab-click="handleClick"
-          @tab-remove="handleTabRemove"
-          @contextmenu.native="handleContextmenu"
-        >
-          <el-tab-pane
-            v-for="page in opened"
-            :key="page.fullPath"
-            :label="page.meta.title || '未命名'"
-            :name="page.fullPath"
-            :closable="isTabClosable(page)"
-          />
+        <el-tabs class="zero-multiple-page-control zero-multiple-page-sort"
+                 :value="current"
+                 type="card"
+                 @tab-click="handleClick"
+                 @tab-remove="handleTabRemove"
+                 @contextmenu.native="handleContextmenu">
+          <el-tab-pane v-for="page in opened"
+                       :key="page.fullPath"
+                       :label="page.meta.title || '未命名'"
+                       :name="page.fullPath"
+                       :closable="isTabClosable(page)" />
         </el-tabs>
       </div>
     </div>
-    <div class="zero-multiple-page-control-btn" flex-box="0">
-      <!-- <el-button  @click="handleRefresh">
+    <!-- <div class="zero-multiple-page-control-btn"
+         flex-box="0">
+      <el-button  @click="handleRefresh">
         <zero-icon name="refresh"/>
-      </el-button> -->
-      <el-dropdown
-        size="default"
-        split-button
-        @click="closeAll"
-        @command="(command) => handleControlItemClick(command)"
-      >
+      </el-button>
+      <el-dropdown size="default"
+                   split-button
+                   @click="closeAll"
+                   @command="(command) => handleControlItemClick(command)">
         <zero-icon name="times-circle" />
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item command="left">
-            <zero-icon name="arrow-left" class="zero-mr-10" />
+            <zero-icon name="arrow-left"
+                       class="zero-mr-10" />
             关闭左侧
           </el-dropdown-item>
           <el-dropdown-item command="right">
-            <zero-icon name="arrow-right" class="zero-mr-10" />
+            <zero-icon name="arrow-right"
+                       class="zero-mr-10" />
             关闭右侧
           </el-dropdown-item>
           <el-dropdown-item command="other">
-            <zero-icon name="times" class="zero-mr-10" />
+            <zero-icon name="times"
+                       class="zero-mr-10" />
             关闭其它
           </el-dropdown-item>
           <el-dropdown-item command="all">
-            <zero-icon name="times-circle" class="zero-mr-10" />
+            <zero-icon name="times-circle"
+                       class="zero-mr-10" />
             全部关闭
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
-    </div>
+    </div> -->
   </div>
 </template>
 
diff --git a/src/main.js b/src/main.js
index 7305aad345ec79608e3b11ba9b061ceb08cdb946..3c56af8d9dbeb905ac3039c512e478f0904a37dd 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,7 +1,7 @@
 
 import iconPicker from 'e-icon-picker'
-import 'e-icon-picker/dist/symbol.js' // 基本彩色图标库
-import 'e-icon-picker/dist/index.css' // 基本样式，包含基本图标
+import 'e-icon-picker/lib/symbol.js' // 基本彩色图标库
+import 'e-icon-picker/lib/index.css' // 基本样式，包含基本图标
 import 'font-awesome/css/font-awesome.min.css' // font-awesome 图标库
 import 'element-ui/lib/theme-chalk/icon.css' // element-ui 图标库
 // Vue
@@ -23,8 +23,12 @@ import JsonViewer from 'vue-json-viewer'
 import 'xe-utils'
 import VXETable from 'vxe-table'
 import 'vxe-table/lib/style.css'
-import ZeroDialog from '@/components/zero-dialog/ZeroDialog' // 权限树
+import ZeroDialog from '@/components/zero-dialog/ZeroDialog' // 弹框
+import ZeroSearch from '@/components/zero-search/ZeroSearch' // 头部查询模块
+import ZeroPage from '@/components/zero-page/ZeroPage' // 分页模块
 Vue.component('zero-dialog', ZeroDialog)
+Vue.component('zero-search', ZeroSearch)
+Vue.component('zero-page', ZeroPage)
 Vue.use(VXETable)
 
 Vue.use(iconPicker, { eIcon: false })
@@ -39,7 +43,7 @@ Vue.prototype.$hasPermission = hasPermission
 
 Vue.prototype.$getRsaCode = function (str) { // 注册方法
   const encryptStr = new JSEncrypt()
-  encryptStr.setPublicKey(window.config.VUE_APP_RSA) // 设置 加密公钥
+  encryptStr.setPublicKey(process.env.VUE_APP_RSA) // 设置 加密公钥
   const data = encryptStr.encrypt(str.toString()) // 进行加密
   return data
 }
diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js
index c89ab63386e81324b91de3da342ad98f85dc9540..fc211942544bae34b939389f957ecd46e3e16c2b 100644
--- a/src/mixins/view-module.js
+++ b/src/mixins/view-module.js
@@ -10,16 +10,17 @@ export default {
         activatedIsNeed: true, // 此页面是否在激活（进入）时，调用查询数据列表接口？
         getDataListUrl: '', // 数据列表接口，API地址
         isPage: true, // 数据列表接口，是否需要分页？
+        el_table: true, // 是否el-table
         deleteUrl: '', // 删除接口，API地址
         batchDelKey: 'id', // 删除接口，批量状态下由那个key进行标记操作？比如：pid，uid...
         exportUrl: '', // 导出接口，API地址
-        dictCodes: '', // 页面初始化需要加载的字典，多个字典用逗号隔开
-        executeGetData: true // 执行获取数据接口，调用分页接口或者不分页接口
+        addUrl: '', // 新增
+        updateUrl: '' // 修改
       },
-      // 默认属性
+      // 查询条件
       searchForm: {
         sortMap: {} // 排序，asc／desc
-      }, // 查询条件
+      },
       dataList: [], // 数据列表
       page: 1, // 当前页码
       limit: 10, // 每页数
@@ -28,38 +29,78 @@ export default {
       dataListLoading: false, // 数据列表，loading状态
       dataListSelections: [], // 数据列表，多选项
       batchBtnDisabled: true, // 批量按钮禁用
-      dictDetails: {}, // 页面字典详情数据
-      searchFormShow: false // 搜索框显示隐藏
+      showSearch: true, // 是否显示查询
+      headerCellStyle: { background: '#eef1f6', color: '#606266' }, // 表头样式
+      ref: 'tableRef', // 表格对象
+      cloumn_all_checked: true // 列全选
     }
   },
   created () {
     if (this.mixinViewModuleOptions.activatedIsNeed) {
-      this.initDict()
       this.getDataList()
     }
   },
+  beforeUpdate () {
+    if (this.mixinViewModuleOptions.el_table) {
+      this.$nextTick(() => { // 在数据加载完，重新渲染表格--防止过滤列时表格抖动
+        this.$refs[this.ref].doLayout()
+      })
+    }
+  },
+  computed: {
+    /* 这里使用了getter和setter，这样写的好处不用自己手动监听复选框的选中事件 */
+    checkedTableColumns: {
+      get () {
+        // 返回选中的列名
+        var zero = []
+        for (var column in this.showColumns) {
+          if (this.showColumns[column].show) {
+            zero.push(column)
+          }
+        }
+        return zero
+      },
+      set (checked) {
+        var i = 0
+        // 设置表格列的显示与隐藏
+        for (var column in this.showColumns) {
+          // 如果选中，则设置列显示
+          if (checked.includes(column)) {
+            this.showColumns[column].show = true
+          } else {
+            // 如果未选中，则设置列隐藏
+            this.showColumns[column].show = false
+            i++
+          }
+        }
+        this.cloumn_all_checked = i === 0
+      }
+    }
+  },
   methods: {
+    cloumnAllChecked (data) {
+      this.cloumn_all_checked = data
+      for (var column in this.showColumns) {
+        this.showColumns[column].show = this.cloumn_all_checked
+      }
+    },
     // 获取数据列表
     getDataList () {
       this.dataListLoading = true
-      if (this.mixinViewModuleOptions.executeGetData) {
-        this.searchForm.page = this.mixinViewModuleOptions.isPage ? this.page : null
-        this.searchForm.pageSize = this.mixinViewModuleOptions.isPage ? this.limit : null
-        const config = {
-          url: this.mixinViewModuleOptions.getDataListUrl,
-          method: 'post',
-          data: this.searchForm
-        }
-        this.$axios(config).then(res => {
-          this.dataListLoading = false
-          this.dataList = res.data
-          this.total = res.total
-        }).catch(() => {
-          this.handleDataCatch()
-        })
-      } else {
-        this.handleDataCatch()
+      this.searchForm.page = this.mixinViewModuleOptions.isPage ? this.page : null
+      this.searchForm.pageSize = this.mixinViewModuleOptions.isPage ? this.limit : null
+      const config = {
+        url: this.mixinViewModuleOptions.getDataListUrl,
+        method: 'post',
+        data: this.searchForm
       }
+      this.$axios(config).then(res => {
+        this.dataListLoading = false
+        this.dataList = res.data
+        this.total = res.total
+      }).catch(() => {
+        this.handleDataCatch()
+      })
     },
     // 处理获取数据接口异常
     handleDataCatch () {
@@ -67,11 +108,16 @@ export default {
       this.total = 0
       this.dataListLoading = false
     },
-    // 多选
+    // 多选---del
     dataListCheckboxChangeHandle ({ selection }) {
       this.dataListSelections = selection
       this.batchBtnDisabled = this.dataListSelections.length <= 0
     },
+    // 多选
+    dataListSelectionChangeHandle (val) {
+      this.dataListSelections = val
+      this.batchBtnDisabled = this.dataListSelections.length <= 0
+    },
     // 排序
     dataListSortChangeHandle (data) {
       this.searchForm.sortMap = {}
@@ -84,6 +130,27 @@ export default {
       }
       this.getDataList()
     },
+    // 分页, 每页条数
+    pageSizeChangeHandle (val) {
+      this.page = 1
+      this.limit = val
+      this.getDataList()
+    },
+    // 分页, 当前页
+    pageCurrentChangeHandle (val) {
+      this.page = val
+      this.getDataList()
+    },
+    // 分页, 首页
+    firstPageHandle (val) {
+      this.page = 1
+      this.getDataList()
+    },
+    // 分页, 尾页
+    lastPageHandle (val) {
+      this.page = Math.ceil(this.total / this.limit) // 总页数
+      this.getDataList()
+    },
     // [分页] 切换事件
     handlePageChange ({ currentPage, pageSize }) {
       this.page = currentPage
@@ -126,8 +193,7 @@ export default {
           data.push({ id: row[this.mixinViewModuleOptions.batchDelKey] })
         } else {
           this.$confirm('您确定要删除该数据?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
+            cancelButtonClass: 'btn-custom-cancel',
             type: 'warning',
             closeOnClickModal: false
           }).then(() => {
@@ -154,8 +220,7 @@ export default {
           this.delete(data, name, ref)
         } else {
           this.$confirm('正在批量删除, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
+            cancelButtonClass: 'btn-custom-cancel',
             type: 'warning',
             closeOnClickModal: false
           }).then(() => {
@@ -175,8 +240,7 @@ export default {
     delete (data, name, ref) {
       const delMsg = name ? '正在删除 [' + name + ']  是否继续?' : '正在批量删除, 是否继续?'
       this.$confirm(delMsg, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+        cancelButtonClass: 'btn-custom-cancel',
         type: 'warning',
         closeOnClickModal: false
       }).then(() => {
@@ -195,7 +259,7 @@ export default {
           this.getDataList()
           this.$message.success(res.msg)
         }).catch(() => {
-          this.handleCodeDelCatch()
+          this.dataListLoading = false
         })
       }).catch(() => {
         this.$message({
@@ -211,10 +275,6 @@ export default {
       this.page = this.page > totalPage ? totalPage : this.page
       this.page = this.page < 1 ? 1 : this.page
     },
-    // 删除失败后的处理
-    handleCodeDelCatch () {
-      this.dataListLoading = false
-    },
     // 导出
     exportHandle (fileName) {
       this.dataListLoading = true
@@ -244,63 +304,22 @@ export default {
           this.dataListLoading = false
         })
     },
-    dateFormat (row) {
+    dateFormat (row, column, cellValue) {
+      return dayjs.unix(cellValue).format('YYYY-MM-DD HH:mm:ss')
+    },
+    vxe_dateFormat (row) {
       if (row.cellValue) {
         return dayjs.unix(row.cellValue).format('YYYY-MM-DD HH:mm:ss')
       }
     },
-    searchResetForm (tableRef) { // 重置输入框
+    searchResetForm () { // 重置输入框
       this.searchForm = {
         sortMap: {}
       }
       // 清空页面选择的排序按钮
-      this.$refs[tableRef].clearSort()
+      this.$refs[this.ref].clearSort()
       this.getDataList()
     },
-    async initDict () { // 页面加载时需要初始化的字典
-      if (this.mixinViewModuleOptions.dictCodes) {
-        const config = {
-          url: '/sysDictDetails/getIdByDictCodeIn',
-          method: 'get',
-          params: { dictCodes: this.mixinViewModuleOptions.dictCodes }
-        }
-        const res = await this.$axios(config)
-        const zeroobj = {}
-        let zeroArr = []
-        let zeroStr = ''
-        for (const key in res.data) {
-          const data = res.data[key]
-          if (zeroStr) {
-            if (zeroStr === data.dictCode) {
-              zeroArr.push(data)
-            } else {
-              zeroobj[zeroStr] = zeroArr
-              zeroArr = []
-              zeroStr = ''
-              zeroArr.push(data)
-            }
-          } else {
-            zeroStr = data.dictCode
-            zeroArr.push(data)
-          }
-        }
-        zeroobj[zeroStr] = zeroArr
-        this.dictDetails = zeroobj
-      }
-    },
-    // 处理字典值的转换,当刷新字典的时候这里会调用两次,待解决
-    dictDetailsHandle (cellValue, dictCodes) {
-      const dictDetails = this.dictDetails[dictCodes]
-      for (const item in dictDetails) {
-        if (cellValue + '' === dictDetails[item].value) {
-          return dictDetails[item].name
-        }
-      }
-      return cellValue
-    },
-    searchOpen (data) {
-      this.searchFormShow = data
-    },
     initDialog (ref, row, val) { // 初始化弹框，第三个参数配合业务使用
       this.$refs[ref].initDialog(row, val)
     }
diff --git a/src/views/database/info/components/AddUpdateForm.vue b/src/views/database/info/components/AddUpdateForm.vue
index 57edcf4fa8c912a453694ee1e4be2884b096f5af..6d636ad9eda8872c8fdef116864beaaea41a8869 100644
--- a/src/views/database/info/components/AddUpdateForm.vue
+++ b/src/views/database/info/components/AddUpdateForm.vue
@@ -1,10 +1,10 @@
 <template>
-  <zero-dialog :addUpdateFormVisible.sync="addUpdateFormVisible"
+  <zero-dialog :showDialog.sync="addUpdateFormVisible"
                :fullscreen.sync="fullscreen"
                :btnExist="btnExist"
                :loading="loading"
                :title="title"
-               :addOrupdate="addOrupdate">
+               :submit="addOrupdate">
     <div slot="body">
       <el-form :model="addUpdateForm"
                :rules="rules"
@@ -88,7 +88,6 @@
 export default {
   name: 'AddUpdateForm',
   props: {
-    dictDetails: Object,
     addUrl: String,
     updateUrl: String,
     getDataList: {
diff --git a/src/views/database/info/components/GeneratorCodeFrom.vue b/src/views/database/info/components/GeneratorCodeFrom.vue
index 09c88199f763d7bd80d918ccab85d5f4daa02d01..1b25a26bc775a992da70dc7f1d19b3ca463e655a 100644
--- a/src/views/database/info/components/GeneratorCodeFrom.vue
+++ b/src/views/database/info/components/GeneratorCodeFrom.vue
@@ -1,13 +1,12 @@
 <!-- 代码生成弹框 -->
 <template>
-  <zero-dialog :addUpdateFormVisible.sync="fromVisible"
+  <zero-dialog :showDialog.sync="fromVisible"
                :fullscreen.sync="fullscreen"
                :btnExist="btnExist"
                :loading="loading"
                :title="'代码生成'"
-               :addOrupdate="generatorCode">
-    <div slot="body"
-         style="height:220px">
+               :submit="generatorCode">
+    <div slot="body">
       <el-form :model="from"
                :rules="rules"
                label-width="90px"
@@ -137,7 +136,6 @@
 export default {
   name: 'GeneratorCodeFrom',
   props: {
-    dictDetails: Object,
     generatorCodeUrl: String
   },
   data () {
diff --git a/src/views/database/info/index.vue b/src/views/database/info/index.vue
index 896b7dba73480fbc9e7f1614e3631ebf3adba5a6..cf34bf94d83bcb611a1ec3987928817f7854ccc0 100644
--- a/src/views/database/info/index.vue
+++ b/src/views/database/info/index.vue
@@ -1,68 +1,122 @@
 /* 数据库管理页面 */
 <template>
   <zero-container>
+
+    <div slot="tool">
+      <el-button v-if="$hasPermission(mixinViewModuleOptions.addUrl)"
+                 type="primary"
+                 @click="initDialog('addUpdateDialogRef')"
+                 size="small">新增</el-button>
+      <el-button v-if="$hasPermission(mixinViewModuleOptions.deleteUrl)"
+                 type="danger"
+                 @click="deleteHandle()"
+                 :disabled="batchBtnDisabled"
+                 size="small">批量删除</el-button>
+
+      <el-button v-if="$hasPermission(generatorCodeUrl)"
+                 type="success"
+                 @click="initDialog('generatorCodeFromRef')"
+                 size="small">代码生成</el-button>
+      <el-button-group style="float: right;">
+        <el-dropdown trigger="click"
+                     :hide-on-click="false">
+          <el-button title="列"
+                     icon="fa fa-th"
+                     class="zero-column-dropdown"
+                     size="small" />
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item key="all"
+                              label="all">
+              <el-checkbox key="all"
+                           v-model="cloumn_all_checked"
+                           v-on:click.stop.native
+                           label="all"
+                           @change="cloumnAllChecked">全选</el-checkbox>
+            </el-dropdown-item>
+            <hr />
+            <el-checkbox-group v-model="checkedTableColumns">
+              <el-dropdown-item v-for="(column,i) in showColumns"
+                                :key="i"
+                                :label="i">
+                <el-checkbox :key="i"
+                             :label="i">{{ column.label }}</el-checkbox>
+              </el-dropdown-item>
+            </el-checkbox-group>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </el-button-group>
+    </div>
     <!-- 右边信息-start -->
     <div slot="main"
          style="height: 100%">
-      <vxe-grid border
-                resizable
-                ref="xGrid"
-                id="xGrid"
-                height="auto"
-                :loading="dataListLoading"
-                :columns="tableColumn"
-                :toolbar="{
-          zoom: true,
-          custom: true,
-          slots: { buttons: 'toolbar_buttons' },
-        }"
+      <el-table :ref="ref"
+                border
+                height="100%"
                 :data="dataList"
-                :custom-config="{ storage: true }"
-                @current-change="dataListCheckboxChangeHandle"
-                @checkbox-all="dataListCheckboxChangeHandle">
-        <template v-slot:toolbar_buttons>
-          <vxe-button status="warning"
-                      transfer
-                      :style="{'margin-right': '10px'}">
-            <template #default>操作</template>
-            <template #dropdowns>
-              <vxe-button type="text"
-                          @click="initDialog('addUpdateDialogRef')">新增</vxe-button>
-              <vxe-button type="text"
-                          @click="deleteHandle()"
-                          :disabled="batchBtnDisabled">批量删除</vxe-button>
-              <vxe-button type="text"
-                          @click="initDialog('generatorCodeFromRef')">代码生成</vxe-button>
-            </template>
-          </vxe-button>
-        </template>
-        <!--自定义插槽 state-->
-        <template v-slot:state_default="{ row }">
-          <el-switch v-model="row.state"
-                     :active-value="1"
-                     :inactive-value="0"
-                     @change="changeState(row)" />
-        </template>
-        <template v-slot:operate="{ row }">
-          <el-button icon="fa fa-edit"
-                     title="修改"
-                     circle
-                     @click="initDialog('addUpdateDialogRef', row)" />
-          <el-button icon="fa fa-trash"
-                     title="删除"
-                     circle
-                     @click="deleteHandle(row, row.name)" />
-        </template>
-      </vxe-grid>
+                @selection-change="dataListSelectionChangeHandle"
+                @sort-change="dataListSortChangeHandle"
+                style="width: 100%">
+        <el-table-column type="selection"
+                         align="center" />
+        <el-table-column v-if="showColumns.name.show"
+                         prop="name"
+                         label="名称"
+                         sortable="custom"
+                         align="center" />
+        <el-table-column v-if="showColumns.databaseType.show"
+                         prop="databaseType"
+                         label="类型"
+                         sortable="custom"
+                         align="center" />
+        <el-table-column v-if="showColumns.username.show"
+                         prop="username"
+                         label="用户名"
+                         sortable="custom"
+                         align="center" />
+        <el-table-column v-if="showColumns.ipPort.show"
+                         prop="ipPort"
+                         label="IP和端口"
+                         sortable="custom"
+                         align="center" />
+        <el-table-column v-if="showColumns.otherParams.show"
+                         prop="otherParams"
+                         label="其他参数"
+                         sortable="custom"
+                         header-align="center" />
+        <el-table-column v-if="showColumns.createTime.show"
+                         prop="createTime"
+                         label="创建时间"
+                         sortable="custom"
+                         align="center"
+                         min-width="180"
+                         :formatter="dateFormat" />
+        <el-table-column v-if="showColumns.remarks.show"
+                         prop="remarks"
+                         label="备注" />
+        <el-table-column v-if="$hasPermission(mixinViewModuleOptions.updateUrl) || $hasPermission(mixinViewModuleOptions.deleteUrl)"
+                         label="操作"
+                         fixed="right"
+                         align="center"
+                         min-width="180">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission(mixinViewModuleOptions.updateUrl)"
+                       type="warning"
+                       @click="initDialog('addUpdateDialogRef',scope.row)"
+                       size="mini">修改</el-button>
+            <el-button v-if="$hasPermission(mixinViewModuleOptions.deleteUrl)"
+                       type="danger"
+                       @click="deleteHandle(scope.row,scope.row.username)"
+                       size="mini">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
       <!-- 新增修改弹框 -->
       <AddUpdateForm ref="addUpdateDialogRef"
-                     :dict-details="dictDetails"
-                     :addUrl="addUrl"
-                     :updateUrl="updateUrl"
+                     :addUrl="mixinViewModuleOptions.addUrl"
+                     :updateUrl="mixinViewModuleOptions.updateUrl"
                      :getDataList="getDataList" />
       <!-- 代码生成弹框 -->
       <GeneratorCodeFrom ref="generatorCodeFromRef"
-                         :dict-details="dictDetails"
                          :generatorCodeUrl="generatorCodeUrl" />
     </div>
     <!-- 右边信息-end -->
@@ -85,24 +139,21 @@ export default {
       mixinViewModuleOptions: {
         isPage: false, // 不分页
         getDataListUrl: '/databaseInfo/list',
+        addUrl: '/databaseInfo/add',
+        updateUrl: '/databaseInfo/update',
         deleteUrl: '/databaseInfo/del',
-        exportUrl: '/databaseInfo/export',
-        dictCodes: 'database_type,entity_base,whether'
+        exportUrl: '/databaseInfo/export'
       },
-      addUrl: '/databaseInfo/add',
-      updateUrl: '/databaseInfo/update',
       generatorCodeUrl: '/databaseInfo/generatorCode',
-      // 列信息
-      tableColumn: [
-        { type: 'checkbox', width: 50 },
-        { field: 'name', title: '名称' },
-        { field: 'databaseType', title: '类型', width: 110 },
-        { field: 'username', title: '用户名', width: 70 },
-        { field: 'ipPort', title: 'IP和端口' },
-        { field: 'otherParams', title: '其他参数' },
-        { field: 'createTime', title: '创建时间', formatter: this.dateFormat },
-        { title: '操作', width: 200, slots: { default: 'operate' } }
-      ]
+      showColumns: {
+        name: { label: '名称', show: true },
+        databaseType: { label: '类型', show: true },
+        username: { label: '用户名', show: true },
+        ipPort: { label: 'IP和端口', show: true },
+        otherParams: { label: '其他参数', show: true },
+        createTime: { label: '创建时间', show: true },
+        remarks: { label: '备注', show: true }
+      }
     }
   }
 }
diff --git a/src/views/druid/index.vue b/src/views/druid/index.vue
index 6be91d8cf79c7d01ded2582e1200d1e9f05450c1..af333b62ed33344ad0d421a9dc5c35f3d727eab2 100644
--- a/src/views/druid/index.vue
+++ b/src/views/druid/index.vue
@@ -11,7 +11,7 @@ export default {
   name: 'Druid',
   data () {
     return {
-      src: window.config.VUE_APP_API + '/druid/sql.html'
+      src: process.env.VUE_APP_API + '/druid/sql.html'
     }
   }
 }
diff --git a/src/views/index/index.vue b/src/views/index/index.vue
index 82ec7e68533f68447a547c0bba065e44a2cb589f..14af942484d5ee1b577cd7531d4912ee748858b3 100644
--- a/src/views/index/index.vue
+++ b/src/views/index/index.vue
@@ -1,10 +1,39 @@
 <template>
   <zero-container>
     <template slot="main">
-      <e-icon-picker
-        v-model="icon"
-        :options="{ FontAwesome: true, ElementUI: true }"
-      />
+      <template>
+        <div>
+          <el-dropdown trigger="click"
+                       :hide-on-click="false">
+            <el-button icon="el-icon-s-grid"
+                       circle></el-button>
+            <!-- <span class="el-dropdown-link">
+              <i class="el-icon-s-grid"></i>
+            </span> -->
+            <el-dropdown-menu slot="dropdown">
+              <el-checkbox-group v-model="checkedTableColumns">
+                <el-dropdown-item divided>
+                  <el-checkbox key="all"
+                               label="all">全选</el-checkbox>
+                </el-dropdown-item>
+                <el-dropdown-item v-for="column in tableColumns"
+                                  :key="column.prop"
+                                  :label="column.prop">
+                  <el-checkbox :key="column.prop"
+                               :label="column.prop">{{ column.label }}</el-checkbox>
+                </el-dropdown-item>
+              </el-checkbox-group>
+            </el-dropdown-menu>
+          </el-dropdown>
+          <el-table :data="tableData"
+                    border>
+            <el-table-column v-for="column in bindTableColumns"
+                             :key="column.prop"
+                             :prop="column.prop"
+                             :label="column.label"></el-table-column>
+          </el-table>
+        </div>
+      </template>
     </template>
   </zero-container>
 </template>
@@ -14,7 +43,64 @@ export default {
   name: 'Index',
   data () {
     return {
-      icon: ''
+      tableData: [
+        {
+          date: '2016-05-02',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        },
+        {
+          date: '2016-05-04',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1517 弄'
+        },
+        {
+          date: '2016-05-01',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1519 弄'
+        }
+      ],
+      tableColumns: [
+        {
+          prop: 'date',
+          label: '日期',
+          show: true
+        },
+        {
+          prop: 'name',
+          label: '姓名',
+          show: true
+        },
+        {
+          prop: 'address',
+          label: '地址',
+          show: true
+        }
+      ]
+    }
+  },
+  computed: {
+    bindTableColumns () {
+      return this.tableColumns.filter((column) => column.show)
+    },
+    /* 这里使用了getter和setter，这样写的好处不用自己手动监听复选框的选中事件 */
+    checkedTableColumns: {
+      get () {
+        // 返回选中的列名
+        return this.bindTableColumns.map(column => column.prop)
+      },
+      set (checked) {
+        // 设置表格列的显示与隐藏
+        this.tableColumns.forEach((column, index) => {
+          // 如果选中，则设置列显示
+          if (checked.includes(column.prop)) {
+            column.show = true
+          } else {
+            // 如果未选中，则设置列隐藏
+            column.show = false
+          }
+        })
+      }
     }
   }
 }
diff --git a/src/views/swagger/index.vue b/src/views/swagger/index.vue
index 722f854e1e9cbac92b2eb56348d4990a67900e31..d4e35b487026a4668e4b2da34ee23fb16ab658b3 100644
--- a/src/views/swagger/index.vue
+++ b/src/views/swagger/index.vue
@@ -11,7 +11,7 @@ export default {
   name: 'Swagger',
   data () {
     return {
-      src: window.config.VUE_APP_API + '/doc.html'
+      src: process.env.VUE_APP_API + '/doc.html'
     }
   }
 }
diff --git a/src/views/sys/dict/components/TreeSide.vue b/src/views/sys/dict/components/TreeSide.vue
index 2b7377c709c1d0fd12190f5d70216ecf7449ae53..f34b52f02faeeb411a0ec897c2eec5f2060155a9 100644
--- a/src/views/sys/dict/components/TreeSide.vue
+++ b/src/views/sys/dict/components/TreeSide.vue
@@ -1,57 +1,49 @@
 <template>
   <div>
-    <el-input placeholder="输入关键字进行过滤" v-model="filterText" clearable>
+    <el-input placeholder="输入关键字进行过滤"
+              v-model="filterText"
+              clearable>
     </el-input>
-    <el-tree
-      v-loading="loading"
-      ref="tree"
-      class="zero-tree"
-      :data="data"
-      node-key="label"
-      :highlight-current="true"
-      :props="{ label: 'name' }"
-      :filter-node-method="filterNode"
-      @node-click="nodeClick"
-    >
-      <span
-        class="custom-tree-node"
-        slot-scope="{ node, data }"
-        @mouseover="mouseover(data)"
-        @mouseleave="mouseout(data)"
-      >
+    <el-tree v-loading="loading"
+             ref="tree"
+             class="zero-tree"
+             :data="data"
+             node-key="label"
+             :highlight-current="true"
+             :props="{ label: 'name' }"
+             :filter-node-method="filterNode"
+             @node-click="nodeClick">
+      <span class="custom-tree-node"
+            slot-scope="{ node, data }"
+            @mouseover="mouseover(data)"
+            @mouseleave="mouseout(data)">
         <span>{{ node.label }}</span>
-        <div v-show="data.dropdownShow" @click.stop="() => {}">
-          <el-dropdown placement="right-start" trigger="click">
+        <div v-if="$hasPermission(addUrl) || $hasPermission(updateUrl) || $hasPermission(deleteUrl)"
+             v-show="data.dropdownShow"
+             @click.stop="() => {}">
+          <el-dropdown placement="right-start"
+                       trigger="click">
             <i class="el-icon-s-operation"></i>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item
-                icon="el-icon-circle-plus"
-                @click.native="initVxeModel('vxeModelRef')"
-              >
-                新增字典
-              </el-dropdown-item>
-              <el-dropdown-item
-                icon="el-icon-edit-outline"
-                @click.native="initVxeModel('vxeModelRef', data)"
-              >
-                修改字典
-              </el-dropdown-item>
-              <el-dropdown-item
-                icon="el-icon-delete-solid"
-                @click.native="delTree(data)"
-              >
-                删除字典
-              </el-dropdown-item>
+              <el-dropdown-item v-if="$hasPermission(addUrl)"
+                                icon="el-icon-circle-plus"
+                                @click.native="initVxeModel('vxeModelRef')">新增字典</el-dropdown-item>
+              <el-dropdown-item v-if="$hasPermission(updateUrl)"
+                                icon="el-icon-edit-outline"
+                                @click.native="initVxeModel('vxeModelRef', data)">修改字典</el-dropdown-item>
+              <el-dropdown-item v-if="$hasPermission(deleteUrl)"
+                                icon="el-icon-delete-solid"
+                                @click.native="delTree(data)">删除字典</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </div>
       </span>
     </el-tree>
-    <TreeSideForm
-      ref="vxeModelRef"
-      @nodeClick="nodeClick"
-      :initTreeData="initTreeData"
-    />
+    <TreeSideForm ref="vxeModelRef"
+                  @nodeClick="nodeClick"
+                  :initTreeData="initTreeData"
+                  :addUrl="addUrl"
+                  :updateUrl="updateUrl" />
   </div>
 </template>
 
@@ -72,7 +64,10 @@ export default {
     return {
       data: [],
       filterText: '',
-      loading: false
+      loading: false,
+      addUrl: '/sysDict/add',
+      updateUrl: '/sysDict/update',
+      deleteUrl: '/sysDict/del'
     }
   },
   watch: {
@@ -110,7 +105,7 @@ export default {
       this.$emit('dataListLoadingFun', true)
       this.$axios({
         method: 'post',
-        url: '/sysDict/del',
+        url: this.deleteUrl,
         data: [{ id: data.id }]
       }).then(res => {
         this.loading = false
diff --git a/src/views/sys/dict/components/TreeSideForm.vue b/src/views/sys/dict/components/TreeSideForm.vue
index fe7af667fd0f8a2b856521faa46112fd09c85ad6..fb36e5eb52d80223c2ba0a22c233809a4999f58a 100644
--- a/src/views/sys/dict/components/TreeSideForm.vue
+++ b/src/views/sys/dict/components/TreeSideForm.vue
@@ -1,41 +1,45 @@
 <template>
-  <vxe-modal v-model="addUpdateFormVisible" :title="title" resize esc-closable>
+  <vxe-modal v-model="addUpdateFormVisible"
+             :title="title"
+             resize
+             esc-closable>
     <template v-slot>
-      <vxe-form
-        ref="addUpdateFormRef"
-        title-align="right"
-        title-width="80"
-        :data="addUpdateForm"
-        :rules="rules"
-        :loading="loading"
-        @submit="submitEvent"
-      >
-        <vxe-form-item title="名称" field="name" span="24">
-          <vxe-input
-            v-model="addUpdateForm.name"
-            placeholder="请输入名称"
-            clearable
-          ></vxe-input>
+      <vxe-form ref="addUpdateFormRef"
+                title-align="right"
+                title-width="80"
+                :data="addUpdateForm"
+                :rules="rules"
+                :loading="loading"
+                @submit="submitEvent">
+        <vxe-form-item title="名称"
+                       field="name"
+                       span="24">
+          <vxe-input v-model="addUpdateForm.name"
+                     placeholder="请输入名称"
+                     clearable></vxe-input>
         </vxe-form-item>
-        <vxe-form-item title="编码" field="code" span="24">
-          <vxe-input
-            v-model="addUpdateForm.code"
-            placeholder="请输入编码"
-            clearable
-          ></vxe-input>
+        <vxe-form-item title="编码"
+                       field="code"
+                       span="24">
+          <vxe-input v-model="addUpdateForm.code"
+                     placeholder="请输入编码"
+                     clearable></vxe-input>
         </vxe-form-item>
-        <vxe-form-item title="备注" span="24">
-          <vxe-textarea
-            v-model="addUpdateForm.remarks"
-            clearable
-          ></vxe-textarea>
+        <vxe-form-item title="备注"
+                       span="24">
+          <vxe-textarea v-model="addUpdateForm.remarks"
+                        clearable></vxe-textarea>
         </vxe-form-item>
-        <vxe-form-item align="right" span="24">
+        <vxe-form-item align="right"
+                       span="24">
           <template v-slot>
-            <vxe-button v-if="btnExist" type="submit" status="primary">
+            <vxe-button v-if="btnExist"
+                        type="submit"
+                        status="primary">
               确定
             </vxe-button>
-            <vxe-button v-if="btnExist" @click="addUpdateFormVisible = false">
+            <vxe-button v-if="btnExist"
+                        @click="addUpdateFormVisible = false">
               取消
             </vxe-button>
           </template>
@@ -53,7 +57,9 @@ export default {
     initTreeData: {
       type: Function,
       default: null
-    }
+    },
+    addUrl: String,
+    updateUrl: String
   },
   data () {
     return {
@@ -88,7 +94,7 @@ export default {
       this.loading = true
       this.btnExist = false
       const config = {
-        url: this.addUpdateForm.id ? '/sysDict/update' : '/sysDict/add',
+        url: this.addUpdateForm.id ? this.updateUrl : this.addUrl,
         method: 'post',
         data: this.addUpdateForm
       }
diff --git a/src/views/sys/dict/index.vue b/src/views/sys/dict/index.vue
index 7c6a4149bbcdccd1d526d6146b50bb29dd54994b..acb5aada3afc143e141b856eb024c9918f514718 100644
--- a/src/views/sys/dict/index.vue
+++ b/src/views/sys/dict/index.vue
@@ -1,6 +1,6 @@
 /* 系统字典页面 */
 <template>
-  <zero-container>
+  <zero-container :loading="dataListLoading">
     <!-- 左边信息-start -->
     <div slot="aside">
       <TreeSide @sysDictFun="sysDictFun"
@@ -16,7 +16,6 @@
                 ref="xGrid"
                 id="xGrid"
                 height="auto"
-                :loading="dataListLoading"
                 :columns="tableColumn"
                 :toolbar="{
           zoom: true,
@@ -35,38 +34,45 @@
                 @checkbox-change="dataListCheckboxChangeHandle"
                 @checkbox-all="dataListCheckboxChangeHandle">
         <template v-slot:toolbar_buttons>
-          <vxe-button status="warning"
-                      transfer
-                      :style="{'margin-right': '10px'}">
-            <template #default>操作</template>
-            <template #dropdowns>
-              <vxe-button type="text"
-                          :disabled="addBtnDisabled"
-                          @click="insertEvent()">新增</vxe-button>
-              <vxe-button :disabled="batchBtnDisabled"
-                          type="text"
-                          @click="deleteHandle(null, null, 'xGrid')">批量删除</vxe-button>
-            </template>
-          </vxe-button>
+          <el-button v-if="$hasPermission(mixinViewModuleOptions.addUrl)"
+                     :disabled="addBtnDisabled"
+                     type="primary"
+                     @click="insertEvent()"
+                     size="small">
+            新增
+          </el-button>
+          <el-button v-if="$hasPermission(mixinViewModuleOptions.deleteUrl)"
+                     type="danger"
+                     @click="deleteHandle(null, null, 'xGrid')"
+                     :disabled="batchBtnDisabled"
+                     size="small">
+            批量删除
+          </el-button>
         </template>
         <template v-slot:operate="{ row }">
           <template v-if="$refs.xGrid.isActiveByRow(row)">
-            <vxe-button icon="fa fa-save"
+            <vxe-button v-if="$hasPermission(mixinViewModuleOptions.addUrl)"
+                        icon="fa fa-save"
                         status="primary"
                         title="保存"
                         circle
-                        @click="saveRowEvent(row)"></vxe-button>
+                        @click="saveRowEvent(row)"
+                        size="small"></vxe-button>
           </template>
           <template v-else>
-            <vxe-button icon="fa fa-edit"
+            <vxe-button v-if="$hasPermission(mixinViewModuleOptions.updateUrl)"
+                        icon="fa fa-edit"
                         title="编辑"
                         circle
-                        @click="editRowEvent(row)"></vxe-button>
+                        @click="editRowEvent(row)"
+                        size="small"></vxe-button>
           </template>
-          <vxe-button icon="fa fa-trash"
+          <vxe-button v-if="$hasPermission(mixinViewModuleOptions.deleteUrl)"
+                      icon="fa fa-trash"
                       title="删除"
                       circle
-                      @click="deleteHandle(row, row.name, 'xGrid')"></vxe-button>
+                      @click="deleteHandle(row, row.name, 'xGrid')"
+                      size="small"></vxe-button>
         </template>
       </vxe-grid>
     </div>
@@ -88,12 +94,13 @@ export default {
       mixinViewModuleOptions: {
         isPage: false, // 不分页
         getDataListUrl: '/sysDictDetails/list',
+        addUrl: '/sysDictDetails/add',
+        updateUrl: '/sysDictDetails/update',
         deleteUrl: '/sysDictDetails/del',
         exportUrl: '/sysDictDetails/export',
-        executeGetData: false
+        activatedIsNeed: false,
+        el_table: false
       },
-      addUrl: '/sysDictDetails/add',
-      updateUrl: '/sysDictDetails/update',
       addBtnDisabled: true,
       // 列信息
       tableColumn: [
@@ -102,7 +109,7 @@ export default {
         { field: 'name', title: '名称', width: 100, editRender: { name: 'input' } },
         { field: 'sort', title: '排序', width: 80, editRender: { name: 'input' } },
         { field: 'value', title: '值', width: 100, editRender: { name: 'input' } },
-        { field: 'createTime', title: '创建时间', width: 150, formatter: this.dateFormat },
+        { field: 'createTime', title: '创建时间', width: 150, formatter: this.vxe_dateFormat },
         { field: 'remarks', title: '备注', editRender: { name: 'input' } },
         { title: '操作', width: 110, slots: { default: 'operate' } }
       ],
@@ -126,7 +133,7 @@ export default {
     sysDictFun (code) {
       if (code) {
         this.addBtnDisabled = false
-        this.mixinViewModuleOptions.executeGetData = true
+        this.mixinViewModuleOptions.activatedIsNeed = true
         this.searchForm.dictCode = code
         this.getDataList()
       } else {
diff --git a/src/views/sys/log/components/Drawer.vue b/src/views/sys/log/components/Drawer.vue
index 390e32dd93ec2a65b73ad8090e0478fa78a340c4..44852d40ce22bb2813ee429bcd5cb7176f00e281 100644
--- a/src/views/sys/log/components/Drawer.vue
+++ b/src/views/sys/log/components/Drawer.vue
@@ -1,15 +1,13 @@
 <template>
-  <el-drawer title="日志详情" :visible.sync="drawerSync" direction="ltr">
-    <el-form label-width="120px">
-      <el-form-item label="请求方法：">{{method}}</el-form-item>
-      <el-form-item label="浏览器信息：">
-        <json-viewer :value="browser" :expand-depth="10" copyable boxed></json-viewer>
-      </el-form-item>
-      <el-form-item label="内容信息：">
-        <json-viewer :value="data" :expand-depth="10" copyable boxed></json-viewer>
-      </el-form-item>
-    </el-form>
-  </el-drawer>
+   <zero-dialog :showDialog.sync="drawerSync"
+               :fullscreen.sync="fullscreen"
+               title="日志详情">
+      <el-form label-width="120px" slot="body">
+        <el-form-item label="内容信息：">
+          <json-viewer :value="data" :expand-depth="10" copyable boxed sort></json-viewer>
+        </el-form-item>
+      </el-form>
+  </zero-dialog>
 </template>
 
 <script>
@@ -18,7 +16,7 @@ export default {
   data () {
     return {
       drawerSync: false,
-      method: '',
+      fullscreen: false,
       browser: '',
       data: ''
     }
@@ -27,8 +25,6 @@ export default {
   methods: {
     initDrawer (row) {
       this.drawerSync = true
-      this.method = row.method
-      this.browser = JSON.parse(row.browser)
       this.data = JSON.parse(row.data)
     }
   }
diff --git a/src/views/sys/log/index.vue b/src/views/sys/log/index.vue
index 270bd2a9bc6ab6fec363b0e90c836988aadc4898..0d833851a36e4b3aac788e712e391b00643dc337 100644
--- a/src/views/sys/log/index.vue
+++ b/src/views/sys/log/index.vue
@@ -1,107 +1,163 @@
 <template>
-  <zero-container>
+  <zero-container v-loading="dataListLoading">
     <!-- 右边信息-start -->
-    <div slot="main" style="height: 100%">
-      <vxe-grid
-        border
-        resizable
-        ref="xGrid"
-        id="xGrid"
-        height="auto"
-        :loading="dataListLoading"
-        :columns="tableColumn"
-        :data="dataList"
-        :custom-config="{ storage: true }"
-        :row-class-name="tableRowClassName"
-        :toolbar-config="{
-          zoom: true,
-          custom: true,
-          slots: { buttons: 'toolbar_buttons' },
-        }"
-      >
-        <template #toolbar_buttons>
-          <vxe-form :inline="true" :model="searchForm">
-            <vxe-form-item title="标题">
-              <vxe-input
-                v-model="searchForm.title"
-                clearable
-                class="zero-search-vxe-input"
-              />
-            </vxe-form-item>
-            <vxe-form-item title="操作">
-              <vxe-input
-                v-model="searchForm.operation"
-                clearable
-                class="zero-search-vxe-input"
-              />
-            </vxe-form-item>
-            <vxe-form-item title="用户名">
-              <vxe-input
-                v-model="searchForm.username"
-                clearable
-                class="zero-search-vxe-input"
-              />
-            </vxe-form-item>
-            <vxe-form-item title="IP">
-              <vxe-input
-                v-model="searchForm.ip"
-                clearable
-                class="zero-search-vxe-input"
-              />
-            </vxe-form-item>
-            <vxe-form-item title="等级">
-              <vxe-select
-                v-model="searchForm.level"
-                clearable
-                class="zero-search-vxe-input"
-              >
-                <vxe-option key="INFO" value="INFO" label="正常"></vxe-option>
-                <vxe-option key="WARN" value="WARN" label="警告"></vxe-option>
-                <vxe-option key="ERROR" value="ERROR" label="异常"></vxe-option>
-              </vxe-select>
-            </vxe-form-item>
-            <vxe-form-item>
-              <vxe-button
-                title="查询"
-                status="primary"
-                icon="el-icon-search"
-                @click="getDataList()"
-                circle
-              ></vxe-button>
-              <vxe-button
-                title="重置查询"
-                icon="el-icon-refresh"
-                @click="searchResetForm('xGrid')"
-                circle
-              >
-              </vxe-button>
-            </vxe-form-item>
-          </vxe-form>
-        </template>
-        <template v-slot:operate="{ row }">
-          <el-button
-            icon="el-icon-search"
-            title="查看详情"
-            circle
-            @click="viewDetails(row)"
-          />
-        </template>
-      </vxe-grid>
+    <div slot="tool">
+      <el-collapse-transition>
+        <div v-show="showSearch">
+          <el-form :inline="true"
+                   :model="searchForm">
+            <el-form-item label="标题">
+              <el-input v-model="searchForm.title"
+                        clearable
+                        size="small" />
+            </el-form-item>
+            <el-form-item label="操作">
+              <el-input v-model="searchForm.operation"
+                        clearable
+                        size="small" />
+            </el-form-item>
+            <el-form-item label="用户名">
+              <el-input v-model="searchForm.username"
+                        clearable
+                        size="small" />
+            </el-form-item>
+            <el-form-item label="请求地址">
+              <el-input v-model="searchForm.requestAddress"
+                        clearable
+                        size="small" />
+            </el-form-item>
+            <el-form-item label="等级">
+              <el-select v-model="searchForm.level"
+                         clearable
+                         size="small">
+                <el-option key="INFO"
+                           value="INFO"
+                           label="正常" />
+                <el-option key="WARN"
+                           value="WARN"
+                           label="警告" />
+                <el-option key="ERROR"
+                           value="ERROR"
+                           label="异常" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="内容信息">
+              <el-input v-model="searchForm.data"
+                        clearable
+                        size="small" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="success"
+                         icon="el-icon-search"
+                         @click="getDataList()"
+                         round
+                         size="small">搜索</el-button>
+              <el-button icon="el-icon-refresh"
+                         type="warning"
+                         @click="searchResetForm()"
+                         round
+                         size="small">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-collapse-transition>
+
+      <el-button-group style="float: right;">
+        <el-button @click="showSearch = !showSearch"
+                   title="显示/隐藏搜索"
+                   icon="fa fa-search"
+                   size="small" />
+        <el-dropdown trigger="click"
+                     :hide-on-click="false">
+          <el-button title="列"
+                     icon="fa fa-th"
+                     class="zero-column-dropdown"
+                     size="small" />
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item key="all"
+                              label="all">
+              <el-checkbox key="all"
+                           v-model="cloumn_all_checked"
+                           v-on:click.stop.native
+                           label="all"
+                           @change="cloumnAllChecked">全选</el-checkbox>
+            </el-dropdown-item>
+            <hr />
+            <el-checkbox-group v-model="checkedTableColumns">
+              <el-dropdown-item v-for="(column,i) in showColumns"
+                                :key="i"
+                                :label="i">
+                <el-checkbox :key="i"
+                             :label="i">{{ column.label }}</el-checkbox>
+              </el-dropdown-item>
+            </el-checkbox-group>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </el-button-group>
+    </div>
+    <div slot="main"
+         style="height: 100%">
+      <el-table ref="tableRef"
+                height="100%"
+                :data="dataList"
+                :row-class-name="tableRowClassName"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                @sort-change="dataListSortChangeHandle"
+                class="zero-table"
+                style="width: 100%">
+        <el-table-column v-if="showColumns.title.show"
+                         prop="title"
+                         label="标题"
+                         align="center" />
+        <el-table-column v-if="showColumns.operation.show"
+                         prop="operation"
+                         label="操作内容"
+                         align="center" />
+        <el-table-column v-if="showColumns.username.show"
+                         prop="username"
+                         label="用户名称"
+                         align="center" />
+        <el-table-column v-if="showColumns.level.show"
+                         prop="level"
+                         label="等级"
+                         align="center" />
+        <el-table-column v-if="showColumns.requestAddress.show"
+                         prop="requestAddress"
+                         label="请求地址"
+                         align="center" />
+        <el-table-column v-if="showColumns.method.show"
+                         prop="method"
+                         label="请求方法"
+                         align="center" />
+        <el-table-column v-if="showColumns.createTime.show"
+                         prop="createTime"
+                         label="创建时间"
+                         align="center"
+                         width="180"
+                         :formatter="dateFormat" />
+        <el-table-column label="操作"
+                         align="center"
+                         width="150">
+          <template slot-scope="scope">
+            <el-button type="text"
+                       @click="viewDetails(scope.row)">查看详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
       <!-- 详情框 -->
       <Drawer ref="drawerRef" />
     </div>
     <!-- 右边信息-end -->
     <!-- 页脚-start -->
     <div slot="footer">
-      <vxe-pager
-        border
-        align="left"
-        :current-page="page"
-        :page-size="limit"
-        :total="total"
-        :layouts="layouts"
-        @page-change="handlePageChange"
-      />
+      <vxe-pager border
+                 align="left"
+                 :current-page="page"
+                 :page-size="limit"
+                 :total="total"
+                 :layouts="layouts"
+                 @page-change="handlePageChange" />
     </div>
     <!-- 页脚-end -->
   </zero-container>
@@ -139,18 +195,15 @@ export default {
           }
         ]
       },
-      // 列信息
-      tableColumn: [
-        { field: 'title', title: '标题', width: 120 },
-        { field: 'operation', title: '操作', width: 70 },
-        { field: 'username', title: '用户名称', width: 80 },
-        { field: 'level', title: '等级', width: 70 },
-        { field: 'mode', title: '请求方式', width: 80 },
-        { field: 'ip', title: 'IP地址', width: 120 },
-        { field: 'path', title: '接口路径' },
-        { field: 'createTime', title: '创建时间', formatter: this.dateFormat },
-        { title: '操作', width: 65, slots: { default: 'operate' } }
-      ]
+      showColumns: {
+        title: { label: '标题', show: true },
+        operation: { label: '操作内容', show: true },
+        username: { label: '用户名称', show: true },
+        level: { label: '等级', show: true },
+        requestAddress: { label: '请求地址', show: true },
+        method: { label: '请求方法', show: true },
+        createTime: { label: '创建时间', show: true }
+      }
     }
   },
   methods: {
diff --git a/src/views/sys/login/index.vue b/src/views/sys/login/index.vue
index e4b08ea457c911dda8de3adc117484132888b941..e13318db62a4120526c6946a384f78bb628eb5ac 100644
--- a/src/views/sys/login/index.vue
+++ b/src/views/sys/login/index.vue
@@ -3,98 +3,84 @@
   <div class="page-login">
     <div class="page-login--layer page-login--layer-area">
       <ul class="circles">
-        <li v-for="n in 10" :key="n"></li>
+        <li v-for="n in 10"
+            :key="n"></li>
       </ul>
     </div>
     <div class="page-login--layer">
-      <div
-        class="page-login--content"
-        flex="dir:top main:justify cross:stretch box:justify"
-      >
+      <div class="page-login--content"
+           flex="dir:top main:justify cross:stretch box:justify">
         <div class="page-login--content-header">
           <p class="page-login--content-header-motto">
             时间是一切财富中最宝贵的财富
           </p>
         </div>
-        <div
-          class="page-login--content-main"
-          flex="dir:top main:center cross:center"
-        >
+        <div class="page-login--content-main"
+             flex="dir:top main:center cross:center">
           <!-- logo -->
-          <img
-            class="page-login--logo"
-            src="@/assets/images/login/logo@2x.png"
-          />
+          <img class="page-login--logo"
+               src="@/assets/images/login/logo@2x.png" />
           <!-- form -->
           <div class="page-login--form">
             <el-card shadow="never">
-              <el-form
-                ref="loginForm"
-                label-position="top"
-                :rules="rules"
-                :model="formLogin"
-                size="default"
-              >
+              <el-form ref="loginForm"
+                       label-position="top"
+                       :rules="rules"
+                       :model="formLogin"
+                       size="default">
                 <el-form-item prop="username">
-                  <el-input
-                    type="text"
-                    v-model="formLogin.username"
-                    placeholder="用户名"
-                    @keyup.enter.native="submit"
-                  >
-                    <i slot="prepend" class="fa fa-user-circle-o"></i>
+                  <el-input type="text"
+                            v-model="formLogin.username"
+                            placeholder="用户名"
+                            @keyup.enter.native="submit">
+                    <i slot="prepend"
+                       class="fa fa-user-circle-o"></i>
                   </el-input>
                 </el-form-item>
                 <el-form-item prop="password">
-                  <el-input
-                    type="password"
-                    v-model="formLogin.password"
-                    placeholder="密码"
-                    @keyup.enter.native="submit"
-                  >
-                    <i slot="prepend" class="fa fa-keyboard-o"></i>
+                  <el-input type="password"
+                            v-model="formLogin.password"
+                            placeholder="密码"
+                            @keyup.enter.native="submit">
+                    <i slot="prepend"
+                       class="fa fa-keyboard-o"></i>
                   </el-input>
                 </el-form-item>
                 <el-form-item prop="code">
-                  <el-input
-                    type="text"
-                    v-model="formLogin.code"
-                    placeholder="验证码"
-                    @keyup.enter.native="submit"
-                  >
+                  <el-input type="text"
+                            v-model="formLogin.code"
+                            placeholder="验证码"
+                            @keyup.enter.native="submit">
                     <template slot="append">
-                      <img
-                        :src="imgCode"
-                        class="login-code"
-                        @click="refreshCode"
-                      />
+                      <img :src="imgCode"
+                           class="login-code"
+                           @click="refreshCode" />
                     </template>
                   </el-input>
                 </el-form-item>
-                <el-button
-                  :loading="loading"
-                  size="default"
-                  @click="submit"
-                  type="primary"
-                  class="button-login"
-                >
+                <el-button :loading="loading"
+                           size="default"
+                           @click="submit"
+                           type="primary"
+                           class="button-login">
                   登录
                 </el-button>
               </el-form>
             </el-card>
-            <p class="page-login--options" flex="main:justify cross:center">
-              <span><zero-icon name="question-circle" /> 忘记密码</span>
+            <p class="page-login--options"
+               flex="main:justify cross:center">
+              <span>
+                <zero-icon name="question-circle" /> 忘记密码
+              </span>
               <span>注册用户</span>
             </p>
           </div>
         </div>
         <div class="page-login--content-footer">
           <p class="page-login--content-footer-locales">
-            <a
-              v-for="language in $languages"
-              :key="language.value"
-              @click="onChangeLocale(language.value)"
-            >
+            <a v-for="language in $languages"
+               :key="language.value"
+               @click="onChangeLocale(language.value)">
               {{ language.label }}
             </a>
           </p>
@@ -132,8 +118,8 @@ export default {
       redisKey: '',
       // 表单
       formLogin: {
-        username: process.env.username,
-        password: process.env.password,
+        username: process.env.VUE_APP_USERNAME,
+        password: process.env.VUE_APP_USERNAME,
         code: ''
       },
       // 表单校验
diff --git a/src/views/sys/power/components/AddUpdateForm.vue b/src/views/sys/power/components/AddUpdateForm.vue
index 02aab981b9b33c0c92622c657c40d3edf580c833..034b1d8a9883e82f746642b2cbf19076542f4803 100644
--- a/src/views/sys/power/components/AddUpdateForm.vue
+++ b/src/views/sys/power/components/AddUpdateForm.vue
@@ -1,13 +1,12 @@
 <template>
-  <zero-dialog :addUpdateFormVisible.sync="addUpdateFormVisible"
+  <zero-dialog :showDialog.sync="addUpdateFormVisible"
                :fullscreen.sync="fullscreen"
                :btnExist="btnExist"
                :loading="loading"
                :title="title"
-               :addOrupdate="addOrupdate">
+               :submit="addOrupdate">
 
-    <div slot="body"
-         style="height:220px">
+    <div slot="body">
       <el-form :model="addUpdateForm"
                :rules="rules"
                label-width="80px"
@@ -41,7 +40,8 @@
         </el-row>
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item prop="parentId"
+            <el-form-item v-if="parentIdExist"
+                          prop="parentId"
                           label="上级">
               <el-cascader ref="parentRef"
                            v-model="addUpdateForm.parentId"
@@ -54,11 +54,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="排序">
-              <el-input-number v-model="addUpdateForm.sort"
-                               controls-position="right"
-                               :min="0"
-                               style="width: 100%" />
+            <el-form-item v-if="urlExist"
+                          prop="url"
+                          label="接口地址">
+              <el-input v-model.trim="addUpdateForm.url"
+                        placeholder="请输入接口地址" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -84,7 +84,17 @@
             </el-form-item>
           </el-col>
         </el-row>
+
         <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="排序">
+              <el-input-number v-model="addUpdateForm.sort"
+                               controls-position="right"
+                               :min="0"
+                               style="width: 100%" />
+            </el-form-item>
+          </el-col>
+
           <el-col :span="12">
             <el-form-item v-if="iconExist"
                           label="图标">
@@ -92,14 +102,6 @@
                              :options="{ FontAwesome: true, ElementUI: true }" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item v-if="urlExist"
-                          prop="url"
-                          label="接口地址">
-              <el-input v-model.trim="addUpdateForm.url"
-                        placeholder="请输入接口地址" />
-            </el-form-item>
-          </el-col>
         </el-row>
 
         <el-form-item label="备注">
@@ -116,7 +118,8 @@
 export default {
   name: 'AddUpdateForm',
   props: {
-    dictDetails: Object,
+    addUrl: String,
+    updateUrl: String,
     getDataList: {
       type: Function,
       default: null
@@ -139,7 +142,8 @@ export default {
       parentOptions: [],
       iconExist: true,
       urlExist: false,
-      pathExist: false,
+      pathExist: true,
+      parentIdExist: false,
       rules: {
         name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
         type: [{ required: true, message: '请选择类型', trigger: 'blur' }],
@@ -157,6 +161,7 @@ export default {
           this.iconExist = true
           this.urlExist = false
           this.pathExist = false
+          this.parentIdExist = false
           if (this.$refs.addUpdateFormRef) {
             this.$refs.addUpdateFormRef.clearValidate('parentId')
             this.rules.parentId[0].required = false
@@ -166,6 +171,7 @@ export default {
           this.iconExist = true
           this.urlExist = false
           this.pathExist = true
+          this.parentIdExist = true
           if (this.$refs.addUpdateFormRef) {
             this.$refs.addUpdateFormRef.clearValidate('parentId')
             this.rules.parentId[0].required = false
@@ -175,6 +181,7 @@ export default {
           this.iconExist = false
           this.urlExist = true
           this.pathExist = false
+          this.parentIdExist = true
           this.rules.parentId[0].required = true
           break
       }
@@ -205,6 +212,7 @@ export default {
         if (copy) {
           delete this.addUpdateForm.id
           this.title = '复制权限'
+          this.addUpdateForm.sort = this.addUpdateForm.sort + 1
         } else {
           this.title = '修改权限'
         }
@@ -237,7 +245,7 @@ export default {
           this.loading = true
           this.btnExist = false
           const config = {
-            url: this.addUpdateForm.id ? 'sysPower/update' : 'sysPower/add',
+            url: this.addUpdateForm.id ? this.updateUrl : this.addUrl,
             method: 'post',
             data: this.addUpdateForm
           }
diff --git a/src/views/sys/power/index.vue b/src/views/sys/power/index.vue
index 21fd9381fc85e433099531bbff4c1abb2486522a..100eacd1259dd38b60f1291b6899061d56d79be1 100644
--- a/src/views/sys/power/index.vue
+++ b/src/views/sys/power/index.vue
@@ -1,72 +1,100 @@
 /* 系统权限页面 */
 <template>
-  <zero-container>
+  <zero-container v-loading="dataListLoading">
+    <div slot="tool">
+      <el-button v-if="$hasPermission(mixinViewModuleOptions.addUrl)"
+                 type="primary"
+                 @click="initDialog('addUpdateDialogRef')"
+                 size="small">新增</el-button>
+    </div>
     <!-- 右边信息-start -->
     <div slot="main"
          style="height: 100%">
-      <vxe-grid border
-                resizable
-                ref="xGrid"
-                id="xGrid"
-                height="auto"
-                :tree-config="{ children: 'children' }"
-                :loading="dataListLoading"
-                :columns="tableColumn"
-                :toolbar="{
-          zoom: true,
-          custom: true,
-          slots: { buttons: 'toolbar_buttons' },
-        }"
+      <el-table ref="tableRef"
+                height="100%"
+                row-key="id"
                 :data="dataList"
-                :custom-config="{ storage: true }"
-                @checkbox-change="dataListCheckboxChangeHandle"
-                @checkbox-all="dataListCheckboxChangeHandle">
-        <template v-slot:toolbar_buttons>
-          <el-button type="primary"
-                     @click="initDialog('addUpdateDialogRef')">
-            新增
-          </el-button>
-        </template>
-        <!--自定义插槽-->
-        <template v-slot:path_default="{ row }">
-          <span v-if="row.cache ==='F'">{{ row.path }}</span>
-          <el-tooltip v-else
-                      :hide-after="1000"
-                      content="缓存页面"
-                      placement="top"
-                      class="page-refresh">
-            <span style="color: red">{{ row.path }}</span>
-          </el-tooltip>
-        </template>
-        <template v-slot:icon_default="{ row }">
-          <i :class="row.icon"></i>
-        </template>
-        <template v-slot:type_default="{ row }">
-          <el-tag v-if="row.type == 'CATALOG'"
-                  type="success"> 目录 </el-tag>
-          <el-tag v-else-if="row.type == 'MENU'"
-                  type="info"> 菜单 </el-tag>
-          <el-tag v-else
-                  type="danger"> 权限 </el-tag>
-        </template>
-        <template v-slot:operate="{ row }">
-          <el-button icon="el-icon-document-copy"
-                     title="复制"
-                     circle
-                     @click="initDialog('addUpdateDialogRef', row, true)" />
-          <el-button icon="fa fa-edit"
-                     title="修改"
-                     circle
-                     @click="initDialog('addUpdateDialogRef', row)" />
-          <el-button icon="fa fa-trash"
-                     title="删除"
-                     circle
-                     @click="deleteHandle(row, row.name)" />
-        </template>
-      </vxe-grid>
+                border
+                style="width: 100%"
+                :tree-props="{children: 'children'}"
+                @row-dblclick="rowDblclick">
+        <el-table-column prop="name"
+                         label="名称"
+                         min-width="120" />
+        <el-table-column prop="path"
+                         label="资源路径"
+                         min-width="100">
+          <template slot-scope="scope">
+            <span v-if="scope.row.cache ==='F'">{{ scope.row.path }}</span>
+            <el-tooltip v-else
+                        :hide-after="1000"
+                        content="缓存页面"
+                        placement="top"
+                        show-overflow-tooltip>
+              <span style="color: red">{{ scope.row.path }}</span>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+        <el-table-column prop="url"
+                         label="接口地址"
+                         min-width="150" />
+        <el-table-column prop="sort"
+                         label="排序"
+                         align="center"
+                         min-width="40" />
+        <el-table-column prop="icon"
+                         label="图标"
+                         align="center"
+                         min-width="40">
+          <template slot-scope="scope">
+            <i :class="scope.row.icon"></i>
+          </template>
+        </el-table-column>
+        <el-table-column prop="type"
+                         label="类型"
+                         align="center"
+                         min-width="60">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.type == 'CATALOG'"
+                    type="success"> 目录 </el-tag>
+            <el-tag v-else-if="scope.row.type == 'MENU'"
+                    type="info"> 菜单 </el-tag>
+            <el-tag v-else
+                    type="danger"> 权限 </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime"
+                         label="创建时间"
+                         show-overflow-tooltip
+                         min-width="180"
+                         :formatter="dateFormat" />
+        <el-table-column prop="remarks"
+                         label="备注"
+                         show-overflow-tooltip />
+        <el-table-column label="操作"
+                         header-align="center"
+                         fixed="right"
+                         width="220">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission(mixinViewModuleOptions.addUrl)"
+                       type="primary"
+                       size="mini"
+                       @click="initDialog('addUpdateDialogRef',scope.row,true)">复制</el-button>
+            <el-button v-if="$hasPermission(mixinViewModuleOptions.updateUrl)"
+                       type="warning"
+                       size="mini"
+                       @click="initDialog('addUpdateDialogRef',scope.row)">修改</el-button>
+            <el-button v-if="$hasPermission(mixinViewModuleOptions.deleteUrl)"
+                       type="danger"
+                       size="mini"
+                       @click="deleteHandle(scope.row,scope.row.name)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
       <!-- 新增修改弹框 -->
       <AddUpdateForm ref="addUpdateDialogRef"
-                     :dict-details="dictDetails"
+                     :addUrl="mixinViewModuleOptions.addUrl"
+                     :updateUrl="mixinViewModuleOptions.updateUrl"
                      :getDataList="getDataList" />
     </div>
     <!-- 右边信息-end -->
@@ -88,20 +116,20 @@ export default {
         isPage: false,
         getDataListUrl: '/sysPower/tree',
         deleteUrl: '/sysPower/del',
+        addUrl: '/sysPower/add',
+        updateUrl: '/sysPower/update',
         exportUrl: '/sysPower/export'
-      },
-      // 列信息
-      tableColumn: [
-        { field: 'name', title: '名称', width: 150, treeNode: true },
-        { field: 'path', title: '资源路径', slots: { default: 'path_default' } },
-        { field: 'url', title: '接口地址' },
-        { field: 'sort', title: '排序', width: 30 },
-        { field: 'icon', title: '图标', width: 35, slots: { default: 'icon_default' } },
-        { field: 'type', title: '类型', width: 70, slots: { default: 'type_default' } },
-        { field: 'createTime', title: '创建时间', width: 150, formatter: this.dateFormat },
-        { field: 'remarks', title: '备注' },
-        { title: '操作', width: 200, slots: { default: 'operate' } }
-      ]
+      }
+      // showColumns: {
+      //   name: { label: '名称', show: true },
+      //   path: { label: '资源路径', show: true },
+      //   url: { label: '接口地址', show: true },
+      //   sort: { label: '排序', show: true },
+      //   icon: { label: '图标', show: true },
+      //   type: { label: '类型', show: true },
+      //   createTime: { label: '创建时间', show: false },
+      //   remarks: { label: '备注', show: true }
+      // }
     }
   },
   methods: {
diff --git a/src/views/sys/role/components/AddUpdateForm.vue b/src/views/sys/role/components/AddUpdateForm.vue
index 59167a3a97f3f5cbc28abe1a270555c9caf5f71d..2840c3c158fe7f825b22cce99ffc4b7378b5a680 100644
--- a/src/views/sys/role/components/AddUpdateForm.vue
+++ b/src/views/sys/role/components/AddUpdateForm.vue
@@ -1,10 +1,10 @@
 <template>
-  <zero-dialog :addUpdateFormVisible.sync="addUpdateFormVisible"
+  <zero-dialog :showDialog.sync="addUpdateFormVisible"
                :fullscreen.sync="fullscreen"
                :btnExist="btnExist"
                :loading="loading"
                :title="title"
-               :addOrupdate="addOrupdate">
+               :submit="addOrupdate">
     <div slot="body"
          style="height:450px">
       <el-form :model="addUpdateForm"
@@ -62,7 +62,8 @@ export default {
     PowerTree
   },
   props: {
-    dictDetails: Object,
+    addUrl: String,
+    updateUrl: String,
     getDataList: {
       type: Function,
       default: null
@@ -123,7 +124,7 @@ export default {
             return { id: it }
           })
           const config = {
-            url: this.addUpdateForm.id ? 'sysRole/update' : 'sysRole/add',
+            url: this.addUpdateForm.id ? this.updateUrl : this.addUrl,
             method: 'post',
             data: this.addUpdateForm
           }
diff --git a/src/views/sys/role/index.vue b/src/views/sys/role/index.vue
index 5fcb87cd8a78868dc2ded6e75d44ddeac502641a..34d5a3f30e0676baff394bad06ac993103fbe70e 100644
--- a/src/views/sys/role/index.vue
+++ b/src/views/sys/role/index.vue
@@ -1,79 +1,154 @@
 /* 系统角色页面 */
 <template>
-  <zero-container>
+  <zero-container v-loading="dataListLoading">
     <!-- 头部信息-start -->
     <!-- 右边信息-start -->
+    <div slot="tool">
+      <el-collapse-transition>
+        <div v-show="showSearch">
+          <el-form :inline="true"
+                   :model="searchForm">
+            <el-form-item label="角色名称">
+              <el-input v-model="searchForm.name"
+                        clearable
+                        size="small" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="success"
+                         icon="el-icon-search"
+                         @click="getDataList()"
+                         round
+                         size="small">搜索</el-button>
+              <el-button icon="el-icon-refresh"
+                         type="warning"
+                         @click="searchResetForm()"
+                         round
+                         size="small">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-collapse-transition>
+
+      <el-button v-if="$hasPermission(mixinViewModuleOptions.addUrl)"
+                 type="primary"
+                 @click="initDialog('addUpdateDialogRef')"
+                 size="small">新增</el-button>
+      <el-button v-if="$hasPermission(mixinViewModuleOptions.deleteUrl)"
+                 type="danger"
+                 @click="deleteHandle()"
+                 :disabled="batchBtnDisabled"
+                 size="small">批量删除</el-button>
+      <el-button-group style="float: right;">
+        <el-button @click="showSearch = !showSearch"
+                   title="显示/隐藏搜索"
+                   icon="fa fa-search"
+                   size="small" />
+        <el-dropdown trigger="click"
+                     :hide-on-click="false">
+          <el-button title="列"
+                     icon="fa fa-th"
+                     class="zero-column-dropdown"
+                     size="small" />
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item key="all"
+                              label="all">
+              <el-checkbox key="all"
+                           v-model="cloumn_all_checked"
+                           v-on:click.stop.native
+                           label="all"
+                           @change="cloumnAllChecked">全选</el-checkbox>
+            </el-dropdown-item>
+            <hr />
+            <el-checkbox-group v-model="checkedTableColumns">
+              <el-dropdown-item v-for="(column,i) in showColumns"
+                                :key="i"
+                                :label="i">
+                <el-checkbox :key="i"
+                             :label="i">{{ column.label }}</el-checkbox>
+              </el-dropdown-item>
+            </el-checkbox-group>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </el-button-group>
+    </div>
     <div slot="main"
          style="height: 100%">
-      <vxe-grid border
-                resizable
-                ref="xGrid"
-                id="xGrid"
-                height="auto"
-                :loading="dataListLoading"
-                :columns="tableColumn"
-                :toolbar="{
-          zoom: true,
-          custom: true,
-          slots: { buttons: 'toolbar_buttons' },
-        }"
+      <el-table :ref="ref"
+                height="100%"
+                border
                 :data="dataList"
-                :custom-config="{ storage: true }"
-                @checkbox-change="dataListCheckboxChangeHandle"
-                @checkbox-all="dataListCheckboxChangeHandle">
-        <template v-slot:toolbar_buttons>
-          <vxe-form :inline="true"
-                    :model="searchForm">
-            <el-dropdown :style="{'margin-right': '10px'}">
-              <el-button type="primary">
-                操作<i class="el-icon-arrow-down el-icon--right"></i>
-              </el-button>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item icon="el-icon-plus"
-                                  @click.native="initDialog('addUpdateDialogRef')">新增</el-dropdown-item>
-                <el-dropdown-item icon="fa fa-trash"
-                                  @click="deleteHandle()"
-                                  :disabled="batchBtnDisabled">批量删除</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-            <vxe-form-item title="用户账号">
-              <vxe-input v-model="searchForm.name"
-                         clearable
-                         class="zero-search-vxe-input" />
-            </vxe-form-item>
-            <vxe-form-item>
-              <vxe-button title="查询"
-                          status="primary"
-                          @click="getDataList()">查询</vxe-button>
-              <vxe-button title="重置查询"
-                          @click="searchResetForm('xGrid')">重置 </vxe-button>
-            </vxe-form-item>
-          </vxe-form>
-        </template>
-        <!--自定义插槽 state-->
-        <template v-slot:state_default="{ row }">
-          <el-tooltip :content="row.state==='ENABLE'?'点击禁用':'点击启用'"
-                      placement="top">
-            <el-switch v-model="row.state"
-                       active-value="ENABLE"
-                       inactive-value="DISABLE"
-                       @change="changeState(row)" />
-          </el-tooltip>
-        </template>
-        <template v-slot:operate="{ row }">
-          <el-button icon="fa fa-edit"
-                     title="修改"
-                     circle
-                     @click="initDialog('addUpdateDialogRef', row)" />
-          <el-button icon="fa fa-trash"
-                     title="删除"
-                     circle
-                     @click="deleteHandle(row, row.name)" />
-        </template>
-      </vxe-grid>
+                @selection-change="dataListSelectionChangeHandle"
+                @sort-change="dataListSortChangeHandle"
+                style="width: 100%">
+        <el-table-column type="selection"
+                         header-align="center"
+                         align="center"
+                         width="50" />
+        <el-table-column v-if="showColumns.name.show"
+                         prop="name"
+                         label="角色名称"
+                         sortable="custom"
+                         header-align="center"
+                         align="center" />
+        <!-- 状态特殊处理 -->
+        <el-table-column v-if="showColumns.state.show"
+                         prop="state"
+                         label="角色状态"
+                         sortable="custom"
+                         header-align="center"
+                         align="center">
+          <template slot-scope="scope">
+            <el-tooltip :content="scope.row.state==='ENABLE'?'点击禁用':'点击启用'"
+                        placement="top">
+              <el-switch v-model="scope.row.state"
+                         active-value="ENABLE"
+                         inactive-value="DISABLE"
+                         @change="changeState(scope.row)" />
+            </el-tooltip>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showColumns.createTime.show"
+                         prop="createTime"
+                         label="创建时间"
+                         sortable="custom"
+                         header-align="center"
+                         align="center"
+                         min-width="180"
+                         :formatter="dateFormat" />
+        <el-table-column v-if="showColumns.updateTime.show"
+                         prop="updateTime"
+                         label="修改时间"
+                         sortable="custom"
+                         header-align="center"
+                         align="center"
+                         min-width="180"
+                         :formatter="dateFormat" />
+        <el-table-column v-if="showColumns.remarks.show"
+                         prop="remarks"
+                         label="备注"
+                         header-align="center"
+                         align="center" />
+        <el-table-column v-if="$hasPermission(mixinViewModuleOptions.updateUrl) || $hasPermission(mixinViewModuleOptions.deleteUrl)"
+                         label="操作"
+                         header-align="center"
+                         align="center"
+                         width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission(mixinViewModuleOptions.updateUrl)"
+                       type="warning"
+                       @click="initDialog('addUpdateDialogRef',scope.row)"
+                       size="mini">修改</el-button>
+            <el-button v-if="$hasPermission(mixinViewModuleOptions.deleteUrl)"
+                       type="danger"
+                       @click="deleteHandle(scope.row,scope.row.username)"
+                       size="mini">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
       <!-- 新增修改弹框 -->
       <AddUpdateForm ref="addUpdateDialogRef"
-                     :dict-details="dictDetails"
+                     :addUrl="mixinViewModuleOptions.addUrl"
+                     :updateUrl="mixinViewModuleOptions.updateUrl"
                      :getDataList="getDataList" />
     </div>
     <!-- 右边信息-end -->
@@ -104,19 +179,17 @@ export default {
     return {
       mixinViewModuleOptions: {
         getDataListUrl: '/sysRole/pageList',
-        deleteUrl: '/sysRole/del',
-        exportUrl: '/sysRole/export'
+        addUrl: '/sysRole/add',
+        updateUrl: '/sysRole/update',
+        deleteUrl: '/sysRole/del'
       },
-      // 列信息
-      tableColumn: [
-        { type: 'checkbox', width: 50 },
-        { field: 'name', title: '角色名称' },
-        { field: 'state', title: '角色状态', slots: { default: 'state_default' } },
-        { field: 'remarks', title: '备注' },
-        { field: 'createTime', title: '创建时间', formatter: this.dateFormat },
-        { field: 'updateTime', title: '修改时间', formatter: this.dateFormat },
-        { title: '操作', width: 200, slots: { default: 'operate' } }
-      ]
+      showColumns: {
+        name: { label: '角色名称', show: true },
+        state: { label: '角色状态', show: true },
+        createTime: { label: '创建时间', show: true },
+        updateTime: { label: '修改时间', show: true },
+        remarks: { label: '备注', show: true }
+      }
     }
   },
   methods: {
diff --git a/src/views/sys/user/components/AddUpdateForm.vue b/src/views/sys/user/components/AddUpdateForm.vue
index 4b15d006d38a3a735d8f32ba128baffad161da9e..3682153e8f3c82aa8d6f9137fb6a8870b85ead99 100644
--- a/src/views/sys/user/components/AddUpdateForm.vue
+++ b/src/views/sys/user/components/AddUpdateForm.vue
@@ -1,11 +1,11 @@
 <template>
 
-  <zero-dialog :addUpdateFormVisible.sync="addUpdateFormVisible"
+  <zero-dialog :showDialog.sync="addUpdateFormVisible"
                :fullscreen.sync="fullscreen"
                :btnExist="btnExist"
                :loading="loading"
                :title="title"
-               :addOrupdate="addOrupdate">
+               :submit="addOrupdate">
 
     <div slot="body"
          style="height:220px">
@@ -95,7 +95,6 @@
 export default {
   name: 'AddUpdateForm',
   props: {
-    dictDetails: Object,
     addUrl: String,
     updateUrl: String,
     getDataList: {
diff --git a/src/views/sys/user/components/ResetPasswordForm.vue b/src/views/sys/user/components/ResetPasswordForm.vue
index d84f709fb9db88d68abbaf8d65faa0417d458d20..01494cb112e45ba55290b3681604d127120c74c6 100644
--- a/src/views/sys/user/components/ResetPasswordForm.vue
+++ b/src/views/sys/user/components/ResetPasswordForm.vue
@@ -1,37 +1,37 @@
 <template>
-  <el-dialog
-    title="重置密码"
-    :visible.sync="resetPasswordFormVisible"
-    width="500px"
-    v-loading.fullscreen.lock="loading"
-  >
-    <el-form
-      :model="resetPasswordForm"
-      :rules="rules"
-      label-width="120px"
-      size="medium"
-      ref="resetPasswordFormRef"
-    >
-      <el-form-item prop="newPassword" label="密码">
-        <el-input v-model.trim="resetPasswordForm.newPassword" placeholder="请输入密码" show-password/>
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button @click="resetPasswordFormVisible = false">取 消</el-button>
-      <el-button type="primary" @click="resetPassword()">确 定</el-button>
+  <zero-dialog :showDialog.sync="resetPasswordFormVisible"
+               :loading="loading"
+               :btnExist="btnExist"
+               :width="'350px'"
+               title="重置密码"
+               :submit="resetPassword">
+    <div slot="body">
+      <el-form :model="resetPasswordForm"
+               :rules="rules"
+               label-width="50px"
+               ref="resetPasswordFormRef">
+        <el-form-item prop="newPassword"
+                      label="密码">
+          <el-input v-model.trim="resetPasswordForm.newPassword"
+                    placeholder="请输入密码"
+                    show-password />
+        </el-form-item>
+      </el-form>
     </div>
-  </el-dialog>
+  </zero-dialog>
 </template>
 
 <script>
 export default {
   name: 'ResetPasswordForm',
   props: {
-    id: String
+    id: String,
+    resetPasswordUrl: String
   },
   data () {
     return {
       loading: false,
+      btnExist: true, // 按钮是否存在
       resetPasswordFormVisible: false, // 是否显示弹框
       resetPasswordForm: {},
       rules: {
@@ -43,6 +43,8 @@ export default {
   },
   methods: {
     initDialog (row) {
+      this.btnExist = true
+      this.fullscreen = false
       this.resetPasswordForm = {}
       this.resetPasswordFormVisible = true
       this.resetPasswordForm.userId = row.id
@@ -50,9 +52,10 @@ export default {
     resetPassword () {
       this.$refs.resetPasswordFormRef.validate(valid => {
         if (valid) {
+          this.btnExist = false
           this.loading = true
           const config = {
-            url: '/sysUser/resetPassword',
+            url: this.resetPasswordUrl,
             method: 'get',
             params: {
               userId: this.resetPasswordForm.userId,
diff --git a/src/views/sys/user/index.vue b/src/views/sys/user/index.vue
index 89fe5ee05de5ded7f7894707f9f0b971fc3901ab..51da31ca797dd4e5c87137d1d14ac3df468a1c3d 100644
--- a/src/views/sys/user/index.vue
+++ b/src/views/sys/user/index.vue
@@ -1,100 +1,191 @@
 /* 系统用户页面 */
 <template>
-  <zero-container>
+  <zero-container v-loading="dataListLoading">
     <!-- 右边信息-start -->
+    <div slot="tool">
+      <el-collapse-transition>
+        <div v-show="showSearch">
+          <el-form :inline="true"
+                   :model="searchForm">
+            <el-form-item label="用户账号">
+              <el-input v-model="searchForm.name"
+                        clearable
+                        size="small" />
+            </el-form-item>
+            <el-form-item label="角色名称">
+              <el-input v-model="searchForm.roleName"
+                        clearable
+                        size="small" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="success"
+                         icon="el-icon-search"
+                         @click="getDataList()"
+                         round
+                         size="small">搜索</el-button>
+              <el-button icon="el-icon-refresh"
+                         type="warning"
+                         @click="searchResetForm()"
+                         round
+                         size="small">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-collapse-transition>
+      <el-button v-if="$hasPermission(mixinViewModuleOptions.addUrl)"
+                 type="primary"
+                 @click="initDialog('addUpdateDialogRef')"
+                 size="small">新增</el-button>
+      <el-button v-if="$hasPermission(mixinViewModuleOptions.exportUrl)"
+                 type="warning"
+                 @click="exportHandle('系统用户')"
+                 size="small">导出Excel</el-button>
+      <el-button v-if="$hasPermission(mixinViewModuleOptions.deleteUrl)"
+                 type="danger"
+                 @click="deleteHandle()"
+                 :disabled="batchBtnDisabled"
+                 size="small">批量删除</el-button>
+      <el-button-group style="float: right;">
+        <el-button @click="showSearch = !showSearch"
+                   title="显示/隐藏搜索"
+                   icon="fa fa-search"
+                   size="small" />
+        <el-dropdown trigger="click"
+                     :hide-on-click="false">
+          <el-button title="列"
+                     icon="fa fa-th"
+                     class="zero-column-dropdown"
+                     size="small" />
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item key="all"
+                              label="all">
+              <el-checkbox key="all"
+                           v-model="cloumn_all_checked"
+                           v-on:click.stop.native
+                           label="all"
+                           @change="cloumnAllChecked">全选</el-checkbox>
+            </el-dropdown-item>
+            <hr />
+            <el-checkbox-group v-model="checkedTableColumns">
+              <el-dropdown-item v-for="(column,i) in showColumns"
+                                :key="i"
+                                :label="i">
+                <el-checkbox :key="i"
+                             :label="i">{{ column.label }}</el-checkbox>
+              </el-dropdown-item>
+            </el-checkbox-group>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </el-button-group>
+    </div>
     <div slot="main"
          style="height: 100%">
-      <vxe-grid border
-                resizable
-                ref="xGrid"
-                id="xGrid"
-                height="auto"
-                :loading="dataListLoading"
-                :columns="tableColumn"
-                :toolbar-config="{
-          zoom: true,
-          custom: true,
-          slots: { buttons: 'toolbar_buttons' },
-        }"
+      <el-table :ref="ref"
+                height="100%"
+                border
                 :data="dataList"
-                :custom-config="{ storage: true }"
-                @checkbox-change="dataListCheckboxChangeHandle"
-                @checkbox-all="dataListCheckboxChangeHandle">
-        <template #toolbar_buttons>
-          <vxe-form :inline="true"
-                    :model="searchForm">
-            <el-dropdown :style="{'margin-right': '10px'}">
-              <el-button type="primary">
-                操作<i class="el-icon-arrow-down el-icon--right"></i>
-              </el-button>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item icon="el-icon-plus"
-                                  @click.native="initDialog('addUpdateDialogRef')">新增</el-dropdown-item>
-                <el-dropdown-item icon="el-icon-download"
-                                  @click="exportHandle('系统用户')">导出Excel</el-dropdown-item>
-                <el-dropdown-item icon="el-icon-delete"
-                                  @click="deleteHandle()"
-                                  :disabled="batchBtnDisabled">批量删除</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-            <vxe-form-item title="用户账号">
-              <vxe-input v-model="searchForm.name"
-                         clearable
-                         class="zero-search-vxe-input" />
-            </vxe-form-item>
-            <vxe-form-item>
-              <vxe-button title="查询"
-                          status="primary"
-                          @click="getDataList()">查询</vxe-button>
-              <vxe-button title="重置查询"
-                          @click="searchResetForm('xGrid')">重置</vxe-button>
-            </vxe-form-item>
-          </vxe-form>
-        </template>
-        <!--自定义插槽 state-->
-        <template v-slot:state_default="{ row }">
-          <el-tooltip :content="row.state==='ENABLE'?'点击禁用':'点击启用'"
-                      placement="top">
-            <el-switch v-model="row.state"
-                       active-value="ENABLE"
-                       inactive-value="DISABLE"
-                       @change="changeState(row)" />
-          </el-tooltip>
-        </template>
-        <!--自定义插槽 role-->
-        <template v-slot:role_default="{ row }">
-          <span v-for="item in row.roles"
-                :key="item.id">
-            <span v-if="item.state === 'ENABLE'">[{{ item.name }}]&nbsp;</span>
-            <el-tooltip v-else
-                        :hide-after="1000"
-                        content="该角色已经被禁用"
-                        placement="top"
-                        class="page-refresh">
-              <span style="color: rgb(204, 204, 204); text-decoration: line-through">
-                [{{ item.name }}]&nbsp;
-              </span>
+                @selection-change="dataListSelectionChangeHandle"
+                @sort-change="dataListSortChangeHandle"
+                style="width: 100%">
+        <el-table-column type="selection"
+                         header-align="center"
+                         align="center"
+                         width="50" />
+        <el-table-column v-if="showColumns.name.show"
+                         prop="name"
+                         label="用户账号"
+                         header-align="center"
+                         align="center" />
+        <el-table-column v-if="showColumns.nickName.show"
+                         prop="nickName"
+                         label="昵称"
+                         sortable="custom"
+                         header-align="center"
+                         align="center" />
+        <el-table-column v-if="showColumns.mobile.show"
+                         prop="mobile"
+                         label="手机号码"
+                         sortable="custom"
+                         header-align="center"
+                         align="center" />
+        <el-table-column v-if="showColumns.roleList.show"
+                         prop="roleList"
+                         label="角色列表">
+          <template slot-scope="scope">
+            <span v-for="item in scope.row.roles"
+                  :key="item.id">
+              <span v-if="item.state === 'ENABLE'">[{{ item.name }}]&nbsp;</span>
+              <el-tooltip v-else
+                          :hide-after="1000"
+                          content="该角色已经被禁用"
+                          placement="top"
+                          class="page-refresh">
+                <span style="color: rgb(204, 204, 204); text-decoration: line-through">
+                  [{{ item.name }}]&nbsp;
+                </span>
+              </el-tooltip>
+            </span>
+          </template>
+        </el-table-column>
+        <!-- 状态特殊处理 -->
+        <el-table-column v-if="showColumns.state.show"
+                         prop="state"
+                         label="用户状态"
+                         sortable="custom"
+                         header-align="center"
+                         align="center">
+          <template slot-scope="scope">
+            <el-tooltip :content="scope.row.state==='ENABLE'?'点击禁用':'点击启用'"
+                        placement="top">
+              <el-switch v-model="scope.row.state"
+                         active-value="ENABLE"
+                         inactive-value="DISABLE"
+                         @change="changeState(scope.row)" />
             </el-tooltip>
-          </span>
-        </template>
-        <template v-slot:operate="{ row }">
-          <vxe-button icon="fa fa-edit"
-                      title="修改"
-                      circle
-                      @click="initDialog('addUpdateDialogRef', row)" />
-          <vxe-button icon="fa fa-trash"
-                      title="删除"
-                      circle
-                      @click="deleteHandle(row, row.name)" />
-        </template>
-      </vxe-grid>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showColumns.createTime.show"
+                         prop="createTime"
+                         label="创建时间"
+                         sortable="custom"
+                         header-align="center"
+                         align="center"
+                         width="180"
+                         :formatter="dateFormat" />
+        <el-table-column v-if="showColumns.remarks.show"
+                         prop="remarks"
+                         label="备注"
+                         header-align="center"
+                         align="center" />
+        <el-table-column v-if="$hasPermission(mixinViewModuleOptions.updateUrl)
+                              || $hasPermission(mixinViewModuleOptions.deleteUrl)
+                              || $hasPermission(resetPasswordUrl)"
+                         label="操作"
+                         header-align="center"
+                         width="250">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission(mixinViewModuleOptions.updateUrl)"
+                       type="warning"
+                       @click="initDialog('addUpdateDialogRef',scope.row)"
+                       size="mini">修改</el-button>
+            <el-button v-if="$hasPermission(mixinViewModuleOptions.deleteUrl)"
+                       type="danger"
+                       @click="deleteHandle(scope.row,scope.row.username)"
+                       size="mini">删除</el-button>
+            <el-button v-if="$hasPermission(resetPasswordUrl)"
+                       type="info"
+                       @click="initDialog('resetPasswordDialogRef',scope.row)"
+                       size="mini">重置密码</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
       <!-- 新增修改弹框 -->
       <AddUpdateForm ref="addUpdateDialogRef"
-                     :dict-details="dictDetails"
-                     :addUrl="addUrl"
-                     :updateUrl="updateUrl"
+                     :addUrl="mixinViewModuleOptions.addUrl"
+                     :updateUrl="mixinViewModuleOptions.updateUrl"
                      :getDataList="getDataList" />
-      <ResetPasswordForm ref="resetPasswordDialogRef" />
+      <ResetPasswordForm :resetPasswordUrl="resetPasswordUrl"
+                         ref="resetPasswordDialogRef" />
     </div>
     <!-- 右边信息-end -->
     <!-- 页脚-start -->
@@ -127,23 +218,20 @@ export default {
       mixinViewModuleOptions: {
         getDataListUrl: '/sysUser/pageList',
         deleteUrl: '/sysUser/del',
-        exportUrl: '/sysUser/export',
-        dictCodes: 'state'
+        addUrl: '/sysUser/add',
+        updateUrl: '/sysUser/update',
+        exportUrl: '/sysUser/export'
       },
-      addUrl: '/sysUser/add',
-      updateUrl: '/sysUser/update',
-      // 列信息
-      tableColumn: [
-        { type: 'checkbox', width: 50 },
-        { field: 'name', title: '用户账号' },
-        { field: 'nickName', title: '昵称' },
-        { field: 'mobile', title: '手机号码', width: 110 },
-        { field: 'roleList', title: '角色列表', slots: { default: 'role_default' } },
-        { field: 'state', title: '用户状态', slots: { default: 'state_default' } },
-        { field: 'createTime', title: '创建时间', width: 150, formatter: this.dateFormat },
-        { field: 'remarks', title: '备注' },
-        { title: '操作', width: 200, slots: { default: 'operate' } }
-      ]
+      resetPasswordUrl: '/sysUser/resetPassword',
+      showColumns: {
+        name: { label: '用户账号', show: true },
+        nickName: { label: '昵称', show: true },
+        mobile: { label: '手机号码', show: true },
+        roleList: { label: '角色列表', show: true },
+        state: { label: '用户状态', show: true },
+        createTime: { label: '创建时间', show: true },
+        remarks: { label: '备注', show: true }
+      }
     }
   },
   methods: {
diff --git a/src/views/sys/user/online/index.vue b/src/views/sys/user/online/index.vue
index 8caf9d0cd9e5f178d2e8a9386e0145a7d69d14ee..1b2eb1e58e11b5b2925f642d0a2283a5835ee6c7 100644
--- a/src/views/sys/user/online/index.vue
+++ b/src/views/sys/user/online/index.vue
@@ -1,72 +1,131 @@
 /* 在线用户页面 */
 <template>
-  <zero-container>
-    <!-- 右边信息-start -->
-    <div slot="main" style="height: 100%">
-      <vxe-grid
-        border
-        resizable
-        ref="xGrid"
-        id="xGrid"
-        height="auto"
-        :loading="dataListLoading"
-        :columns="tableColumn"
-        :data="dataList"
-        :custom-config="{ storage: true }"
-        :toolbar-config="{
-          zoom: true,
-          custom: true,
-          slots: { buttons: 'toolbar_buttons' },
-        }"
-      >
-        <template #toolbar_buttons>
-          <vxe-form :inline="true" :model="searchForm">
-            <vxe-form-item title="用户账号">
-              <vxe-input
-                v-model="searchForm.name"
-                clearable
-                class="zero-search-vxe-input"
-              />
-            </vxe-form-item>
-            <vxe-form-item title="昵称">
-              <vxe-input
-                v-model="searchForm.nickName"
-                class="zero-search-vxe-input"
-                clearable
-              />
-            </vxe-form-item>
-            <vxe-form-item>
-              <vxe-button
-                title="查询"
-                status="primary"
-                @click="getDataList()"
-              >查询</vxe-button>
-              <vxe-button
-                title="重置查询"
-                @click="searchResetForm('xGrid')"
-              >重置</vxe-button>
-            </vxe-form-item>
-          </vxe-form>
-        </template>
-        <template v-slot:operate="{ row }">
-          <el-button type="text" @click="forcedOffline(row.name)">
-            强制下线
-          </el-button>
-        </template>
-      </vxe-grid>
+  <zero-container v-loading="dataListLoading"
+                  type="zero">
+    <!-- 表格操作工具-start -->
+    <div slot="tool">
+      <el-form :inline="true"
+               :model="searchForm"
+               style="float: left;">
+        <el-form-item label="用户账号">
+          <el-input v-model="searchForm.name"
+                    clearable
+                    size="small" />
+        </el-form-item>
+        <el-form-item label="昵称">
+          <el-input v-model="searchForm.nickName"
+                    clearable
+                    size="small" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="success"
+                     icon="el-icon-search"
+                     @click="getDataList()"
+                     round
+                     size="small">搜索</el-button>
+          <el-button icon="el-icon-refresh"
+                     type="warning"
+                     @click="searchResetForm()"
+                     round
+                     size="small">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <el-button-group style="float: right;">
+        <el-dropdown trigger="click"
+                     :hide-on-click="false">
+          <el-button title="列"
+                     icon="fa fa-th"
+                     class="zero-column-dropdown"
+                     size="small" />
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item key="all"
+                              label="all">
+              <el-checkbox key="all"
+                           v-model="cloumn_all_checked"
+                           v-on:click.stop.native
+                           label="all"
+                           @change="cloumnAllChecked">全选</el-checkbox>
+            </el-dropdown-item>
+            <hr />
+            <el-checkbox-group v-model="checkedTableColumns">
+              <el-dropdown-item v-for="(column,i) in showColumns"
+                                :key="i"
+                                :label="i">
+                <el-checkbox :key="i"
+                             :label="i">{{ column.label }}</el-checkbox>
+              </el-dropdown-item>
+            </el-checkbox-group>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </el-button-group>
+    </div>
+    <!-- 表格操作工具-end -->
+    <div slot="main"
+         style="height:100%;">
+      <el-table :ref="ref"
+                border
+                height="100%"
+                :data="dataList"
+                @selection-change="dataListSelectionChangeHandle"
+                @sort-change="dataListSortChangeHandle"
+                style="width: 100%">
+        <el-table-column type="selection"
+                         header-align="center"
+                         align="center"
+                         width="50" />
+        <el-table-column v-if="showColumns.name.show"
+                         prop="name"
+                         label="用户账号"
+                         header-align="center"
+                         align="center" />
+        <el-table-column v-if="showColumns.nickName.show"
+                         prop="nickName"
+                         label="昵称"
+                         header-align="center"
+                         align="center" />
+        <el-table-column v-if="showColumns.mobile.show"
+                         prop="mobile"
+                         label="手机号码"
+                         header-align="center"
+                         align="center" />
+        <el-table-column v-if="showColumns.loginTime.show"
+                         prop="loginTime"
+                         label="登录时间"
+                         sortable="custom"
+                         header-align="center"
+                         align="center"
+                         width="180"
+                         :formatter="dateFormat" />
+        <el-table-column v-if="showColumns.useTime.show"
+                         prop="loginTime"
+                         label="在线时长(分)"
+                         sortable="custom"
+                         header-align="center"
+                         align="center"
+                         width="180"
+                         :formatter="useTimeFormat" />
+        <el-table-column v-if="$hasPermission(forcedOfflineUrl)"
+                         label="操作"
+                         align="center"
+                         width="180">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission(forcedOfflineUrl)"
+                       type="danger"
+                       @click="forcedOffline(scope.row.name)"
+                       size="mini">强制下线</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
     </div>
-    <!-- 右边信息-end -->
     <!-- 页脚-start -->
     <div slot="footer">
-      <vxe-pager
-        border
-        align="left"
-        :current-page="page"
-        :page-size="limit"
-        :total="total"
-        :layouts="layouts"
-        @page-change="handlePageChange"
-      />
+      <vxe-pager border
+                 align="left"
+                 :current-page="page"
+                 :page-size="limit"
+                 :total="total"
+                 :layouts="layouts"
+                 @page-change="handlePageChange" />
     </div>
     <!-- 页脚-end -->
   </zero-container>
@@ -78,7 +137,6 @@ import dayjs from 'dayjs'
 export default {
   name: 'SysUserOnline',
   mixins: [mixinViewModule],
-  components: {},
   data () {
     return {
       mixinViewModuleOptions: {
@@ -86,40 +144,42 @@ export default {
         exportUrl: '/sysUser/export'
       },
       forcedOfflineUrl: '/sysUser/forcedOffline',
-      // 列信息
-      tableColumn: [
-        { field: 'name', title: '用户账号' },
-        { field: 'nickName', title: '昵称' },
-        { field: 'mobile', title: '手机号码' },
-        {
-          field: 'useTime',
-          title: '在线时长',
-          formatter: this.useTimeFormat
-        },
-        { field: 'loginTime', title: '登录时间', formatter: this.dateFormat },
-        { title: '操作', width: 200, slots: { default: 'operate' } }
-      ]
+      showColumns: {
+        name: { label: '用户账号', show: true },
+        nickName: { label: '昵称', show: true },
+        mobile: { label: '手机号码', show: true },
+        loginTime: { label: '登录时间', show: true },
+        useTime: { label: '在线时长', show: true }
+      }
     }
   },
   methods: {
     forcedOffline (name) {
-      this.dataListLoading = true
       const config = {
         url: this.forcedOfflineUrl,
         method: 'get',
         params: { name: name }
       }
-      this.$axios(config)
-        .then((res) => {
-          this.dataListLoading = false
-          this.$message.success(res.msg)
-          this.getDataList()
-        })
-        .catch(() => {
-          this.dataListLoading = false
+      this.$confirm('确定强制下线 [' + name + '] 吗?', '提示', {
+        cancelButtonClass: 'btn-custom-cancel',
+        type: 'warning',
+        closeOnClickModal: false
+      }).then(() => {
+        this.$axios(config)
+          .then((res) => {
+            this.$message.success(res.msg)
+            this.getDataList()
+          })
+          .catch(() => {
+          })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消'
         })
+      })
     },
-    useTimeFormat ({ row }) {
+    useTimeFormat (row) {
       // 总秒数
       const date3 = (dayjs().unix() - row.loginTime) * 1000
       // 计算出相差天数