From b16d8cfe4f64728408256ed2bb63dbaa27a49efb Mon Sep 17 00:00:00 2001
From: zero <254353372>
Date: Wed, 3 Jun 2020 00:05:19 +0800
Subject: [PATCH 01/70] ee

---
 src/api/index.js                              | 14 --------
 src/api/modules/sys.user.js                   | 14 --------
 .../components/header-user/index.vue          | 35 ++++++++++++++-----
 src/plugin/api/index.js                       |  7 ----
 src/plugin/zerovue/index.js                   |  2 --
 src/store/modules/zerovue/modules/ua.js       |  1 +
 src/views/system/login/index.vue              |  2 +-
 7 files changed, 29 insertions(+), 46 deletions(-)
 delete mode 100644 src/api/index.js
 delete mode 100644 src/api/modules/sys.user.js
 delete mode 100644 src/plugin/api/index.js

diff --git a/src/api/index.js b/src/api/index.js
deleted file mode 100644
index f5ce95f..0000000
--- a/src/api/index.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { assign, map } from 'lodash'
-import faker from 'faker/locale/zh_CN'
-import { service, request } from './axios'
-import * as tools from './tools'
-
-const files = require.context('./modules', false, /\.js$/)
-const generators = files.keys().map(key => files(key).default)
-
-export default assign({}, ...map(generators, generator => generator({
-  service,
-  request,
-  faker,
-  tools
-})))
diff --git a/src/api/modules/sys.user.js b/src/api/modules/sys.user.js
deleted file mode 100644
index 45b7161..0000000
--- a/src/api/modules/sys.user.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export default ({ service, request, mock, faker, tools }) => ({
-  /**
-   * @description 登录
-   * @param {Object} data 登录携带的信息
-   */
-  SYS_USER_LOGIN (data = {}) {
-    // 接口请求
-    return request({
-      url: '/sysLogin',
-      method: 'post',
-      data
-    })
-  }
-})
diff --git a/src/layout/header-aside/components/header-user/index.vue b/src/layout/header-aside/components/header-user/index.vue
index 451a0f8..f791fc9 100644
--- a/src/layout/header-aside/components/header-user/index.vue
+++ b/src/layout/header-aside/components/header-user/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dropdown size="small" class="zero-mr">
+  <el-dropdown size="small" class="zero-mr"  v-loading="loading" >
     <span class="btn-text">{{info.name ? `你好 ${info.name}` : '未登录'}}</span>
     <el-dropdown-menu slot="dropdown">
       <el-dropdown-item @click.native="logOff">
@@ -11,24 +11,43 @@
 </template>
 
 <script>
-import { mapState, mapActions } from 'vuex'
+import { mapState } from 'vuex'
+import util from '@/libs/util.js'
+import { Message, MessageBox } from 'element-ui'
 export default {
+  data () {
+    return {
+      loading: false
+    }
+  },
   computed: {
     ...mapState('zerovue/user', [
       'info'
     ])
   },
   methods: {
-    ...mapActions('zerovue/account', [
-      'logout'
-    ]),
     /**
      * @description 登出
      */
     logOff () {
-      this.logout({
-        confirm: true
-      })
+      const config = {
+        url: '/sysLogout',
+        method: 'post'
+      }
+      MessageBox.confirm('确定要注销当前用户吗', '注销用户', { type: 'warning' })
+        .then(() => {
+          // 删除cookie
+          util.cookies.remove('token')
+          util.cookies.remove('uuid')
+          // 清空 vuex 用户信息
+          this.$store.dispatch('zerovue/user/set', {}, { root: true })
+          // 跳转路由
+          this.$router.push({ name: 'login' })
+          this.$axios(config)
+        })
+        .catch(() => {
+          Message({ message: '取消注销操作' })
+        })
     }
   }
 }
diff --git a/src/plugin/api/index.js b/src/plugin/api/index.js
deleted file mode 100644
index 550c7d0..0000000
--- a/src/plugin/api/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import api from '@/api'
-
-export default {
-  install (Vue) {
-    Vue.prototype.$api = api
-  }
-}
diff --git a/src/plugin/zerovue/index.js b/src/plugin/zerovue/index.js
index 62f7d86..7c739e9 100644
--- a/src/plugin/zerovue/index.js
+++ b/src/plugin/zerovue/index.js
@@ -11,7 +11,6 @@ import '@/assets/svg-icons'
 import i18n from '@/i18n.js'
 
 // 功能插件
-import pluginApi from '@/plugin/api'
 import pluginError from '@/plugin/error'
 import pluginLog from '@/plugin/log'
 import pluginOpen from '@/plugin/open'
@@ -34,7 +33,6 @@ export default {
       i18n: (key, value) => i18n.t(key, value)
     })
     // 插件
-    Vue.use(pluginApi)
     Vue.use(pluginError)
     Vue.use(pluginLog)
     Vue.use(pluginOpen)
diff --git a/src/store/modules/zerovue/modules/ua.js b/src/store/modules/zerovue/modules/ua.js
index f5f7b3c..5ef0782 100644
--- a/src/store/modules/zerovue/modules/ua.js
+++ b/src/store/modules/zerovue/modules/ua.js
@@ -13,6 +13,7 @@ export default {
      */
     get (state) {
       state.data = new UaParser().getResult()
+      console.log(state.data)
     }
   }
 }
diff --git a/src/views/system/login/index.vue b/src/views/system/login/index.vue
index 11a0c34..ae00e35 100644
--- a/src/views/system/login/index.vue
+++ b/src/views/system/login/index.vue
@@ -182,7 +182,7 @@ export default {
             // 设置 vuex 用户信息
             this.$store.dispatch('zerovue/user/set', { name: this.formLogin.username }, { root: true })
             // 用户登录后从持久化数据加载一系列的设置
-            this.$store.dispatch('load')
+            this.$store.dispatch('zerovue/account/load')
             // 重定向对象不存在则返回顶层路径
             this.$router.replace(this.$route.query.redirect || '/')
             this.loading = false
-- 
Gitee


From 6da1fb72731246469ac0d06c98c99f5dd2a58c69 Mon Sep 17 00:00:00 2001
From: zero <254353372>
Date: Thu, 4 Jun 2020 22:17:25 +0800
Subject: [PATCH 02/70] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/style/theme/theme-base.scss                 |  4 ++++
 .../zero-container/components/zero-container-full.vue  | 10 +++++-----
 src/views/demo/page1/index.vue                         |  7 ++++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss
index 7bcbca2..e31f26d 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -301,6 +301,10 @@
                 width:15% !important;
                 overflow:hidden;
               }
+              .zero-container-full_main {
+                padding: 0px !important;
+                height: 100%;
+              }
               .zero-container-full__body {
                 flex-grow: 1;
                 height: 100%;
diff --git a/src/components/zero-container/components/zero-container-full.vue b/src/components/zero-container/components/zero-container-full.vue
index 95de5f2..d038196 100644
--- a/src/components/zero-container/components/zero-container-full.vue
+++ b/src/components/zero-container/components/zero-container-full.vue
@@ -1,19 +1,19 @@
 <template>
   <div class="zero-container-full">
-    <el-container class="zero-container-full__body" ref="full__body">
-      <el-aside v-if="$slots.aside" class="zero-container-full__aside" ref="full__aside">
+    <el-container class="zero-container-full__body">
+      <el-aside v-if="$slots.aside" class="zero-container-full__aside">
         <el-scrollbar style="height:100%;">
         <slot name="aside"/>
         </el-scrollbar>
       </el-aside>
       <el-container  >
-        <div v-if="$slots.header" class="zero-container-full__header" ref="full__header">
+        <div v-if="$slots.header" class="zero-container-full__header">
           <slot name="header"/>
         </div>
-        <el-main v-if="$slots.main" ref="full__main">
+        <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" ref="full__footer">
+        <el-footer v-if="$slots.footer" class="zero-container-full__footer">
           <slot name="footer"/>
         </el-footer>
       </el-container>
diff --git a/src/views/demo/page1/index.vue b/src/views/demo/page1/index.vue
index 707c0d2..c87eeef 100644
--- a/src/views/demo/page1/index.vue
+++ b/src/views/demo/page1/index.vue
@@ -5,9 +5,9 @@
       树
       <DemoTreeSide/>
     </div>
-    <div slot="main">
+    <div slot="main" style="height:100%">
      <el-table
-        height="400"
+        height="100%"
         size="mini"
         v-loading="dataListLoading"
         :data="dataList"
@@ -66,7 +66,8 @@ export default {
       },
       dataForm: {
         username: ''
-      }
+      },
+      height: 0
     }
   },
   mounted () {
-- 
Gitee


From 415b072b645ce6d81646b16f6bbee476f78799cc Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Fri, 5 Jun 2020 10:24:07 +0800
Subject: [PATCH 03/70] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/tools.js                              |   8 --
 .../components/header-log/index.vue           |  39 ------
 src/layout/header-aside/layout.vue            |   3 -
 src/plugin/error/index.js                     |  30 -----
 src/plugin/log/index.js                       |  25 ----
 src/plugin/zerovue/index.js                   |   2 -
 src/router/routes.js                          |  10 --
 src/views/system/index/index.vue              |   2 +
 src/views/system/log/index.vue                | 121 ------------------
 9 files changed, 2 insertions(+), 238 deletions(-)
 delete mode 100644 src/layout/header-aside/components/header-log/index.vue
 delete mode 100644 src/plugin/log/index.js
 delete mode 100644 src/views/system/log/index.vue

diff --git a/src/api/tools.js b/src/api/tools.js
index 0f277f7..c356c08 100644
--- a/src/api/tools.js
+++ b/src/api/tools.js
@@ -54,14 +54,6 @@ export function responseError (data = {}, msg = '请求失败', code = 500) {
  * @param {Error} error 错误对象
  */
 export function errorLog (error) {
-  // 添加到日志
-  store.dispatch('zerovue/log/push', {
-    message: '数据请求异常',
-    type: 'danger',
-    meta: {
-      error
-    }
-  })
   // 打印到控制台
   if (process.env.NODE_ENV === 'development') {
     util.log.danger('>>>>>> Error >>>>>>')
diff --git a/src/layout/header-aside/components/header-log/index.vue b/src/layout/header-aside/components/header-log/index.vue
deleted file mode 100644
index e385221..0000000
--- a/src/layout/header-aside/components/header-log/index.vue
+++ /dev/null
@@ -1,39 +0,0 @@
-<template>
-  <el-tooltip effect="dark" :content="tooltipContent" placement="bottom">
-    <el-button class="zero-ml-0 zero-mr btn-text can-hover" type="text" @click="handleClick">
-      <el-badge v-if="logLength > 0" :max="99" :value="logLengthError" :is-dot="logLengthError === 0">
-        <zero-icon :name="logLengthError === 0 ? 'dot-circle-o' : 'bug'" style="font-size: 20px"/>
-      </el-badge>
-      <zero-icon v-else name="dot-circle-o" style="font-size: 20px"/>
-    </el-button>
-  </el-tooltip>
-</template>
-
-<script>
-import { mapGetters, mapMutations } from 'vuex'
-export default {
-  computed: {
-    ...mapGetters('zerovue', {
-      logLength: 'log/length',
-      logLengthError: 'log/lengthError'
-    }),
-    tooltipContent () {
-      return this.logLength === 0
-        ? '没有日志或异常'
-        : `${this.logLength} 条日志${this.logLengthError > 0
-          ? ` | 包含 ${this.logLengthError} 个异常`
-          : ''}`
-    }
-  },
-  methods: {
-    ...mapMutations('zerovue/log', [
-      'clean'
-    ]),
-    handleClick () {
-      this.$router.push({
-        name: 'log'
-      })
-    }
-  }
-}
-</script>
diff --git a/src/layout/header-aside/layout.vue b/src/layout/header-aside/layout.vue
index d76c711..ec06a64 100644
--- a/src/layout/header-aside/layout.vue
+++ b/src/layout/header-aside/layout.vue
@@ -22,7 +22,6 @@
         <div class="zero-header-right" flex-box="0">
           <!-- 如果你只想在开发环境显示这个按钮请添加 v-if="$env === 'development'" -->
           <zero-header-search @click="handleSearchClick"/>
-          <zero-header-log/>
           <zero-header-fullscreen/>
           <zero-header-theme/>
           <zero-header-size/>
@@ -85,7 +84,6 @@ import zeroHeaderSearch from './components/header-search'
 import zeroHeaderSize from './components/header-size'
 import zeroHeaderTheme from './components/header-theme'
 import zeroHeaderUser from './components/header-user'
-import zeroHeaderLog from './components/header-log'
 import zeroHeaderColor from './components/header-color'
 import { mapState, mapGetters, mapActions } from 'vuex'
 import mixinSearch from './mixins/search'
@@ -104,7 +102,6 @@ export default {
     zeroHeaderSize,
     zeroHeaderTheme,
     zeroHeaderUser,
-    zeroHeaderLog,
     zeroHeaderColor
   },
   data () {
diff --git a/src/plugin/error/index.js b/src/plugin/error/index.js
index 6b8bbdf..5da0f18 100644
--- a/src/plugin/error/index.js
+++ b/src/plugin/error/index.js
@@ -7,14 +7,6 @@ export default {
     function writeLog (logType) {
       return (error, vm, info = '') => {
         Vue.nextTick(() => {
-          store.dispatch('zerovue/log/push', {
-            message: `${info}: ${isObject(error) ? error.message : error}`,
-            type: logType,
-            meta: {
-              error,
-              vm
-            }
-          })
           if (process.env.NODE_ENV !== 'development') return
           util.log.capsule('ZeroVue', 'ErrorHandler', logType)
           util.log.danger('>>>>>> 错误信息 >>>>>>')
@@ -30,27 +22,5 @@ export default {
       Vue.config.warnHandler = writeLog('warning')
     }
     Vue.config.errorHandler = writeLog('danger')
-    window.onunhandledrejection = error => {
-      store.dispatch('zerovue/log/push', {
-        message: get(error, 'reason.message', 'Unknown error'),
-        type: 'danger',
-        meta: {
-          error: get(error, 'reason'),
-          trace: get(error, 'reason.stack')
-        }
-      })
-    }
-    window.onerror = (event, source, lineno, colno, error) => {
-      store.dispatch('zerovue/log/push', {
-        message: get(error, 'message', 'Unknown error'),
-        type: 'danger',
-        meta: {
-          error,
-          trace: get(error, 'stack'),
-          source: `${source}@${lineno}:${colno}`,
-          event: event
-        }
-      })
-    }
   }
 }
diff --git a/src/plugin/log/index.js b/src/plugin/log/index.js
deleted file mode 100644
index 8fe1bc6..0000000
--- a/src/plugin/log/index.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import store from '@/store'
-import util from '@/libs/util'
-
-export default {
-  install (Vue, options) {
-    // 快速打印 log
-    Vue.prototype.$log = {
-      ...util.log,
-      push (data) {
-        if (typeof data === 'string') {
-          // 如果传递来的数据是字符串
-          // 赋值给 message 字段
-          // 为了方便使用
-          // eg: this.$log.push('foo text')
-          store.dispatch('zerovue/log/push', {
-            message: data
-          })
-        } else if (typeof data === 'object') {
-          // 如果传递来的数据是对象
-          store.dispatch('zerovue/log/push', data)
-        }
-      }
-    }
-  }
-}
diff --git a/src/plugin/zerovue/index.js b/src/plugin/zerovue/index.js
index 7c739e9..2299bdc 100644
--- a/src/plugin/zerovue/index.js
+++ b/src/plugin/zerovue/index.js
@@ -12,7 +12,6 @@ import i18n from '@/i18n.js'
 
 // 功能插件
 import pluginError from '@/plugin/error'
-import pluginLog from '@/plugin/log'
 import pluginOpen from '@/plugin/open'
 
 export default {
@@ -34,7 +33,6 @@ export default {
     })
     // 插件
     Vue.use(pluginError)
-    Vue.use(pluginLog)
     Vue.use(pluginOpen)
   }
 }
diff --git a/src/router/routes.js b/src/router/routes.js
index 7fd6bab..3433c99 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -49,16 +49,6 @@ const frameIn = [
         },
         component: _import('demo/page3')
       },
-      // 系统 前端日志
-      {
-        path: 'log',
-        name: 'log',
-        meta: {
-          title: '前端日志',
-          auth: true
-        },
-        component: _import('system/log')
-      },
       // 刷新页面 必须保留
       {
         path: 'refresh',
diff --git a/src/views/system/index/index.vue b/src/views/system/index/index.vue
index 14edc8f..1b4d5d5 100644
--- a/src/views/system/index/index.vue
+++ b/src/views/system/index/index.vue
@@ -15,6 +15,8 @@
 export default {
   name: 'index',
   components: {
+  },
+  created () {
   }
 }
 </script>
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
deleted file mode 100644
index 23ac894..0000000
--- a/src/views/system/log/index.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-<template>
-  <zero-container>
-    <el-table
-      :data="log"
-      size="mini"
-      style="width: 100%"
-      empty-text="暂无日志信息"
-      stripe>
-      <!-- 时间 -->
-      <el-table-column
-        prop="time"
-        label="Time"
-        width="140">
-      </el-table-column>
-      <!-- 信息 -->
-      <el-table-column
-        prop="message"
-        label="Message">
-      </el-table-column>
-      <!-- 触发页面 -->
-      <el-table-column
-        label="Url"
-        align="center"
-        min-width="200">
-        <template slot-scope="scope">
-          {{get(scope.row, 'meta.url')}}
-        </template>
-      </el-table-column>
-      <!-- 触发组件 -->
-      <el-table-column
-        label="Tag"
-        align="center"
-        min-width="120">
-        <template slot-scope="scope">
-          <el-tag
-            v-if="get(scope.row, 'meta.instance.$vnode.componentOptions.tag')"
-            type="info"
-            size="mini">
-            &#60;{{get(scope.row, 'meta.instance.$vnode.componentOptions.tag')}}&gt;
-          </el-tag>
-        </template>
-      </el-table-column>
-      <!-- 查看详情 -->
-      <el-table-column
-        fixed="right"
-        align="center"
-        label="More"
-        width="100">
-        <template slot-scope="scope">
-          <el-button
-            type="primary"
-            size="mini"
-            @click="handleShowMore(scope.row)">
-            <zero-icon name="eye"/>
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-button
-      slot="footer"
-      type="primary"
-      size="mini"
-      :loading="uploading"
-      @click="handleUpload">
-      <zero-icon name="cloud-upload"/>
-      Upload {{log.length}} log data
-    </el-button>
-  </zero-container>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-import { get } from 'lodash'
-export default {
-  name: 'log',
-  data () {
-    return {
-      uploading: false
-    }
-  },
-  computed: {
-    ...mapState('zerovue/log', [
-      'log'
-    ])
-  },
-  methods: {
-    get,
-    handleShowMore (log) {
-      // 打印一条日志的所有信息到控制台
-      this.$notify({
-        type: 'info',
-        title: '日志详情',
-        message: '完整的日志内容已经打印到控制台'
-      })
-      this.$log.capsule('ZeroVue', 'handleShowMore', 'primary')
-      console.group(log.message)
-      console.log('time: ', log.time)
-      console.log('type: ', log.type)
-      console.log(log.meta)
-      console.groupEnd()
-    },
-    // 日志上传
-    handleUpload () {
-      this.uploading = true
-      this.$notify({
-        type: 'info',
-        title: '日志上传',
-        message: `开始上传${this.log.length}条日志`
-      })
-      setTimeout(() => {
-        this.uploading = false
-        this.$notify({
-          type: 'success',
-          title: '日志上传',
-          message: '上传成功'
-        })
-      }, 3000)
-    }
-  }
-}
-</script>
-- 
Gitee


From fa028d4a31a961cb899d39f13f6aaf6956bee40a Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Fri, 5 Jun 2020 11:39:31 +0800
Subject: [PATCH 04/70] =?UTF-8?q?=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/style/theme/theme-base.scss | 8 ++++----
 src/mixins/view-module.js              | 2 +-
 src/views/demo/page1/index.vue         | 4 +---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss
index e31f26d..a5bf750 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -292,11 +292,11 @@
               flex-direction: column;
               overflow: hidden;
               .zero-container-full__header {
-                padding: 20px;
+                padding: 10px;
               }
               .zero-container-full__aside {
-                // padding-left: 10px;
-                padding: 20px;
+                padding-left: 10px;
+                // padding: 10px;
                 border-right:1px solid #cfd7e5;
                 width:15% !important;
                 overflow:hidden;
@@ -312,7 +312,7 @@
                 overflow-y:auto;
               }
               .zero-container-full__footer {
-                padding: 20px;
+                padding: 10px;
               }
             }
             // 填充式布局组件 - 滚动优化
diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js
index 026e6a7..c2b84d3 100644
--- a/src/mixins/view-module.js
+++ b/src/mixins/view-module.js
@@ -9,7 +9,7 @@ export default {
       mixinViewModuleOptions: {
         activatedIsNeed: true, // 此页面是否在激活（进入）时，调用查询数据列表接口？
         getDataListUrl: '', // 数据列表接口，API地址
-        isPage: false, // 数据列表接口，是否需要分页？
+        isPage: true, // 数据列表接口，是否需要分页？
         deleteUrl: '', // 删除接口，API地址
         batchDelKey: 'id', // 删除接口，批量状态下由那个key进行标记操作？比如：pid，uid...
         exportUrl: '' // 导出接口，API地址
diff --git a/src/views/demo/page1/index.vue b/src/views/demo/page1/index.vue
index c87eeef..21a3f01 100644
--- a/src/views/demo/page1/index.vue
+++ b/src/views/demo/page1/index.vue
@@ -60,14 +60,12 @@ export default {
     return {
       mixinViewModuleOptions: {
         getDataListUrl: '/sysUser/pageList',
-        isPage: true,
         deleteUrl: '/sysUser/del',
         exportUrl: '/sysUser/export'
       },
       dataForm: {
         username: ''
-      },
-      height: 0
+      }
     }
   },
   mounted () {
-- 
Gitee


From aa54faaefc6a64caa508a33501e2612615534d08 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Fri, 5 Jun 2020 18:05:58 +0800
Subject: [PATCH 05/70] test

---
 src/assets/style/theme/theme-base.scss        |  2 ++
 .../demo/page1/components/SearchHearder.vue   | 22 ++++++++++++++++++
 src/views/demo/page1/index.vue                | 23 ++++++++++++++++---
 3 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 src/views/demo/page1/components/SearchHearder.vue

diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss
index a5bf750..d5e1da6 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -293,6 +293,7 @@
               overflow: hidden;
               .zero-container-full__header {
                 padding: 10px;
+                border-bottom: 0px !important
               }
               .zero-container-full__aside {
                 padding-left: 10px;
@@ -313,6 +314,7 @@
               }
               .zero-container-full__footer {
                 padding: 10px;
+                border-top: 0px !important
               }
             }
             // 填充式布局组件 - 滚动优化
diff --git a/src/views/demo/page1/components/SearchHearder.vue b/src/views/demo/page1/components/SearchHearder.vue
new file mode 100644
index 0000000..76d9a50
--- /dev/null
+++ b/src/views/demo/page1/components/SearchHearder.vue
@@ -0,0 +1,22 @@
+<template>
+  <el-button size="mini" :icon="icon" @click="click">{{open ? '隐藏':'展开'}}</el-button>
+</template>
+
+<script>
+export default {
+  name: 'SearchHearder',
+  data () {
+    return {
+      icon: 'el-icon-caret-bottom',
+      open: false
+    }
+  },
+  methods: {
+    click () {
+      this.icon = this.open ? 'el-icon-caret-bottom' : 'el-icon-caret-top'
+      this.open = !this.open
+      this.$emit('searchOpen', this.open)
+    }
+  }
+}
+</script>
diff --git a/src/views/demo/page1/index.vue b/src/views/demo/page1/index.vue
index 21a3f01..c279065 100644
--- a/src/views/demo/page1/index.vue
+++ b/src/views/demo/page1/index.vue
@@ -1,6 +1,17 @@
 <template>
   <zero-container>
-    <div slot="header">Page 1 header</div>
+    <div slot="header">
+      <SearchHearder  @searchOpen="searchOpen"/>
+      <el-collapse-transition >
+        <div v-show="zero">
+          <el-form :inline="true" size="mini" :model="dataForm" @keyup.enter.native="getDataList()">
+            <el-form-item>
+                <el-input v-model="dataForm.username" :placeholder="$t('user.username')" clearable/>
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-collapse-transition>
+    </div>
     <div slot="aside">
       树
       <DemoTreeSide/>
@@ -49,12 +60,14 @@
 
 <script>
 import DemoTreeSide from './components/DemoTreeSide'
+import SearchHearder from './components/SearchHearder'
 import mixinViewModule from '@/mixins/view-module'
 export default {
   name: 'page1',
   mixins: [mixinViewModule],
   components: {
-    DemoTreeSide
+    DemoTreeSide,
+    SearchHearder
   },
   data () {
     return {
@@ -65,7 +78,8 @@ export default {
       },
       dataForm: {
         username: ''
-      }
+      },
+      zero: false
     }
   },
   mounted () {
@@ -73,6 +87,9 @@ export default {
   created () {
   },
   methods: {
+    searchOpen (data) {
+      this.zero = data
+    }
   }
 }
 </script>
-- 
Gitee


From 457ae621745d58788a07e2fbc58763e172e79142 Mon Sep 17 00:00:00 2001
From: zero <254353372>
Date: Fri, 5 Jun 2020 22:54:58 +0800
Subject: [PATCH 06/70] 1

---
 src/api/tools.js               |  1 -
 src/mixins/view-module.js      | 29 +++++++++++++++++++----------
 src/plugin/error/index.js      |  2 --
 src/views/demo/page1/index.vue | 30 ++++++++++++++++++++++++++----
 4 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/src/api/tools.js b/src/api/tools.js
index c356c08..6090095 100644
--- a/src/api/tools.js
+++ b/src/api/tools.js
@@ -1,5 +1,4 @@
 import { Message } from 'element-ui'
-import store from '@/store'
 import util from '@/libs/util'
 
 /**
diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js
index c2b84d3..1b0d65e 100644
--- a/src/mixins/view-module.js
+++ b/src/mixins/view-module.js
@@ -15,9 +15,10 @@ export default {
         exportUrl: '' // 导出接口，API地址
       },
       // 默认属性
-      dataForm: {}, // 查询条件
+      searchForm: {
+        sortMap: {} // 排序，asc／desc
+      }, // 查询条件
       dataList: [], // 数据列表
-      sortList: [], // 排序，asc／desc
       page: 1, // 当前页码
       limit: 10, // 每页数
       total: 0, // 总条数
@@ -41,12 +42,12 @@ export default {
     // 获取数据列表
     getDataList () {
       this.dataListLoading = true
-      this.dataForm.page = this.mixinViewModuleOptions.isPage ? this.page : null
-      this.dataForm.pageSize = this.mixinViewModuleOptions.isPage ? this.limit : null
+      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.dataForm
+        data: this.searchForm
       }
       this.$axios(config).then(res => {
         if (res) {
@@ -71,13 +72,14 @@ export default {
     },
     // 排序
     dataListSortChangeHandle (data) {
-      this.sortList = []
+      this.searchForm.sortMap = {}
       if (!data.order || !data.prop) {
         return false
       } else {
-        this.sortList.push(data.prop + ',' + data.order.replace(/ending$/, ''))
+        const key = data.prop
+        const vaule = data.order.replace(/ending$/, '')
+        this.searchForm.sortMap = { [key]: vaule }
       }
-      this.dataForm.sortList = this.sortList
       this.getDataList()
     },
     // 分页, 每页条数
@@ -95,7 +97,7 @@ export default {
     addOrUpdateHandle (id) {
       this.addOrUpdateVisible = true
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.dataForm.id = id
+        this.$refs.addOrUpdate.searchForm.id = id
         this.$refs.addOrUpdate.init()
       })
     },
@@ -159,12 +161,19 @@ export default {
     exportHandle () {
       var params = qs.stringify({
         token: util.cookies.get('token'),
-        ...this.dataForm
+        ...this.searchForm
       })
       window.location.href = `${window.SITE_CONFIG.apiURL}${this.mixinViewModuleOptions.exportUrl}?${params}`
     },
     dateFormat (row, column, cellValue) {
       return dayjs.unix(cellValue).format('YYYY-MM-DD HH:mm:ss')
+    },
+    searchResetForm (tableRef) { // 重置输入框
+      this.searchForm = {
+        sortMap: {}
+      }
+      // 清空页面选择的排序按钮
+      this.$refs[tableRef].clearSort()
     }
   }
 }
diff --git a/src/plugin/error/index.js b/src/plugin/error/index.js
index 5da0f18..86a07e4 100644
--- a/src/plugin/error/index.js
+++ b/src/plugin/error/index.js
@@ -1,5 +1,3 @@
-import { get, isObject } from 'lodash'
-import store from '@/store'
 import util from '@/libs/util'
 
 export default {
diff --git a/src/views/demo/page1/index.vue b/src/views/demo/page1/index.vue
index c279065..5700809 100644
--- a/src/views/demo/page1/index.vue
+++ b/src/views/demo/page1/index.vue
@@ -2,14 +2,25 @@
   <zero-container>
     <div slot="header">
       <SearchHearder  @searchOpen="searchOpen"/>
+      <div style="float:right">
+        <el-button size="mini" icon="el-icon-refresh" @click="refreshPage()" >
+          刷新
+        </el-button>
+      </div>
       <el-collapse-transition >
-        <div v-show="zero">
-          <el-form :inline="true" size="mini" :model="dataForm" @keyup.enter.native="getDataList()">
+          <el-form v-show="zero" :inline="true" size="mini" :model="searchForm" class="zero-from">
+            <el-form-item label="用户名">
+              <el-input v-model="searchForm.username" placeholder="请输入用户名" clearable />
+            </el-form-item>
             <el-form-item>
-                <el-input v-model="dataForm.username" :placeholder="$t('user.username')" clearable/>
+              <el-button size="mini" type="primary" icon="el-icon-search" @click="getDataList()">
+                搜索
+              </el-button>
+              <el-button size="mini" icon="el-icon-refresh" @click="searchResetForm('tableRef')">
+                重置
+              </el-button>
             </el-form-item>
           </el-form>
-        </div>
       </el-collapse-transition>
     </div>
     <div slot="aside">
@@ -18,6 +29,7 @@
     </div>
     <div slot="main" style="height:100%">
      <el-table
+        ref="tableRef"
         height="100%"
         size="mini"
         v-loading="dataListLoading"
@@ -89,7 +101,17 @@ export default {
   methods: {
     searchOpen (data) {
       this.zero = data
+    },
+    refreshPage () { // 最小粒度刷新,只刷新数据
+      this.searchResetForm('tableRef')
+      this.getDataList()
     }
   }
 }
 </script>
+<style scoped>
+.zero-from .el-form-item--mini.el-form-item, .zero-from .el-form-item--small.el-form-item{
+  margin-bottom:0px;
+  padding-top: 10px;
+}
+</style>
-- 
Gitee


From 3b88a65be862fa2ec733c0da36dca4ad3184d736 Mon Sep 17 00:00:00 2001
From: zero <254353372>
Date: Sat, 6 Jun 2020 00:10:12 +0800
Subject: [PATCH 07/70] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/style/theme/theme-base.scss               |  4 ++--
 .../components/zero-container-full.vue               | 12 ++++++------
 src/views/demo/page1/index.vue                       |  4 ++++
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss
index d5e1da6..371dd7a 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -293,7 +293,7 @@
               overflow: hidden;
               .zero-container-full__header {
                 padding: 10px;
-                border-bottom: 0px !important
+                height: auto !important;
               }
               .zero-container-full__aside {
                 padding-left: 10px;
@@ -302,7 +302,7 @@
                 width:15% !important;
                 overflow:hidden;
               }
-              .zero-container-full_main {
+              .zero-container-full__main {
                 padding: 0px !important;
                 height: 100%;
               }
diff --git a/src/components/zero-container/components/zero-container-full.vue b/src/components/zero-container/components/zero-container-full.vue
index d038196..b0319a4 100644
--- a/src/components/zero-container/components/zero-container-full.vue
+++ b/src/components/zero-container/components/zero-container-full.vue
@@ -1,16 +1,16 @@
 <template>
   <div class="zero-container-full">
+    <el-header v-if="$slots.header" class="zero-container-full__header">
+      <slot name="header"/>
+    </el-header>
     <el-container class="zero-container-full__body">
       <el-aside v-if="$slots.aside" class="zero-container-full__aside">
         <el-scrollbar style="height:100%;">
-        <slot name="aside"/>
+          <slot name="aside"/>
         </el-scrollbar>
       </el-aside>
-      <el-container  >
-        <div v-if="$slots.header" class="zero-container-full__header">
-          <slot name="header"/>
-        </div>
-        <el-main v-if="$slots.main" class="zero-container-full_main">
+      <el-container>
+        <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">
diff --git a/src/views/demo/page1/index.vue b/src/views/demo/page1/index.vue
index 5700809..86b6975 100644
--- a/src/views/demo/page1/index.vue
+++ b/src/views/demo/page1/index.vue
@@ -37,6 +37,7 @@
         border
         @selection-change="dataListSelectionChangeHandle"
         @sort-change="dataListSortChangeHandle"
+        class="zero-table"
         style="width: 100%">
           <el-table-column type="selection" header-align="center" align="center" width="50"/>
           <el-table-column prop="name" label="名称" sortable="custom" header-align="center" align="center"/>
@@ -114,4 +115,7 @@ export default {
   margin-bottom:0px;
   padding-top: 10px;
 }
+.zero-table.el-table--fit.el-table--border{
+  border: 0px !important
+}
 </style>
-- 
Gitee


From af532189c76eaeeeb48cc510629bc33dfcf45cf6 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Sat, 6 Jun 2020 17:08:56 +0800
Subject: [PATCH 08/70] =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/view-module.js      | 50 ++++++++++++++++++++++++++++------
 src/views/demo/page1/index.vue | 30 ++++++++++++--------
 2 files changed, 60 insertions(+), 20 deletions(-)

diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js
index 1b0d65e..2083f93 100644
--- a/src/mixins/view-module.js
+++ b/src/mixins/view-module.js
@@ -12,7 +12,8 @@ export default {
         isPage: true, // 数据列表接口，是否需要分页？
         deleteUrl: '', // 删除接口，API地址
         batchDelKey: 'id', // 删除接口，批量状态下由那个key进行标记操作？比如：pid，uid...
-        exportUrl: '' // 导出接口，API地址
+        exportUrl: '', // 导出接口，API地址
+        dictCodes: '' // 页面初始化需要加载的字典，多个字典用逗号隔开
       },
       // 默认属性
       searchForm: {
@@ -25,16 +26,13 @@ export default {
       dataListLoading: false, // 数据列表，loading状态
       dataListSelections: [], // 数据列表，多选项
       addOrUpdateVisible: false, // 新增／更新，弹窗visible状态
-      batchBtnDisabled: true // 批量按钮禁用
-    }
-  },
-  activated () {
-    if (this.mixinViewModuleOptions.activatedIsNeed) {
-      this.getDataList()
+      batchBtnDisabled: true, // 批量按钮禁用
+      dictDetails: {}
     }
   },
   created () {
     if (this.mixinViewModuleOptions.activatedIsNeed) {
+      this.initDict()
       this.getDataList()
     }
   },
@@ -74,7 +72,7 @@ export default {
     dataListSortChangeHandle (data) {
       this.searchForm.sortMap = {}
       if (!data.order || !data.prop) {
-        return false
+        this.searchForm.sortMap = {}
       } else {
         const key = data.prop
         const vaule = data.order.replace(/ending$/, '')
@@ -174,6 +172,42 @@ export default {
       }
       // 清空页面选择的排序按钮
       this.$refs[tableRef].clearSort()
+    },
+    refreshPage (tableRef) { // 最小粒度刷新,只刷新数据
+      this.searchResetForm(tableRef)
+      this.initDict()
+      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) {
+          const data = res[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 = res
+      }
     }
   }
 }
diff --git a/src/views/demo/page1/index.vue b/src/views/demo/page1/index.vue
index 86b6975..e071cf4 100644
--- a/src/views/demo/page1/index.vue
+++ b/src/views/demo/page1/index.vue
@@ -3,7 +3,7 @@
     <div slot="header">
       <SearchHearder  @searchOpen="searchOpen"/>
       <div style="float:right">
-        <el-button size="mini" icon="el-icon-refresh" @click="refreshPage()" >
+        <el-button size="mini" icon="el-icon-refresh" @click="refreshPage('tableRef')" >
           刷新
         </el-button>
       </div>
@@ -40,12 +40,20 @@
         class="zero-table"
         style="width: 100%">
           <el-table-column type="selection" header-align="center" align="center" width="50"/>
-          <el-table-column prop="name" label="名称" sortable="custom" header-align="center" align="center"/>
-          <el-table-column prop="username" label="用户名" sortable="custom" header-align="center" align="center"/>
-          <el-table-column prop="email" label="邮箱" header-align="center" align="center"/>
+          <el-table-column prop="name" label="用户名称" sortable="custom" header-align="center" align="center"/>
+          <el-table-column prop="username" label="用户账号" sortable="custom" header-align="center" align="center"/>
           <el-table-column prop="mobile" label="手机号码" sortable="custom" header-align="center" align="center"/>
-          <el-table-column prop="status" label="状态" sortable="custom" header-align="center" align="center" />
+          <el-table-column prop="state" label="状态" sortable="custom" header-align="center" align="center"  >
+            <template slot-scope="scope">
+              <el-switch
+                v-model="scope.row.state"
+                :active-value="1"
+                :inactive-value="0"/>
+            </template>
+          </el-table-column>
+          <el-table-column prop="type" label="用户类型" sortable="custom" header-align="center" align="center" :formatter="typeFormat"/>
           <el-table-column prop="createTime" label="创建时间" sortable="custom" header-align="center" align="center" width="180" :formatter="dateFormat"/>
+          <el-table-column prop="remarks" label="备注" header-align="center" align="center" />
           <el-table-column label="操作" header-align="center" align="center" width="150">
               <template slot-scope="scope">
                   <el-button type="text" size="mini" @click="addOrUpdateHandle(scope.row.id)">
@@ -87,10 +95,8 @@ export default {
       mixinViewModuleOptions: {
         getDataListUrl: '/sysUser/pageList',
         deleteUrl: '/sysUser/del',
-        exportUrl: '/sysUser/export'
-      },
-      dataForm: {
-        username: ''
+        exportUrl: '/sysUser/export',
+        dictCodes: 'sys_user_type,state'
       },
       zero: false
     }
@@ -103,9 +109,9 @@ export default {
     searchOpen (data) {
       this.zero = data
     },
-    refreshPage () { // 最小粒度刷新,只刷新数据
-      this.searchResetForm('tableRef')
-      this.getDataList()
+    typeFormat (row, column, cellValue) {
+      console.log(111)
+      console.log(this.dictDetails)
     }
   }
 }
-- 
Gitee


From ab16f53bc9a6ada0a1d455a4a7a9b931e29f3853 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Sat, 6 Jun 2020 18:05:10 +0800
Subject: [PATCH 09/70] bug

---
 src/mixins/view-module.js               |  2 +-
 src/store/modules/zerovue/modules/ua.js |  1 -
 src/views/demo/page1/index.vue          | 10 ++++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js
index 2083f93..b260699 100644
--- a/src/mixins/view-module.js
+++ b/src/mixins/view-module.js
@@ -206,7 +206,7 @@ export default {
           }
         }
         zeroobj[zeroStr] = zeroArr
-        this.dictDetails = res
+        this.dictDetails = zeroobj
       }
     }
   }
diff --git a/src/store/modules/zerovue/modules/ua.js b/src/store/modules/zerovue/modules/ua.js
index 5ef0782..f5f7b3c 100644
--- a/src/store/modules/zerovue/modules/ua.js
+++ b/src/store/modules/zerovue/modules/ua.js
@@ -13,7 +13,6 @@ export default {
      */
     get (state) {
       state.data = new UaParser().getResult()
-      console.log(state.data)
     }
   }
 }
diff --git a/src/views/demo/page1/index.vue b/src/views/demo/page1/index.vue
index e071cf4..b41b2af 100644
--- a/src/views/demo/page1/index.vue
+++ b/src/views/demo/page1/index.vue
@@ -110,8 +110,14 @@ export default {
       this.zero = data
     },
     typeFormat (row, column, cellValue) {
-      console.log(111)
-      console.log(this.dictDetails)
+      const dictDetails = this.dictDetails.sys_user_type
+      for (const item in dictDetails) {
+        // eslint-disable-next-line eqeqeq
+        if (cellValue == dictDetails[item].value) {
+          return dictDetails[item].name
+        }
+      }
+      return cellValue
     }
   }
 }
-- 
Gitee


From 6b9d2695fcdf8326b37cfc97d9e0e64814f007bd Mon Sep 17 00:00:00 2001
From: zero <254353372>
Date: Sat, 6 Jun 2020 22:21:48 +0800
Subject: [PATCH 10/70] 1

---
 src/mixins/view-module.js      | 13 ++++++++++---
 src/views/demo/page1/index.vue |  5 ++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js
index b260699..286e639 100644
--- a/src/mixins/view-module.js
+++ b/src/mixins/view-module.js
@@ -100,7 +100,7 @@ export default {
       })
     },
     // 批量删除和单个删除
-    deleteHandle (row) {
+    deleteHandle (row, name) {
       let data = []
       // 判断是否有删除数据
       if (this.dataListSelections.length <= 0 && !row) {
@@ -117,10 +117,12 @@ export default {
       } else {
         data.push({ id: row.id })
       }
-      this.$confirm(this.$t('prompt.info', { handle: this.$t('delete') }), this.$t('prompt.title'), {
+      const delMsg = name ? '正在执行删除 [' + name + ']  是否继续?' : '正在进行批量删除, 是否继续?'
+      this.$confirm(delMsg, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning'
+        type: 'warning',
+        closeOnClickModal: false
       }).then(() => {
         this.dataListLoading = true
         const config = {
@@ -142,6 +144,11 @@ export default {
         }).catch(() => {
           this.handleCodeDelCatch()
         })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
       })
     },
     // 删除后计算分页
diff --git a/src/views/demo/page1/index.vue b/src/views/demo/page1/index.vue
index b41b2af..fa4f0fd 100644
--- a/src/views/demo/page1/index.vue
+++ b/src/views/demo/page1/index.vue
@@ -59,7 +59,7 @@
                   <el-button type="text" size="mini" @click="addOrUpdateHandle(scope.row.id)">
                     修改
                   </el-button>
-                  <el-button type="text" size="mini" @click="deleteHandle(scope.row)">
+                  <el-button type="text" size="mini" @click="deleteHandle(scope.row,scope.row.username)">
                     删除
                   </el-button>
               </template>
@@ -112,8 +112,7 @@ export default {
     typeFormat (row, column, cellValue) {
       const dictDetails = this.dictDetails.sys_user_type
       for (const item in dictDetails) {
-        // eslint-disable-next-line eqeqeq
-        if (cellValue == dictDetails[item].value) {
+        if (cellValue + '' === dictDetails[item].value) {
           return dictDetails[item].name
         }
       }
-- 
Gitee


From b70bb949a60193bb38765a7159abf06796b283d5 Mon Sep 17 00:00:00 2001
From: zero <254353372>
Date: Sun, 7 Jun 2020 12:26:53 +0800
Subject: [PATCH 11/70] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86,=E6=A0=B7=E5=BC=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/zero-container-full.vue        |  2 +-
 src/mixins/view-module.js                     | 32 +++++++++----
 .../demo/page1/components/AddUpdateForm.vue   | 35 ++++++++++++++
 .../demo/page1/components/PageFooter.vue      | 16 +++++++
 src/views/demo/page1/index.vue                | 47 +++++++++----------
 5 files changed, 96 insertions(+), 36 deletions(-)
 create mode 100644 src/views/demo/page1/components/AddUpdateForm.vue
 create mode 100644 src/views/demo/page1/components/PageFooter.vue

diff --git a/src/components/zero-container/components/zero-container-full.vue b/src/components/zero-container/components/zero-container-full.vue
index b0319a4..11a59c5 100644
--- a/src/components/zero-container/components/zero-container-full.vue
+++ b/src/components/zero-container/components/zero-container-full.vue
@@ -27,7 +27,7 @@ export default {
 }
 </script>
 <style>
-.el-scrollbar .el-scrollbar__wrap {
+.zero-container-full__aside>.el-scrollbar .el-scrollbar__wrap {
   overflow-x: hidden !important;
   overflow-y: auto !important;
   height: 100%;
diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js
index 286e639..e2365c8 100644
--- a/src/mixins/view-module.js
+++ b/src/mixins/view-module.js
@@ -25,9 +25,9 @@ export default {
       total: 0, // 总条数
       dataListLoading: false, // 数据列表，loading状态
       dataListSelections: [], // 数据列表，多选项
-      addOrUpdateVisible: false, // 新增／更新，弹窗visible状态
       batchBtnDisabled: true, // 批量按钮禁用
-      dictDetails: {}
+      dictDetails: {}, // 批量按钮禁用
+      searchFormShow: false // 搜索框显示隐藏
     }
   },
   created () {
@@ -92,12 +92,13 @@ export default {
       this.getDataList()
     },
     // 新增 / 修改
-    addOrUpdateHandle (id) {
-      this.addOrUpdateVisible = true
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.searchForm.id = id
-        this.$refs.addOrUpdate.init()
-      })
+    addUpdateFormFun (id) {
+      // 显示新增修改弹框
+      this.$refs.addUpdateFormRef.addUpdateFormVisible = true
+      // this.$nextTick(() => {
+      //   this.$refs.addOrUpdate.searchForm.id = id
+      //   this.$refs.addOrUpdate.init()
+      // })
     },
     // 批量删除和单个删除
     deleteHandle (row, name) {
@@ -182,7 +183,7 @@ export default {
     },
     refreshPage (tableRef) { // 最小粒度刷新,只刷新数据
       this.searchResetForm(tableRef)
-      this.initDict()
+      // this.initDict()
       this.getDataList()
     },
     async initDict () { // 页面加载时需要初始化的字典
@@ -215,6 +216,19 @@ export default {
         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
     }
   }
 }
diff --git a/src/views/demo/page1/components/AddUpdateForm.vue b/src/views/demo/page1/components/AddUpdateForm.vue
new file mode 100644
index 0000000..6f983ec
--- /dev/null
+++ b/src/views/demo/page1/components/AddUpdateForm.vue
@@ -0,0 +1,35 @@
+<template>
+  <el-dialog title="收货地址" :visible.sync="addUpdateFormVisible">
+    <el-form :model="form">
+      <el-form-item label="活动名称">
+        <el-input v-model="form.name" autocomplete="off"></el-input>
+      </el-form-item>
+      <el-form-item label="活动区域">
+        <el-select v-model="form.region" placeholder="请选择活动区域">
+          <el-option label="区域一" value="shanghai"></el-option>
+          <el-option label="区域二" value="beijing"></el-option>
+        </el-select>
+      </el-form-item>
+    </el-form>
+  <div slot="footer" class="dialog-footer">
+    <el-button @click="addUpdateFormVisible = false">取 消</el-button>
+    <el-button type="primary" @click="addUpdateFormVisible = false">确 定</el-button>
+  </div>
+</el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'AddUpdateForm',
+  data () {
+    return {
+      addUpdateFormVisible: false,
+      form: {}
+    }
+  },
+  created () {
+  },
+  methods: {
+  }
+}
+</script>
diff --git a/src/views/demo/page1/components/PageFooter.vue b/src/views/demo/page1/components/PageFooter.vue
new file mode 100644
index 0000000..06f2add
--- /dev/null
+++ b/src/views/demo/page1/components/PageFooter.vue
@@ -0,0 +1,16 @@
+<template>
+  <el-pagination
+    :current-page="page"
+    :page-sizes="[10, 20, 50, 100]"
+    :page-size="limit"
+    :total="total"
+    layout="total, sizes, prev, pager, next, jumper"
+    @size-change="pageSizeChangeHandle"
+    @current-change="pageCurrentChangeHandle" />
+</template>
+
+<script>
+export default {
+  name: 'PageFooter'
+}
+</script>
diff --git a/src/views/demo/page1/index.vue b/src/views/demo/page1/index.vue
index fa4f0fd..8fab653 100644
--- a/src/views/demo/page1/index.vue
+++ b/src/views/demo/page1/index.vue
@@ -6,9 +6,12 @@
         <el-button size="mini" icon="el-icon-refresh" @click="refreshPage('tableRef')" >
           刷新
         </el-button>
+        <el-button size="mini" @click="addUpdateFormFun">
+          新增
+        </el-button>
       </div>
       <el-collapse-transition >
-          <el-form v-show="zero" :inline="true" size="mini" :model="searchForm" class="zero-from">
+          <el-form v-show="searchFormShow" :inline="true" size="mini" :model="searchForm" class="zero-from">
             <el-form-item label="用户名">
               <el-input v-model="searchForm.username" placeholder="请输入用户名" clearable />
             </el-form-item>
@@ -51,12 +54,13 @@
                 :inactive-value="0"/>
             </template>
           </el-table-column>
-          <el-table-column prop="type" label="用户类型" sortable="custom" header-align="center" align="center" :formatter="typeFormat"/>
+          <el-table-column prop="type" label="用户类型" sortable="custom" header-align="center" align="center"
+            :formatter="(row, column, cellValue) => dictDetailsHandle(cellValue, 'sys_user_type')"/>
           <el-table-column prop="createTime" label="创建时间" sortable="custom" header-align="center" align="center" width="180" :formatter="dateFormat"/>
           <el-table-column prop="remarks" label="备注" header-align="center" align="center" />
           <el-table-column label="操作" header-align="center" align="center" width="150">
               <template slot-scope="scope">
-                  <el-button type="text" size="mini" @click="addOrUpdateHandle(scope.row.id)">
+                  <el-button type="text" size="mini" @click="addUpdateFormFun(scope.row.id)">
                     修改
                   </el-button>
                   <el-button type="text" size="mini" @click="deleteHandle(scope.row,scope.row.username)">
@@ -65,30 +69,33 @@
               </template>
           </el-table-column>
       </el-table>
+      <AddUpdateForm ref="addUpdateFormRef" />
     </div>
     <div slot="footer">
       <el-pagination
-      :current-page="page"
-      :page-sizes="[10, 20, 50, 100]"
-      :page-size="limit"
-      :total="total"
-      layout="total, sizes, prev, pager, next, jumper"
-      @size-change="pageSizeChangeHandle"
-      @current-change="pageCurrentChangeHandle" />
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle" />
     </div>
   </zero-container>
 </template>
 
 <script>
-import DemoTreeSide from './components/DemoTreeSide'
-import SearchHearder from './components/SearchHearder'
 import mixinViewModule from '@/mixins/view-module'
+import SearchHearder from './components/SearchHearder'
+import AddUpdateForm from './components/AddUpdateForm'
+import DemoTreeSide from './components/DemoTreeSide'
 export default {
   name: 'page1',
   mixins: [mixinViewModule],
   components: {
     DemoTreeSide,
-    SearchHearder
+    SearchHearder,
+    AddUpdateForm
   },
   data () {
     return {
@@ -106,22 +113,10 @@ export default {
   created () {
   },
   methods: {
-    searchOpen (data) {
-      this.zero = data
-    },
-    typeFormat (row, column, cellValue) {
-      const dictDetails = this.dictDetails.sys_user_type
-      for (const item in dictDetails) {
-        if (cellValue + '' === dictDetails[item].value) {
-          return dictDetails[item].name
-        }
-      }
-      return cellValue
-    }
   }
 }
 </script>
-<style scoped>
+<style>
 .zero-from .el-form-item--mini.el-form-item, .zero-from .el-form-item--small.el-form-item{
   margin-bottom:0px;
   padding-top: 10px;
-- 
Gitee


From 243840f458503fd0a1c05df142256a39b70a138b Mon Sep 17 00:00:00 2001
From: zero <254353372>
Date: Sun, 7 Jun 2020 12:57:42 +0800
Subject: [PATCH 12/70] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E5=A4=B4=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/menu-header/index.js           | 133 ------------------
 src/layout/header-aside/layout.vue            |   4 +-
 src/main.js                                   |   6 +-
 src/menu/index.js                             |  13 --
 4 files changed, 3 insertions(+), 153 deletions(-)
 delete mode 100644 src/layout/header-aside/components/menu-header/index.js

diff --git a/src/layout/header-aside/components/menu-header/index.js b/src/layout/header-aside/components/menu-header/index.js
deleted file mode 100644
index f0cda57..0000000
--- a/src/layout/header-aside/components/menu-header/index.js
+++ /dev/null
@@ -1,133 +0,0 @@
-import { throttle } from 'lodash'
-import { mapState } from 'vuex'
-import menuMixin from '../mixin/menu'
-import { elMenuItem, elSubmenu } from '../libs/util.menu'
-
-export default {
-  name: 'zero-layout-header-aside-menu-header',
-  mixins: [
-    menuMixin
-  ],
-  render (h) {
-    return h('div', {
-      attrs: { flex: 'cross:center' },
-      class: { 'zero-theme-header-menu': true, 'is-scrollable': this.isScroll },
-      ref: 'page'
-    }, [
-      h('div', {
-        attrs: { class: 'zero-theme-header-menu__content', flex: '', 'flex-box': '1' },
-        ref: 'content'
-      }, [
-        h('div', {
-          attrs: { class: 'zero-theme-header-menu__scroll', 'flex-box': '0' },
-          style: { transform: `translateX(${this.currentTranslateX}px)` },
-          ref: 'scroll'
-        }, [
-          h('el-menu', {
-            props: { mode: 'horizontal', defaultActive: this.active },
-            on: { select: this.handleMenuSelect }
-          }, this.header.map(menu => (menu.children === undefined ? elMenuItem : elSubmenu).call(this, h, menu)))
-        ])
-      ]),
-      ...this.isScroll ? [
-        h('div', {
-          attrs: { class: 'zero-theme-header-menu__prev', flex: 'main:center cross:center', 'flex-box': '0' },
-          on: { click: () => this.scroll('left') }
-        }, [
-          h('i', { attrs: { class: 'el-icon-arrow-left' } })
-        ]),
-        h('div', {
-          attrs: { class: 'zero-theme-header-menu__next', flex: 'main:center cross:center', 'flex-box': '0' },
-          on: { click: () => this.scroll('right') }
-        }, [
-          h('i', { attrs: { class: 'el-icon-arrow-right' } })
-        ])
-      ] : []
-    ])
-  },
-  computed: {
-    ...mapState('zerovue/menu', [
-      'header'
-    ])
-  },
-  data () {
-    return {
-      active: '',
-      isScroll: false,
-      scrollWidth: 0,
-      contentWidth: 0,
-      currentTranslateX: 0,
-      throttledCheckScroll: null
-    }
-  },
-  watch: {
-    '$route.matched': {
-      handler (val) {
-        this.active = val[val.length - 1].path
-      },
-      immediate: true
-    }
-  },
-  methods: {
-    scroll (direction) {
-      if (direction === 'left') {
-        // 向右滚动
-        this.currentTranslateX = 0
-      } else {
-        // 向左滚动
-        if (this.contentWidth * 2 - this.currentTranslateX <= this.scrollWidth) {
-          this.currentTranslateX -= this.contentWidth
-        } else {
-          this.currentTranslateX = this.contentWidth - this.scrollWidth
-        }
-      }
-    },
-    checkScroll () {
-      let contentWidth = this.$refs.content.clientWidth
-      let scrollWidth = this.$refs.scroll.clientWidth
-      if (this.isScroll) {
-        // 页面依旧允许滚动的情况，需要更新width
-        if (this.contentWidth - this.scrollWidth === this.currentTranslateX) {
-          // currentTranslateX 也需要相应变化【在右端到头的情况时】
-          this.currentTranslateX = contentWidth - scrollWidth
-          // 快速的滑动依旧存在判断和计算时对应的contentWidth变成正数，所以需要限制一下
-          if (this.currentTranslateX > 0) {
-            this.currentTranslateX = 0
-          }
-        }
-        // 更新元素数据
-        this.contentWidth = contentWidth
-        this.scrollWidth = scrollWidth
-        // 判断何时滚动消失: 当scroll > content
-        if (contentWidth > scrollWidth) {
-          this.isScroll = false
-        }
-      }
-      // 判断何时滚动出现: 当scroll < content
-      if (!this.isScroll && contentWidth < scrollWidth) {
-        this.isScroll = true
-        // 注意，当isScroll变为true，对应的元素盒子大小会发生变化
-        this.$nextTick(() => {
-          contentWidth = this.$refs.content.clientWidth
-          scrollWidth = this.$refs.scroll.clientWidth
-          this.contentWidth = contentWidth
-          this.scrollWidth = scrollWidth
-          this.currentTranslateX = 0
-        })
-      }
-    }
-  },
-  mounted () {
-    // 初始化判断
-    // 默认判断父元素和子元素的大小，以确定初始情况是否显示滚动
-    window.addEventListener('load', this.checkScroll)
-    // 全局窗口变化监听，判断父元素和子元素的大小，从而控制isScroll的开关
-    this.throttledCheckScroll = throttle(this.checkScroll, 300)
-    window.addEventListener('resize', this.throttledCheckScroll)
-  },
-  beforeDestroy () {
-    // 取消监听
-    window.removeEventListener('resize', this.throttledCheckScroll)
-    window.removeEventListener('load', this.checkScroll)
-  }
-}
diff --git a/src/layout/header-aside/layout.vue b/src/layout/header-aside/layout.vue
index ec06a64..d0d6c8c 100644
--- a/src/layout/header-aside/layout.vue
+++ b/src/layout/header-aside/layout.vue
@@ -17,7 +17,7 @@
         <div class="toggle-aside-btn" @click="handleToggleAside" flex-box="0">
           <zero-icon name="bars"/>
         </div>
-        <zero-menu-header flex-box="1"/>
+        <span flex-box="1"/>
         <!-- 顶栏右侧 -->
         <div class="zero-header-right" flex-box="0">
           <!-- 如果你只想在开发环境显示这个按钮请添加 v-if="$env === 'development'" -->
@@ -76,7 +76,6 @@
 
 <script>
 import zeroMenuSide from './components/menu-side'
-import zeroMenuHeader from './components/menu-header'
 import zeroTabs from './components/tabs'
 import zeroHeaderFullscreen from './components/header-fullscreen'
 import zeroHeaderLocales from './components/header-locales'
@@ -94,7 +93,6 @@ export default {
   ],
   components: {
     zeroMenuSide,
-    zeroMenuHeader,
     zeroTabs,
     zeroHeaderFullscreen,
     zeroHeaderLocales,
diff --git a/src/main.js b/src/main.js
index c42860b..18660fd 100644
--- a/src/main.js
+++ b/src/main.js
@@ -9,7 +9,7 @@ import store from '@/store/index'
 
 // 菜单和路由设置
 import router from './router'
-import { menuHeader, menuAside } from '@/menu'
+import { menuAside } from '@/menu'
 import { frameInRoutes } from '@/router/routes'
 import { request } from './api/axios'
 
@@ -26,12 +26,10 @@ new Vue({
   created () {
     // 处理路由 得到每一级的路由设置
     this.$store.commit('zerovue/page/init', frameInRoutes)
-    // 设置顶栏菜单
-    this.$store.commit('zerovue/menu/headerSet', menuHeader)
     // 设置侧边栏菜单
     this.$store.commit('zerovue/menu/asideSet', menuAside)
     // 初始化菜单搜索功能
-    this.$store.commit('zerovue/search/init', menuHeader)
+    this.$store.commit('zerovue/search/init', menuAside)
   },
   mounted () {
     // 展示系统信息
diff --git a/src/menu/index.js b/src/menu/index.js
index 373d737..2d99711 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -15,19 +15,6 @@ function supplementPath (menu) {
   }))
 }
 
-export const menuHeader = supplementPath([
-  { path: '/index', title: '首页', icon: 'home' },
-  {
-    title: '页面',
-    icon: 'folder-o',
-    children: [
-      { path: '/page1', title: '页面 1' },
-      { path: '/page2', title: '页面 2' },
-      { path: '/page3', title: '页面 3' }
-    ]
-  }
-])
-
 export const menuAside = supplementPath([
   { path: '/index', title: '首页', icon: 'home' },
   {
-- 
Gitee


From b75c05c7e080e22b3447c417e0b856447997a905 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Mon, 8 Jun 2020 17:26:23 +0800
Subject: [PATCH 13/70] =?UTF-8?q?=E6=A0=91=E5=BD=A2=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/style/theme/theme-base.scss        |  2 +-
 .../components/zero-container-full.vue        |  8 ++--
 .../demo/page1/components/DemoTreeSide.vue    | 40 ++++++++++++++++++-
 src/views/demo/page1/index.vue                | 34 +++++++++-------
 4 files changed, 61 insertions(+), 23 deletions(-)

diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss
index 371dd7a..97e708b 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -300,7 +300,7 @@
                 // padding: 10px;
                 border-right:1px solid #cfd7e5;
                 width:15% !important;
-                overflow:hidden;
+                // overflow:hidden;
               }
               .zero-container-full__main {
                 padding: 0px !important;
diff --git a/src/components/zero-container/components/zero-container-full.vue b/src/components/zero-container/components/zero-container-full.vue
index 11a59c5..8670f61 100644
--- a/src/components/zero-container/components/zero-container-full.vue
+++ b/src/components/zero-container/components/zero-container-full.vue
@@ -5,9 +5,7 @@
     </el-header>
     <el-container class="zero-container-full__body">
       <el-aside v-if="$slots.aside" class="zero-container-full__aside">
-        <el-scrollbar style="height:100%;">
-          <slot name="aside"/>
-        </el-scrollbar>
+        <slot name="aside"/>
       </el-aside>
       <el-container>
         <el-main v-if="$slots.main" class="zero-container-full__main">
@@ -27,11 +25,11 @@ export default {
 }
 </script>
 <style>
-.zero-container-full__aside>.el-scrollbar .el-scrollbar__wrap {
+/* .zero-container-full__aside>.el-scrollbar .el-scrollbar__wrap {
   overflow-x: hidden !important;
   overflow-y: auto !important;
   height: 100%;
-  }
+  } */
   .el-tree>.el-tree-node{
     display:inline-block;
     min-width: 100%;
diff --git a/src/views/demo/page1/components/DemoTreeSide.vue b/src/views/demo/page1/components/DemoTreeSide.vue
index 07b4823..36ab9a3 100644
--- a/src/views/demo/page1/components/DemoTreeSide.vue
+++ b/src/views/demo/page1/components/DemoTreeSide.vue
@@ -1,5 +1,25 @@
 <template>
-  <el-tree :data="data" class="tree" />
+  <el-tree
+      :data="data"
+      node-key="id"
+      :expand-on-click-node="false">
+      <span class="custom-tree-node" slot-scope="{ node, data }">
+        <span>{{ node.label }}</span>
+        <span>
+          <el-dropdown trigger="click" placement="right-start">
+            <span class="el-dropdown-link">
+              <i class="el-icon-s-operation"></i>
+            </span>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item icon="el-icon-plus" @click.native="addPeerTree(data)">新增同级</el-dropdown-item>
+              <el-dropdown-item icon="el-icon-circle-plus" @click.native="addChildrenTree(data)">新增下级</el-dropdown-item>
+              <el-dropdown-item icon="el-icon-edit-outline" @click.native="updateTree(data)">修改</el-dropdown-item>
+              <el-dropdown-item icon="el-icon-delete-solid" @click.native="delTree(data)">删除</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </span>
+      </span>
+    </el-tree>
 </template>
 
 <script>
@@ -24,8 +44,24 @@ export default {
   name: 'DemoTreeSide',
   data () {
     return {
-      data: treeData
+      data: treeData,
+      zero_add: false
+    }
+  },
+  methods: {
+    addTree (data) {
+      console.log(data)
     }
   }
 }
 </script>
+<style rel="stylesheet/scss" lang="scss">
+  .custom-tree-node {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-size: 14px;
+    padding-right: 10px;
+  }
+</style>
diff --git a/src/views/demo/page1/index.vue b/src/views/demo/page1/index.vue
index 8fab653..e5ff493 100644
--- a/src/views/demo/page1/index.vue
+++ b/src/views/demo/page1/index.vue
@@ -1,5 +1,6 @@
 <template>
   <zero-container>
+    <!-- 头部信息-start -->
     <div slot="header">
       <SearchHearder  @searchOpen="searchOpen"/>
       <div style="float:right">
@@ -11,7 +12,7 @@
         </el-button>
       </div>
       <el-collapse-transition >
-          <el-form v-show="searchFormShow" :inline="true" size="mini" :model="searchForm" class="zero-from">
+          <el-form v-show="searchFormShow" :inline="true" size="mini" :model="searchForm" class="zero-search-from">
             <el-form-item label="用户名">
               <el-input v-model="searchForm.username" placeholder="请输入用户名" clearable />
             </el-form-item>
@@ -26,10 +27,14 @@
           </el-form>
       </el-collapse-transition>
     </div>
+    <!-- 头部信息-end -->
+    <!-- 左边信息-start -->
     <div slot="aside">
       树
       <DemoTreeSide/>
     </div>
+    <!-- 左边信息-end -->
+    <!-- 右边信息-start -->
     <div slot="main" style="height:100%">
      <el-table
         ref="tableRef"
@@ -46,6 +51,7 @@
           <el-table-column prop="name" label="用户名称" sortable="custom" header-align="center" align="center"/>
           <el-table-column prop="username" label="用户账号" sortable="custom" header-align="center" align="center"/>
           <el-table-column prop="mobile" label="手机号码" sortable="custom" header-align="center" align="center"/>
+          <!-- 状态特殊处理 -->
           <el-table-column prop="state" label="状态" sortable="custom" header-align="center" align="center"  >
             <template slot-scope="scope">
               <el-switch
@@ -54,6 +60,7 @@
                 :inactive-value="0"/>
             </template>
           </el-table-column>
+          <!-- 字典特殊处理 -->
           <el-table-column prop="type" label="用户类型" sortable="custom" header-align="center" align="center"
             :formatter="(row, column, cellValue) => dictDetailsHandle(cellValue, 'sys_user_type')"/>
           <el-table-column prop="createTime" label="创建时间" sortable="custom" header-align="center" align="center" width="180" :formatter="dateFormat"/>
@@ -69,8 +76,11 @@
               </template>
           </el-table-column>
       </el-table>
+      <!-- 新增修改弹框 -->
       <AddUpdateForm ref="addUpdateFormRef" />
     </div>
+    <!-- 右边信息-end -->
+    <!-- 页脚-start -->
     <div slot="footer">
       <el-pagination
         :current-page="page"
@@ -81,14 +91,15 @@
         @size-change="pageSizeChangeHandle"
         @current-change="pageCurrentChangeHandle" />
     </div>
+    <!-- 页脚-end -->
   </zero-container>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import SearchHearder from './components/SearchHearder'
-import AddUpdateForm from './components/AddUpdateForm'
-import DemoTreeSide from './components/DemoTreeSide'
+import mixinViewModule from '@/mixins/view-module' // 分页相关js
+import SearchHearder from './components/SearchHearder' // 头部查询模块
+import AddUpdateForm from './components/AddUpdateForm' // 添加修改模块
+import DemoTreeSide from './components/DemoTreeSide' // 左边树形模块
 export default {
   name: 'page1',
   mixins: [mixinViewModule],
@@ -103,21 +114,14 @@ export default {
         getDataListUrl: '/sysUser/pageList',
         deleteUrl: '/sysUser/del',
         exportUrl: '/sysUser/export',
-        dictCodes: 'sys_user_type,state'
-      },
-      zero: false
+        dictCodes: 'sys_user_type'
+      }
     }
-  },
-  mounted () {
-  },
-  created () {
-  },
-  methods: {
   }
 }
 </script>
 <style>
-.zero-from .el-form-item--mini.el-form-item, .zero-from .el-form-item--small.el-form-item{
+.zero-search-from .el-form-item--mini.el-form-item, .zero-search-from .el-form-item--small.el-form-item{
   margin-bottom:0px;
   padding-top: 10px;
 }
-- 
Gitee


From ec55c1039ddaa008dd4da5ab5e88fcfcfd1348b2 Mon Sep 17 00:00:00 2001
From: zero <254353372>
Date: Mon, 8 Jun 2020 21:17:50 +0800
Subject: [PATCH 14/70] =?UTF-8?q?=E6=A0=91=E5=BD=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demo/page1/components/AddUpdateForm.vue | 8 ++++----
 src/views/demo/page1/components/DemoTreeSide.vue  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/demo/page1/components/AddUpdateForm.vue b/src/views/demo/page1/components/AddUpdateForm.vue
index 6f983ec..ee078df 100644
--- a/src/views/demo/page1/components/AddUpdateForm.vue
+++ b/src/views/demo/page1/components/AddUpdateForm.vue
@@ -1,11 +1,11 @@
 <template>
   <el-dialog title="收货地址" :visible.sync="addUpdateFormVisible">
-    <el-form :model="form">
+    <el-form :model="addUpdateForm">
       <el-form-item label="活动名称">
-        <el-input v-model="form.name" autocomplete="off"></el-input>
+        <el-input v-model="addUpdateForm.name" autocomplete="off"></el-input>
       </el-form-item>
       <el-form-item label="活动区域">
-        <el-select v-model="form.region" placeholder="请选择活动区域">
+        <el-select v-model="addUpdateForm.region" placeholder="请选择活动区域">
           <el-option label="区域一" value="shanghai"></el-option>
           <el-option label="区域二" value="beijing"></el-option>
         </el-select>
@@ -24,7 +24,7 @@ export default {
   data () {
     return {
       addUpdateFormVisible: false,
-      form: {}
+      addUpdateForm: {}
     }
   },
   created () {
diff --git a/src/views/demo/page1/components/DemoTreeSide.vue b/src/views/demo/page1/components/DemoTreeSide.vue
index 36ab9a3..4f5b563 100644
--- a/src/views/demo/page1/components/DemoTreeSide.vue
+++ b/src/views/demo/page1/components/DemoTreeSide.vue
@@ -1,8 +1,7 @@
 <template>
   <el-tree
       :data="data"
-      node-key="id"
-      :expand-on-click-node="false">
+      node-key="id">
       <span class="custom-tree-node" slot-scope="{ node, data }">
         <span>{{ node.label }}</span>
         <span>
@@ -11,7 +10,7 @@
               <i class="el-icon-s-operation"></i>
             </span>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item icon="el-icon-plus" @click.native="addPeerTree(data)">新增同级</el-dropdown-item>
+              <el-dropdown-item icon="el-icon-plus" @click.native="addPeerTree(node,data)">新增同级</el-dropdown-item>
               <el-dropdown-item icon="el-icon-circle-plus" @click.native="addChildrenTree(data)">新增下级</el-dropdown-item>
               <el-dropdown-item icon="el-icon-edit-outline" @click.native="updateTree(data)">修改</el-dropdown-item>
               <el-dropdown-item icon="el-icon-delete-solid" @click.native="delTree(data)">删除</el-dropdown-item>
@@ -49,7 +48,8 @@ export default {
     }
   },
   methods: {
-    addTree (data) {
+    addPeerTree (node, data) {
+      console.log(data)
       console.log(data)
     }
   }
-- 
Gitee


From 6d2f85cab0456046186dc817c14191a7c4ed7653 Mon Sep 17 00:00:00 2001
From: zero <254353372>
Date: Tue, 9 Jun 2020 00:27:26 +0800
Subject: [PATCH 15/70] =?UTF-8?q?=E6=A0=91=E5=BD=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/style/theme/theme-base.scss        |  1 -
 .../demo/page1/components/DemoTreeSide.vue    | 22 ++++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss
index 97e708b..9cb2f69 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -299,7 +299,6 @@
                 padding-left: 10px;
                 // padding: 10px;
                 border-right:1px solid #cfd7e5;
-                width:15% !important;
                 // overflow:hidden;
               }
               .zero-container-full__main {
diff --git a/src/views/demo/page1/components/DemoTreeSide.vue b/src/views/demo/page1/components/DemoTreeSide.vue
index 4f5b563..4377c33 100644
--- a/src/views/demo/page1/components/DemoTreeSide.vue
+++ b/src/views/demo/page1/components/DemoTreeSide.vue
@@ -1,11 +1,13 @@
 <template>
+<div  width="300px">
   <el-tree
       :data="data"
       node-key="id">
-      <span class="custom-tree-node" slot-scope="{ node, data }">
+      <span class="custom-tree-node" slot-scope="{ node, data }"
+        @mouseover="mouseover(data.label)" @mouseout="mouseout">
         <span>{{ node.label }}</span>
-        <span>
-          <el-dropdown trigger="click" placement="right-start">
+        <span v-show="showDropdown[data.label]">
+          <el-dropdown placement="right-start">
             <span class="el-dropdown-link">
               <i class="el-icon-s-operation"></i>
             </span>
@@ -18,7 +20,7 @@
           </el-dropdown>
         </span>
       </span>
-    </el-tree>
+    </el-tree></div>
 </template>
 
 <script>
@@ -29,7 +31,7 @@ const treeData = [
     label: 'Side menu'
   },
   ...map(range(1, 10), (index1) => ({
-    label: ' ' + index1,
+    label: 'Menu item  ' + index1,
     children: map(range(1, 20), (index2) => ({
       label: 'Menu item ' + index1 + '-' + index2,
       children: map(range(1, 5), (index3) => ({
@@ -44,13 +46,17 @@ export default {
   data () {
     return {
       data: treeData,
-      zero_add: false
+      showDropdown: {}
     }
   },
   methods: {
     addPeerTree (node, data) {
-      console.log(data)
-      console.log(data)
+    },
+    mouseover (id) {
+      this.showDropdown = { [id]: true }
+    },
+    mouseout () {
+      this.showDropdown = {}
     }
   }
 }
-- 
Gitee


From 07a9fde750628b27a6b9f02fe4ece61b98c5b722 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Tue, 9 Jun 2020 13:23:58 +0800
Subject: [PATCH 16/70] =?UTF-8?q?=E6=A0=91=E5=BD=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/page1/components/DemoTreeSide.vue    | 45 +++++++++----------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/views/demo/page1/components/DemoTreeSide.vue b/src/views/demo/page1/components/DemoTreeSide.vue
index 4377c33..bf087cb 100644
--- a/src/views/demo/page1/components/DemoTreeSide.vue
+++ b/src/views/demo/page1/components/DemoTreeSide.vue
@@ -1,26 +1,23 @@
 <template>
-<div  width="300px">
-  <el-tree
-      :data="data"
-      node-key="id">
-      <span class="custom-tree-node" slot-scope="{ node, data }"
-        @mouseover="mouseover(data.label)" @mouseout="mouseout">
-        <span>{{ node.label }}</span>
-        <span v-show="showDropdown[data.label]">
-          <el-dropdown placement="right-start">
-            <span class="el-dropdown-link">
-              <i class="el-icon-s-operation"></i>
-            </span>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item icon="el-icon-plus" @click.native="addPeerTree(node,data)">新增同级</el-dropdown-item>
-              <el-dropdown-item icon="el-icon-circle-plus" @click.native="addChildrenTree(data)">新增下级</el-dropdown-item>
-              <el-dropdown-item icon="el-icon-edit-outline" @click.native="updateTree(data)">修改</el-dropdown-item>
-              <el-dropdown-item icon="el-icon-delete-solid" @click.native="delTree(data)">删除</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </span>
-      </span>
-    </el-tree></div>
+  <el-tree :data="data" node-key="label">
+    <span class="custom-tree-node" slot-scope="{ node, data }"
+      @mouseover="mouseover(data.label,$event)" @mouseleave="mouseout(data.label)">
+      <span>{{ node.label }}</span>
+      <div v-show="showDropdown[data.label]" @click.stop="()=>{}" >
+        <el-dropdown placement="right-start" trigger="click">
+          <span class="el-dropdown-link">
+            <i class="el-icon-s-operation"></i>
+          </span>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item icon="el-icon-plus" @click.native="addPeerTree(node,data)">新增同级</el-dropdown-item>
+            <el-dropdown-item icon="el-icon-circle-plus" @click.native="addChildrenTree(data)">新增下级</el-dropdown-item>
+            <el-dropdown-item icon="el-icon-edit-outline" @click.native="updateTree(data)">修改</el-dropdown-item>
+            <el-dropdown-item icon="el-icon-delete-solid" @click.native="delTree(data)">删除</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
+    </span>
+  </el-tree>
 </template>
 
 <script>
@@ -55,13 +52,13 @@ export default {
     mouseover (id) {
       this.showDropdown = { [id]: true }
     },
-    mouseout () {
+    mouseout (id) {
       this.showDropdown = {}
     }
   }
 }
 </script>
-<style rel="stylesheet/scss" lang="scss">
+<style>
   .custom-tree-node {
     flex: 1;
     display: flex;
-- 
Gitee


From 2afc79327ab48232e331adc84c129a9f1b3b2ef8 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Tue, 9 Jun 2020 14:28:14 +0800
Subject: [PATCH 17/70] =?UTF-8?q?=E6=A0=91=E5=BD=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/page1/components/DemoTreeSide.vue    | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/views/demo/page1/components/DemoTreeSide.vue b/src/views/demo/page1/components/DemoTreeSide.vue
index bf087cb..ac54346 100644
--- a/src/views/demo/page1/components/DemoTreeSide.vue
+++ b/src/views/demo/page1/components/DemoTreeSide.vue
@@ -1,18 +1,15 @@
 <template>
   <el-tree :data="data" node-key="label">
-    <span class="custom-tree-node" slot-scope="{ node, data }"
-      @mouseover="mouseover(data.label,$event)" @mouseleave="mouseout(data.label)">
+    <span class="custom-tree-node" slot-scope="{ node, data }" @mouseover="mouseover(data)" @mouseleave="mouseout(data)">
       <span>{{ node.label }}</span>
-      <div v-show="showDropdown[data.label]" @click.stop="()=>{}" >
+      <div v-show="data.dropdownShow" @click.stop="()=>{}">
         <el-dropdown placement="right-start" trigger="click">
-          <span class="el-dropdown-link">
-            <i class="el-icon-s-operation"></i>
-          </span>
+          <i class="el-icon-s-operation"></i>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item icon="el-icon-plus" @click.native="addPeerTree(node,data)">新增同级</el-dropdown-item>
-            <el-dropdown-item icon="el-icon-circle-plus" @click.native="addChildrenTree(data)">新增下级</el-dropdown-item>
-            <el-dropdown-item icon="el-icon-edit-outline" @click.native="updateTree(data)">修改</el-dropdown-item>
-            <el-dropdown-item icon="el-icon-delete-solid" @click.native="delTree(data)">删除</el-dropdown-item>
+            <el-dropdown-item icon="el-icon-circle-plus" @click.native="addChildrenTree(node,data)">新增下级</el-dropdown-item>
+            <el-dropdown-item icon="el-icon-edit-outline" @click.native="updateTree(node,data)">修改</el-dropdown-item>
+            <el-dropdown-item icon="el-icon-delete-solid" @click.native="delTree(node,data)">删除</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
       </div>
@@ -22,7 +19,7 @@
 
 <script>
 import { map, range } from 'lodash'
-
+// 构造树形数据
 const treeData = [
   {
     label: 'Side menu'
@@ -42,18 +39,27 @@ export default {
   name: 'DemoTreeSide',
   data () {
     return {
-      data: treeData,
-      showDropdown: {}
+      data: treeData
     }
   },
   methods: {
+    mouseover (data) { // 移入
+      this.$set(data, 'dropdownShow', true)
+    },
+    mouseout (data) { // 移除
+      this.$set(data, 'dropdownShow', false)
+    },
     addPeerTree (node, data) {
+      console.log('新增同级')
+    },
+    addChildrenTree (node, data) {
+      console.log('新增下级')
     },
-    mouseover (id) {
-      this.showDropdown = { [id]: true }
+    updateTree (node, data) {
+      console.log('修改')
     },
-    mouseout (id) {
-      this.showDropdown = {}
+    updateTdelTreeree (node, data) {
+      console.log('删除')
     }
   }
 }
@@ -66,5 +72,6 @@ export default {
     justify-content: space-between;
     font-size: 14px;
     padding-right: 10px;
+    height:100%;
   }
 </style>
-- 
Gitee


From e7a47faaa6f551badab646bc6559e3199d7faa42 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Tue, 9 Jun 2020 18:02:28 +0800
Subject: [PATCH 18/70] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/view-module.js                     | 11 +--
 .../demo/page1/components/AddUpdateForm.vue   | 88 +++++++++++++++----
 .../demo/page1/components/DemoTreeSide.vue    |  2 +-
 .../demo/page1/components/PageFooter.vue      | 16 ----
 src/views/demo/page1/index.vue                | 17 +++-
 5 files changed, 85 insertions(+), 49 deletions(-)
 delete mode 100644 src/views/demo/page1/components/PageFooter.vue

diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js
index e2365c8..fa5318a 100644
--- a/src/mixins/view-module.js
+++ b/src/mixins/view-module.js
@@ -26,7 +26,7 @@ export default {
       dataListLoading: false, // 数据列表，loading状态
       dataListSelections: [], // 数据列表，多选项
       batchBtnDisabled: true, // 批量按钮禁用
-      dictDetails: {}, // 批量按钮禁用
+      dictDetails: {}, // 页面字典详情数据
       searchFormShow: false // 搜索框显示隐藏
     }
   },
@@ -91,15 +91,6 @@ export default {
       this.page = val
       this.getDataList()
     },
-    // 新增 / 修改
-    addUpdateFormFun (id) {
-      // 显示新增修改弹框
-      this.$refs.addUpdateFormRef.addUpdateFormVisible = true
-      // this.$nextTick(() => {
-      //   this.$refs.addOrUpdate.searchForm.id = id
-      //   this.$refs.addOrUpdate.init()
-      // })
-    },
     // 批量删除和单个删除
     deleteHandle (row, name) {
       let data = []
diff --git a/src/views/demo/page1/components/AddUpdateForm.vue b/src/views/demo/page1/components/AddUpdateForm.vue
index ee078df..294e47c 100644
--- a/src/views/demo/page1/components/AddUpdateForm.vue
+++ b/src/views/demo/page1/components/AddUpdateForm.vue
@@ -1,21 +1,49 @@
 <template>
-  <el-dialog title="收货地址" :visible.sync="addUpdateFormVisible">
-    <el-form :model="addUpdateForm">
-      <el-form-item label="活动名称">
-        <el-input v-model="addUpdateForm.name" autocomplete="off"></el-input>
-      </el-form-item>
-      <el-form-item label="活动区域">
-        <el-select v-model="addUpdateForm.region" placeholder="请选择活动区域">
-          <el-option label="区域一" value="shanghai"></el-option>
-          <el-option label="区域二" value="beijing"></el-option>
-        </el-select>
+  <el-dialog :title="title" :visible.sync="addUpdateFormVisible" width="800px">
+    <el-form :model="addUpdateForm" label-width="120px" size="medium" ref="addUpdateFormRef">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="用户名称">
+            <el-input v-model="addUpdateForm.name"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="状态">
+            <el-select v-model="addUpdateForm.state" placeholder="请选择状态" style="width:100%">
+              <el-option label="区域一" value="shanghai"></el-option>
+              <el-option label="区域二" value="beijing"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="手机号">
+            <el-input v-model="addUpdateForm.mobile"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="密码">
+            <el-input v-model="addUpdateForm.password"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="类型">
+            <el-input v-model="addUpdateForm.type"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="备注">
+        <el-input type="textarea" v-model="addUpdateForm.remarks" />
       </el-form-item>
     </el-form>
-  <div slot="footer" class="dialog-footer">
-    <el-button @click="addUpdateFormVisible = false">取 消</el-button>
-    <el-button type="primary" @click="addUpdateFormVisible = false">确 定</el-button>
-  </div>
-</el-dialog>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="addUpdateFormReset">取 消</el-button>
+      <el-button type="primary" @click="addOrUpdate(addUpdateForm.id)">确 定</el-button>
+    </div>
+  </el-dialog>
 </template>
 
 <script>
@@ -23,13 +51,35 @@ export default {
   name: 'AddUpdateForm',
   data () {
     return {
-      addUpdateFormVisible: false,
-      addUpdateForm: {}
+      addUpdateFormVisible: false, // 是否显示弹框
+      title: '', // 弹框标题
+      addUpdateForm: {} // 表单数据
     }
   },
-  created () {
-  },
+  created () {},
   methods: {
+    addOrUpdate (id) {
+      if (id) {
+        this.update()
+      } else {
+        this.add()
+      }
+    },
+    add () { // 添加
+      console.log('添加')
+      console.log(this.addUpdateForm)
+    },
+    update () { // 修改
+      console.log('修改')
+      console.log(this.addUpdateForm)
+    },
+    addUpdateFormReset () { // 新增、修改、取消成功后调用重置表单
+      this.addUpdateForm = {}
+      this.addUpdateFormVisible = false
+      this.$nextTick(() => {
+        this.$refs.addUpdateFormRef.resetFields()
+      })
+    }
   }
 }
 </script>
diff --git a/src/views/demo/page1/components/DemoTreeSide.vue b/src/views/demo/page1/components/DemoTreeSide.vue
index ac54346..4385b19 100644
--- a/src/views/demo/page1/components/DemoTreeSide.vue
+++ b/src/views/demo/page1/components/DemoTreeSide.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-tree :data="data" node-key="label">
+  <el-tree :data="data" node-key="label" :highlight-current="true">
     <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="()=>{}">
diff --git a/src/views/demo/page1/components/PageFooter.vue b/src/views/demo/page1/components/PageFooter.vue
deleted file mode 100644
index 06f2add..0000000
--- a/src/views/demo/page1/components/PageFooter.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<template>
-  <el-pagination
-    :current-page="page"
-    :page-sizes="[10, 20, 50, 100]"
-    :page-size="limit"
-    :total="total"
-    layout="total, sizes, prev, pager, next, jumper"
-    @size-change="pageSizeChangeHandle"
-    @current-change="pageCurrentChangeHandle" />
-</template>
-
-<script>
-export default {
-  name: 'PageFooter'
-}
-</script>
diff --git a/src/views/demo/page1/index.vue b/src/views/demo/page1/index.vue
index e5ff493..70197a2 100644
--- a/src/views/demo/page1/index.vue
+++ b/src/views/demo/page1/index.vue
@@ -7,7 +7,7 @@
         <el-button size="mini" icon="el-icon-refresh" @click="refreshPage('tableRef')" >
           刷新
         </el-button>
-        <el-button size="mini" @click="addUpdateFormFun">
+        <el-button size="mini" @click="addUpdateFormFun()">
           新增
         </el-button>
       </div>
@@ -67,7 +67,7 @@
           <el-table-column prop="remarks" label="备注" header-align="center" align="center" />
           <el-table-column label="操作" header-align="center" align="center" width="150">
               <template slot-scope="scope">
-                  <el-button type="text" size="mini" @click="addUpdateFormFun(scope.row.id)">
+                  <el-button type="text" size="mini" @click="addUpdateFormFun(scope.row)">
                     修改
                   </el-button>
                   <el-button type="text" size="mini" @click="deleteHandle(scope.row,scope.row.username)">
@@ -77,7 +77,7 @@
           </el-table-column>
       </el-table>
       <!-- 新增修改弹框 -->
-      <AddUpdateForm ref="addUpdateFormRef" />
+      <AddUpdateForm ref="addUpdateDialogRef" />
     </div>
     <!-- 右边信息-end -->
     <!-- 页脚-start -->
@@ -117,6 +117,17 @@ export default {
         dictCodes: 'sys_user_type'
       }
     }
+  },
+  methods: {
+    addUpdateFormFun (row) { // 新增或修改
+      this.$refs.addUpdateDialogRef.addUpdateFormVisible = true
+      if (row) {
+        this.$refs.addUpdateDialogRef.title = '修改用户'
+        this.$refs.addUpdateDialogRef.addUpdateForm = JSON.parse(JSON.stringify(row))
+      } else {
+        this.$refs.addUpdateDialogRef.title = '新增用户'
+      }
+    }
   }
 }
 </script>
-- 
Gitee


From 90a05037fa782cdddff8569968d353e2cd6274ef Mon Sep 17 00:00:00 2001
From: zero <254353372>
Date: Tue, 9 Jun 2020 22:19:57 +0800
Subject: [PATCH 19/70] 1

---
 .../demo/page1/components/AddUpdateForm.vue   | 72 ++++++++++++-------
 src/views/demo/page1/index.vue                |  5 +-
 2 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/src/views/demo/page1/components/AddUpdateForm.vue b/src/views/demo/page1/components/AddUpdateForm.vue
index 294e47c..4c2864c 100644
--- a/src/views/demo/page1/components/AddUpdateForm.vue
+++ b/src/views/demo/page1/components/AddUpdateForm.vue
@@ -3,44 +3,59 @@
     <el-form :model="addUpdateForm" label-width="120px" size="medium" ref="addUpdateFormRef">
       <el-row>
         <el-col :span="12">
-          <el-form-item label="用户名称">
-            <el-input v-model="addUpdateForm.name"></el-input>
+          <el-form-item label="用户账号">
+            <el-input v-model="addUpdateForm.username" placeholder="请输入用户账号" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="状态">
-            <el-select v-model="addUpdateForm.state" placeholder="请选择状态" style="width:100%">
-              <el-option label="区域一" value="shanghai"></el-option>
-              <el-option label="区域二" value="beijing"></el-option>
-            </el-select>
-          </el-form-item>
+          <el-col :span="12">
+            <el-form-item label="密码">
+              <el-input v-model="addUpdateForm.password" placeholder="请输入密码" show-password/>
+            </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
           <el-form-item label="手机号">
-            <el-input v-model="addUpdateForm.mobile"></el-input>
+            <el-input v-model="addUpdateForm.mobile" placeholder="请输入手机号" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="密码">
-            <el-input v-model="addUpdateForm.password"></el-input>
+          <el-form-item label="用户名称">
+            <el-input v-model="addUpdateForm.name" placeholder="请输入用户名称" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
+        <el-col :span="12">
+          <el-form-item label="状态">
+            <el-radio-group v-model="addUpdateForm.state">
+              <el-radio-button v-for="state in dictDetails.state"
+              :label="state.value"
+              :key="state.value">
+                {{state.name}}
+              </el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="类型">
-            <el-input v-model="addUpdateForm.type"></el-input>
+            <el-select v-model="addUpdateForm.type" placeholder="请选择类型" style="width:100%">
+              <el-option
+                v-for="type in dictDetails.sys_user_type"
+                :key="type.value"
+                :label="type.name"
+                :value="type.value">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-form-item label="备注">
-        <el-input type="textarea" v-model="addUpdateForm.remarks" />
+        <el-input type="textarea" v-model="addUpdateForm.remarks" placeholder="请输入备注" />
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
-      <el-button @click="addUpdateFormReset">取 消</el-button>
+      <el-button @click="addUpdateFormVisible = false">取 消</el-button>
       <el-button type="primary" @click="addOrUpdate(addUpdateForm.id)">确 定</el-button>
     </div>
   </el-dialog>
@@ -49,14 +64,20 @@
 <script>
 export default {
   name: 'AddUpdateForm',
+  props: {
+    dictDetails: Object
+  },
   data () {
     return {
       addUpdateFormVisible: false, // 是否显示弹框
       title: '', // 弹框标题
-      addUpdateForm: {} // 表单数据
+      addUpdateForm: {
+        state: 1 // 默认启用
+      }
     }
   },
-  created () {},
+  created () {
+  },
   methods: {
     addOrUpdate (id) {
       if (id) {
@@ -65,19 +86,22 @@ export default {
         this.add()
       }
     },
-    add () { // 添加
+    add () {
+      // 添加
       console.log('添加')
-      console.log(this.addUpdateForm)
+      console.log(this.addUpdateForm.state)
     },
-    update () { // 修改
+    update () {
+      // 修改
       console.log('修改')
       console.log(this.addUpdateForm)
     },
-    addUpdateFormReset () { // 新增、修改、取消成功后调用重置表单
-      this.addUpdateForm = {}
-      this.addUpdateFormVisible = false
+    addUpdateFormReset () { // 重置表单
+      this.addUpdateForm = {
+        state: 1 // 默认启用
+      }
       this.$nextTick(() => {
-        this.$refs.addUpdateFormRef.resetFields()
+        this.$refs.addUpdateFormRef.clearValidate()
       })
     }
   }
diff --git a/src/views/demo/page1/index.vue b/src/views/demo/page1/index.vue
index 70197a2..59cd537 100644
--- a/src/views/demo/page1/index.vue
+++ b/src/views/demo/page1/index.vue
@@ -77,7 +77,7 @@
           </el-table-column>
       </el-table>
       <!-- 新增修改弹框 -->
-      <AddUpdateForm ref="addUpdateDialogRef" />
+      <AddUpdateForm ref="addUpdateDialogRef" :dict-details="dictDetails"/>
     </div>
     <!-- 右边信息-end -->
     <!-- 页脚-start -->
@@ -114,13 +114,14 @@ export default {
         getDataListUrl: '/sysUser/pageList',
         deleteUrl: '/sysUser/del',
         exportUrl: '/sysUser/export',
-        dictCodes: 'sys_user_type'
+        dictCodes: 'sys_user_type,state'
       }
     }
   },
   methods: {
     addUpdateFormFun (row) { // 新增或修改
       this.$refs.addUpdateDialogRef.addUpdateFormVisible = true
+      this.$refs.addUpdateDialogRef.addUpdateFormReset()
       if (row) {
         this.$refs.addUpdateDialogRef.title = '修改用户'
         this.$refs.addUpdateDialogRef.addUpdateForm = JSON.parse(JSON.stringify(row))
-- 
Gitee


From e9e705a3a45dcfdf38a2a24fa8ec3abcf006e554 Mon Sep 17 00:00:00 2001
From: zero <254353372>
Date: Wed, 10 Jun 2020 00:04:46 +0800
Subject: [PATCH 20/70] 11

---
 src/api/axios.js                              |  2 +-
 src/mixins/view-module.js                     | 26 ++---
 .../demo/page1/components/AddUpdateForm.vue   | 94 +++++++++++++------
 src/views/demo/page1/index.vue                |  2 +
 4 files changed, 75 insertions(+), 49 deletions(-)

diff --git a/src/api/axios.js b/src/api/axios.js
index 58c4077..6669b25 100644
--- a/src/api/axios.js
+++ b/src/api/axios.js
@@ -38,7 +38,7 @@ function createService () {
         switch (code) {
           case 200:
             // [ 示例 ] code === 200 代表没有错误
-            return dataAxios.data
+            return dataAxios
           case 'xxx':
             // [ 示例 ] 其它和后台约定的 code
             errorCreate(`[ code: xxx ] ${dataAxios.msg}: ${response.config.url}`)
diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js
index fa5318a..c83163f 100644
--- a/src/mixins/view-module.js
+++ b/src/mixins/view-module.js
@@ -48,11 +48,9 @@ export default {
         data: this.searchForm
       }
       this.$axios(config).then(res => {
-        if (res) {
-          this.dataListLoading = false
-          this.dataList = res.data
-          this.total = this.mixinViewModuleOptions.isPage ? res.total : 0
-        }
+        this.dataListLoading = false
+        this.dataList = res.data.data
+        this.total = this.mixinViewModuleOptions.isPage ? res.data.total : 0
       }).catch(() => {
         this.handleDataCatch()
       })
@@ -123,16 +121,10 @@ export default {
           data: data
         }
         this.$axios(config).then(res => {
-          if (res) {
-            this.dataListLoading = false
-            this.calculationPage(this.dataListSelections.length > 0 ? this.dataListSelections.length : 1)
-            this.getDataList()
-            this.$message({
-              message: res.msg,
-              type: 'success',
-              duration: 500
-            })
-          }
+          this.dataListLoading = false
+          this.calculationPage(this.dataListSelections.length > 0 ? this.dataListSelections.length : 1)
+          this.getDataList()
+          this.$message.success(res.msg)
         }).catch(() => {
           this.handleCodeDelCatch()
         })
@@ -188,8 +180,8 @@ export default {
         const zeroobj = {}
         let zeroArr = []
         let zeroStr = ''
-        for (const key in res) {
-          const data = res[key]
+        for (const key in res.data) {
+          const data = res.data[key]
           if (zeroStr) {
             if (zeroStr === data.dictCode) {
               zeroArr.push(data)
diff --git a/src/views/demo/page1/components/AddUpdateForm.vue b/src/views/demo/page1/components/AddUpdateForm.vue
index 4c2864c..e359f82 100644
--- a/src/views/demo/page1/components/AddUpdateForm.vue
+++ b/src/views/demo/page1/components/AddUpdateForm.vue
@@ -1,33 +1,33 @@
 <template>
-  <el-dialog :title="title" :visible.sync="addUpdateFormVisible" width="800px">
-    <el-form :model="addUpdateForm" label-width="120px" size="medium" ref="addUpdateFormRef">
+  <el-dialog :title="title" :visible.sync="addUpdateFormVisible" width="800px" v-loading.fullscreen.lock="loading">
+    <el-form :model="addUpdateForm" :rules="rules" label-width="120px" size="medium" ref="addUpdateFormRef">
       <el-row>
         <el-col :span="12">
-          <el-form-item label="用户账号">
+          <el-form-item prop="username" label="用户账号">
             <el-input v-model="addUpdateForm.username" placeholder="请输入用户账号" />
           </el-form-item>
         </el-col>
           <el-col :span="12">
-            <el-form-item label="密码">
-              <el-input v-model="addUpdateForm.password" placeholder="请输入密码" show-password/>
+            <el-form-item prop="password" label="用户密码">
+              <el-input v-model="addUpdateForm.password" placeholder="请输入用户密码" show-password/>
             </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="手机号">
+          <el-form-item prop="mobile" label="手机号">
             <el-input v-model="addUpdateForm.mobile" placeholder="请输入手机号" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="用户名称">
-            <el-input v-model="addUpdateForm.name" placeholder="请输入用户名称" />
+          <el-form-item label="昵称">
+            <el-input v-model="addUpdateForm.nickname" placeholder="请输入昵称" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="状态">
+          <el-form-item prop="state" label="用户状态">
             <el-radio-group v-model="addUpdateForm.state">
               <el-radio-button v-for="state in dictDetails.state"
               :label="state.value"
@@ -38,8 +38,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="类型">
-            <el-select v-model="addUpdateForm.type" placeholder="请选择类型" style="width:100%">
+          <el-form-item prop="type" label="用户类型">
+            <el-select v-model="addUpdateForm.type" placeholder="请选择类型">
               <el-option
                 v-for="type in dictDetails.sys_user_type"
                 :key="type.value"
@@ -55,8 +55,11 @@
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
-      <el-button @click="addUpdateFormVisible = false">取 消</el-button>
-      <el-button type="primary" @click="addOrUpdate(addUpdateForm.id)">确 定</el-button>
+      <el-button v-if="btnExist" @click="addUpdateFormVisible = false">取 消</el-button>
+      <el-button v-if="btnExist" type="primary"
+        @click="addUpdateForm.id ? update(addUpdateForm.id) : add()">
+        确 定
+      </el-button>
     </div>
   </el-dialog>
 </template>
@@ -69,36 +72,65 @@ export default {
   },
   data () {
     return {
+      loading: false,
+      btnExist: true,
       addUpdateFormVisible: false, // 是否显示弹框
       title: '', // 弹框标题
-      addUpdateForm: {
-        state: 1 // 默认启用
+      addUpdateForm: {},
+      rules: {
+        username: [
+          { required: true, message: '请输入用户账号', trigger: 'blur' }
+        ],
+        password: [
+          { required: true, message: '请输入用户密码', trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, message: '请输入手机号', trigger: 'blur' }
+        ],
+        state: [
+          { required: true, message: '请选择用户状态', trigger: 'blur' }
+        ],
+        type: [
+          { required: true, message: '请选择用户类型', trigger: 'blur' }
+        ]
       }
     }
   },
   created () {
   },
   methods: {
-    addOrUpdate (id) {
-      if (id) {
-        this.update()
-      } else {
-        this.add()
-      }
-    },
-    add () {
-      // 添加
-      console.log('添加')
-      console.log(this.addUpdateForm.state)
+    add () { // 添加
+      this.$refs.addUpdateFormRef.validate((valid) => {
+        if (valid) {
+          this.loading = true
+          this.btnExist = false
+          const config = {
+            url: 'sysUser/add',
+            method: 'post',
+            data: this.addUpdateForm
+          }
+          this.$axios(config).then(res => {
+            this.loading = false
+            // this.$parent.getDataList()
+            this.addUpdateFormVisible = false
+            this.$message.success(res.msg)
+          }).catch(() => {
+            this.loading = false
+          })
+        }
+      })
     },
-    update () {
-      // 修改
-      console.log('修改')
-      console.log(this.addUpdateForm)
+    update () { // 修改
+      this.$refs.addUpdateFormRef.validate((valid) => {
+        if (valid) {
+          console.log(111)
+        }
+      })
     },
     addUpdateFormReset () { // 重置表单
       this.addUpdateForm = {
-        state: 1 // 默认启用
+        state: 1,
+        type: '0'
       }
       this.$nextTick(() => {
         this.$refs.addUpdateFormRef.clearValidate()
diff --git a/src/views/demo/page1/index.vue b/src/views/demo/page1/index.vue
index 59cd537..0481cd6 100644
--- a/src/views/demo/page1/index.vue
+++ b/src/views/demo/page1/index.vue
@@ -121,8 +121,10 @@ export default {
   methods: {
     addUpdateFormFun (row) { // 新增或修改
       this.$refs.addUpdateDialogRef.addUpdateFormVisible = true
+      this.$refs.addUpdateDialogRef.btnExist = true
       this.$refs.addUpdateDialogRef.addUpdateFormReset()
       if (row) {
+        row.type += '' // 转成字符串,不然select控件不支持回显
         this.$refs.addUpdateDialogRef.title = '修改用户'
         this.$refs.addUpdateDialogRef.addUpdateForm = JSON.parse(JSON.stringify(row))
       } else {
-- 
Gitee


From 32cb01d4d077a2c523be90cb770d30ccc7993b03 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Wed, 10 Jun 2020 17:39:02 +0800
Subject: [PATCH 21/70] `

---
 src/mixins/view-module.js                     |  3 ++
 .../demo/page1/components/AddUpdateForm.vue   | 39 ++++++++++++-------
 src/views/demo/page1/index.vue                | 22 +++--------
 3 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js
index c83163f..26c91a0 100644
--- a/src/mixins/view-module.js
+++ b/src/mixins/view-module.js
@@ -212,6 +212,9 @@ export default {
     },
     searchOpen (data) {
       this.searchFormShow = data
+    },
+    initAddOrUpdate (ref, row) { // 初始化新增修改
+      this.$refs[ref].initAddOrUpdate(row)
     }
   }
 }
diff --git a/src/views/demo/page1/components/AddUpdateForm.vue b/src/views/demo/page1/components/AddUpdateForm.vue
index e359f82..800afdd 100644
--- a/src/views/demo/page1/components/AddUpdateForm.vue
+++ b/src/views/demo/page1/components/AddUpdateForm.vue
@@ -7,7 +7,7 @@
             <el-input v-model="addUpdateForm.username" placeholder="请输入用户账号" />
           </el-form-item>
         </el-col>
-          <el-col :span="12">
+          <el-col :span="12" v-if="updateExist">
             <el-form-item prop="password" label="用户密码">
               <el-input v-model="addUpdateForm.password" placeholder="请输入用户密码" show-password/>
             </el-form-item>
@@ -57,7 +57,7 @@
     <div slot="footer" class="dialog-footer">
       <el-button v-if="btnExist" @click="addUpdateFormVisible = false">取 消</el-button>
       <el-button v-if="btnExist" type="primary"
-        @click="addUpdateForm.id ? update(addUpdateForm.id) : add()">
+        @click="addOrupdate()">
         确 定
       </el-button>
     </div>
@@ -68,12 +68,17 @@
 export default {
   name: 'AddUpdateForm',
   props: {
-    dictDetails: Object
+    dictDetails: Object,
+    getDataList: {
+      type: Function,
+      default: null
+    }
   },
   data () {
     return {
       loading: false,
-      btnExist: true,
+      btnExist: true, // 按钮是否存在
+      updateExist: true, // 修改弹框是否存在
       addUpdateFormVisible: false, // 是否显示弹框
       title: '', // 弹框标题
       addUpdateForm: {},
@@ -99,34 +104,40 @@ export default {
   created () {
   },
   methods: {
-    add () { // 添加
+    initAddOrUpdate (row) { // 新增或修改
+      this.addUpdateFormVisible = true
+      this.btnExist = true
+      this.addUpdateFormReset()
+      if (row) {
+        this.updateExist = false
+        row.type += '' // 转成字符串,不然select控件不支持回显
+        this.title = '修改用户'
+        this.addUpdateForm = JSON.parse(JSON.stringify(row))
+      } else {
+        this.title = '新增用户'
+      }
+    },
+    addOrupdate () { // 添加或修改
       this.$refs.addUpdateFormRef.validate((valid) => {
         if (valid) {
           this.loading = true
           this.btnExist = false
           const config = {
-            url: 'sysUser/add',
+            url: this.addUpdateForm.id ? 'sysUser/update' : 'sysUser/add',
             method: 'post',
             data: this.addUpdateForm
           }
           this.$axios(config).then(res => {
             this.loading = false
-            // this.$parent.getDataList()
             this.addUpdateFormVisible = false
             this.$message.success(res.msg)
+            this.getDataList()
           }).catch(() => {
             this.loading = false
           })
         }
       })
     },
-    update () { // 修改
-      this.$refs.addUpdateFormRef.validate((valid) => {
-        if (valid) {
-          console.log(111)
-        }
-      })
-    },
     addUpdateFormReset () { // 重置表单
       this.addUpdateForm = {
         state: 1,
diff --git a/src/views/demo/page1/index.vue b/src/views/demo/page1/index.vue
index 0481cd6..ddecccc 100644
--- a/src/views/demo/page1/index.vue
+++ b/src/views/demo/page1/index.vue
@@ -7,13 +7,13 @@
         <el-button size="mini" icon="el-icon-refresh" @click="refreshPage('tableRef')" >
           刷新
         </el-button>
-        <el-button size="mini" @click="addUpdateFormFun()">
+        <el-button size="mini" @click="initAddOrUpdate('addUpdateDialogRef')">
           新增
         </el-button>
       </div>
       <el-collapse-transition >
           <el-form v-show="searchFormShow" :inline="true" size="mini" :model="searchForm" class="zero-search-from">
-            <el-form-item label="用户名">
+            <el-form-item label="用户账号">
               <el-input v-model="searchForm.username" placeholder="请输入用户名" clearable />
             </el-form-item>
             <el-form-item>
@@ -48,7 +48,7 @@
         class="zero-table"
         style="width: 100%">
           <el-table-column type="selection" header-align="center" align="center" width="50"/>
-          <el-table-column prop="name" label="用户名称" sortable="custom" header-align="center" align="center"/>
+          <el-table-column prop="nickname" label="昵称" sortable="custom" header-align="center" align="center"/>
           <el-table-column prop="username" label="用户账号" sortable="custom" header-align="center" align="center"/>
           <el-table-column prop="mobile" label="手机号码" sortable="custom" header-align="center" align="center"/>
           <!-- 状态特殊处理 -->
@@ -67,7 +67,7 @@
           <el-table-column prop="remarks" label="备注" header-align="center" align="center" />
           <el-table-column label="操作" header-align="center" align="center" width="150">
               <template slot-scope="scope">
-                  <el-button type="text" size="mini" @click="addUpdateFormFun(scope.row)">
+                  <el-button type="text" size="mini" @click="initAddOrUpdate('addUpdateDialogRef',scope.row)">
                     修改
                   </el-button>
                   <el-button type="text" size="mini" @click="deleteHandle(scope.row,scope.row.username)">
@@ -77,7 +77,7 @@
           </el-table-column>
       </el-table>
       <!-- 新增修改弹框 -->
-      <AddUpdateForm ref="addUpdateDialogRef" :dict-details="dictDetails"/>
+      <AddUpdateForm ref="addUpdateDialogRef" :dict-details="dictDetails" :getDataList="getDataList"/>
     </div>
     <!-- 右边信息-end -->
     <!-- 页脚-start -->
@@ -119,18 +119,6 @@ export default {
     }
   },
   methods: {
-    addUpdateFormFun (row) { // 新增或修改
-      this.$refs.addUpdateDialogRef.addUpdateFormVisible = true
-      this.$refs.addUpdateDialogRef.btnExist = true
-      this.$refs.addUpdateDialogRef.addUpdateFormReset()
-      if (row) {
-        row.type += '' // 转成字符串,不然select控件不支持回显
-        this.$refs.addUpdateDialogRef.title = '修改用户'
-        this.$refs.addUpdateDialogRef.addUpdateForm = JSON.parse(JSON.stringify(row))
-      } else {
-        this.$refs.addUpdateDialogRef.title = '新增用户'
-      }
-    }
   }
 }
 </script>
-- 
Gitee


From 951fc3b45814849e117df2a6b3a9f77871670cf2 Mon Sep 17 00:00:00 2001
From: zero <254353372>
Date: Thu, 11 Jun 2020 20:29:45 +0800
Subject: [PATCH 22/70] 11

---
 src/views/demo/page1/index.vue | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/views/demo/page1/index.vue b/src/views/demo/page1/index.vue
index ddecccc..12c4998 100644
--- a/src/views/demo/page1/index.vue
+++ b/src/views/demo/page1/index.vue
@@ -57,7 +57,8 @@
               <el-switch
                 v-model="scope.row.state"
                 :active-value="1"
-                :inactive-value="0"/>
+                :inactive-value="0"
+                @change="changeState(scope.row)"/>
             </template>
           </el-table-column>
           <!-- 字典特殊处理 -->
@@ -115,10 +116,28 @@ export default {
         deleteUrl: '/sysUser/del',
         exportUrl: '/sysUser/export',
         dictCodes: 'sys_user_type,state'
-      }
+      },
+      stateValue: ''
     }
   },
   methods: {
+    changeState (row) {
+      this.dataListLoading = true
+      const config = {
+        url: '/sysUser/updateState',
+        method: 'get',
+        params: {
+          id: row.id,
+          state: row.state
+        }
+      }
+      this.$axios(config).then(res => {
+        this.dataListLoading = false
+        this.$message.success(res.msg)
+      }).catch(() => {
+        this.dataListLoading = false
+      })
+    }
   }
 }
 </script>
-- 
Gitee


From e7c6ac99bd5af106954934bf5dabc7a8b2ecc57b Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Fri, 12 Jun 2020 13:23:23 +0800
Subject: [PATCH 23/70] 1

---
 .../demo/page1/components/AddUpdateForm.vue   |   8 +-
 src/views/demo/page1/index.vue                | 201 +++++++++++-------
 2 files changed, 132 insertions(+), 77 deletions(-)

diff --git a/src/views/demo/page1/components/AddUpdateForm.vue b/src/views/demo/page1/components/AddUpdateForm.vue
index 800afdd..5d40ee5 100644
--- a/src/views/demo/page1/components/AddUpdateForm.vue
+++ b/src/views/demo/page1/components/AddUpdateForm.vue
@@ -78,7 +78,7 @@ export default {
     return {
       loading: false,
       btnExist: true, // 按钮是否存在
-      updateExist: true, // 修改弹框是否存在
+      updateExist: true, // 修改时，是否存在的输入框
       addUpdateFormVisible: false, // 是否显示弹框
       title: '', // 弹框标题
       addUpdateForm: {},
@@ -106,7 +106,6 @@ export default {
   methods: {
     initAddOrUpdate (row) { // 新增或修改
       this.addUpdateFormVisible = true
-      this.btnExist = true
       this.addUpdateFormReset()
       if (row) {
         this.updateExist = false
@@ -114,6 +113,7 @@ export default {
         this.title = '修改用户'
         this.addUpdateForm = JSON.parse(JSON.stringify(row))
       } else {
+        this.updateExist = true
         this.title = '新增用户'
       }
     },
@@ -130,10 +130,12 @@ export default {
           this.$axios(config).then(res => {
             this.loading = false
             this.addUpdateFormVisible = false
-            this.$message.success(res.msg)
+            this.btnExist = true
             this.getDataList()
+            this.$message.success(res.msg)
           }).catch(() => {
             this.loading = false
+            this.btnExist = true
           })
         }
       })
diff --git a/src/views/demo/page1/index.vue b/src/views/demo/page1/index.vue
index 12c4998..25403d7 100644
--- a/src/views/demo/page1/index.vue
+++ b/src/views/demo/page1/index.vue
@@ -2,41 +2,40 @@
   <zero-container>
     <!-- 头部信息-start -->
     <div slot="header">
-      <SearchHearder  @searchOpen="searchOpen"/>
-      <div style="float:right">
-        <el-button size="mini" icon="el-icon-refresh" @click="refreshPage('tableRef')" >
-          刷新
-        </el-button>
-        <el-button size="mini" @click="initAddOrUpdate('addUpdateDialogRef')">
-          新增
-        </el-button>
-      </div>
-      <el-collapse-transition >
-          <el-form v-show="searchFormShow" :inline="true" size="mini" :model="searchForm" class="zero-search-from">
-            <el-form-item label="用户账号">
-              <el-input v-model="searchForm.username" placeholder="请输入用户名" clearable />
-            </el-form-item>
-            <el-form-item>
-              <el-button size="mini" type="primary" icon="el-icon-search" @click="getDataList()">
-                搜索
-              </el-button>
-              <el-button size="mini" icon="el-icon-refresh" @click="searchResetForm('tableRef')">
-                重置
-              </el-button>
-            </el-form-item>
-          </el-form>
+      <SearchHearder @searchOpen="searchOpen" />
+      <!-- <div style="float:right"> -->
+        <el-button size="mini" icon="el-icon-refresh" @click="refreshPage('tableRef')">刷新</el-button>
+        <el-button size="mini" type="primary" @click="initAddOrUpdate('addUpdateDialogRef')">新增</el-button>
+        <el-button size="mini" type="danger" @click="deleteHandle()" :disabled="batchBtnDisabled" >批量删除</el-button>
+      <!-- </div> -->
+      <el-collapse-transition>
+        <el-form
+          v-show="searchFormShow"
+          :inline="true"
+          size="mini"
+          :model="searchForm"
+          class="zero-search-from"
+        >
+          <el-form-item label="用户账号">
+            <el-input v-model="searchForm.username" placeholder="请输入用户名" clearable />
+          </el-form-item>
+          <el-form-item>
+            <el-button size="mini" type="primary" icon="el-icon-search" @click="getDataList()">搜索</el-button>
+            <el-button size="mini" icon="el-icon-refresh" @click="searchResetForm('tableRef')">重置</el-button>
+          </el-form-item>
+        </el-form>
       </el-collapse-transition>
     </div>
     <!-- 头部信息-end -->
     <!-- 左边信息-start -->
     <div slot="aside">
       树
-      <DemoTreeSide/>
+      <DemoTreeSide />
     </div>
     <!-- 左边信息-end -->
     <!-- 右边信息-start -->
     <div slot="main" style="height:100%">
-     <el-table
+      <el-table
         ref="tableRef"
         height="100%"
         size="mini"
@@ -46,39 +45,87 @@
         @selection-change="dataListSelectionChangeHandle"
         @sort-change="dataListSortChangeHandle"
         class="zero-table"
-        style="width: 100%">
-          <el-table-column type="selection" header-align="center" align="center" width="50"/>
-          <el-table-column prop="nickname" label="昵称" sortable="custom" header-align="center" align="center"/>
-          <el-table-column prop="username" label="用户账号" sortable="custom" header-align="center" align="center"/>
-          <el-table-column prop="mobile" label="手机号码" sortable="custom" header-align="center" align="center"/>
-          <!-- 状态特殊处理 -->
-          <el-table-column prop="state" label="状态" sortable="custom" header-align="center" align="center"  >
-            <template slot-scope="scope">
-              <el-switch
-                v-model="scope.row.state"
-                :active-value="1"
-                :inactive-value="0"
-                @change="changeState(scope.row)"/>
-            </template>
-          </el-table-column>
-          <!-- 字典特殊处理 -->
-          <el-table-column prop="type" label="用户类型" sortable="custom" header-align="center" align="center"
-            :formatter="(row, column, cellValue) => dictDetailsHandle(cellValue, 'sys_user_type')"/>
-          <el-table-column prop="createTime" label="创建时间" sortable="custom" header-align="center" align="center" width="180" :formatter="dateFormat"/>
-          <el-table-column prop="remarks" label="备注" header-align="center" align="center" />
-          <el-table-column label="操作" header-align="center" align="center" width="150">
-              <template slot-scope="scope">
-                  <el-button type="text" size="mini" @click="initAddOrUpdate('addUpdateDialogRef',scope.row)">
-                    修改
-                  </el-button>
-                  <el-button type="text" size="mini" @click="deleteHandle(scope.row,scope.row.username)">
-                    删除
-                  </el-button>
-              </template>
-          </el-table-column>
+        style="width: 100%"
+      >
+        <el-table-column type="selection" header-align="center" align="center" width="50" />
+        <el-table-column
+          prop="nickname"
+          label="昵称"
+          sortable="custom"
+          header-align="center"
+          align="center"
+        />
+        <el-table-column
+          prop="username"
+          label="用户账号"
+          sortable="custom"
+          header-align="center"
+          align="center"
+        />
+        <el-table-column
+          prop="mobile"
+          label="手机号码"
+          sortable="custom"
+          header-align="center"
+          align="center"
+        />
+        <!-- 状态特殊处理 -->
+        <el-table-column
+          prop="state"
+          label="状态"
+          sortable="custom"
+          header-align="center"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.state"
+              :active-value="1"
+              :inactive-value="0"
+              @change="changeState(scope.row)"
+            />
+          </template>
+        </el-table-column>
+        <!-- 字典特殊处理 -->
+        <el-table-column
+          prop="type"
+          label="用户类型"
+          sortable="custom"
+          header-align="center"
+          align="center"
+          :formatter="(row, column, cellValue) => dictDetailsHandle(cellValue, 'sys_user_type')"
+        />
+        <el-table-column
+          prop="createTime"
+          label="创建时间"
+          sortable="custom"
+          header-align="center"
+          align="center"
+          width="180"
+          :formatter="dateFormat"
+        />
+        <el-table-column prop="remarks" label="备注" header-align="center" align="center" />
+        <el-table-column label="操作" header-align="center" align="center" fixed="right" width="150">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="mini"
+              @click="initAddOrUpdate('addUpdateDialogRef',scope.row)"
+            >修改</el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteHandle(scope.row,scope.row.username)"
+            >删除</el-button>
+          </template>
+        </el-table-column>
       </el-table>
       <!-- 新增修改弹框 -->
-      <AddUpdateForm ref="addUpdateDialogRef" :dict-details="dictDetails" :getDataList="getDataList"/>
+      <AddUpdateForm
+        ref="addUpdateDialogRef"
+        :dict-details="dictDetails"
+        :getDataList="getDataList"
+      />
     </div>
     <!-- 右边信息-end -->
     <!-- 页脚-start -->
@@ -90,7 +137,8 @@
         :total="total"
         layout="total, sizes, prev, pager, next, jumper"
         @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle" />
+        @current-change="pageCurrentChangeHandle"
+      />
     </div>
     <!-- 页脚-end -->
   </zero-container>
@@ -116,37 +164,42 @@ export default {
         deleteUrl: '/sysUser/del',
         exportUrl: '/sysUser/export',
         dictCodes: 'sys_user_type,state'
-      },
-      stateValue: ''
+      }
     }
   },
   methods: {
-    changeState (row) {
+    changeState (row) { // 修改状态
       this.dataListLoading = true
+      const params = {
+        id: row.id,
+        state: row.state
+      }
+      row.state = (row.state + 1) % 2
       const config = {
         url: '/sysUser/updateState',
         method: 'get',
-        params: {
-          id: row.id,
-          state: row.state
-        }
+        params: params
       }
-      this.$axios(config).then(res => {
-        this.dataListLoading = false
-        this.$message.success(res.msg)
-      }).catch(() => {
-        this.dataListLoading = false
-      })
+      this.$axios(config)
+        .then(res => {
+          this.dataListLoading = false
+          row.state = params.state
+          this.$message.success(res.msg)
+        })
+        .catch(() => {
+          this.dataListLoading = false
+        })
     }
   }
 }
 </script>
 <style>
-.zero-search-from .el-form-item--mini.el-form-item, .zero-search-from .el-form-item--small.el-form-item{
-  margin-bottom:0px;
+.zero-search-from .el-form-item--mini.el-form-item,
+.zero-search-from .el-form-item--small.el-form-item {
+  margin-bottom: 0px;
   padding-top: 10px;
 }
-.zero-table.el-table--fit.el-table--border{
-  border: 0px !important
+.zero-table.el-table--fit.el-table--border {
+  border: 0px !important;
 }
 </style>
-- 
Gitee


From 97adaa4c7dc079d09de58d03130f37b5e40e529e Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Mon, 15 Jun 2020 17:08:19 +0800
Subject: [PATCH 24/70] =?UTF-8?q?=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/view-module.js                     |   2 +-
 .../demo/page2/components/AddUpdateForm.vue   | 154 ++++++++++++++++++
 .../demo/page2/components/DemoTreeSide.vue    |  77 +++++++++
 .../demo/page2/components/SearchHearder.vue   |  22 +++
 src/views/demo/page2/index.vue                | 127 ++++++++++++++-
 5 files changed, 378 insertions(+), 4 deletions(-)
 create mode 100644 src/views/demo/page2/components/AddUpdateForm.vue
 create mode 100644 src/views/demo/page2/components/DemoTreeSide.vue
 create mode 100644 src/views/demo/page2/components/SearchHearder.vue

diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js
index 26c91a0..183ab44 100644
--- a/src/mixins/view-module.js
+++ b/src/mixins/view-module.js
@@ -49,7 +49,7 @@ export default {
       }
       this.$axios(config).then(res => {
         this.dataListLoading = false
-        this.dataList = res.data.data
+        this.dataList = this.mixinViewModuleOptions.isPage ? res.data.data : res.data
         this.total = this.mixinViewModuleOptions.isPage ? res.data.total : 0
       }).catch(() => {
         this.handleDataCatch()
diff --git a/src/views/demo/page2/components/AddUpdateForm.vue b/src/views/demo/page2/components/AddUpdateForm.vue
new file mode 100644
index 0000000..5d40ee5
--- /dev/null
+++ b/src/views/demo/page2/components/AddUpdateForm.vue
@@ -0,0 +1,154 @@
+<template>
+  <el-dialog :title="title" :visible.sync="addUpdateFormVisible" width="800px" v-loading.fullscreen.lock="loading">
+    <el-form :model="addUpdateForm" :rules="rules" label-width="120px" size="medium" ref="addUpdateFormRef">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item prop="username" label="用户账号">
+            <el-input v-model="addUpdateForm.username" placeholder="请输入用户账号" />
+          </el-form-item>
+        </el-col>
+          <el-col :span="12" v-if="updateExist">
+            <el-form-item prop="password" label="用户密码">
+              <el-input v-model="addUpdateForm.password" placeholder="请输入用户密码" show-password/>
+            </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item prop="mobile" label="手机号">
+            <el-input v-model="addUpdateForm.mobile" placeholder="请输入手机号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="昵称">
+            <el-input v-model="addUpdateForm.nickname" placeholder="请输入昵称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item prop="state" label="用户状态">
+            <el-radio-group v-model="addUpdateForm.state">
+              <el-radio-button v-for="state in dictDetails.state"
+              :label="state.value"
+              :key="state.value">
+                {{state.name}}
+              </el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item prop="type" label="用户类型">
+            <el-select v-model="addUpdateForm.type" placeholder="请选择类型">
+              <el-option
+                v-for="type in dictDetails.sys_user_type"
+                :key="type.value"
+                :label="type.name"
+                :value="type.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="备注">
+        <el-input type="textarea" v-model="addUpdateForm.remarks" placeholder="请输入备注" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-if="btnExist" @click="addUpdateFormVisible = false">取 消</el-button>
+      <el-button v-if="btnExist" type="primary"
+        @click="addOrupdate()">
+        确 定
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'AddUpdateForm',
+  props: {
+    dictDetails: Object,
+    getDataList: {
+      type: Function,
+      default: null
+    }
+  },
+  data () {
+    return {
+      loading: false,
+      btnExist: true, // 按钮是否存在
+      updateExist: true, // 修改时，是否存在的输入框
+      addUpdateFormVisible: false, // 是否显示弹框
+      title: '', // 弹框标题
+      addUpdateForm: {},
+      rules: {
+        username: [
+          { required: true, message: '请输入用户账号', trigger: 'blur' }
+        ],
+        password: [
+          { required: true, message: '请输入用户密码', trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, message: '请输入手机号', trigger: 'blur' }
+        ],
+        state: [
+          { required: true, message: '请选择用户状态', trigger: 'blur' }
+        ],
+        type: [
+          { required: true, message: '请选择用户类型', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created () {
+  },
+  methods: {
+    initAddOrUpdate (row) { // 新增或修改
+      this.addUpdateFormVisible = true
+      this.addUpdateFormReset()
+      if (row) {
+        this.updateExist = false
+        row.type += '' // 转成字符串,不然select控件不支持回显
+        this.title = '修改用户'
+        this.addUpdateForm = JSON.parse(JSON.stringify(row))
+      } else {
+        this.updateExist = true
+        this.title = '新增用户'
+      }
+    },
+    addOrupdate () { // 添加或修改
+      this.$refs.addUpdateFormRef.validate((valid) => {
+        if (valid) {
+          this.loading = true
+          this.btnExist = false
+          const config = {
+            url: this.addUpdateForm.id ? 'sysUser/update' : 'sysUser/add',
+            method: 'post',
+            data: this.addUpdateForm
+          }
+          this.$axios(config).then(res => {
+            this.loading = false
+            this.addUpdateFormVisible = false
+            this.btnExist = true
+            this.getDataList()
+            this.$message.success(res.msg)
+          }).catch(() => {
+            this.loading = false
+            this.btnExist = true
+          })
+        }
+      })
+    },
+    addUpdateFormReset () { // 重置表单
+      this.addUpdateForm = {
+        state: 1,
+        type: '0'
+      }
+      this.$nextTick(() => {
+        this.$refs.addUpdateFormRef.clearValidate()
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/demo/page2/components/DemoTreeSide.vue b/src/views/demo/page2/components/DemoTreeSide.vue
new file mode 100644
index 0000000..4385b19
--- /dev/null
+++ b/src/views/demo/page2/components/DemoTreeSide.vue
@@ -0,0 +1,77 @@
+<template>
+  <el-tree :data="data" node-key="label" :highlight-current="true">
+    <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">
+          <i class="el-icon-s-operation"></i>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item icon="el-icon-plus" @click.native="addPeerTree(node,data)">新增同级</el-dropdown-item>
+            <el-dropdown-item icon="el-icon-circle-plus" @click.native="addChildrenTree(node,data)">新增下级</el-dropdown-item>
+            <el-dropdown-item icon="el-icon-edit-outline" @click.native="updateTree(node,data)">修改</el-dropdown-item>
+            <el-dropdown-item icon="el-icon-delete-solid" @click.native="delTree(node,data)">删除</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
+    </span>
+  </el-tree>
+</template>
+
+<script>
+import { map, range } from 'lodash'
+// 构造树形数据
+const treeData = [
+  {
+    label: 'Side menu'
+  },
+  ...map(range(1, 10), (index1) => ({
+    label: 'Menu item  ' + index1,
+    children: map(range(1, 20), (index2) => ({
+      label: 'Menu item ' + index1 + '-' + index2,
+      children: map(range(1, 5), (index3) => ({
+        label: 'Menu item ' + index1 + '-' + index2 + '-' + index3
+      }))
+    }))
+  }))
+]
+
+export default {
+  name: 'DemoTreeSide',
+  data () {
+    return {
+      data: treeData
+    }
+  },
+  methods: {
+    mouseover (data) { // 移入
+      this.$set(data, 'dropdownShow', true)
+    },
+    mouseout (data) { // 移除
+      this.$set(data, 'dropdownShow', false)
+    },
+    addPeerTree (node, data) {
+      console.log('新增同级')
+    },
+    addChildrenTree (node, data) {
+      console.log('新增下级')
+    },
+    updateTree (node, data) {
+      console.log('修改')
+    },
+    updateTdelTreeree (node, data) {
+      console.log('删除')
+    }
+  }
+}
+</script>
+<style>
+  .custom-tree-node {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-size: 14px;
+    padding-right: 10px;
+    height:100%;
+  }
+</style>
diff --git a/src/views/demo/page2/components/SearchHearder.vue b/src/views/demo/page2/components/SearchHearder.vue
new file mode 100644
index 0000000..76d9a50
--- /dev/null
+++ b/src/views/demo/page2/components/SearchHearder.vue
@@ -0,0 +1,22 @@
+<template>
+  <el-button size="mini" :icon="icon" @click="click">{{open ? '隐藏':'展开'}}</el-button>
+</template>
+
+<script>
+export default {
+  name: 'SearchHearder',
+  data () {
+    return {
+      icon: 'el-icon-caret-bottom',
+      open: false
+    }
+  },
+  methods: {
+    click () {
+      this.icon = this.open ? 'el-icon-caret-bottom' : 'el-icon-caret-top'
+      this.open = !this.open
+      this.$emit('searchOpen', this.open)
+    }
+  }
+}
+</script>
diff --git a/src/views/demo/page2/index.vue b/src/views/demo/page2/index.vue
index 6e1ddab..4554735 100644
--- a/src/views/demo/page2/index.vue
+++ b/src/views/demo/page2/index.vue
@@ -1,12 +1,133 @@
 <template>
   <zero-container>
-    <template slot="header">Page 2 header</template>
-    Hello World
+    <!-- 头部信息-start -->
+    <div slot="header">
+      <SearchHearder @searchOpen="searchOpen" />
+      <!-- <div style="float:right"> -->
+      <el-button size="mini" icon="el-icon-refresh" @click="refreshPage('tableRef')">刷新</el-button>
+      <el-button size="mini" type="primary" @click="initAddOrUpdate('addUpdateDialogRef')">新增</el-button>
+      <!-- </div> -->
+      <el-collapse-transition>
+        <el-form
+          v-show="searchFormShow"
+          :inline="true"
+          size="mini"
+          :model="searchForm"
+          class="zero-search-from"
+        >
+          <el-form-item label="用户账号">
+            <el-input v-model="searchForm.username" placeholder="请输入用户名" clearable />
+          </el-form-item>
+          <el-form-item>
+            <el-button size="mini" type="primary" icon="el-icon-search" @click="getDataList()">搜索</el-button>
+            <el-button size="mini" icon="el-icon-refresh" @click="searchResetForm('tableRef')">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </el-collapse-transition>
+    </div>
+    <!-- 头部信息-end -->
+    <!-- 右边信息-start -->
+    <div slot="main" style="height:100%">
+      <el-table
+        ref="tableRef"
+        height="100%"
+        size="mini"
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        class="zero-table"
+        style="width: 100%"
+      >
+        <el-table-column
+          prop="name"
+          label="名称"
+          header-align="center"
+          align="center"
+        />
+        <el-table-column
+          prop="url"
+          label="接口地址"
+          header-align="center"
+          align="center"
+        />
+        <el-table-column
+          prop="path"
+          label="资源路径"
+          header-align="center"
+          align="center"
+        />
+        <el-table-column
+          prop="icon"
+          label="图标"
+          header-align="center"
+          align="center"
+        />
+        <!-- 字典特殊处理 -->
+        <el-table-column
+          prop="type"
+          label="权限类型"
+          header-align="center"
+          align="center"
+          :formatter="(row, column, cellValue) => dictDetailsHandle(cellValue, 'sys_power_type')"
+        />
+        <el-table-column
+          prop="createTime"
+          label="创建时间"
+          header-align="center"
+          align="center"
+          width="180"
+          :formatter="dateFormat"
+        />
+        <el-table-column prop="remarks" label="备注" header-align="center" align="center" />
+        <el-table-column label="操作" header-align="center" align="center" fixed="right" width="150">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="mini"
+              @click="initAddOrUpdate('addUpdateDialogRef',scope.row)"
+            >修改</el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteHandle(scope.row,scope.row.username)"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 新增修改弹框 -->
+      <AddUpdateForm
+        ref="addUpdateDialogRef"
+        :dict-details="dictDetails"
+        :getDataList="getDataList"
+      />
+    </div>
+    <!-- 右边信息-end -->
   </zero-container>
 </template>
 
 <script>
+import mixinViewModule from '@/mixins/view-module' // 分页相关js
+import SearchHearder from './components/SearchHearder' // 头部查询模块
+import AddUpdateForm from './components/AddUpdateForm' // 添加修改模块
 export default {
-  name: 'page2'
+  name: 'page2',
+  mixins: [mixinViewModule],
+  components: {
+    SearchHearder,
+    AddUpdateForm
+  },
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        isPage: false,
+        getDataListUrl: '/sysPower/list',
+        deleteUrl: '/sysPower/del',
+        exportUrl: '/sysPower/export',
+        dictCodes: 'sys_power_type'
+      }
+    }
+  },
+  methods: {
+  }
 }
 </script>
-- 
Gitee


From b087e9e19af921f66a4be8f202a24353c7d378da Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Tue, 16 Jun 2020 22:48:47 +0800
Subject: [PATCH 25/70] =?UTF-8?q?=E6=9D=83=E9=99=90=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/page2/components/AddUpdateForm.vue   | 65 +++++++------------
 src/views/demo/page2/index.vue                | 19 ++++--
 2 files changed, 40 insertions(+), 44 deletions(-)

diff --git a/src/views/demo/page2/components/AddUpdateForm.vue b/src/views/demo/page2/components/AddUpdateForm.vue
index 5d40ee5..aaddc58 100644
--- a/src/views/demo/page2/components/AddUpdateForm.vue
+++ b/src/views/demo/page2/components/AddUpdateForm.vue
@@ -3,50 +3,44 @@
     <el-form :model="addUpdateForm" :rules="rules" label-width="120px" size="medium" ref="addUpdateFormRef">
       <el-row>
         <el-col :span="12">
-          <el-form-item prop="username" label="用户账号">
-            <el-input v-model="addUpdateForm.username" placeholder="请输入用户账号" />
+          <el-form-item prop="name" label="名称">
+            <el-input v-model="addUpdateForm.name" placeholder="请输入名称" />
           </el-form-item>
         </el-col>
-          <el-col :span="12" v-if="updateExist">
-            <el-form-item prop="password" label="用户密码">
-              <el-input v-model="addUpdateForm.password" placeholder="请输入用户密码" show-password/>
-            </el-form-item>
+          <el-col :span="12">
+           <el-form-item prop="type" label="类型">
+            <el-select v-model="addUpdateForm.type" placeholder="请选择类型">
+              <el-option
+                v-for="type in dictDetails.sys_power_type"
+                :key="type.value"
+                :label="type.name"
+                :value="type.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item prop="mobile" label="手机号">
-            <el-input v-model="addUpdateForm.mobile" placeholder="请输入手机号" />
+          <el-form-item label="图标">
+            <el-input v-model="addUpdateForm.icon" placeholder="请选择图标" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="昵称">
-            <el-input v-model="addUpdateForm.nickname" placeholder="请输入昵称" />
+          <el-form-item label="排序">
+            <el-input v-model="addUpdateForm.sort" placeholder="请输入排序" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="12">
-          <el-form-item prop="state" label="用户状态">
-            <el-radio-group v-model="addUpdateForm.state">
-              <el-radio-button v-for="state in dictDetails.state"
-              :label="state.value"
-              :key="state.value">
-                {{state.name}}
-              </el-radio-button>
-            </el-radio-group>
+        <el-col prop="url" :span="12">
+          <el-form-item label="接口地址">
+            <el-input v-model="addUpdateForm.url" placeholder="请输入接口地址" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item prop="type" label="用户类型">
-            <el-select v-model="addUpdateForm.type" placeholder="请选择类型">
-              <el-option
-                v-for="type in dictDetails.sys_user_type"
-                :key="type.value"
-                :label="type.name"
-                :value="type.value">
-              </el-option>
-            </el-select>
+          <el-form-item prop="path" label="资源路径">
+            <el-input v-model="addUpdateForm.path" placeholder="请输入资源路径" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -83,20 +77,11 @@ export default {
       title: '', // 弹框标题
       addUpdateForm: {},
       rules: {
-        username: [
-          { required: true, message: '请输入用户账号', trigger: 'blur' }
-        ],
-        password: [
-          { required: true, message: '请输入用户密码', trigger: 'blur' }
-        ],
-        mobile: [
-          { required: true, message: '请输入手机号', trigger: 'blur' }
-        ],
-        state: [
-          { required: true, message: '请选择用户状态', trigger: 'blur' }
+        name: [
+          { required: true, message: '请输入名称', trigger: 'blur' }
         ],
         type: [
-          { required: true, message: '请选择用户类型', trigger: 'blur' }
+          { required: true, message: '请选择类型', trigger: 'blur' }
         ]
       }
     }
diff --git a/src/views/demo/page2/index.vue b/src/views/demo/page2/index.vue
index 4554735..608ffc1 100644
--- a/src/views/demo/page2/index.vue
+++ b/src/views/demo/page2/index.vue
@@ -32,11 +32,13 @@
         ref="tableRef"
         height="100%"
         size="mini"
+        row-key="id"
         v-loading="dataListLoading"
         :data="dataList"
         border
         class="zero-table"
         style="width: 100%"
+        :tree-props="{children: 'children'}"
       >
         <el-table-column
           prop="name"
@@ -61,15 +63,24 @@
           label="图标"
           header-align="center"
           align="center"
-        />
+        >
+         <template slot-scope="scope">
+           <i :class="scope.row.icon"></i>
+          </template>
+        </el-table-column>
         <!-- 字典特殊处理 -->
         <el-table-column
           prop="type"
           label="权限类型"
           header-align="center"
           align="center"
-          :formatter="(row, column, cellValue) => dictDetailsHandle(cellValue, 'sys_power_type')"
-        />
+        >
+          <template slot-scope="scope">
+            <el-tag
+              :type="scope.row.type === 0 ? 'success' : scope.row.type === 1 ? 'warning' : 'danger'"
+              disable-transitions>{{dictDetailsHandle(scope.row.type, 'sys_power_type')}}</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="createTime"
           label="创建时间"
@@ -120,7 +131,7 @@ export default {
     return {
       mixinViewModuleOptions: {
         isPage: false,
-        getDataListUrl: '/sysPower/list',
+        getDataListUrl: '/sysPower/tree',
         deleteUrl: '/sysPower/del',
         exportUrl: '/sysPower/export',
         dictCodes: 'sys_power_type'
-- 
Gitee


From 2a5b56336115c194a842f1d5d9770a28cd32b137 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Wed, 17 Jun 2020 16:44:57 +0800
Subject: [PATCH 26/70] 1

---
 package.json                                  |   1 +
 src/api/axios.js                              |   3 +-
 src/main.js                                   |   5 +
 .../demo/page2/components/AddUpdateForm.vue   | 132 ++++++++++++------
 src/views/demo/page2/index.vue                |   2 +-
 5 files changed, 99 insertions(+), 44 deletions(-)

diff --git a/package.json b/package.json
index efab589..99ae6c0 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
     "better-scroll": "^1.15.2",
     "core-js": "^3.4.3",
     "dayjs": "^1.8.17",
+    "e-icon-picker": "^1.0.4",
     "element-ui": "^2.13.1",
     "faker": "^4.1.0",
     "flex.css": "^1.1.7",
diff --git a/src/api/axios.js b/src/api/axios.js
index 6669b25..1569725 100644
--- a/src/api/axios.js
+++ b/src/api/axios.js
@@ -52,8 +52,9 @@ function createService () {
     },
     error => {
       if (error && error.response) {
+        console.log(error.response)
         switch (error.response.status) {
-          case 400: error.message = '请求错误'; break
+          case 400: error.message = error.response.data.msg; break
           case 401: error.message = '未授权，请登录'; break
           case 403: error.message = '拒绝访问'; break
           case 404: error.message = `请求地址出错: ${error.response.config.url}`; break
diff --git a/src/main.js b/src/main.js
index 18660fd..d716884 100644
--- a/src/main.js
+++ b/src/main.js
@@ -12,6 +12,11 @@ import router from './router'
 import { menuAside } from '@/menu'
 import { frameInRoutes } from '@/router/routes'
 import { request } from './api/axios'
+import iconPicker from 'e-icon-picker'
+import 'e-icon-picker/dist/index.css'// 基础样式
+import 'e-icon-picker/dist/main.css' // fontAwesome 图标库样式
+
+Vue.use(iconPicker)
 
 // 核心插件
 Vue.use(zeroVue)
diff --git a/src/views/demo/page2/components/AddUpdateForm.vue b/src/views/demo/page2/components/AddUpdateForm.vue
index aaddc58..a60a3d7 100644
--- a/src/views/demo/page2/components/AddUpdateForm.vue
+++ b/src/views/demo/page2/components/AddUpdateForm.vue
@@ -1,34 +1,61 @@
 <template>
-  <el-dialog :title="title" :visible.sync="addUpdateFormVisible" width="800px" v-loading.fullscreen.lock="loading">
-    <el-form :model="addUpdateForm" :rules="rules" label-width="120px" size="medium" ref="addUpdateFormRef">
-      <el-row>
-        <el-col :span="12">
+  <el-dialog
+    :title="title"
+    :visible.sync="addUpdateFormVisible"
+    width="800px"
+    v-loading.fullscreen.lock="loading"
+  >
+    <el-form
+      :model="addUpdateForm"
+      :rules="rules"
+      label-width="120px"
+      size="medium"
+      ref="addUpdateFormRef"
+    >
+    <el-row>
+      <el-col :span="12">
           <el-form-item prop="name" label="名称">
             <el-input v-model="addUpdateForm.name" placeholder="请输入名称" />
           </el-form-item>
         </el-col>
-          <el-col :span="12">
-           <el-form-item prop="type" label="类型">
-            <el-select v-model="addUpdateForm.type" placeholder="请选择类型">
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item prop="type" label="类型">
+            <el-select v-model="addUpdateForm.type" placeholder="请选择类型" @change="getParentSelect" style="width:100%">
               <el-option
                 v-for="type in dictDetails.sys_power_type"
                 :key="type.value"
                 :label="type.name"
-                :value="type.value">
-              </el-option>
+                :value="type.value"
+              ></el-option>
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item prop="parentId" label="上级">
+            <el-cascader
+              ref="parentRef"
+              v-model="addUpdateForm.parentId"
+              :options="parentOptions"
+              :props="{ value: 'id',label: 'name' }"
+              :show-all-levels="false"
+              clearable
+              filterable
+              style="width:100%"
+            />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
           <el-form-item label="图标">
-            <el-input v-model="addUpdateForm.icon" placeholder="请选择图标" />
+            <e-icon-picker v-model="addUpdateForm.icon" placeholder="请选择图标" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="排序">
-            <el-input v-model="addUpdateForm.sort" placeholder="请输入排序" />
+              <el-input-number v-model="addUpdateForm.sort" controls-position="right" :min="0" style="width:100%" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -50,10 +77,7 @@
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button v-if="btnExist" @click="addUpdateFormVisible = false">取 消</el-button>
-      <el-button v-if="btnExist" type="primary"
-        @click="addOrupdate()">
-        确 定
-      </el-button>
+      <el-button v-if="btnExist" type="primary" @click="addOrupdate()">确 定</el-button>
     </div>
   </el-dialog>
 </template>
@@ -76,60 +100,84 @@ export default {
       addUpdateFormVisible: false, // 是否显示弹框
       title: '', // 弹框标题
       addUpdateForm: {},
+      initFrom: {
+        // 初始弹框
+        type: '0'
+      },
+      parentOptions: [],
       rules: {
-        name: [
-          { required: true, message: '请输入名称', trigger: 'blur' }
-        ],
-        type: [
-          { required: true, message: '请选择类型', trigger: 'blur' }
-        ]
+        name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+        type: [{ required: true, message: '请选择类型', trigger: 'blur' }]
       }
     }
   },
   created () {
   },
   methods: {
-    initAddOrUpdate (row) { // 新增或修改
+    getParentSelect (type) {
+      const config = {
+        url: 'sysPower/tree',
+        method: 'get',
+        params: {
+          type: type
+        }
+      }
+      this.$axios(config).then(res => {
+        this.parentOptions = res.data
+      })
+    },
+    initAddOrUpdate (row) {
+      // 新增或修改
       this.addUpdateFormVisible = true
       this.addUpdateFormReset()
       if (row) {
         this.updateExist = false
         row.type += '' // 转成字符串,不然select控件不支持回显
-        this.title = '修改用户'
+        this.title = '修改权限'
         this.addUpdateForm = JSON.parse(JSON.stringify(row))
+        // 修改下拉框数据
+        this.getParentSelect(this.addUpdateForm.type)
+        // 通过父级编号集来回显
+        this.addUpdateForm.parentId = this.addUpdateForm.parentIds.split(',')
       } else {
+        this.getParentSelect(this.initFrom.type)
         this.updateExist = true
-        this.title = '新增用户'
+        this.title = '新增权限'
       }
     },
-    addOrupdate () { // 添加或修改
-      this.$refs.addUpdateFormRef.validate((valid) => {
+    addOrupdate () {
+      // 添加或修改
+      this.$refs.addUpdateFormRef.validate(valid => {
         if (valid) {
+          if (this.addUpdateForm.parentId) {
+            this.addUpdateForm.parentIds = this.addUpdateForm.parentId.join(',')
+            this.addUpdateForm.parentId = this.$refs.parentRef.getCheckedNodes()[0].value
+          }
           this.loading = true
           this.btnExist = false
           const config = {
-            url: this.addUpdateForm.id ? 'sysUser/update' : 'sysUser/add',
+            url: this.addUpdateForm.id ? 'sysPower/update' : 'sysPower/add',
             method: 'post',
             data: this.addUpdateForm
           }
-          this.$axios(config).then(res => {
-            this.loading = false
-            this.addUpdateFormVisible = false
-            this.btnExist = true
-            this.getDataList()
-            this.$message.success(res.msg)
-          }).catch(() => {
-            this.loading = false
-            this.btnExist = true
-          })
+          this.$axios(config)
+            .then(res => {
+              this.loading = false
+              this.addUpdateFormVisible = false
+              this.btnExist = true
+              this.getDataList()
+              this.$message.success(res.msg)
+            })
+            .catch(() => {
+              this.loading = false
+              this.btnExist = true
+            })
         }
       })
     },
-    addUpdateFormReset () { // 重置表单
-      this.addUpdateForm = {
-        state: 1,
-        type: '0'
-      }
+    addUpdateFormReset () {
+      // 重置表单 需要转成字符串赋值，不然这两个对象的值会一直相等
+      this.addUpdateForm = JSON.parse(JSON.stringify(this.initFrom))
       this.$nextTick(() => {
         this.$refs.addUpdateFormRef.clearValidate()
       })
diff --git a/src/views/demo/page2/index.vue b/src/views/demo/page2/index.vue
index 608ffc1..b09fd40 100644
--- a/src/views/demo/page2/index.vue
+++ b/src/views/demo/page2/index.vue
@@ -71,7 +71,7 @@
         <!-- 字典特殊处理 -->
         <el-table-column
           prop="type"
-          label="权限类型"
+          label="类型"
           header-align="center"
           align="center"
         >
-- 
Gitee


From 7f55e0b7167292070c72abd80aa785b93c8506d3 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Wed, 17 Jun 2020 17:27:11 +0800
Subject: [PATCH 27/70] 1

---
 .../demo/page2/components/AddUpdateForm.vue   | 147 ++++++++++--------
 1 file changed, 79 insertions(+), 68 deletions(-)

diff --git a/src/views/demo/page2/components/AddUpdateForm.vue b/src/views/demo/page2/components/AddUpdateForm.vue
index a60a3d7..1f7114e 100644
--- a/src/views/demo/page2/components/AddUpdateForm.vue
+++ b/src/views/demo/page2/components/AddUpdateForm.vue
@@ -2,7 +2,8 @@
   <el-dialog
     :title="title"
     :visible.sync="addUpdateFormVisible"
-    width="800px"
+    center
+    width="500px"
     v-loading.fullscreen.lock="loading"
   >
     <el-form
@@ -12,65 +13,54 @@
       size="medium"
       ref="addUpdateFormRef"
     >
-    <el-row>
-      <el-col :span="12">
-          <el-form-item prop="name" label="名称">
-            <el-input v-model="addUpdateForm.name" placeholder="请输入名称" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item prop="type" label="类型">
-            <el-select v-model="addUpdateForm.type" placeholder="请选择类型" @change="getParentSelect" style="width:100%">
-              <el-option
-                v-for="type in dictDetails.sys_power_type"
-                :key="type.value"
-                :label="type.name"
-                :value="type.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item prop="parentId" label="上级">
-            <el-cascader
-              ref="parentRef"
-              v-model="addUpdateForm.parentId"
-              :options="parentOptions"
-              :props="{ value: 'id',label: 'name' }"
-              :show-all-levels="false"
-              clearable
-              filterable
-              style="width:100%"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="图标">
-            <e-icon-picker v-model="addUpdateForm.icon" placeholder="请选择图标" />
-          </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>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col prop="url" :span="12">
-          <el-form-item label="接口地址">
-            <el-input v-model="addUpdateForm.url" placeholder="请输入接口地址" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item prop="path" label="资源路径">
-            <el-input v-model="addUpdateForm.path" placeholder="请输入资源路径" />
-          </el-form-item>
-        </el-col>
-      </el-row>
+      <el-form-item prop="name" label="名称">
+        <el-input v-model="addUpdateForm.name" placeholder="请输入名称" />
+      </el-form-item>
+      <el-form-item prop="type" label="类型">
+        <el-select
+          v-model="addUpdateForm.type"
+          placeholder="请选择类型"
+          @change="getParentSelect"
+          style="width:100%"
+        >
+          <el-option
+            v-for="type in dictDetails.sys_power_type"
+            :key="type.value"
+            :label="type.name"
+            :value="type.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item prop="parentId" label="上级">
+        <el-cascader
+          ref="parentRef"
+          v-model="addUpdateForm.parentId"
+          :options="parentOptions"
+          :props="{ value: 'id',label: 'name' }"
+          :show-all-levels="false"
+          clearable
+          filterable
+          style="width:100%"
+        />
+      </el-form-item>
+      <el-form-item v-if="iconExist" label="图标">
+        <e-icon-picker v-model="addUpdateForm.icon" placeholder="请选择图标" />
+      </el-form-item>
+      <el-form-item label="排序">
+        <el-input-number
+          v-model="addUpdateForm.sort"
+          controls-position="right"
+          :min="0"
+          style="width:100%"
+        />
+      </el-form-item>
+      <el-form-item v-if="urlExist" prop="url" label="接口地址">
+        <el-input v-model="addUpdateForm.url" placeholder="请输入接口地址" />
+      </el-form-item>
+      <el-form-item v-if="pathExist" prop="path" label="资源路径">
+        <el-input v-model="addUpdateForm.path" placeholder="请输入资源路径" />
+      </el-form-item>
       <el-form-item label="备注">
         <el-input type="textarea" v-model="addUpdateForm.remarks" placeholder="请输入备注" />
       </el-form-item>
@@ -96,25 +86,46 @@ export default {
     return {
       loading: false,
       btnExist: true, // 按钮是否存在
-      updateExist: true, // 修改时，是否存在的输入框
       addUpdateFormVisible: false, // 是否显示弹框
       title: '', // 弹框标题
       addUpdateForm: {},
       initFrom: {
         // 初始弹框
-        type: '0'
+        type: '0',
+        sort: 0
       },
       parentOptions: [],
+      iconExist: true,
+      urlExist: false,
+      pathExist: false,
       rules: {
         name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
-        type: [{ required: true, message: '请选择类型', trigger: 'blur' }]
+        type: [{ required: true, message: '请选择类型', trigger: 'blur' }],
+        url: [{ required: true, message: '请输入接口地址', trigger: 'blur' }],
+        path: [{ required: true, message: '请输入资源路径', trigger: 'blur' }]
       }
     }
   },
-  created () {
-  },
+  created () {},
   methods: {
     getParentSelect (type) {
+      switch (type) {
+        case '0':
+          this.iconExist = true
+          this.urlExist = false
+          this.pathExist = false
+          break
+        case '1':
+          this.iconExist = true
+          this.urlExist = false
+          this.pathExist = true
+          break
+        case '2':
+          this.iconExist = false
+          this.urlExist = true
+          this.pathExist = false
+          break
+      }
       const config = {
         url: 'sysPower/tree',
         method: 'get',
@@ -131,7 +142,6 @@ export default {
       this.addUpdateFormVisible = true
       this.addUpdateFormReset()
       if (row) {
-        this.updateExist = false
         row.type += '' // 转成字符串,不然select控件不支持回显
         this.title = '修改权限'
         this.addUpdateForm = JSON.parse(JSON.stringify(row))
@@ -141,7 +151,6 @@ export default {
         this.addUpdateForm.parentId = this.addUpdateForm.parentIds.split(',')
       } else {
         this.getParentSelect(this.initFrom.type)
-        this.updateExist = true
         this.title = '新增权限'
       }
     },
@@ -150,7 +159,9 @@ export default {
       this.$refs.addUpdateFormRef.validate(valid => {
         if (valid) {
           if (this.addUpdateForm.parentId) {
-            this.addUpdateForm.parentIds = this.addUpdateForm.parentId.join(',')
+            this.addUpdateForm.parentIds = this.addUpdateForm.parentId.join(
+              ','
+            )
             this.addUpdateForm.parentId = this.$refs.parentRef.getCheckedNodes()[0].value
           }
           this.loading = true
-- 
Gitee


From 2193c69bf996ededdac70d574208bfc020fe951a Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Wed, 17 Jun 2020 20:41:13 +0800
Subject: [PATCH 28/70] 1

---
 src/mixins/view-module.js                         |  2 +-
 src/views/demo/page2/components/AddUpdateForm.vue | 15 +++++++++++----
 src/views/demo/page2/index.vue                    |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js
index 183ab44..160b7fa 100644
--- a/src/mixins/view-module.js
+++ b/src/mixins/view-module.js
@@ -107,7 +107,7 @@ export default {
       } else {
         data.push({ id: row.id })
       }
-      const delMsg = name ? '正在执行删除 [' + name + ']  是否继续?' : '正在进行批量删除, 是否继续?'
+      const delMsg = name ? '正在删除 [' + name + ']  是否继续?' : '正在批量删除, 是否继续?'
       this.$confirm(delMsg, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
diff --git a/src/views/demo/page2/components/AddUpdateForm.vue b/src/views/demo/page2/components/AddUpdateForm.vue
index 1f7114e..a016c09 100644
--- a/src/views/demo/page2/components/AddUpdateForm.vue
+++ b/src/views/demo/page2/components/AddUpdateForm.vue
@@ -102,7 +102,8 @@ export default {
         name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
         type: [{ required: true, message: '请选择类型', trigger: 'blur' }],
         url: [{ required: true, message: '请输入接口地址', trigger: 'blur' }],
-        path: [{ required: true, message: '请输入资源路径', trigger: 'blur' }]
+        path: [{ required: true, message: '请输入资源路径', trigger: 'blur' }],
+        parentId: [{ required: false, message: '请选择上级', trigger: 'blur' }]
       }
     }
   },
@@ -114,16 +115,23 @@ export default {
           this.iconExist = true
           this.urlExist = false
           this.pathExist = false
+          if (this.$refs.addUpdateFormRef) {
+            this.$refs.addUpdateFormRef.clearValidate('parentId')
+            this.rules.parentId[0].required = false
+          }
           break
         case '1':
           this.iconExist = true
           this.urlExist = false
           this.pathExist = true
+          this.$refs.addUpdateFormRef.clearValidate('parentId')
+          this.rules.parentId[0].required = false
           break
         case '2':
           this.iconExist = false
           this.urlExist = true
           this.pathExist = false
+          this.rules.parentId[0].required = true
           break
       }
       const config = {
@@ -135,6 +143,7 @@ export default {
       }
       this.$axios(config).then(res => {
         this.parentOptions = res.data
+        this.addUpdateForm.parentId = ''
       })
     },
     initAddOrUpdate (row) {
@@ -159,9 +168,7 @@ export default {
       this.$refs.addUpdateFormRef.validate(valid => {
         if (valid) {
           if (this.addUpdateForm.parentId) {
-            this.addUpdateForm.parentIds = this.addUpdateForm.parentId.join(
-              ','
-            )
+            this.addUpdateForm.parentIds = this.addUpdateForm.parentId.join(',')
             this.addUpdateForm.parentId = this.$refs.parentRef.getCheckedNodes()[0].value
           }
           this.loading = true
diff --git a/src/views/demo/page2/index.vue b/src/views/demo/page2/index.vue
index b09fd40..6353c4b 100644
--- a/src/views/demo/page2/index.vue
+++ b/src/views/demo/page2/index.vue
@@ -100,7 +100,7 @@
             <el-button
               type="text"
               size="mini"
-              @click="deleteHandle(scope.row,scope.row.username)"
+              @click="deleteHandle(scope.row,scope.row.name)"
             >删除</el-button>
           </template>
         </el-table-column>
-- 
Gitee


From 961b560df5ff5b64c75c804420da105231f4cd53 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Thu, 18 Jun 2020 17:50:43 +0800
Subject: [PATCH 29/70] 1

---
 .../demo/page2/components/AddUpdateForm.vue   | 32 +++++---
 .../demo/page2/components/DemoTreeSide.vue    | 77 -------------------
 .../demo/page2/components/SearchHearder.vue   | 22 ------
 src/views/demo/page2/index.vue                | 24 +-----
 4 files changed, 24 insertions(+), 131 deletions(-)
 delete mode 100644 src/views/demo/page2/components/DemoTreeSide.vue
 delete mode 100644 src/views/demo/page2/components/SearchHearder.vue

diff --git a/src/views/demo/page2/components/AddUpdateForm.vue b/src/views/demo/page2/components/AddUpdateForm.vue
index a016c09..a01439b 100644
--- a/src/views/demo/page2/components/AddUpdateForm.vue
+++ b/src/views/demo/page2/components/AddUpdateForm.vue
@@ -37,7 +37,7 @@
           ref="parentRef"
           v-model="addUpdateForm.parentId"
           :options="parentOptions"
-          :props="{ value: 'id',label: 'name' }"
+          :props="{ value: 'id',label: 'name',checkStrictly: true }"
           :show-all-levels="false"
           clearable
           filterable
@@ -124,8 +124,10 @@ export default {
           this.iconExist = true
           this.urlExist = false
           this.pathExist = true
-          this.$refs.addUpdateFormRef.clearValidate('parentId')
-          this.rules.parentId[0].required = false
+          if (this.$refs.addUpdateFormRef) {
+            this.$refs.addUpdateFormRef.clearValidate('parentId')
+            this.rules.parentId[0].required = false
+          }
           break
         case '2':
           this.iconExist = false
@@ -141,9 +143,10 @@ export default {
           type: type
         }
       }
+      delete this.addUpdateForm.parentId
+      delete this.addUpdateForm.parentIds
       this.$axios(config).then(res => {
         this.parentOptions = res.data
-        this.addUpdateForm.parentId = ''
       })
     },
     initAddOrUpdate (row) {
@@ -153,9 +156,9 @@ export default {
       if (row) {
         row.type += '' // 转成字符串,不然select控件不支持回显
         this.title = '修改权限'
-        this.addUpdateForm = JSON.parse(JSON.stringify(row))
         // 修改下拉框数据
-        this.getParentSelect(this.addUpdateForm.type)
+        this.getParentSelect(row.type)
+        this.addUpdateForm = JSON.parse(JSON.stringify(row))
         // 通过父级编号集来回显
         this.addUpdateForm.parentId = this.addUpdateForm.parentIds.split(',')
       } else {
@@ -167,9 +170,20 @@ export default {
       // 添加或修改
       this.$refs.addUpdateFormRef.validate(valid => {
         if (valid) {
-          if (this.addUpdateForm.parentId) {
-            this.addUpdateForm.parentIds = this.addUpdateForm.parentId.join(',')
-            this.addUpdateForm.parentId = this.$refs.parentRef.getCheckedNodes()[0].value
+          if (this.addUpdateForm.parentId) { // 判断是否存在
+            if (Array.isArray(this.addUpdateForm.parentId)) {
+              if (this.addUpdateForm.parentId.length === 0) { // 当为空数组时的处理
+                delete this.addUpdateForm.parentId
+                delete this.addUpdateForm.parentIds
+              } else {
+                this.addUpdateForm.parentIds = this.addUpdateForm.parentId.join(',')
+                if (this.$refs.parentRef.getCheckedNodes()[0]) {
+                  this.addUpdateForm.parentId = this.$refs.parentRef.getCheckedNodes()[0].value
+                } else {
+                  this.addUpdateForm.parentId = this.addUpdateForm.parentId[0]
+                }
+              }
+            }
           }
           this.loading = true
           this.btnExist = false
diff --git a/src/views/demo/page2/components/DemoTreeSide.vue b/src/views/demo/page2/components/DemoTreeSide.vue
deleted file mode 100644
index 4385b19..0000000
--- a/src/views/demo/page2/components/DemoTreeSide.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<template>
-  <el-tree :data="data" node-key="label" :highlight-current="true">
-    <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">
-          <i class="el-icon-s-operation"></i>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item icon="el-icon-plus" @click.native="addPeerTree(node,data)">新增同级</el-dropdown-item>
-            <el-dropdown-item icon="el-icon-circle-plus" @click.native="addChildrenTree(node,data)">新增下级</el-dropdown-item>
-            <el-dropdown-item icon="el-icon-edit-outline" @click.native="updateTree(node,data)">修改</el-dropdown-item>
-            <el-dropdown-item icon="el-icon-delete-solid" @click.native="delTree(node,data)">删除</el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>
-      </div>
-    </span>
-  </el-tree>
-</template>
-
-<script>
-import { map, range } from 'lodash'
-// 构造树形数据
-const treeData = [
-  {
-    label: 'Side menu'
-  },
-  ...map(range(1, 10), (index1) => ({
-    label: 'Menu item  ' + index1,
-    children: map(range(1, 20), (index2) => ({
-      label: 'Menu item ' + index1 + '-' + index2,
-      children: map(range(1, 5), (index3) => ({
-        label: 'Menu item ' + index1 + '-' + index2 + '-' + index3
-      }))
-    }))
-  }))
-]
-
-export default {
-  name: 'DemoTreeSide',
-  data () {
-    return {
-      data: treeData
-    }
-  },
-  methods: {
-    mouseover (data) { // 移入
-      this.$set(data, 'dropdownShow', true)
-    },
-    mouseout (data) { // 移除
-      this.$set(data, 'dropdownShow', false)
-    },
-    addPeerTree (node, data) {
-      console.log('新增同级')
-    },
-    addChildrenTree (node, data) {
-      console.log('新增下级')
-    },
-    updateTree (node, data) {
-      console.log('修改')
-    },
-    updateTdelTreeree (node, data) {
-      console.log('删除')
-    }
-  }
-}
-</script>
-<style>
-  .custom-tree-node {
-    flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    font-size: 14px;
-    padding-right: 10px;
-    height:100%;
-  }
-</style>
diff --git a/src/views/demo/page2/components/SearchHearder.vue b/src/views/demo/page2/components/SearchHearder.vue
deleted file mode 100644
index 76d9a50..0000000
--- a/src/views/demo/page2/components/SearchHearder.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
-  <el-button size="mini" :icon="icon" @click="click">{{open ? '隐藏':'展开'}}</el-button>
-</template>
-
-<script>
-export default {
-  name: 'SearchHearder',
-  data () {
-    return {
-      icon: 'el-icon-caret-bottom',
-      open: false
-    }
-  },
-  methods: {
-    click () {
-      this.icon = this.open ? 'el-icon-caret-bottom' : 'el-icon-caret-top'
-      this.open = !this.open
-      this.$emit('searchOpen', this.open)
-    }
-  }
-}
-</script>
diff --git a/src/views/demo/page2/index.vue b/src/views/demo/page2/index.vue
index 6353c4b..200a519 100644
--- a/src/views/demo/page2/index.vue
+++ b/src/views/demo/page2/index.vue
@@ -2,28 +2,8 @@
   <zero-container>
     <!-- 头部信息-start -->
     <div slot="header">
-      <SearchHearder @searchOpen="searchOpen" />
-      <!-- <div style="float:right"> -->
       <el-button size="mini" icon="el-icon-refresh" @click="refreshPage('tableRef')">刷新</el-button>
       <el-button size="mini" type="primary" @click="initAddOrUpdate('addUpdateDialogRef')">新增</el-button>
-      <!-- </div> -->
-      <el-collapse-transition>
-        <el-form
-          v-show="searchFormShow"
-          :inline="true"
-          size="mini"
-          :model="searchForm"
-          class="zero-search-from"
-        >
-          <el-form-item label="用户账号">
-            <el-input v-model="searchForm.username" placeholder="请输入用户名" clearable />
-          </el-form-item>
-          <el-form-item>
-            <el-button size="mini" type="primary" icon="el-icon-search" @click="getDataList()">搜索</el-button>
-            <el-button size="mini" icon="el-icon-refresh" @click="searchResetForm('tableRef')">重置</el-button>
-          </el-form-item>
-        </el-form>
-      </el-collapse-transition>
     </div>
     <!-- 头部信息-end -->
     <!-- 右边信息-start -->
@@ -77,7 +57,7 @@
         >
           <template slot-scope="scope">
             <el-tag
-              :type="scope.row.type === 0 ? 'success' : scope.row.type === 1 ? 'warning' : 'danger'"
+              :type="scope.row.type == 0  ? 'success' : scope.row.type == 1 ? 'warning' : 'danger'"
               disable-transitions>{{dictDetailsHandle(scope.row.type, 'sys_power_type')}}</el-tag>
           </template>
         </el-table-column>
@@ -118,13 +98,11 @@
 
 <script>
 import mixinViewModule from '@/mixins/view-module' // 分页相关js
-import SearchHearder from './components/SearchHearder' // 头部查询模块
 import AddUpdateForm from './components/AddUpdateForm' // 添加修改模块
 export default {
   name: 'page2',
   mixins: [mixinViewModule],
   components: {
-    SearchHearder,
     AddUpdateForm
   },
   data () {
-- 
Gitee


From 053d7829ef474cbc24a1f46cbd7138378d352efd Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Mon, 22 Jun 2020 13:21:34 +0800
Subject: [PATCH 30/70] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BB=8E=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E6=8E=A5=E5=8F=A3=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../header-aside/components/libs/util.menu.js |  4 +--
 src/main.js                                   | 33 ++++++++++++++++---
 src/menu/index.js                             | 29 ----------------
 3 files changed, 30 insertions(+), 36 deletions(-)
 delete mode 100644 src/menu/index.js

diff --git a/src/layout/header-aside/components/libs/util.menu.js b/src/layout/header-aside/components/libs/util.menu.js
index 5d68cab..3a0a18e 100644
--- a/src/layout/header-aside/components/libs/util.menu.js
+++ b/src/layout/header-aside/components/libs/util.menu.js
@@ -2,7 +2,7 @@
 export function elMenuItem (h, menu) {
   return h('el-menu-item', { key: menu.path, props: { index: menu.path } }, [
     ...menu.icon ? [
-      h('i', { attrs: { class: `fa fa-${menu.icon}` } })
+      h('i', { attrs: { class: `${menu.icon}` } })
     ] : [],
     ...menu.icon === undefined & !menu.iconSvg ? [
       h('i', { attrs: { class: 'fa fa-file-o' } })
@@ -18,7 +18,7 @@ export function elMenuItem (h, menu) {
 export function elSubmenu (h, menu) {
   return h('el-submenu', { key: menu.path, props: { index: menu.path } }, [
     ...menu.icon ? [
-      h('i', { slot: 'title', attrs: { class: `fa fa-${menu.icon}` } })
+      h('i', { slot: 'title', attrs: { class: `${menu.icon}` } })
     ] : [],
     ...menu.icon === undefined & !menu.iconSvg ? [
       h('i', { slot: 'title', attrs: { class: 'fa fa-folder-o' } })
diff --git a/src/main.js b/src/main.js
index d716884..5623946 100644
--- a/src/main.js
+++ b/src/main.js
@@ -9,12 +9,12 @@ import store from '@/store/index'
 
 // 菜单和路由设置
 import router from './router'
-import { menuAside } from '@/menu'
 import { frameInRoutes } from '@/router/routes'
 import { request } from './api/axios'
 import iconPicker from 'e-icon-picker'
 import 'e-icon-picker/dist/index.css'// 基础样式
 import 'e-icon-picker/dist/main.css' // fontAwesome 图标库样式
+import { uniqueId } from 'lodash'
 
 Vue.use(iconPicker)
 
@@ -31,10 +31,7 @@ new Vue({
   created () {
     // 处理路由 得到每一级的路由设置
     this.$store.commit('zerovue/page/init', frameInRoutes)
-    // 设置侧边栏菜单
-    this.$store.commit('zerovue/menu/asideSet', menuAside)
-    // 初始化菜单搜索功能
-    this.$store.commit('zerovue/search/init', menuAside)
+    this.getUserMenu()
   },
   mounted () {
     // 展示系统信息
@@ -45,5 +42,31 @@ new Vue({
     this.$store.commit('zerovue/ua/get')
     // 初始化全屏监听
     this.$store.dispatch('zerovue/fullscreen/listen')
+  },
+  methods: {
+    getUserMenu () {
+      request({ url: '/sysPower/getUserMenu', method: 'get' }).then(res => {
+        const menu = this.handleMenu(res.data)
+        // 设置侧边栏菜单
+        this.$store.commit('zerovue/menu/asideSet', menu)
+        // 初始化菜单搜索功能
+        this.$store.commit('zerovue/search/init', menu)
+      })
+    },
+    /**
+     * 处理菜单数据
+     */
+    handleMenu (data) {
+      return data.map(e => ({
+        ...e,
+        path: e.path || uniqueId('zero-path-'),
+        title: e.name,
+        ...e.children ? {
+          children: this.handleMenu(e.children)
+        } : {
+          children: undefined
+        }
+      }))
+    }
   }
 }).$mount('#app')
diff --git a/src/menu/index.js b/src/menu/index.js
deleted file mode 100644
index 2d99711..0000000
--- a/src/menu/index.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { uniqueId } from 'lodash'
-
-/**
- * @description 给菜单数据补充上 path 字段
- * @description
- * @param {Array} menu 原始的菜单数据
- */
-function supplementPath (menu) {
-  return menu.map(e => ({
-    ...e,
-    path: e.path || uniqueId('zero-menu-empty-'),
-    ...e.children ? {
-      children: supplementPath(e.children)
-    } : {}
-  }))
-}
-
-export const menuAside = supplementPath([
-  { path: '/index', title: '首页', icon: 'home' },
-  {
-    title: '页面',
-    icon: 'folder-o',
-    children: [
-      { path: '/page1', title: '页面 1' },
-      { path: '/page2', title: '页面 2' },
-      { path: '/page3', title: '页面 3' }
-    ]
-  }
-])
-- 
Gitee


From 0867143203aa5c29f489b7e0fd42e85fb82667b6 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Mon, 22 Jun 2020 17:10:06 +0800
Subject: [PATCH 31/70] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demo/page1/index.vue                |   3 +-
 .../demo/page3/components/AddUpdateForm.vue   | 114 ++++++++++++
 .../demo/page3/components/SearchHearder.vue   |  22 +++
 src/views/demo/page3/index.vue                | 168 +++++++++++++++++-
 4 files changed, 303 insertions(+), 4 deletions(-)
 create mode 100644 src/views/demo/page3/components/AddUpdateForm.vue
 create mode 100644 src/views/demo/page3/components/SearchHearder.vue

diff --git a/src/views/demo/page1/index.vue b/src/views/demo/page1/index.vue
index 25403d7..eb1c80b 100644
--- a/src/views/demo/page1/index.vue
+++ b/src/views/demo/page1/index.vue
@@ -72,7 +72,7 @@
         <!-- 状态特殊处理 -->
         <el-table-column
           prop="state"
-          label="状态"
+          label="用户状态"
           sortable="custom"
           header-align="center"
           align="center"
@@ -185,6 +185,7 @@ export default {
           this.dataListLoading = false
           row.state = params.state
           this.$message.success(res.msg)
+          this.getDataList()
         })
         .catch(() => {
           this.dataListLoading = false
diff --git a/src/views/demo/page3/components/AddUpdateForm.vue b/src/views/demo/page3/components/AddUpdateForm.vue
new file mode 100644
index 0000000..851640d
--- /dev/null
+++ b/src/views/demo/page3/components/AddUpdateForm.vue
@@ -0,0 +1,114 @@
+<template>
+  <el-dialog :title="title" :visible.sync="addUpdateFormVisible" width="800px" v-loading.fullscreen.lock="loading">
+    <el-form :model="addUpdateForm" :rules="rules" label-width="120px" size="medium" ref="addUpdateFormRef">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item prop="name" label="角色名称">
+            <el-input v-model="addUpdateForm.name" placeholder="请输入角色名称" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item prop="state" label="角色状态">
+            <el-radio-group v-model="addUpdateForm.state">
+              <el-radio-button v-for="state in dictDetails.state"
+              :label="state.value"
+              :key="state.value">
+                {{state.name}}
+              </el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="备注">
+        <el-input type="textarea" v-model="addUpdateForm.remarks" placeholder="请输入备注" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-if="btnExist" @click="addUpdateFormVisible = false">取 消</el-button>
+      <el-button v-if="btnExist" type="primary"
+        @click="addOrupdate()">
+        确 定
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'AddUpdateForm',
+  props: {
+    dictDetails: Object,
+    getDataList: {
+      type: Function,
+      default: null
+    }
+  },
+  data () {
+    return {
+      loading: false,
+      btnExist: true, // 按钮是否存在
+      updateExist: true, // 修改时，是否存在的输入框
+      addUpdateFormVisible: false, // 是否显示弹框
+      title: '', // 弹框标题
+      addUpdateForm: {},
+      initFrom: {
+        state: 1
+      },
+      rules: {
+        name: [
+          { required: true, message: '请输入角色名称', trigger: 'blur' }
+        ],
+        state: [
+          { required: true, message: '请选择角色状态', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created () {
+  },
+  methods: {
+    initAddOrUpdate (row) { // 新增或修改
+      this.addUpdateFormVisible = true
+      this.addUpdateFormReset()
+      if (row) {
+        this.updateExist = false
+        this.title = '修改角色'
+        this.addUpdateForm = JSON.parse(JSON.stringify(row))
+      } else {
+        this.updateExist = true
+        this.title = '新增角色'
+      }
+    },
+    addOrupdate () { // 添加或修改
+      this.$refs.addUpdateFormRef.validate((valid) => {
+        if (valid) {
+          this.loading = true
+          this.btnExist = false
+          const config = {
+            url: this.addUpdateForm.id ? 'sysRole/update' : 'sysRole/add',
+            method: 'post',
+            data: this.addUpdateForm
+          }
+          this.$axios(config).then(res => {
+            this.loading = false
+            this.addUpdateFormVisible = false
+            this.btnExist = true
+            this.getDataList()
+            this.$message.success(res.msg)
+          }).catch(() => {
+            this.loading = false
+            this.btnExist = true
+          })
+        }
+      })
+    },
+    addUpdateFormReset () {
+      // 重置表单 需要转成字符串赋值，不然这两个对象的值会一直相等
+      this.addUpdateForm = JSON.parse(JSON.stringify(this.initFrom))
+      this.$nextTick(() => {
+        this.$refs.addUpdateFormRef.clearValidate()
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/demo/page3/components/SearchHearder.vue b/src/views/demo/page3/components/SearchHearder.vue
new file mode 100644
index 0000000..76d9a50
--- /dev/null
+++ b/src/views/demo/page3/components/SearchHearder.vue
@@ -0,0 +1,22 @@
+<template>
+  <el-button size="mini" :icon="icon" @click="click">{{open ? '隐藏':'展开'}}</el-button>
+</template>
+
+<script>
+export default {
+  name: 'SearchHearder',
+  data () {
+    return {
+      icon: 'el-icon-caret-bottom',
+      open: false
+    }
+  },
+  methods: {
+    click () {
+      this.icon = this.open ? 'el-icon-caret-bottom' : 'el-icon-caret-top'
+      this.open = !this.open
+      this.$emit('searchOpen', this.open)
+    }
+  }
+}
+</script>
diff --git a/src/views/demo/page3/index.vue b/src/views/demo/page3/index.vue
index 8e972e7..db12c5a 100644
--- a/src/views/demo/page3/index.vue
+++ b/src/views/demo/page3/index.vue
@@ -1,12 +1,174 @@
 <template>
   <zero-container>
-    <template slot="header">Page 3 header</template>
-    Hello World
+    <!-- 头部信息-start -->
+    <div slot="header">
+      <SearchHearder @searchOpen="searchOpen" />
+      <!-- <div style="float:right"> -->
+        <el-button size="mini" icon="el-icon-refresh" @click="refreshPage('tableRef')">刷新</el-button>
+        <el-button size="mini" type="primary" @click="initAddOrUpdate('addUpdateDialogRef')">新增</el-button>
+        <el-button size="mini" type="danger" @click="deleteHandle()" :disabled="batchBtnDisabled" >批量删除</el-button>
+      <!-- </div> -->
+      <el-collapse-transition>
+        <el-form
+          v-show="searchFormShow"
+          :inline="true"
+          size="mini"
+          :model="searchForm"
+          class="zero-search-from"
+        >
+          <el-form-item label="角色名称">
+            <el-input v-model="searchForm.name" placeholder="请输入角色名称" clearable />
+          </el-form-item>
+          <el-form-item>
+            <el-button size="mini" type="primary" icon="el-icon-search" @click="getDataList()">搜索</el-button>
+            <el-button size="mini" icon="el-icon-refresh" @click="searchResetForm('tableRef')">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </el-collapse-transition>
+    </div>
+    <!-- 头部信息-end -->
+    <!-- 右边信息-start -->
+    <div slot="main" style="height:100%">
+      <el-table
+        ref="tableRef"
+        height="100%"
+        size="mini"
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle"
+        class="zero-table"
+        style="width: 100%"
+      >
+        <el-table-column type="selection" header-align="center" align="center" width="50" />
+        <el-table-column
+          prop="name"
+          label="角色名称"
+          sortable="custom"
+          header-align="center"
+          align="center"
+        />
+        <!-- 状态特殊处理 -->
+        <el-table-column
+          prop="state"
+          label="角色状态"
+          sortable="custom"
+          header-align="center"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.state"
+              :active-value="1"
+              :inactive-value="0"
+              @change="changeState(scope.row)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="createTime"
+          label="创建时间"
+          sortable="custom"
+          header-align="center"
+          align="center"
+          width="180"
+          :formatter="dateFormat"
+        />
+        <el-table-column
+          prop="updateTime"
+          label="修改时间"
+          sortable="custom"
+          header-align="center"
+          align="center"
+          width="180"
+          :formatter="dateFormat"
+        />
+        <el-table-column prop="remarks" label="备注" header-align="center" align="center" />
+        <el-table-column label="操作" header-align="center" align="center" fixed="right" width="150">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="mini"
+              @click="initAddOrUpdate('addUpdateDialogRef',scope.row)"
+            >修改</el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteHandle(scope.row,scope.row.username)"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 新增修改弹框 -->
+      <AddUpdateForm
+        ref="addUpdateDialogRef"
+        :dict-details="dictDetails"
+        :getDataList="getDataList"
+      />
+    </div>
+    <!-- 右边信息-end -->
+    <!-- 页脚-start -->
+    <div slot="footer">
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      />
+    </div>
+    <!-- 页脚-end -->
   </zero-container>
 </template>
 
 <script>
+import mixinViewModule from '@/mixins/view-module' // 分页相关js
+import SearchHearder from './components/SearchHearder' // 头部查询模块
+import AddUpdateForm from './components/AddUpdateForm' // 添加修改模块
 export default {
-  name: 'page3'
+  name: 'page3',
+  mixins: [mixinViewModule],
+  components: {
+    SearchHearder,
+    AddUpdateForm
+  },
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListUrl: '/sysRole/pageList',
+        deleteUrl: '/sysRole/del',
+        exportUrl: '/sysRole/export',
+        dictCodes: 'state'
+      }
+    }
+  },
+  methods: {
+    changeState (row) { // 修改状态
+      this.dataListLoading = true
+      const params = {
+        id: row.id,
+        state: row.state
+      }
+      row.state = (row.state + 1) % 2
+      const config = {
+        url: '/sysRole/updateState',
+        method: 'get',
+        params: params
+      }
+      this.$axios(config)
+        .then(res => {
+          this.dataListLoading = false
+          row.state = params.state
+          this.$message.success(res.msg)
+          this.getDataList()
+        })
+        .catch(() => {
+          this.dataListLoading = false
+        })
+    }
+  }
 }
 </script>
-- 
Gitee


From 79df389a3a1c8920bb645e70da40b15a0e989c67 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Mon, 22 Jun 2020 17:14:06 +0800
Subject: [PATCH 32/70] =?UTF-8?q?input=E6=A1=86=E4=B8=AD=E7=A6=81=E6=AD=A2?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demo/page1/components/AddUpdateForm.vue | 8 ++++----
 src/views/demo/page1/index.vue                    | 2 +-
 src/views/demo/page2/components/AddUpdateForm.vue | 6 +++---
 src/views/demo/page3/components/AddUpdateForm.vue | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/demo/page1/components/AddUpdateForm.vue b/src/views/demo/page1/components/AddUpdateForm.vue
index 5d40ee5..64c2b89 100644
--- a/src/views/demo/page1/components/AddUpdateForm.vue
+++ b/src/views/demo/page1/components/AddUpdateForm.vue
@@ -4,24 +4,24 @@
       <el-row>
         <el-col :span="12">
           <el-form-item prop="username" label="用户账号">
-            <el-input v-model="addUpdateForm.username" placeholder="请输入用户账号" />
+            <el-input v-model.trim="addUpdateForm.username" placeholder="请输入用户账号" />
           </el-form-item>
         </el-col>
           <el-col :span="12" v-if="updateExist">
             <el-form-item prop="password" label="用户密码">
-              <el-input v-model="addUpdateForm.password" placeholder="请输入用户密码" show-password/>
+              <el-input v-model.trim="addUpdateForm.password" placeholder="请输入用户密码" show-password/>
             </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
           <el-form-item prop="mobile" label="手机号">
-            <el-input v-model="addUpdateForm.mobile" placeholder="请输入手机号" />
+            <el-input v-model.trim="addUpdateForm.mobile" placeholder="请输入手机号" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="昵称">
-            <el-input v-model="addUpdateForm.nickname" placeholder="请输入昵称" />
+            <el-input v-model.trim="addUpdateForm.name" placeholder="请输入昵称" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/demo/page1/index.vue b/src/views/demo/page1/index.vue
index eb1c80b..3fdd9ba 100644
--- a/src/views/demo/page1/index.vue
+++ b/src/views/demo/page1/index.vue
@@ -49,7 +49,7 @@
       >
         <el-table-column type="selection" header-align="center" align="center" width="50" />
         <el-table-column
-          prop="nickname"
+          prop="name"
           label="昵称"
           sortable="custom"
           header-align="center"
diff --git a/src/views/demo/page2/components/AddUpdateForm.vue b/src/views/demo/page2/components/AddUpdateForm.vue
index a01439b..3e5425c 100644
--- a/src/views/demo/page2/components/AddUpdateForm.vue
+++ b/src/views/demo/page2/components/AddUpdateForm.vue
@@ -14,7 +14,7 @@
       ref="addUpdateFormRef"
     >
       <el-form-item prop="name" label="名称">
-        <el-input v-model="addUpdateForm.name" placeholder="请输入名称" />
+        <el-input v-model.trim="addUpdateForm.name" placeholder="请输入名称" />
       </el-form-item>
       <el-form-item prop="type" label="类型">
         <el-select
@@ -56,10 +56,10 @@
         />
       </el-form-item>
       <el-form-item v-if="urlExist" prop="url" label="接口地址">
-        <el-input v-model="addUpdateForm.url" placeholder="请输入接口地址" />
+        <el-input v-model.trim="addUpdateForm.url" placeholder="请输入接口地址" />
       </el-form-item>
       <el-form-item v-if="pathExist" prop="path" label="资源路径">
-        <el-input v-model="addUpdateForm.path" placeholder="请输入资源路径" />
+        <el-input v-model.trim="addUpdateForm.path" placeholder="请输入资源路径" />
       </el-form-item>
       <el-form-item label="备注">
         <el-input type="textarea" v-model="addUpdateForm.remarks" placeholder="请输入备注" />
diff --git a/src/views/demo/page3/components/AddUpdateForm.vue b/src/views/demo/page3/components/AddUpdateForm.vue
index 851640d..2291a81 100644
--- a/src/views/demo/page3/components/AddUpdateForm.vue
+++ b/src/views/demo/page3/components/AddUpdateForm.vue
@@ -4,7 +4,7 @@
       <el-row>
         <el-col :span="12">
           <el-form-item prop="name" label="角色名称">
-            <el-input v-model="addUpdateForm.name" placeholder="请输入角色名称" />
+            <el-input v-model.trim="addUpdateForm.name" placeholder="请输入角色名称" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-- 
Gitee


From 989022e18217fd1cc223363f98b19607a3f17665 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Mon, 22 Jun 2020 23:45:06 +0800
Subject: [PATCH 33/70] 1

---
 .../demo/page3/components/PageFooter.vue      | 64 +++++++++++++++++++
 src/views/demo/page3/index.vue                | 33 ++++++----
 2 files changed, 85 insertions(+), 12 deletions(-)
 create mode 100644 src/views/demo/page3/components/PageFooter.vue

diff --git a/src/views/demo/page3/components/PageFooter.vue b/src/views/demo/page3/components/PageFooter.vue
new file mode 100644
index 0000000..fe5cbd9
--- /dev/null
+++ b/src/views/demo/page3/components/PageFooter.vue
@@ -0,0 +1,64 @@
+<template>
+  <div>
+    <el-pagination
+      :current-page="page"
+      :page-sizes="limits"
+      :page-size="limit"
+      :total="total"
+      prev-text="上一页"
+      next-text="下一页"
+      layout="total, sizes, slot, prev,pager, next"
+      @size-change="pageSizeChangeHandle"
+      @current-change="pageCurrentChangeHandle"
+    >
+      <el-link :underline="false">首页</el-link>
+    </el-pagination>
+    <el-pagination
+      :current-page="page"
+      :page-sizes="limits"
+      :page-size="limit"
+      :total="total"
+      layout="slot,jumper"
+      @size-change="pageSizeChangeHandle"
+      @current-change="pageCurrentChangeHandle"
+    >
+      <el-link :underline="false">尾页</el-link>
+      <el-tooltip :hide-after="2000" content="点击刷新" placement="right">
+        <el-link :underline="false" icon="el-icon-refresh" @click="refreshTable()" />
+      </el-tooltip>
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'PageFooter',
+  props: {
+    page: Number,
+    limits: Array,
+    limit: Number,
+    total: Number,
+    refreshRef: String,
+    pageSizeChangeHandle: {
+      type: Function,
+      default: null
+    },
+    pageCurrentChangeHandle: {
+      type: Function,
+      default: null
+    },
+    refreshPage: {
+      type: Function,
+      default: null
+    }
+  },
+  data () {
+    return {}
+  },
+  methods: {
+    refreshTable () {
+      this.refreshPage(this.refreshRef)
+    }
+  }
+}
+</script>
diff --git a/src/views/demo/page3/index.vue b/src/views/demo/page3/index.vue
index db12c5a..1e7f898 100644
--- a/src/views/demo/page3/index.vue
+++ b/src/views/demo/page3/index.vue
@@ -4,9 +4,8 @@
     <div slot="header">
       <SearchHearder @searchOpen="searchOpen" />
       <!-- <div style="float:right"> -->
-        <el-button size="mini" icon="el-icon-refresh" @click="refreshPage('tableRef')">刷新</el-button>
-        <el-button size="mini" type="primary" @click="initAddOrUpdate('addUpdateDialogRef')">新增</el-button>
-        <el-button size="mini" type="danger" @click="deleteHandle()" :disabled="batchBtnDisabled" >批量删除</el-button>
+      <el-button size="mini" type="primary" @click="initAddOrUpdate('addUpdateDialogRef')">新增</el-button>
+      <el-button size="mini" type="danger" @click="deleteHandle()" :disabled="batchBtnDisabled">批量删除</el-button>
       <!-- </div> -->
       <el-collapse-transition>
         <el-form
@@ -110,14 +109,15 @@
     <!-- 右边信息-end -->
     <!-- 页脚-start -->
     <div slot="footer">
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle"
+      <PageFooter
+      :limits="[10, 20, 50, 100]"
+      :page="page"
+      :limit="limit"
+      :total="total"
+      :pageSizeChangeHandle="pageSizeChangeHandle"
+      :pageCurrentChangeHandle="pageCurrentChangeHandle"
+      :refreshPage="refreshPage"
+      refreshRef ="tableRef"
       />
     </div>
     <!-- 页脚-end -->
@@ -127,12 +127,14 @@
 <script>
 import mixinViewModule from '@/mixins/view-module' // 分页相关js
 import SearchHearder from './components/SearchHearder' // 头部查询模块
+import PageFooter from './components/PageFooter' // 头部查询模块
 import AddUpdateForm from './components/AddUpdateForm' // 添加修改模块
 export default {
   name: 'page3',
   mixins: [mixinViewModule],
   components: {
     SearchHearder,
+    PageFooter,
     AddUpdateForm
   },
   data () {
@@ -146,7 +148,8 @@ export default {
     }
   },
   methods: {
-    changeState (row) { // 修改状态
+    changeState (row) {
+      // 修改状态
       this.dataListLoading = true
       const params = {
         id: row.id,
@@ -172,3 +175,9 @@ export default {
   }
 }
 </script>
+
+<style>
+.el-pagination {
+  float: left;
+}
+</style>
-- 
Gitee


From 17ba1f35226de4ad91d64c96562480be24b6fe70 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Tue, 23 Jun 2020 09:49:00 +0800
Subject: [PATCH 34/70] =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=92=8C=E6=A3=80?=
 =?UTF-8?q?=E7=B4=A2=E5=A4=B4=E4=BF=A1=E6=81=AF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page-footer}/PageFooter.vue               | 29 +++++++++++--------
 .../search-hearder}/SearchHearder.vue         |  0
 src/mixins/view-module.js                     |  3 +-
 src/views/demo/page1/index.vue                |  2 +-
 .../demo/page3/components/SearchHearder.vue   | 22 --------------
 src/views/demo/page3/index.vue                | 10 ++-----
 6 files changed, 21 insertions(+), 45 deletions(-)
 rename src/{views/demo/page3/components => components/page-footer}/PageFooter.vue (70%)
 rename src/{views/demo/page1/components => components/search-hearder}/SearchHearder.vue (100%)
 delete mode 100644 src/views/demo/page3/components/SearchHearder.vue

diff --git a/src/views/demo/page3/components/PageFooter.vue b/src/components/page-footer/PageFooter.vue
similarity index 70%
rename from src/views/demo/page3/components/PageFooter.vue
rename to src/components/page-footer/PageFooter.vue
index fe5cbd9..41b5888 100644
--- a/src/views/demo/page3/components/PageFooter.vue
+++ b/src/components/page-footer/PageFooter.vue
@@ -10,6 +10,7 @@
       layout="total, sizes, slot, prev,pager, next"
       @size-change="pageSizeChangeHandle"
       @current-change="pageCurrentChangeHandle"
+      class="zero-pagination"
     >
       <el-link :underline="false">首页</el-link>
     </el-pagination>
@@ -21,10 +22,11 @@
       layout="slot,jumper"
       @size-change="pageSizeChangeHandle"
       @current-change="pageCurrentChangeHandle"
+      class="zero-pagination"
     >
       <el-link :underline="false">尾页</el-link>
       <el-tooltip :hide-after="2000" content="点击刷新" placement="right">
-        <el-link :underline="false" icon="el-icon-refresh" @click="refreshTable()" />
+        <el-link :underline="false" icon="el-icon-refresh" @click="refreshPage(refreshRef)" />
       </el-tooltip>
     </el-pagination>
   </div>
@@ -34,20 +36,20 @@
 export default {
   name: 'PageFooter',
   props: {
-    page: Number,
-    limits: Array,
-    limit: Number,
-    total: Number,
-    refreshRef: String,
-    pageSizeChangeHandle: {
+    page: Number, // 当前页
+    limits: Array, // 一页显示多少条选择
+    limit: Number, // 一页显示多少条
+    total: Number, // 总条数
+    refreshRef: String, // 刷新的表格ref值
+    pageSizeChangeHandle: { // 分页, 每页条数
       type: Function,
       default: null
     },
-    pageCurrentChangeHandle: {
+    pageCurrentChangeHandle: { // 分页, 当前页
       type: Function,
       default: null
     },
-    refreshPage: {
+    refreshPage: { // 刷新表格数据
       type: Function,
       default: null
     }
@@ -56,9 +58,12 @@ export default {
     return {}
   },
   methods: {
-    refreshTable () {
-      this.refreshPage(this.refreshRef)
-    }
   }
 }
 </script>
+
+<style>
+.zero-pagination {
+  float: left;
+}
+</style>
diff --git a/src/views/demo/page1/components/SearchHearder.vue b/src/components/search-hearder/SearchHearder.vue
similarity index 100%
rename from src/views/demo/page1/components/SearchHearder.vue
rename to src/components/search-hearder/SearchHearder.vue
diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js
index 160b7fa..8a4aaa0 100644
--- a/src/mixins/view-module.js
+++ b/src/mixins/view-module.js
@@ -164,9 +164,8 @@ export default {
       // 清空页面选择的排序按钮
       this.$refs[tableRef].clearSort()
     },
-    refreshPage (tableRef) { // 最小粒度刷新,只刷新数据
+    refreshPage (tableRef) { // 刷新表格数据
       this.searchResetForm(tableRef)
-      // this.initDict()
       this.getDataList()
     },
     async initDict () { // 页面加载时需要初始化的字典
diff --git a/src/views/demo/page1/index.vue b/src/views/demo/page1/index.vue
index 3fdd9ba..bc790c0 100644
--- a/src/views/demo/page1/index.vue
+++ b/src/views/demo/page1/index.vue
@@ -146,7 +146,7 @@
 
 <script>
 import mixinViewModule from '@/mixins/view-module' // 分页相关js
-import SearchHearder from './components/SearchHearder' // 头部查询模块
+import SearchHearder from '@/components/search-hearder/SearchHearder' // 头部查询模块
 import AddUpdateForm from './components/AddUpdateForm' // 添加修改模块
 import DemoTreeSide from './components/DemoTreeSide' // 左边树形模块
 export default {
diff --git a/src/views/demo/page3/components/SearchHearder.vue b/src/views/demo/page3/components/SearchHearder.vue
deleted file mode 100644
index 76d9a50..0000000
--- a/src/views/demo/page3/components/SearchHearder.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
-  <el-button size="mini" :icon="icon" @click="click">{{open ? '隐藏':'展开'}}</el-button>
-</template>
-
-<script>
-export default {
-  name: 'SearchHearder',
-  data () {
-    return {
-      icon: 'el-icon-caret-bottom',
-      open: false
-    }
-  },
-  methods: {
-    click () {
-      this.icon = this.open ? 'el-icon-caret-bottom' : 'el-icon-caret-top'
-      this.open = !this.open
-      this.$emit('searchOpen', this.open)
-    }
-  }
-}
-</script>
diff --git a/src/views/demo/page3/index.vue b/src/views/demo/page3/index.vue
index 1e7f898..bf5ce5d 100644
--- a/src/views/demo/page3/index.vue
+++ b/src/views/demo/page3/index.vue
@@ -126,8 +126,8 @@
 
 <script>
 import mixinViewModule from '@/mixins/view-module' // 分页相关js
-import SearchHearder from './components/SearchHearder' // 头部查询模块
-import PageFooter from './components/PageFooter' // 头部查询模块
+import SearchHearder from '@/components/search-hearder/SearchHearder' // 头部查询模块
+import PageFooter from '@/components/page-footer/PageFooter' // 分页模块
 import AddUpdateForm from './components/AddUpdateForm' // 添加修改模块
 export default {
   name: 'page3',
@@ -175,9 +175,3 @@ export default {
   }
 }
 </script>
-
-<style>
-.el-pagination {
-  float: left;
-}
-</style>
-- 
Gitee


From 8b6e1bfe3183139cb06b6992eb73f2d4d043f639 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Tue, 23 Jun 2020 10:25:43 +0800
Subject: [PATCH 35/70] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page-footer/PageFooter.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/page-footer/PageFooter.vue b/src/components/page-footer/PageFooter.vue
index 41b5888..1ea2950 100644
--- a/src/components/page-footer/PageFooter.vue
+++ b/src/components/page-footer/PageFooter.vue
@@ -1,6 +1,8 @@
 <template>
   <div>
     <el-pagination
+    background
+    space
       :current-page="page"
       :page-sizes="limits"
       :page-size="limit"
@@ -15,6 +17,8 @@
       <el-link :underline="false">首页</el-link>
     </el-pagination>
     <el-pagination
+    background
+    space
       :current-page="page"
       :page-sizes="limits"
       :page-size="limit"
@@ -25,7 +29,7 @@
       class="zero-pagination"
     >
       <el-link :underline="false">尾页</el-link>
-      <el-tooltip :hide-after="2000" content="点击刷新" placement="right">
+      <el-tooltip :hide-after="1000" content="点击刷新" placement="right">
         <el-link :underline="false" icon="el-icon-refresh" @click="refreshPage(refreshRef)" />
       </el-tooltip>
     </el-pagination>
@@ -64,6 +68,6 @@ export default {
 
 <style>
 .zero-pagination {
-  float: left;
+  float: left
 }
 </style>
-- 
Gitee


From 8a1cb60abc0d7fc202a08f01dec0ec2efe38a485 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Tue, 23 Jun 2020 23:28:35 +0800
Subject: [PATCH 36/70] 1

---
 src/components/page-footer/PageFooter.vue | 32 +++++++++++++++--------
 src/mixins/view-module.js                 | 10 +++++++
 src/views/demo/page3/index.vue            |  2 ++
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/components/page-footer/PageFooter.vue b/src/components/page-footer/PageFooter.vue
index 1ea2950..a14c6ec 100644
--- a/src/components/page-footer/PageFooter.vue
+++ b/src/components/page-footer/PageFooter.vue
@@ -1,35 +1,29 @@
 <template>
   <div>
     <el-pagination
-    background
-    space
       :current-page="page"
       :page-sizes="limits"
       :page-size="limit"
       :total="total"
-      prev-text="上一页"
-      next-text="下一页"
-      layout="total, sizes, slot, prev,pager, next"
+      layout="total, sizes, jumper,slot, prev,pager, next"
       @size-change="pageSizeChangeHandle"
       @current-change="pageCurrentChangeHandle"
       class="zero-pagination"
     >
-      <el-link :underline="false">首页</el-link>
+      <el-link :underline="false"  @click="firstPageHandle">首页</el-link>
     </el-pagination>
     <el-pagination
-    background
-    space
       :current-page="page"
       :page-sizes="limits"
       :page-size="limit"
       :total="total"
-      layout="slot,jumper"
+      layout="slot"
       @size-change="pageSizeChangeHandle"
       @current-change="pageCurrentChangeHandle"
       class="zero-pagination"
     >
-      <el-link :underline="false">尾页</el-link>
-      <el-tooltip :hide-after="1000" content="点击刷新" placement="right">
+      <el-link :underline="false" @click="lastPageHandle">尾页</el-link>
+      <el-tooltip :hide-after="1000" content="点击刷新" placement="right" class="page-refresh">
         <el-link :underline="false" icon="el-icon-refresh" @click="refreshPage(refreshRef)" />
       </el-tooltip>
     </el-pagination>
@@ -53,6 +47,14 @@ export default {
       type: Function,
       default: null
     },
+    firstPageHandle: { // 分页,首页
+      type: Function,
+      default: null
+    },
+    lastPageHandle: { // 分页,首页
+      type: Function,
+      default: null
+    },
     refreshPage: { // 刷新表格数据
       type: Function,
       default: null
@@ -70,4 +72,12 @@ export default {
 .zero-pagination {
   float: left
 }
+.zero-pagination>.el-pagination__jump {
+  margin-left:0px;
+  margin-right:20px
+}
+.page-refresh{
+  margin-left: 5px;
+  font-size: unset
+}
 </style>
diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js
index 8a4aaa0..70e60dc 100644
--- a/src/mixins/view-module.js
+++ b/src/mixins/view-module.js
@@ -89,6 +89,16 @@ export default {
       this.page = val
       this.getDataList()
     },
+    // 分页, 首页
+    firstPageHandle (val) {
+      this.page = 1
+      this.getDataList()
+    },
+    // 分页, 尾页
+    lastPageHandle (val) {
+      this.page = Math.ceil(this.total / this.limit) // 总页数
+      this.getDataList()
+    },
     // 批量删除和单个删除
     deleteHandle (row, name) {
       let data = []
diff --git a/src/views/demo/page3/index.vue b/src/views/demo/page3/index.vue
index bf5ce5d..14dd308 100644
--- a/src/views/demo/page3/index.vue
+++ b/src/views/demo/page3/index.vue
@@ -116,6 +116,8 @@
       :total="total"
       :pageSizeChangeHandle="pageSizeChangeHandle"
       :pageCurrentChangeHandle="pageCurrentChangeHandle"
+      :firstPageHandle="firstPageHandle"
+      :lastPageHandle="lastPageHandle"
       :refreshPage="refreshPage"
       refreshRef ="tableRef"
       />
-- 
Gitee


From f7aa8382c997730552b0b919d0c20acd5295b4c6 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Wed, 24 Jun 2020 10:36:14 +0800
Subject: [PATCH 37/70] =?UTF-8?q?=E5=88=86=E9=A1=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page-footer/PageFooter.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/page-footer/PageFooter.vue b/src/components/page-footer/PageFooter.vue
index a14c6ec..f5d8f0b 100644
--- a/src/components/page-footer/PageFooter.vue
+++ b/src/components/page-footer/PageFooter.vue
@@ -10,7 +10,7 @@
       @current-change="pageCurrentChangeHandle"
       class="zero-pagination"
     >
-      <el-link :underline="false"  @click="firstPageHandle">首页</el-link>
+      <el-link :underline="false"  @click="firstPageHandle" :disabled="page === 1">首页</el-link>
     </el-pagination>
     <el-pagination
       :current-page="page"
@@ -22,7 +22,7 @@
       @current-change="pageCurrentChangeHandle"
       class="zero-pagination"
     >
-      <el-link :underline="false" @click="lastPageHandle">尾页</el-link>
+      <el-link :underline="false" @click="lastPageHandle" :disabled="Math.ceil(total / limit) === 1 || Math.ceil(total / limit) === page">尾页</el-link>
       <el-tooltip :hide-after="1000" content="点击刷新" placement="right" class="page-refresh">
         <el-link :underline="false" icon="el-icon-refresh" @click="refreshPage(refreshRef)" />
       </el-tooltip>
@@ -78,6 +78,7 @@ export default {
 }
 .page-refresh{
   margin-left: 5px;
-  font-size: unset
+  font-size: unset;
+  margin-top: -2px;
 }
 </style>
-- 
Gitee


From 2cc585272e1fdc4441b657f380793dbaa6ca1055 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Wed, 24 Jun 2020 14:20:23 +0800
Subject: [PATCH 38/70] 1

---
 src/views/demo/page1/index.vue | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/views/demo/page1/index.vue b/src/views/demo/page1/index.vue
index bc790c0..a6c9b14 100644
--- a/src/views/demo/page1/index.vue
+++ b/src/views/demo/page1/index.vue
@@ -130,14 +130,17 @@
     <!-- 右边信息-end -->
     <!-- 页脚-start -->
     <div slot="footer">
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle"
+      <PageFooter
+      :limits="[10, 20, 50, 100]"
+      :page="page"
+      :limit="limit"
+      :total="total"
+      :pageSizeChangeHandle="pageSizeChangeHandle"
+      :pageCurrentChangeHandle="pageCurrentChangeHandle"
+      :firstPageHandle="firstPageHandle"
+      :lastPageHandle="lastPageHandle"
+      :refreshPage="refreshPage"
+      refreshRef ="tableRef"
       />
     </div>
     <!-- 页脚-end -->
@@ -147,14 +150,16 @@
 <script>
 import mixinViewModule from '@/mixins/view-module' // 分页相关js
 import SearchHearder from '@/components/search-hearder/SearchHearder' // 头部查询模块
-import AddUpdateForm from './components/AddUpdateForm' // 添加修改模块
 import DemoTreeSide from './components/DemoTreeSide' // 左边树形模块
+import PageFooter from '@/components/page-footer/PageFooter' // 分页模块
+import AddUpdateForm from './components/AddUpdateForm' // 添加修改模块
 export default {
   name: 'page1',
   mixins: [mixinViewModule],
   components: {
     DemoTreeSide,
     SearchHearder,
+    PageFooter,
     AddUpdateForm
   },
   data () {
-- 
Gitee


From 2aeaf27fecfe1cf1ae4f4599e56756282af71746 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Wed, 24 Jun 2020 16:29:00 +0800
Subject: [PATCH 39/70] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/page1/components/AddUpdateForm.vue   | 46 ++++++++--
 src/views/demo/page1/index.vue                | 59 +++++++-----
 .../demo/page3/components/AddUpdateForm.vue   | 91 ++++++++++---------
 3 files changed, 120 insertions(+), 76 deletions(-)

diff --git a/src/views/demo/page1/components/AddUpdateForm.vue b/src/views/demo/page1/components/AddUpdateForm.vue
index 64c2b89..92e30b1 100644
--- a/src/views/demo/page1/components/AddUpdateForm.vue
+++ b/src/views/demo/page1/components/AddUpdateForm.vue
@@ -27,14 +27,16 @@
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item prop="state" label="用户状态">
-            <el-radio-group v-model="addUpdateForm.state">
-              <el-radio-button v-for="state in dictDetails.state"
-              :label="state.value"
-              :key="state.value">
-                {{state.name}}
-              </el-radio-button>
-            </el-radio-group>
+          <el-form-item label="用户角色">
+            <el-select v-model="modelRoles" filterable clearable multiple placeholder="请选择角色">
+              <el-option
+                v-for="item in roles"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+                :disabled="item.state === 0"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -50,6 +52,19 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item prop="state" label="用户状态">
+            <el-radio-group v-model="addUpdateForm.state">
+              <el-radio-button v-for="state in dictDetails.state"
+              :label="state.value"
+              :key="state.value">
+                {{state.name}}
+              </el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-form-item label="备注">
         <el-input type="textarea" v-model="addUpdateForm.remarks" placeholder="请输入备注" />
       </el-form-item>
@@ -82,6 +97,8 @@ export default {
       addUpdateFormVisible: false, // 是否显示弹框
       title: '', // 弹框标题
       addUpdateForm: {},
+      modelRoles: [],
+      roles: [],
       rules: {
         username: [
           { required: true, message: '请输入用户账号', trigger: 'blur' }
@@ -102,8 +119,14 @@ export default {
     }
   },
   created () {
+    this.initRoles()
   },
   methods: {
+    initRoles () { // 角色初始化
+      this.$axios({ url: 'sysRole/getIdAndName', method: 'get' }).then(res => {
+        this.roles = res.data
+      })
+    },
     initAddOrUpdate (row) { // 新增或修改
       this.addUpdateFormVisible = true
       this.addUpdateFormReset()
@@ -112,6 +135,9 @@ export default {
         row.type += '' // 转成字符串,不然select控件不支持回显
         this.title = '修改用户'
         this.addUpdateForm = JSON.parse(JSON.stringify(row))
+        if (row.roles) {
+          this.modelRoles = row.roles.map(it => it.id)
+        }
       } else {
         this.updateExist = true
         this.title = '新增用户'
@@ -122,6 +148,9 @@ export default {
         if (valid) {
           this.loading = true
           this.btnExist = false
+          this.addUpdateForm.roles = this.modelRoles.map(it => {
+            return { id: it }
+          })
           const config = {
             url: this.addUpdateForm.id ? 'sysUser/update' : 'sysUser/add',
             method: 'post',
@@ -145,6 +174,7 @@ export default {
         state: 1,
         type: '0'
       }
+      this.modelRoles = []
       this.$nextTick(() => {
         this.$refs.addUpdateFormRef.clearValidate()
       })
diff --git a/src/views/demo/page1/index.vue b/src/views/demo/page1/index.vue
index a6c9b14..8de9338 100644
--- a/src/views/demo/page1/index.vue
+++ b/src/views/demo/page1/index.vue
@@ -4,9 +4,9 @@
     <div slot="header">
       <SearchHearder @searchOpen="searchOpen" />
       <!-- <div style="float:right"> -->
-        <el-button size="mini" icon="el-icon-refresh" @click="refreshPage('tableRef')">刷新</el-button>
-        <el-button size="mini" type="primary" @click="initAddOrUpdate('addUpdateDialogRef')">新增</el-button>
-        <el-button size="mini" type="danger" @click="deleteHandle()" :disabled="batchBtnDisabled" >批量删除</el-button>
+      <el-button size="mini" icon="el-icon-refresh" @click="refreshPage('tableRef')">刷新</el-button>
+      <el-button size="mini" type="primary" @click="initAddOrUpdate('addUpdateDialogRef')">新增</el-button>
+      <el-button size="mini" type="danger" @click="deleteHandle()" :disabled="batchBtnDisabled">批量删除</el-button>
       <!-- </div> -->
       <el-collapse-transition>
         <el-form
@@ -69,6 +69,27 @@
           header-align="center"
           align="center"
         />
+        <!-- 字典特殊处理 -->
+        <el-table-column
+          prop="type"
+          label="用户类型"
+          sortable="custom"
+          header-align="center"
+          align="center"
+          :formatter="(row, column, cellValue) => dictDetailsHandle(cellValue, 'sys_user_type')"
+        />
+        <el-table-column prop="roleList" label="角色列表">
+          <template slot-scope="scope">
+            <span v-for="item in scope.row.roles" :key="item.id">
+              <span v-if="item.state === 1">[{{ item.name }}]&nbsp;</span>
+              <span
+                v-else
+                style="color: rgb(204, 204, 204);text-decoration:line-through"
+                title="该角色已经被禁用"
+              >[{{ item.name }}]&nbsp;</span>
+            </span>
+          </template>
+        </el-table-column>
         <!-- 状态特殊处理 -->
         <el-table-column
           prop="state"
@@ -86,15 +107,6 @@
             />
           </template>
         </el-table-column>
-        <!-- 字典特殊处理 -->
-        <el-table-column
-          prop="type"
-          label="用户类型"
-          sortable="custom"
-          header-align="center"
-          align="center"
-          :formatter="(row, column, cellValue) => dictDetailsHandle(cellValue, 'sys_user_type')"
-        />
         <el-table-column
           prop="createTime"
           label="创建时间"
@@ -131,16 +143,16 @@
     <!-- 页脚-start -->
     <div slot="footer">
       <PageFooter
-      :limits="[10, 20, 50, 100]"
-      :page="page"
-      :limit="limit"
-      :total="total"
-      :pageSizeChangeHandle="pageSizeChangeHandle"
-      :pageCurrentChangeHandle="pageCurrentChangeHandle"
-      :firstPageHandle="firstPageHandle"
-      :lastPageHandle="lastPageHandle"
-      :refreshPage="refreshPage"
-      refreshRef ="tableRef"
+        :limits="[10, 20, 50, 100]"
+        :page="page"
+        :limit="limit"
+        :total="total"
+        :pageSizeChangeHandle="pageSizeChangeHandle"
+        :pageCurrentChangeHandle="pageCurrentChangeHandle"
+        :firstPageHandle="firstPageHandle"
+        :lastPageHandle="lastPageHandle"
+        :refreshPage="refreshPage"
+        refreshRef="tableRef"
       />
     </div>
     <!-- 页脚-end -->
@@ -173,7 +185,8 @@ export default {
     }
   },
   methods: {
-    changeState (row) { // 修改状态
+    changeState (row) {
+      // 修改状态
       this.dataListLoading = true
       const params = {
         id: row.id,
diff --git a/src/views/demo/page3/components/AddUpdateForm.vue b/src/views/demo/page3/components/AddUpdateForm.vue
index 2291a81..56cc640 100644
--- a/src/views/demo/page3/components/AddUpdateForm.vue
+++ b/src/views/demo/page3/components/AddUpdateForm.vue
@@ -1,34 +1,36 @@
 <template>
-  <el-dialog :title="title" :visible.sync="addUpdateFormVisible" width="800px" v-loading.fullscreen.lock="loading">
-    <el-form :model="addUpdateForm" :rules="rules" label-width="120px" size="medium" ref="addUpdateFormRef">
-      <el-row>
-        <el-col :span="12">
-          <el-form-item prop="name" label="角色名称">
-            <el-input v-model.trim="addUpdateForm.name" placeholder="请输入角色名称" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item prop="state" label="角色状态">
-            <el-radio-group v-model="addUpdateForm.state">
-              <el-radio-button v-for="state in dictDetails.state"
-              :label="state.value"
-              :key="state.value">
-                {{state.name}}
-              </el-radio-button>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
+  <el-dialog
+    :title="title"
+    :visible.sync="addUpdateFormVisible"
+    width="500px"
+    v-loading.fullscreen.lock="loading"
+  >
+    <el-form
+      :model="addUpdateForm"
+      :rules="rules"
+      label-width="120px"
+      size="medium"
+      ref="addUpdateFormRef"
+    >
+      <el-form-item prop="name" label="角色名称">
+        <el-input v-model.trim="addUpdateForm.name" placeholder="请输入角色名称" />
+      </el-form-item>
+      <el-form-item prop="state" label="角色状态">
+        <el-radio-group v-model="addUpdateForm.state">
+          <el-radio-button
+            v-for="state in dictDetails.state"
+            :label="state.value"
+            :key="state.value"
+          >{{state.name}}</el-radio-button>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item label="备注">
         <el-input type="textarea" v-model="addUpdateForm.remarks" placeholder="请输入备注" />
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button v-if="btnExist" @click="addUpdateFormVisible = false">取 消</el-button>
-      <el-button v-if="btnExist" type="primary"
-        @click="addOrupdate()">
-        确 定
-      </el-button>
+      <el-button v-if="btnExist" type="primary" @click="addOrupdate()">确 定</el-button>
     </div>
   </el-dialog>
 </template>
@@ -55,19 +57,15 @@ export default {
         state: 1
       },
       rules: {
-        name: [
-          { required: true, message: '请输入角色名称', trigger: 'blur' }
-        ],
-        state: [
-          { required: true, message: '请选择角色状态', trigger: 'blur' }
-        ]
+        name: [{ required: true, message: '请输入角色名称', trigger: 'blur' }],
+        state: [{ required: true, message: '请选择角色状态', trigger: 'blur' }]
       }
     }
   },
-  created () {
-  },
+  created () {},
   methods: {
-    initAddOrUpdate (row) { // 新增或修改
+    initAddOrUpdate (row) {
+      // 新增或修改
       this.addUpdateFormVisible = true
       this.addUpdateFormReset()
       if (row) {
@@ -79,8 +77,9 @@ export default {
         this.title = '新增角色'
       }
     },
-    addOrupdate () { // 添加或修改
-      this.$refs.addUpdateFormRef.validate((valid) => {
+    addOrupdate () {
+      // 添加或修改
+      this.$refs.addUpdateFormRef.validate(valid => {
         if (valid) {
           this.loading = true
           this.btnExist = false
@@ -89,16 +88,18 @@ export default {
             method: 'post',
             data: this.addUpdateForm
           }
-          this.$axios(config).then(res => {
-            this.loading = false
-            this.addUpdateFormVisible = false
-            this.btnExist = true
-            this.getDataList()
-            this.$message.success(res.msg)
-          }).catch(() => {
-            this.loading = false
-            this.btnExist = true
-          })
+          this.$axios(config)
+            .then(res => {
+              this.loading = false
+              this.addUpdateFormVisible = false
+              this.btnExist = true
+              this.getDataList()
+              this.$message.success(res.msg)
+            })
+            .catch(() => {
+              this.loading = false
+              this.btnExist = true
+            })
         }
       })
     },
-- 
Gitee


From 3109601bf711dcd20b1cc62f15039a6104826167 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Mon, 29 Jun 2020 16:08:08 +0800
Subject: [PATCH 40/70] 1

---
 .../demo/page1/components/AddUpdateForm.vue   | 174 ++++++++----------
 src/views/demo/page1/index.vue                |  15 +-
 2 files changed, 90 insertions(+), 99 deletions(-)

diff --git a/src/views/demo/page1/components/AddUpdateForm.vue b/src/views/demo/page1/components/AddUpdateForm.vue
index 92e30b1..d6da185 100644
--- a/src/views/demo/page1/components/AddUpdateForm.vue
+++ b/src/views/demo/page1/components/AddUpdateForm.vue
@@ -1,80 +1,66 @@
 <template>
-  <el-dialog :title="title" :visible.sync="addUpdateFormVisible" width="800px" v-loading.fullscreen.lock="loading">
-    <el-form :model="addUpdateForm" :rules="rules" label-width="120px" size="medium" ref="addUpdateFormRef">
-      <el-row>
-        <el-col :span="12">
-          <el-form-item prop="username" label="用户账号">
-            <el-input v-model.trim="addUpdateForm.username" placeholder="请输入用户账号" />
-          </el-form-item>
-        </el-col>
-          <el-col :span="12" v-if="updateExist">
-            <el-form-item prop="password" label="用户密码">
-              <el-input v-model.trim="addUpdateForm.password" placeholder="请输入用户密码" show-password/>
-            </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item prop="mobile" label="手机号">
-            <el-input v-model.trim="addUpdateForm.mobile" placeholder="请输入手机号" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="昵称">
-            <el-input v-model.trim="addUpdateForm.name" placeholder="请输入昵称" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="用户角色">
-            <el-select v-model="modelRoles" filterable clearable multiple placeholder="请选择角色">
-              <el-option
-                v-for="item in roles"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-                :disabled="item.state === 0"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item prop="type" label="用户类型">
-            <el-select v-model="addUpdateForm.type" placeholder="请选择类型">
-              <el-option
-                v-for="type in dictDetails.sys_user_type"
-                :key="type.value"
-                :label="type.name"
-                :value="type.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item prop="state" label="用户状态">
-            <el-radio-group v-model="addUpdateForm.state">
-              <el-radio-button v-for="state in dictDetails.state"
-              :label="state.value"
-              :key="state.value">
-                {{state.name}}
-              </el-radio-button>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
+  <el-dialog
+    :title="title"
+    :visible.sync="addUpdateFormVisible"
+    width="500px"
+    v-loading.fullscreen.lock="loading"
+  >
+    <el-form
+      :model="addUpdateForm"
+      :rules="rules"
+      label-width="120px"
+      size="medium"
+      ref="addUpdateFormRef"
+    >
+      <el-form-item prop="username" label="用户账号">
+        <el-input v-model.trim="addUpdateForm.username" placeholder="请输入用户账号" />
+      </el-form-item>
+      <el-form-item prop="password" label="用户密码">
+        <el-input v-model.trim="addUpdateForm.password" placeholder="请输入用户密码" show-password />
+      </el-form-item>
+      <el-form-item prop="mobile" label="手机号">
+        <el-input v-model.trim="addUpdateForm.mobile" placeholder="请输入手机号" />
+      </el-form-item>
+      <el-form-item label="昵称">
+        <el-input v-model.trim="addUpdateForm.name" placeholder="请输入昵称" />
+      </el-form-item>
+      <el-form-item label="用户角色">
+        <el-select v-model="modelRoles" filterable clearable multiple placeholder="请选择角色" style="width:100%">
+          <el-option
+            v-for="item in roles"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+            :disabled="item.state === 0"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="type" label="用户类型">
+        <el-select v-model="addUpdateForm.type" placeholder="请选择类型" style="width:100%">
+          <el-option
+            v-for="type in dictDetails.sys_user_type"
+            :key="type.value"
+            :label="type.name"
+            :value="type.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="state" label="用户状态">
+        <el-radio-group v-model="addUpdateForm.state">
+          <el-radio-button
+            v-for="state in dictDetails.state"
+            :label="state.value"
+            :key="state.value"
+          >{{state.name}}</el-radio-button>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item label="备注">
         <el-input type="textarea" v-model="addUpdateForm.remarks" placeholder="请输入备注" />
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button v-if="btnExist" @click="addUpdateFormVisible = false">取 消</el-button>
-      <el-button v-if="btnExist" type="primary"
-        @click="addOrupdate()">
-        确 定
-      </el-button>
+      <el-button v-if="btnExist" type="primary" @click="addOrupdate()">确 定</el-button>
     </div>
   </el-dialog>
 </template>
@@ -106,15 +92,9 @@ export default {
         password: [
           { required: true, message: '请输入用户密码', trigger: 'blur' }
         ],
-        mobile: [
-          { required: true, message: '请输入手机号', trigger: 'blur' }
-        ],
-        state: [
-          { required: true, message: '请选择用户状态', trigger: 'blur' }
-        ],
-        type: [
-          { required: true, message: '请选择用户类型', trigger: 'blur' }
-        ]
+        mobile: [{ required: true, message: '请输入手机号', trigger: 'blur' }],
+        state: [{ required: true, message: '请选择用户状态', trigger: 'blur' }],
+        type: [{ required: true, message: '请选择用户类型', trigger: 'blur' }]
       }
     }
   },
@@ -122,12 +102,14 @@ export default {
     this.initRoles()
   },
   methods: {
-    initRoles () { // 角色初始化
+    initRoles () {
+      // 角色初始化
       this.$axios({ url: 'sysRole/getIdAndName', method: 'get' }).then(res => {
         this.roles = res.data
       })
     },
-    initAddOrUpdate (row) { // 新增或修改
+    initAddOrUpdate (row) {
+      // 新增或修改
       this.addUpdateFormVisible = true
       this.addUpdateFormReset()
       if (row) {
@@ -143,8 +125,9 @@ export default {
         this.title = '新增用户'
       }
     },
-    addOrupdate () { // 添加或修改
-      this.$refs.addUpdateFormRef.validate((valid) => {
+    addOrupdate () {
+      // 添加或修改
+      this.$refs.addUpdateFormRef.validate(valid => {
         if (valid) {
           this.loading = true
           this.btnExist = false
@@ -156,20 +139,23 @@ export default {
             method: 'post',
             data: this.addUpdateForm
           }
-          this.$axios(config).then(res => {
-            this.loading = false
-            this.addUpdateFormVisible = false
-            this.btnExist = true
-            this.getDataList()
-            this.$message.success(res.msg)
-          }).catch(() => {
-            this.loading = false
-            this.btnExist = true
-          })
+          this.$axios(config)
+            .then(res => {
+              this.loading = false
+              this.addUpdateFormVisible = false
+              this.btnExist = true
+              this.getDataList()
+              this.$message.success(res.msg)
+            })
+            .catch(() => {
+              this.loading = false
+              this.btnExist = true
+            })
         }
       })
     },
-    addUpdateFormReset () { // 重置表单
+    addUpdateFormReset () {
+      // 重置表单
       this.addUpdateForm = {
         state: 1,
         type: '0'
diff --git a/src/views/demo/page1/index.vue b/src/views/demo/page1/index.vue
index 8de9338..baa73b0 100644
--- a/src/views/demo/page1/index.vue
+++ b/src/views/demo/page1/index.vue
@@ -4,7 +4,6 @@
     <div slot="header">
       <SearchHearder @searchOpen="searchOpen" />
       <!-- <div style="float:right"> -->
-      <el-button size="mini" icon="el-icon-refresh" @click="refreshPage('tableRef')">刷新</el-button>
       <el-button size="mini" type="primary" @click="initAddOrUpdate('addUpdateDialogRef')">新增</el-button>
       <el-button size="mini" type="danger" @click="deleteHandle()" :disabled="batchBtnDisabled">批量删除</el-button>
       <!-- </div> -->
@@ -82,11 +81,17 @@
           <template slot-scope="scope">
             <span v-for="item in scope.row.roles" :key="item.id">
               <span v-if="item.state === 1">[{{ item.name }}]&nbsp;</span>
-              <span
+              <el-tooltip
                 v-else
-                style="color: rgb(204, 204, 204);text-decoration:line-through"
-                title="该角色已经被禁用"
-              >[{{ item.name }}]&nbsp;</span>
+                :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>
-- 
Gitee


From 8deb9c820d578b63e0c663ac4b036e54fc7f52ef Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Mon, 29 Jun 2020 16:52:17 +0800
Subject: [PATCH 41/70] 1

---
 src/views/demo/page1/components/AddUpdateForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/demo/page1/components/AddUpdateForm.vue b/src/views/demo/page1/components/AddUpdateForm.vue
index d6da185..9035e80 100644
--- a/src/views/demo/page1/components/AddUpdateForm.vue
+++ b/src/views/demo/page1/components/AddUpdateForm.vue
@@ -15,7 +15,7 @@
       <el-form-item prop="username" label="用户账号">
         <el-input v-model.trim="addUpdateForm.username" placeholder="请输入用户账号" />
       </el-form-item>
-      <el-form-item prop="password" label="用户密码">
+      <el-form-item v-show="updateExist" prop="password" label="用户密码">
         <el-input v-model.trim="addUpdateForm.password" placeholder="请输入用户密码" show-password />
       </el-form-item>
       <el-form-item prop="mobile" label="手机号">
-- 
Gitee


From 9f0e3758cbf2969c8e063eb3967eed588c7304b1 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Tue, 30 Jun 2020 14:28:26 +0800
Subject: [PATCH 42/70] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=97=B6=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/page3/components/AddUpdateForm.vue   | 22 ++++++
 src/views/demo/page3/components/PowerTree.vue | 73 +++++++++++++++++++
 2 files changed, 95 insertions(+)
 create mode 100644 src/views/demo/page3/components/PowerTree.vue

diff --git a/src/views/demo/page3/components/AddUpdateForm.vue b/src/views/demo/page3/components/AddUpdateForm.vue
index 56cc640..a6a809a 100644
--- a/src/views/demo/page3/components/AddUpdateForm.vue
+++ b/src/views/demo/page3/components/AddUpdateForm.vue
@@ -27,6 +27,10 @@
       <el-form-item label="备注">
         <el-input type="textarea" v-model="addUpdateForm.remarks" placeholder="请输入备注" />
       </el-form-item>
+      <el-row :gutter="20">
+        <el-col :span="6" style="text-align:right">权限</el-col>
+        <el-col :span="18"><PowerTree ref= "treeRef"/></el-col>
+      </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button v-if="btnExist" @click="addUpdateFormVisible = false">取 消</el-button>
@@ -36,8 +40,14 @@
 </template>
 
 <script>
+
+import PowerTree from './PowerTree' // 权限树
+
 export default {
   name: 'AddUpdateForm',
+  components: {
+    PowerTree
+  },
   props: {
     dictDetails: Object,
     getDataList: {
@@ -72,9 +82,17 @@ export default {
         this.updateExist = false
         this.title = '修改角色'
         this.addUpdateForm = JSON.parse(JSON.stringify(row))
+        this.$nextTick(() => {
+          this.$refs.treeRef.getPowerTree() // 权限初始化
+          this.$refs.treeRef.setCheckedKeys(row.powers.map(power => power.id)) // 权限处理
+        })
       } else {
         this.updateExist = true
         this.title = '新增角色'
+        this.$nextTick(() => {
+          this.$refs.treeRef.getPowerTree() // 权限初始化
+          this.$refs.treeRef.setCheckedKeys([]) // 权限处理
+        })
       }
     },
     addOrupdate () {
@@ -83,6 +101,10 @@ export default {
         if (valid) {
           this.loading = true
           this.btnExist = false
+          // 处理权限
+          this.addUpdateForm.powers = this.$refs.treeRef.getCheckedKeys().map(it => {
+            return { id: it }
+          })
           const config = {
             url: this.addUpdateForm.id ? 'sysRole/update' : 'sysRole/add',
             method: 'post',
diff --git a/src/views/demo/page3/components/PowerTree.vue b/src/views/demo/page3/components/PowerTree.vue
new file mode 100644
index 0000000..3f8ad4c
--- /dev/null
+++ b/src/views/demo/page3/components/PowerTree.vue
@@ -0,0 +1,73 @@
+<template>
+  <div>
+    <el-input placeholder="输入关键字进行过滤" v-model="filterText" />
+    <el-tree ref="treeRef"
+      v-loading="treeLoading"
+      class="tree"
+      show-checkbox
+      node-key="id"
+      highlight-current
+      :data="data"
+      :props="{
+        children: 'children',
+        label: 'name'
+      }"
+      :filter-node-method="filterNode"
+     />
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      treeLoading: false,
+      data: [],
+      filterText: ''
+    }
+  },
+  created () {
+  },
+  watch: {
+    filterText (val) {
+      this.$refs.treeRef.filter(val)
+    }
+  },
+  methods: {
+    getPowerTree () {
+      this.treeLoading = true
+      const config = {
+        url: '/sysPower/tree',
+        method: 'get'
+      }
+      this.$axios(config)
+        .then(res => {
+          this.data = res.data
+          this.treeLoading = false
+        })
+        .catch(() => {
+          this.treeLoading = false
+        })
+    },
+    filterNode (value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
+    },
+    setCheckedKeys (arr) { // 设置选中节点
+      this.$refs.treeRef.setCheckedKeys(arr)
+    },
+    getCheckedKeys () { // 获取选中节点
+      return this.$refs.treeRef.getCheckedKeys()
+    }
+  }
+}
+</script>
+<style>
+.tree {
+  overflow-y: auto;
+  min-height: 180px;
+  max-height: 300px;
+  border: 1px solid #e4e7ed;
+  border-top: 0px;
+}
+</style>
-- 
Gitee


From 1b22f9ac7b38b6f728dc7b318628264cfd33df9b Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Tue, 30 Jun 2020 17:31:22 +0800
Subject: [PATCH 43/70] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=9B=9E=E6=98=BE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/page3/components/AddUpdateForm.vue   | 13 ++++--------
 src/views/demo/page3/components/PowerTree.vue | 20 +++++++++++++++++--
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/views/demo/page3/components/AddUpdateForm.vue b/src/views/demo/page3/components/AddUpdateForm.vue
index a6a809a..f94e0f1 100644
--- a/src/views/demo/page3/components/AddUpdateForm.vue
+++ b/src/views/demo/page3/components/AddUpdateForm.vue
@@ -29,7 +29,7 @@
       </el-form-item>
       <el-row :gutter="20">
         <el-col :span="6" style="text-align:right">权限</el-col>
-        <el-col :span="18"><PowerTree ref= "treeRef"/></el-col>
+        <el-col :span="18"><PowerTree ref= "treeRef" :powerArray="powerArray"/></el-col>
       </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -63,6 +63,7 @@ export default {
       addUpdateFormVisible: false, // 是否显示弹框
       title: '', // 弹框标题
       addUpdateForm: {},
+      powerArray: [],
       initFrom: {
         state: 1
       },
@@ -82,17 +83,10 @@ export default {
         this.updateExist = false
         this.title = '修改角色'
         this.addUpdateForm = JSON.parse(JSON.stringify(row))
-        this.$nextTick(() => {
-          this.$refs.treeRef.getPowerTree() // 权限初始化
-          this.$refs.treeRef.setCheckedKeys(row.powers.map(power => power.id)) // 权限处理
-        })
+        this.powerArray = row.powers.map(power => power.id)
       } else {
         this.updateExist = true
         this.title = '新增角色'
-        this.$nextTick(() => {
-          this.$refs.treeRef.getPowerTree() // 权限初始化
-          this.$refs.treeRef.setCheckedKeys([]) // 权限处理
-        })
       }
     },
     addOrupdate () {
@@ -129,6 +123,7 @@ export default {
       // 重置表单 需要转成字符串赋值，不然这两个对象的值会一直相等
       this.addUpdateForm = JSON.parse(JSON.stringify(this.initFrom))
       this.$nextTick(() => {
+        this.$refs.treeRef.getPowerTree() // 权限初始化
         this.$refs.addUpdateFormRef.clearValidate()
       })
     }
diff --git a/src/views/demo/page3/components/PowerTree.vue b/src/views/demo/page3/components/PowerTree.vue
index 3f8ad4c..eac7cd6 100644
--- a/src/views/demo/page3/components/PowerTree.vue
+++ b/src/views/demo/page3/components/PowerTree.vue
@@ -12,22 +12,27 @@
         children: 'children',
         label: 'name'
       }"
+      :check-strictly="checkStrictly"
       :filter-node-method="filterNode"
+      :default-expand-all="true"
      />
   </div>
 </template>
 
 <script>
 export default {
+  name: 'PowerTree',
+  props: {
+    powerArray: Array
+  },
   data () {
     return {
       treeLoading: false,
       data: [],
+      checkStrictly: false,
       filterText: ''
     }
   },
-  created () {
-  },
   watch: {
     filterText (val) {
       this.$refs.treeRef.filter(val)
@@ -44,6 +49,7 @@ export default {
         .then(res => {
           this.data = res.data
           this.treeLoading = false
+          this.setTreeData()
         })
         .catch(() => {
           this.treeLoading = false
@@ -58,6 +64,16 @@ export default {
     },
     getCheckedKeys () { // 获取选中节点
       return this.$refs.treeRef.getCheckedKeys()
+    },
+    setTreeData () {
+      setTimeout(() => {
+        this.powerArray.forEach((i, n) => {
+          var node = this.$refs.treeRef.getNode(i)
+          if (node && node.isLeaf) {
+            this.$refs.treeRef.setChecked(node, true)
+          }
+        })
+      }, 100)
     }
   }
 }
-- 
Gitee


From e79952c77218844f40715e1126072c8afa477e84 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Tue, 30 Jun 2020 17:59:43 +0800
Subject: [PATCH 44/70] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/routes.js                          |  24 +-
 .../system/power/components/AddUpdateForm.vue | 219 +++++++++++++++++
 src/views/system/power/index.vue              | 129 ++++++++++
 .../system/role/components/AddUpdateForm.vue  | 132 ++++++++++
 .../system/role/components/PowerTree.vue      |  89 +++++++
 src/views/system/role/index.vue               | 179 ++++++++++++++
 .../system/user/components/AddUpdateForm.vue  | 170 +++++++++++++
 .../system/user/components/DemoTreeSide.vue   |  77 ++++++
 src/views/system/user/index.vue               | 229 ++++++++++++++++++
 9 files changed, 1236 insertions(+), 12 deletions(-)
 create mode 100644 src/views/system/power/components/AddUpdateForm.vue
 create mode 100644 src/views/system/power/index.vue
 create mode 100644 src/views/system/role/components/AddUpdateForm.vue
 create mode 100644 src/views/system/role/components/PowerTree.vue
 create mode 100644 src/views/system/role/index.vue
 create mode 100644 src/views/system/user/components/AddUpdateForm.vue
 create mode 100644 src/views/system/user/components/DemoTreeSide.vue
 create mode 100644 src/views/system/user/index.vue

diff --git a/src/router/routes.js b/src/router/routes.js
index 3433c99..db3a298 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -23,31 +23,31 @@ const frameIn = [
       },
       // 演示页面
       {
-        path: 'page1',
-        name: 'page1',
+        path: 'SysUser',
+        name: 'SysUser',
         meta: {
-          title: '页面 1',
+          title: '系统用户',
           auth: true
         },
-        component: _import('demo/page1')
+        component: _import('system/user')
       },
       {
-        path: 'page2',
-        name: 'page2',
+        path: 'SysRole',
+        name: 'SysRole',
         meta: {
-          title: '页面 2',
+          title: '系统角色',
           auth: true
         },
-        component: _import('demo/page2')
+        component: _import('system/role')
       },
       {
-        path: 'page3',
-        name: 'page3',
+        path: 'SysPower',
+        name: 'SysPower',
         meta: {
-          title: '页面 3',
+          title: '系统权限',
           auth: true
         },
-        component: _import('demo/page3')
+        component: _import('system/power')
       },
       // 刷新页面 必须保留
       {
diff --git a/src/views/system/power/components/AddUpdateForm.vue b/src/views/system/power/components/AddUpdateForm.vue
new file mode 100644
index 0000000..3e5425c
--- /dev/null
+++ b/src/views/system/power/components/AddUpdateForm.vue
@@ -0,0 +1,219 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="addUpdateFormVisible"
+    center
+    width="500px"
+    v-loading.fullscreen.lock="loading"
+  >
+    <el-form
+      :model="addUpdateForm"
+      :rules="rules"
+      label-width="120px"
+      size="medium"
+      ref="addUpdateFormRef"
+    >
+      <el-form-item prop="name" label="名称">
+        <el-input v-model.trim="addUpdateForm.name" placeholder="请输入名称" />
+      </el-form-item>
+      <el-form-item prop="type" label="类型">
+        <el-select
+          v-model="addUpdateForm.type"
+          placeholder="请选择类型"
+          @change="getParentSelect"
+          style="width:100%"
+        >
+          <el-option
+            v-for="type in dictDetails.sys_power_type"
+            :key="type.value"
+            :label="type.name"
+            :value="type.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item prop="parentId" label="上级">
+        <el-cascader
+          ref="parentRef"
+          v-model="addUpdateForm.parentId"
+          :options="parentOptions"
+          :props="{ value: 'id',label: 'name',checkStrictly: true }"
+          :show-all-levels="false"
+          clearable
+          filterable
+          style="width:100%"
+        />
+      </el-form-item>
+      <el-form-item v-if="iconExist" label="图标">
+        <e-icon-picker v-model="addUpdateForm.icon" placeholder="请选择图标" />
+      </el-form-item>
+      <el-form-item label="排序">
+        <el-input-number
+          v-model="addUpdateForm.sort"
+          controls-position="right"
+          :min="0"
+          style="width:100%"
+        />
+      </el-form-item>
+      <el-form-item v-if="urlExist" prop="url" label="接口地址">
+        <el-input v-model.trim="addUpdateForm.url" placeholder="请输入接口地址" />
+      </el-form-item>
+      <el-form-item v-if="pathExist" prop="path" label="资源路径">
+        <el-input v-model.trim="addUpdateForm.path" placeholder="请输入资源路径" />
+      </el-form-item>
+      <el-form-item label="备注">
+        <el-input type="textarea" v-model="addUpdateForm.remarks" placeholder="请输入备注" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-if="btnExist" @click="addUpdateFormVisible = false">取 消</el-button>
+      <el-button v-if="btnExist" type="primary" @click="addOrupdate()">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'AddUpdateForm',
+  props: {
+    dictDetails: Object,
+    getDataList: {
+      type: Function,
+      default: null
+    }
+  },
+  data () {
+    return {
+      loading: false,
+      btnExist: true, // 按钮是否存在
+      addUpdateFormVisible: false, // 是否显示弹框
+      title: '', // 弹框标题
+      addUpdateForm: {},
+      initFrom: {
+        // 初始弹框
+        type: '0',
+        sort: 0
+      },
+      parentOptions: [],
+      iconExist: true,
+      urlExist: false,
+      pathExist: false,
+      rules: {
+        name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+        type: [{ required: true, message: '请选择类型', trigger: 'blur' }],
+        url: [{ required: true, message: '请输入接口地址', trigger: 'blur' }],
+        path: [{ required: true, message: '请输入资源路径', trigger: 'blur' }],
+        parentId: [{ required: false, message: '请选择上级', trigger: 'blur' }]
+      }
+    }
+  },
+  created () {},
+  methods: {
+    getParentSelect (type) {
+      switch (type) {
+        case '0':
+          this.iconExist = true
+          this.urlExist = false
+          this.pathExist = false
+          if (this.$refs.addUpdateFormRef) {
+            this.$refs.addUpdateFormRef.clearValidate('parentId')
+            this.rules.parentId[0].required = false
+          }
+          break
+        case '1':
+          this.iconExist = true
+          this.urlExist = false
+          this.pathExist = true
+          if (this.$refs.addUpdateFormRef) {
+            this.$refs.addUpdateFormRef.clearValidate('parentId')
+            this.rules.parentId[0].required = false
+          }
+          break
+        case '2':
+          this.iconExist = false
+          this.urlExist = true
+          this.pathExist = false
+          this.rules.parentId[0].required = true
+          break
+      }
+      const config = {
+        url: 'sysPower/tree',
+        method: 'get',
+        params: {
+          type: type
+        }
+      }
+      delete this.addUpdateForm.parentId
+      delete this.addUpdateForm.parentIds
+      this.$axios(config).then(res => {
+        this.parentOptions = res.data
+      })
+    },
+    initAddOrUpdate (row) {
+      // 新增或修改
+      this.addUpdateFormVisible = true
+      this.addUpdateFormReset()
+      if (row) {
+        row.type += '' // 转成字符串,不然select控件不支持回显
+        this.title = '修改权限'
+        // 修改下拉框数据
+        this.getParentSelect(row.type)
+        this.addUpdateForm = JSON.parse(JSON.stringify(row))
+        // 通过父级编号集来回显
+        this.addUpdateForm.parentId = this.addUpdateForm.parentIds.split(',')
+      } else {
+        this.getParentSelect(this.initFrom.type)
+        this.title = '新增权限'
+      }
+    },
+    addOrupdate () {
+      // 添加或修改
+      this.$refs.addUpdateFormRef.validate(valid => {
+        if (valid) {
+          if (this.addUpdateForm.parentId) { // 判断是否存在
+            if (Array.isArray(this.addUpdateForm.parentId)) {
+              if (this.addUpdateForm.parentId.length === 0) { // 当为空数组时的处理
+                delete this.addUpdateForm.parentId
+                delete this.addUpdateForm.parentIds
+              } else {
+                this.addUpdateForm.parentIds = this.addUpdateForm.parentId.join(',')
+                if (this.$refs.parentRef.getCheckedNodes()[0]) {
+                  this.addUpdateForm.parentId = this.$refs.parentRef.getCheckedNodes()[0].value
+                } else {
+                  this.addUpdateForm.parentId = this.addUpdateForm.parentId[0]
+                }
+              }
+            }
+          }
+          this.loading = true
+          this.btnExist = false
+          const config = {
+            url: this.addUpdateForm.id ? 'sysPower/update' : 'sysPower/add',
+            method: 'post',
+            data: this.addUpdateForm
+          }
+          this.$axios(config)
+            .then(res => {
+              this.loading = false
+              this.addUpdateFormVisible = false
+              this.btnExist = true
+              this.getDataList()
+              this.$message.success(res.msg)
+            })
+            .catch(() => {
+              this.loading = false
+              this.btnExist = true
+            })
+        }
+      })
+    },
+    addUpdateFormReset () {
+      // 重置表单 需要转成字符串赋值，不然这两个对象的值会一直相等
+      this.addUpdateForm = JSON.parse(JSON.stringify(this.initFrom))
+      this.$nextTick(() => {
+        this.$refs.addUpdateFormRef.clearValidate()
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/system/power/index.vue b/src/views/system/power/index.vue
new file mode 100644
index 0000000..2a2e357
--- /dev/null
+++ b/src/views/system/power/index.vue
@@ -0,0 +1,129 @@
+<template>
+  <zero-container>
+    <!-- 头部信息-start -->
+    <div slot="header">
+      <el-button size="mini" icon="el-icon-refresh" @click="refreshPage('tableRef')">刷新</el-button>
+      <el-button size="mini" type="primary" @click="initAddOrUpdate('addUpdateDialogRef')">新增</el-button>
+    </div>
+    <!-- 头部信息-end -->
+    <!-- 右边信息-start -->
+    <div slot="main" style="height:100%">
+      <el-table
+        ref="tableRef"
+        height="100%"
+        size="mini"
+        row-key="id"
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        class="zero-table"
+        style="width: 100%"
+        default-expand-all
+        :tree-props="{children: 'children'}"
+      >
+        <el-table-column
+          prop="name"
+          label="名称"
+          header-align="center"
+          align="center"
+        />
+        <el-table-column
+          prop="url"
+          label="接口地址"
+          header-align="center"
+          align="center"
+        />
+        <el-table-column
+          prop="path"
+          label="资源路径"
+          header-align="center"
+          align="center"
+        />
+        <el-table-column
+          prop="sort"
+          label="排序"
+          header-align="center"
+          align="center"
+        />
+        <el-table-column
+          prop="icon"
+          label="图标"
+          header-align="center"
+          align="center"
+        >
+         <template slot-scope="scope">
+           <i :class="scope.row.icon"></i>
+          </template>
+        </el-table-column>
+        <!-- 字典特殊处理 -->
+        <el-table-column
+          prop="type"
+          label="类型"
+          header-align="center"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <el-tag
+              :type="scope.row.type == 0  ? 'success' : scope.row.type == 1 ? 'warning' : 'danger'"
+              disable-transitions>{{dictDetailsHandle(scope.row.type, 'sys_power_type')}}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="createTime"
+          label="创建时间"
+          header-align="center"
+          align="center"
+          width="180"
+          :formatter="dateFormat"
+        />
+        <el-table-column prop="remarks" label="备注" header-align="center" align="center" />
+        <el-table-column label="操作" header-align="center" align="center" fixed="right" width="150">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="mini"
+              @click="initAddOrUpdate('addUpdateDialogRef',scope.row)"
+            >修改</el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteHandle(scope.row,scope.row.name)"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 新增修改弹框 -->
+      <AddUpdateForm
+        ref="addUpdateDialogRef"
+        :dict-details="dictDetails"
+        :getDataList="getDataList"
+      />
+    </div>
+    <!-- 右边信息-end -->
+  </zero-container>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module' // 分页相关js
+import AddUpdateForm from './components/AddUpdateForm' // 添加修改模块
+export default {
+  name: 'SysPower',
+  mixins: [mixinViewModule],
+  components: {
+    AddUpdateForm
+  },
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        isPage: false,
+        getDataListUrl: '/sysPower/tree',
+        deleteUrl: '/sysPower/del',
+        exportUrl: '/sysPower/export',
+        dictCodes: 'sys_power_type'
+      }
+    }
+  },
+  methods: {
+  }
+}
+</script>
diff --git a/src/views/system/role/components/AddUpdateForm.vue b/src/views/system/role/components/AddUpdateForm.vue
new file mode 100644
index 0000000..f94e0f1
--- /dev/null
+++ b/src/views/system/role/components/AddUpdateForm.vue
@@ -0,0 +1,132 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="addUpdateFormVisible"
+    width="500px"
+    v-loading.fullscreen.lock="loading"
+  >
+    <el-form
+      :model="addUpdateForm"
+      :rules="rules"
+      label-width="120px"
+      size="medium"
+      ref="addUpdateFormRef"
+    >
+      <el-form-item prop="name" label="角色名称">
+        <el-input v-model.trim="addUpdateForm.name" placeholder="请输入角色名称" />
+      </el-form-item>
+      <el-form-item prop="state" label="角色状态">
+        <el-radio-group v-model="addUpdateForm.state">
+          <el-radio-button
+            v-for="state in dictDetails.state"
+            :label="state.value"
+            :key="state.value"
+          >{{state.name}}</el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="备注">
+        <el-input type="textarea" v-model="addUpdateForm.remarks" placeholder="请输入备注" />
+      </el-form-item>
+      <el-row :gutter="20">
+        <el-col :span="6" style="text-align:right">权限</el-col>
+        <el-col :span="18"><PowerTree ref= "treeRef" :powerArray="powerArray"/></el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-if="btnExist" @click="addUpdateFormVisible = false">取 消</el-button>
+      <el-button v-if="btnExist" type="primary" @click="addOrupdate()">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+
+import PowerTree from './PowerTree' // 权限树
+
+export default {
+  name: 'AddUpdateForm',
+  components: {
+    PowerTree
+  },
+  props: {
+    dictDetails: Object,
+    getDataList: {
+      type: Function,
+      default: null
+    }
+  },
+  data () {
+    return {
+      loading: false,
+      btnExist: true, // 按钮是否存在
+      updateExist: true, // 修改时，是否存在的输入框
+      addUpdateFormVisible: false, // 是否显示弹框
+      title: '', // 弹框标题
+      addUpdateForm: {},
+      powerArray: [],
+      initFrom: {
+        state: 1
+      },
+      rules: {
+        name: [{ required: true, message: '请输入角色名称', trigger: 'blur' }],
+        state: [{ required: true, message: '请选择角色状态', trigger: 'blur' }]
+      }
+    }
+  },
+  created () {},
+  methods: {
+    initAddOrUpdate (row) {
+      // 新增或修改
+      this.addUpdateFormVisible = true
+      this.addUpdateFormReset()
+      if (row) {
+        this.updateExist = false
+        this.title = '修改角色'
+        this.addUpdateForm = JSON.parse(JSON.stringify(row))
+        this.powerArray = row.powers.map(power => power.id)
+      } else {
+        this.updateExist = true
+        this.title = '新增角色'
+      }
+    },
+    addOrupdate () {
+      // 添加或修改
+      this.$refs.addUpdateFormRef.validate(valid => {
+        if (valid) {
+          this.loading = true
+          this.btnExist = false
+          // 处理权限
+          this.addUpdateForm.powers = this.$refs.treeRef.getCheckedKeys().map(it => {
+            return { id: it }
+          })
+          const config = {
+            url: this.addUpdateForm.id ? 'sysRole/update' : 'sysRole/add',
+            method: 'post',
+            data: this.addUpdateForm
+          }
+          this.$axios(config)
+            .then(res => {
+              this.loading = false
+              this.addUpdateFormVisible = false
+              this.btnExist = true
+              this.getDataList()
+              this.$message.success(res.msg)
+            })
+            .catch(() => {
+              this.loading = false
+              this.btnExist = true
+            })
+        }
+      })
+    },
+    addUpdateFormReset () {
+      // 重置表单 需要转成字符串赋值，不然这两个对象的值会一直相等
+      this.addUpdateForm = JSON.parse(JSON.stringify(this.initFrom))
+      this.$nextTick(() => {
+        this.$refs.treeRef.getPowerTree() // 权限初始化
+        this.$refs.addUpdateFormRef.clearValidate()
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/system/role/components/PowerTree.vue b/src/views/system/role/components/PowerTree.vue
new file mode 100644
index 0000000..bd31e8f
--- /dev/null
+++ b/src/views/system/role/components/PowerTree.vue
@@ -0,0 +1,89 @@
+<template>
+  <div>
+    <el-input placeholder="输入关键字进行过滤" v-model="filterText" />
+    <el-tree ref="treeRef"
+      v-loading="treeLoading"
+      class="tree"
+      show-checkbox
+      default-expand-all
+      node-key="id"
+      highlight-current
+      :data="data"
+      :props="{
+        children: 'children',
+        label: 'name'
+      }"
+      :check-strictly="checkStrictly"
+      :filter-node-method="filterNode"
+     />
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'PowerTree',
+  props: {
+    powerArray: Array
+  },
+  data () {
+    return {
+      treeLoading: false,
+      data: [],
+      checkStrictly: false,
+      filterText: ''
+    }
+  },
+  watch: {
+    filterText (val) {
+      this.$refs.treeRef.filter(val)
+    }
+  },
+  methods: {
+    getPowerTree () {
+      this.treeLoading = true
+      const config = {
+        url: '/sysPower/tree',
+        method: 'get'
+      }
+      this.$axios(config)
+        .then(res => {
+          this.data = res.data
+          this.treeLoading = false
+          this.setTreeData()
+        })
+        .catch(() => {
+          this.treeLoading = false
+        })
+    },
+    filterNode (value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
+    },
+    setCheckedKeys (arr) { // 设置选中节点
+      this.$refs.treeRef.setCheckedKeys(arr)
+    },
+    getCheckedKeys () { // 获取选中节点
+      return this.$refs.treeRef.getCheckedKeys()
+    },
+    setTreeData () {
+      setTimeout(() => {
+        this.powerArray.forEach((i, n) => {
+          var node = this.$refs.treeRef.getNode(i)
+          if (node && node.isLeaf) {
+            this.$refs.treeRef.setChecked(node, true)
+          }
+        })
+      }, 100)
+    }
+  }
+}
+</script>
+<style>
+.tree {
+  overflow-y: auto;
+  min-height: 180px;
+  max-height: 300px;
+  border: 1px solid #e4e7ed;
+  border-top: 0px;
+}
+</style>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
new file mode 100644
index 0000000..bf9f064
--- /dev/null
+++ b/src/views/system/role/index.vue
@@ -0,0 +1,179 @@
+<template>
+  <zero-container>
+    <!-- 头部信息-start -->
+    <div slot="header">
+      <SearchHearder @searchOpen="searchOpen" />
+      <!-- <div style="float:right"> -->
+      <el-button size="mini" type="primary" @click="initAddOrUpdate('addUpdateDialogRef')">新增</el-button>
+      <el-button size="mini" type="danger" @click="deleteHandle()" :disabled="batchBtnDisabled">批量删除</el-button>
+      <!-- </div> -->
+      <el-collapse-transition>
+        <el-form
+          v-show="searchFormShow"
+          :inline="true"
+          size="mini"
+          :model="searchForm"
+          class="zero-search-from"
+        >
+          <el-form-item label="角色名称">
+            <el-input v-model="searchForm.name" placeholder="请输入角色名称" clearable />
+          </el-form-item>
+          <el-form-item>
+            <el-button size="mini" type="primary" icon="el-icon-search" @click="getDataList()">搜索</el-button>
+            <el-button size="mini" icon="el-icon-refresh" @click="searchResetForm('tableRef')">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </el-collapse-transition>
+    </div>
+    <!-- 头部信息-end -->
+    <!-- 右边信息-start -->
+    <div slot="main" style="height:100%">
+      <el-table
+        ref="tableRef"
+        height="100%"
+        size="mini"
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle"
+        class="zero-table"
+        style="width: 100%"
+      >
+        <el-table-column type="selection" header-align="center" align="center" width="50" />
+        <el-table-column
+          prop="name"
+          label="角色名称"
+          sortable="custom"
+          header-align="center"
+          align="center"
+        />
+        <!-- 状态特殊处理 -->
+        <el-table-column
+          prop="state"
+          label="角色状态"
+          sortable="custom"
+          header-align="center"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.state"
+              :active-value="1"
+              :inactive-value="0"
+              @change="changeState(scope.row)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="createTime"
+          label="创建时间"
+          sortable="custom"
+          header-align="center"
+          align="center"
+          width="180"
+          :formatter="dateFormat"
+        />
+        <el-table-column
+          prop="updateTime"
+          label="修改时间"
+          sortable="custom"
+          header-align="center"
+          align="center"
+          width="180"
+          :formatter="dateFormat"
+        />
+        <el-table-column prop="remarks" label="备注" header-align="center" align="center" />
+        <el-table-column label="操作" header-align="center" align="center" fixed="right" width="150">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="mini"
+              @click="initAddOrUpdate('addUpdateDialogRef',scope.row)"
+            >修改</el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteHandle(scope.row,scope.row.username)"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 新增修改弹框 -->
+      <AddUpdateForm
+        ref="addUpdateDialogRef"
+        :dict-details="dictDetails"
+        :getDataList="getDataList"
+      />
+    </div>
+    <!-- 右边信息-end -->
+    <!-- 页脚-start -->
+    <div slot="footer">
+      <PageFooter
+      :limits="[10, 20, 50, 100]"
+      :page="page"
+      :limit="limit"
+      :total="total"
+      :pageSizeChangeHandle="pageSizeChangeHandle"
+      :pageCurrentChangeHandle="pageCurrentChangeHandle"
+      :firstPageHandle="firstPageHandle"
+      :lastPageHandle="lastPageHandle"
+      :refreshPage="refreshPage"
+      refreshRef ="tableRef"
+      />
+    </div>
+    <!-- 页脚-end -->
+  </zero-container>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module' // 分页相关js
+import SearchHearder from '@/components/search-hearder/SearchHearder' // 头部查询模块
+import PageFooter from '@/components/page-footer/PageFooter' // 分页模块
+import AddUpdateForm from './components/AddUpdateForm' // 添加修改模块
+export default {
+  name: 'SysRole',
+  mixins: [mixinViewModule],
+  components: {
+    SearchHearder,
+    PageFooter,
+    AddUpdateForm
+  },
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListUrl: '/sysRole/pageList',
+        deleteUrl: '/sysRole/del',
+        exportUrl: '/sysRole/export',
+        dictCodes: 'state'
+      }
+    }
+  },
+  methods: {
+    changeState (row) {
+      // 修改状态
+      this.dataListLoading = true
+      const params = {
+        id: row.id,
+        state: row.state
+      }
+      row.state = (row.state + 1) % 2
+      const config = {
+        url: '/sysRole/updateState',
+        method: 'get',
+        params: params
+      }
+      this.$axios(config)
+        .then(res => {
+          this.dataListLoading = false
+          row.state = params.state
+          this.$message.success(res.msg)
+          this.getDataList()
+        })
+        .catch(() => {
+          this.dataListLoading = false
+        })
+    }
+  }
+}
+</script>
diff --git a/src/views/system/user/components/AddUpdateForm.vue b/src/views/system/user/components/AddUpdateForm.vue
new file mode 100644
index 0000000..9035e80
--- /dev/null
+++ b/src/views/system/user/components/AddUpdateForm.vue
@@ -0,0 +1,170 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="addUpdateFormVisible"
+    width="500px"
+    v-loading.fullscreen.lock="loading"
+  >
+    <el-form
+      :model="addUpdateForm"
+      :rules="rules"
+      label-width="120px"
+      size="medium"
+      ref="addUpdateFormRef"
+    >
+      <el-form-item prop="username" label="用户账号">
+        <el-input v-model.trim="addUpdateForm.username" placeholder="请输入用户账号" />
+      </el-form-item>
+      <el-form-item v-show="updateExist" prop="password" label="用户密码">
+        <el-input v-model.trim="addUpdateForm.password" placeholder="请输入用户密码" show-password />
+      </el-form-item>
+      <el-form-item prop="mobile" label="手机号">
+        <el-input v-model.trim="addUpdateForm.mobile" placeholder="请输入手机号" />
+      </el-form-item>
+      <el-form-item label="昵称">
+        <el-input v-model.trim="addUpdateForm.name" placeholder="请输入昵称" />
+      </el-form-item>
+      <el-form-item label="用户角色">
+        <el-select v-model="modelRoles" filterable clearable multiple placeholder="请选择角色" style="width:100%">
+          <el-option
+            v-for="item in roles"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+            :disabled="item.state === 0"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="type" label="用户类型">
+        <el-select v-model="addUpdateForm.type" placeholder="请选择类型" style="width:100%">
+          <el-option
+            v-for="type in dictDetails.sys_user_type"
+            :key="type.value"
+            :label="type.name"
+            :value="type.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="state" label="用户状态">
+        <el-radio-group v-model="addUpdateForm.state">
+          <el-radio-button
+            v-for="state in dictDetails.state"
+            :label="state.value"
+            :key="state.value"
+          >{{state.name}}</el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="备注">
+        <el-input type="textarea" v-model="addUpdateForm.remarks" placeholder="请输入备注" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-if="btnExist" @click="addUpdateFormVisible = false">取 消</el-button>
+      <el-button v-if="btnExist" type="primary" @click="addOrupdate()">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'AddUpdateForm',
+  props: {
+    dictDetails: Object,
+    getDataList: {
+      type: Function,
+      default: null
+    }
+  },
+  data () {
+    return {
+      loading: false,
+      btnExist: true, // 按钮是否存在
+      updateExist: true, // 修改时，是否存在的输入框
+      addUpdateFormVisible: false, // 是否显示弹框
+      title: '', // 弹框标题
+      addUpdateForm: {},
+      modelRoles: [],
+      roles: [],
+      rules: {
+        username: [
+          { required: true, message: '请输入用户账号', trigger: 'blur' }
+        ],
+        password: [
+          { required: true, message: '请输入用户密码', trigger: 'blur' }
+        ],
+        mobile: [{ required: true, message: '请输入手机号', trigger: 'blur' }],
+        state: [{ required: true, message: '请选择用户状态', trigger: 'blur' }],
+        type: [{ required: true, message: '请选择用户类型', trigger: 'blur' }]
+      }
+    }
+  },
+  created () {
+    this.initRoles()
+  },
+  methods: {
+    initRoles () {
+      // 角色初始化
+      this.$axios({ url: 'sysRole/getIdAndName', method: 'get' }).then(res => {
+        this.roles = res.data
+      })
+    },
+    initAddOrUpdate (row) {
+      // 新增或修改
+      this.addUpdateFormVisible = true
+      this.addUpdateFormReset()
+      if (row) {
+        this.updateExist = false
+        row.type += '' // 转成字符串,不然select控件不支持回显
+        this.title = '修改用户'
+        this.addUpdateForm = JSON.parse(JSON.stringify(row))
+        if (row.roles) {
+          this.modelRoles = row.roles.map(it => it.id)
+        }
+      } else {
+        this.updateExist = true
+        this.title = '新增用户'
+      }
+    },
+    addOrupdate () {
+      // 添加或修改
+      this.$refs.addUpdateFormRef.validate(valid => {
+        if (valid) {
+          this.loading = true
+          this.btnExist = false
+          this.addUpdateForm.roles = this.modelRoles.map(it => {
+            return { id: it }
+          })
+          const config = {
+            url: this.addUpdateForm.id ? 'sysUser/update' : 'sysUser/add',
+            method: 'post',
+            data: this.addUpdateForm
+          }
+          this.$axios(config)
+            .then(res => {
+              this.loading = false
+              this.addUpdateFormVisible = false
+              this.btnExist = true
+              this.getDataList()
+              this.$message.success(res.msg)
+            })
+            .catch(() => {
+              this.loading = false
+              this.btnExist = true
+            })
+        }
+      })
+    },
+    addUpdateFormReset () {
+      // 重置表单
+      this.addUpdateForm = {
+        state: 1,
+        type: '0'
+      }
+      this.modelRoles = []
+      this.$nextTick(() => {
+        this.$refs.addUpdateFormRef.clearValidate()
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/system/user/components/DemoTreeSide.vue b/src/views/system/user/components/DemoTreeSide.vue
new file mode 100644
index 0000000..4385b19
--- /dev/null
+++ b/src/views/system/user/components/DemoTreeSide.vue
@@ -0,0 +1,77 @@
+<template>
+  <el-tree :data="data" node-key="label" :highlight-current="true">
+    <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">
+          <i class="el-icon-s-operation"></i>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item icon="el-icon-plus" @click.native="addPeerTree(node,data)">新增同级</el-dropdown-item>
+            <el-dropdown-item icon="el-icon-circle-plus" @click.native="addChildrenTree(node,data)">新增下级</el-dropdown-item>
+            <el-dropdown-item icon="el-icon-edit-outline" @click.native="updateTree(node,data)">修改</el-dropdown-item>
+            <el-dropdown-item icon="el-icon-delete-solid" @click.native="delTree(node,data)">删除</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
+    </span>
+  </el-tree>
+</template>
+
+<script>
+import { map, range } from 'lodash'
+// 构造树形数据
+const treeData = [
+  {
+    label: 'Side menu'
+  },
+  ...map(range(1, 10), (index1) => ({
+    label: 'Menu item  ' + index1,
+    children: map(range(1, 20), (index2) => ({
+      label: 'Menu item ' + index1 + '-' + index2,
+      children: map(range(1, 5), (index3) => ({
+        label: 'Menu item ' + index1 + '-' + index2 + '-' + index3
+      }))
+    }))
+  }))
+]
+
+export default {
+  name: 'DemoTreeSide',
+  data () {
+    return {
+      data: treeData
+    }
+  },
+  methods: {
+    mouseover (data) { // 移入
+      this.$set(data, 'dropdownShow', true)
+    },
+    mouseout (data) { // 移除
+      this.$set(data, 'dropdownShow', false)
+    },
+    addPeerTree (node, data) {
+      console.log('新增同级')
+    },
+    addChildrenTree (node, data) {
+      console.log('新增下级')
+    },
+    updateTree (node, data) {
+      console.log('修改')
+    },
+    updateTdelTreeree (node, data) {
+      console.log('删除')
+    }
+  }
+}
+</script>
+<style>
+  .custom-tree-node {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-size: 14px;
+    padding-right: 10px;
+    height:100%;
+  }
+</style>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
new file mode 100644
index 0000000..4f44fd1
--- /dev/null
+++ b/src/views/system/user/index.vue
@@ -0,0 +1,229 @@
+<template>
+  <zero-container>
+    <!-- 头部信息-start -->
+    <div slot="header">
+      <SearchHearder @searchOpen="searchOpen" />
+      <!-- <div style="float:right"> -->
+      <el-button size="mini" type="primary" @click="initAddOrUpdate('addUpdateDialogRef')">新增</el-button>
+      <el-button size="mini" type="danger" @click="deleteHandle()" :disabled="batchBtnDisabled">批量删除</el-button>
+      <!-- </div> -->
+      <el-collapse-transition>
+        <el-form
+          v-show="searchFormShow"
+          :inline="true"
+          size="mini"
+          :model="searchForm"
+          class="zero-search-from"
+        >
+          <el-form-item label="用户账号">
+            <el-input v-model="searchForm.username" placeholder="请输入用户名" clearable />
+          </el-form-item>
+          <el-form-item>
+            <el-button size="mini" type="primary" icon="el-icon-search" @click="getDataList()">搜索</el-button>
+            <el-button size="mini" icon="el-icon-refresh" @click="searchResetForm('tableRef')">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </el-collapse-transition>
+    </div>
+    <!-- 头部信息-end -->
+    <!-- 左边信息-start -->
+    <div slot="aside">
+      树
+      <DemoTreeSide />
+    </div>
+    <!-- 左边信息-end -->
+    <!-- 右边信息-start -->
+    <div slot="main" style="height:100%">
+      <el-table
+        ref="tableRef"
+        height="100%"
+        size="mini"
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle"
+        class="zero-table"
+        style="width: 100%"
+      >
+        <el-table-column type="selection" header-align="center" align="center" width="50" />
+        <el-table-column
+          prop="name"
+          label="昵称"
+          sortable="custom"
+          header-align="center"
+          align="center"
+        />
+        <el-table-column
+          prop="username"
+          label="用户账号"
+          sortable="custom"
+          header-align="center"
+          align="center"
+        />
+        <el-table-column
+          prop="mobile"
+          label="手机号码"
+          sortable="custom"
+          header-align="center"
+          align="center"
+        />
+        <!-- 字典特殊处理 -->
+        <el-table-column
+          prop="type"
+          label="用户类型"
+          sortable="custom"
+          header-align="center"
+          align="center"
+          :formatter="(row, column, cellValue) => dictDetailsHandle(cellValue, 'sys_user_type')"
+        />
+        <el-table-column prop="roleList" label="角色列表">
+          <template slot-scope="scope">
+            <span v-for="item in scope.row.roles" :key="item.id">
+              <span v-if="item.state === 1">[{{ 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
+          prop="state"
+          label="用户状态"
+          sortable="custom"
+          header-align="center"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.state"
+              :active-value="1"
+              :inactive-value="0"
+              @change="changeState(scope.row)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="createTime"
+          label="创建时间"
+          sortable="custom"
+          header-align="center"
+          align="center"
+          width="180"
+          :formatter="dateFormat"
+        />
+        <el-table-column prop="remarks" label="备注" header-align="center" align="center" />
+        <el-table-column label="操作" header-align="center" align="center" fixed="right" width="150">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="mini"
+              @click="initAddOrUpdate('addUpdateDialogRef',scope.row)"
+            >修改</el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteHandle(scope.row,scope.row.username)"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 新增修改弹框 -->
+      <AddUpdateForm
+        ref="addUpdateDialogRef"
+        :dict-details="dictDetails"
+        :getDataList="getDataList"
+      />
+    </div>
+    <!-- 右边信息-end -->
+    <!-- 页脚-start -->
+    <div slot="footer">
+      <PageFooter
+        :limits="[10, 20, 50, 100]"
+        :page="page"
+        :limit="limit"
+        :total="total"
+        :pageSizeChangeHandle="pageSizeChangeHandle"
+        :pageCurrentChangeHandle="pageCurrentChangeHandle"
+        :firstPageHandle="firstPageHandle"
+        :lastPageHandle="lastPageHandle"
+        :refreshPage="refreshPage"
+        refreshRef="tableRef"
+      />
+    </div>
+    <!-- 页脚-end -->
+  </zero-container>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module' // 分页相关js
+import SearchHearder from '@/components/search-hearder/SearchHearder' // 头部查询模块
+import DemoTreeSide from './components/DemoTreeSide' // 左边树形模块
+import PageFooter from '@/components/page-footer/PageFooter' // 分页模块
+import AddUpdateForm from './components/AddUpdateForm' // 添加修改模块
+export default {
+  name: 'SysUser',
+  mixins: [mixinViewModule],
+  components: {
+    DemoTreeSide,
+    SearchHearder,
+    PageFooter,
+    AddUpdateForm
+  },
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListUrl: '/sysUser/pageList',
+        deleteUrl: '/sysUser/del',
+        exportUrl: '/sysUser/export',
+        dictCodes: 'sys_user_type,state'
+      }
+    }
+  },
+  methods: {
+    changeState (row) {
+      // 修改状态
+      this.dataListLoading = true
+      const params = {
+        id: row.id,
+        state: row.state
+      }
+      row.state = (row.state + 1) % 2
+      const config = {
+        url: '/sysUser/updateState',
+        method: 'get',
+        params: params
+      }
+      this.$axios(config)
+        .then(res => {
+          this.dataListLoading = false
+          row.state = params.state
+          this.$message.success(res.msg)
+          this.getDataList()
+        })
+        .catch(() => {
+          this.dataListLoading = false
+        })
+    }
+  }
+}
+</script>
+<style>
+.zero-search-from .el-form-item--mini.el-form-item,
+.zero-search-from .el-form-item--small.el-form-item {
+  margin-bottom: 0px;
+  padding-top: 10px;
+}
+.zero-table.el-table--fit.el-table--border {
+  border: 0px !important;
+}
+</style>
-- 
Gitee


From 30fd592962b944bbb58f53aa5484092d9adae904 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Thu, 2 Jul 2020 13:48:20 +0800
Subject: [PATCH 45/70] =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common.js                | 27 +++++++++++++++++++++++++++
 src/main.js                      | 25 +++++++------------------
 src/views/system/login/index.vue | 14 +++++++++++---
 3 files changed, 45 insertions(+), 21 deletions(-)
 create mode 100644 src/api/common.js

diff --git a/src/api/common.js b/src/api/common.js
new file mode 100644
index 0000000..b4dc454
--- /dev/null
+++ b/src/api/common.js
@@ -0,0 +1,27 @@
+
+import util from '@/libs/util'
+import { uniqueId } from 'lodash'
+
+/**
+ * 权限
+ * @param {*} key
+ */
+export function hasPermission (key) {
+  return util.cookies.get('powers').indexOf(key) !== -1 || false
+}
+/**
+ * 处理菜单
+ * @param {*}
+ */
+export function handleMenu (data) {
+  return data.map(e => ({
+    ...e,
+    path: e.path || uniqueId('zero-path-'),
+    title: e.name,
+    ...e.children ? {
+      children: handleMenu(e.children)
+    } : {
+      children: undefined
+    }
+  }))
+}
diff --git a/src/main.js b/src/main.js
index 5623946..43f6310 100644
--- a/src/main.js
+++ b/src/main.js
@@ -11,10 +11,11 @@ import store from '@/store/index'
 import router from './router'
 import { frameInRoutes } from '@/router/routes'
 import { request } from './api/axios'
+import { handleMenu } from './api/common'
 import iconPicker from 'e-icon-picker'
 import 'e-icon-picker/dist/index.css'// 基础样式
 import 'e-icon-picker/dist/main.css' // fontAwesome 图标库样式
-import { uniqueId } from 'lodash'
+import util from '@/libs/util.js'
 
 Vue.use(iconPicker)
 
@@ -23,6 +24,7 @@ Vue.use(zeroVue)
 
 // 将axios封装加入到Vue 原型里 直接this.$axios调用
 Vue.prototype.$axios = request
+Vue.prototype.$handleMenu = handleMenu
 new Vue({
   router,
   store,
@@ -31,7 +33,9 @@ new Vue({
   created () {
     // 处理路由 得到每一级的路由设置
     this.$store.commit('zerovue/page/init', frameInRoutes)
-    this.getUserMenu()
+    if (util.cookies.get('token')) {
+      this.getUserMenu()
+    }
   },
   mounted () {
     // 展示系统信息
@@ -46,27 +50,12 @@ new Vue({
   methods: {
     getUserMenu () {
       request({ url: '/sysPower/getUserMenu', method: 'get' }).then(res => {
-        const menu = this.handleMenu(res.data)
+        const menu = handleMenu(res.data)
         // 设置侧边栏菜单
         this.$store.commit('zerovue/menu/asideSet', menu)
         // 初始化菜单搜索功能
         this.$store.commit('zerovue/search/init', menu)
       })
-    },
-    /**
-     * 处理菜单数据
-     */
-    handleMenu (data) {
-      return data.map(e => ({
-        ...e,
-        path: e.path || uniqueId('zero-path-'),
-        title: e.name,
-        ...e.children ? {
-          children: this.handleMenu(e.children)
-        } : {
-          children: undefined
-        }
-      }))
     }
   }
 }).$mount('#app')
diff --git a/src/views/system/login/index.vue b/src/views/system/login/index.vue
index ae00e35..b85f8b1 100644
--- a/src/views/system/login/index.vue
+++ b/src/views/system/login/index.vue
@@ -183,9 +183,17 @@ export default {
             this.$store.dispatch('zerovue/user/set', { name: this.formLogin.username }, { root: true })
             // 用户登录后从持久化数据加载一系列的设置
             this.$store.dispatch('zerovue/account/load')
-            // 重定向对象不存在则返回顶层路径
-            this.$router.replace(this.$route.query.redirect || '/')
-            this.loading = false
+            this.$axios({ url: '/sysPower/getUserMenu', method: 'get' }).then(res => {
+              const menu = this.$handleMenu(res.data)
+              // 设置侧边栏菜单
+              this.$store.commit('zerovue/menu/asideSet', menu)
+              // 初始化菜单搜索功能
+              this.$store.commit('zerovue/search/init', menu)
+
+              // 重定向对象不存在则返回顶层路径
+              this.$router.replace(this.$route.query.redirect || '/')
+              this.loading = false
+            })
           }).catch(() => {
             this.loading = false
           })
-- 
Gitee


From fb56b853fd16e8e80406e18697ad971578204cce Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Thu, 2 Jul 2020 14:53:14 +0800
Subject: [PATCH 46/70] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common.js                    | 11 ++++++++--
 src/main.js                          |  3 ++-
 src/router/index.js                  | 30 +++++++++++++---------------
 src/router/routes.js                 | 26 ++++++++++++++----------
 src/views/system/error/401/index.vue |  3 +++
 src/views/system/error/404/index.vue | 16 ---------------
 6 files changed, 43 insertions(+), 46 deletions(-)
 create mode 100644 src/views/system/error/401/index.vue

diff --git a/src/api/common.js b/src/api/common.js
index b4dc454..1af1733 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -1,5 +1,4 @@
 
-import util from '@/libs/util'
 import { uniqueId } from 'lodash'
 
 /**
@@ -7,7 +6,15 @@ import { uniqueId } from 'lodash'
  * @param {*} key
  */
 export function hasPermission (key) {
-  return util.cookies.get('powers').indexOf(key) !== -1 || false
+  if (!key) {
+    return true
+  }
+  // 获取所有权限
+  const powers = localStorage.getItem('powers')
+  if (!powers) { // 如果一个权限都没有，路由中标记需要权限的路由都不能访问，并跳转到401
+    return false
+  }
+  return powers.indexOf(key) !== -1 || false
 }
 /**
  * 处理菜单
diff --git a/src/main.js b/src/main.js
index 43f6310..c950870 100644
--- a/src/main.js
+++ b/src/main.js
@@ -11,7 +11,7 @@ import store from '@/store/index'
 import router from './router'
 import { frameInRoutes } from '@/router/routes'
 import { request } from './api/axios'
-import { handleMenu } from './api/common'
+import { hasPermission, handleMenu } from './api/common'
 import iconPicker from 'e-icon-picker'
 import 'e-icon-picker/dist/index.css'// 基础样式
 import 'e-icon-picker/dist/main.css' // fontAwesome 图标库样式
@@ -24,6 +24,7 @@ Vue.use(zeroVue)
 
 // 将axios封装加入到Vue 原型里 直接this.$axios调用
 Vue.prototype.$axios = request
+Vue.prototype.$hasPermission = hasPermission
 Vue.prototype.$handleMenu = handleMenu
 new Vue({
   router,
diff --git a/src/router/index.js b/src/router/index.js
index 7f09905..2cec893 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10,6 +10,7 @@ import util from '@/libs/util.js'
 
 // 路由数据
 import routes from './routes'
+import { hasPermission } from '@/api/common'
 
 // fix vue-router NavigationDuplicated
 const VueRouterPush = VueRouter.prototype.push
@@ -41,27 +42,24 @@ router.beforeEach(async (to, from, next) => {
   NProgress.start()
   // 关闭搜索面板
   store.commit('zerovue/search/set', false)
-  // 验证当前路由所有的匹配中是否需要有登录验证的
-  if (to.matched.some(r => r.meta.auth)) {
-    // 这里暂时将cookie里是否存有token作为验证是否登录的条件
-    // 请根据自身业务需要修改
-    const token = util.cookies.get('token')
-    if (token && token !== 'undefined') {
+  // 如果是登录或者401直接放行
+  if (to.path === '/login' || to.path === '/401') {
+    next()
+  }
+  const token = util.cookies.get('token')
+  // 如果存在token或者路劲为login直接放行
+  if (token) {
+    if (hasPermission(to.meta.auth)) {
       next()
     } else {
-      // 没有登录的时候跳转到登录界面
-      // 携带上登陆成功之后需要跳转的页面完整路径
-      next({
-        name: 'login',
-        query: {
-          redirect: to.fullPath
-        }
-      })
+      next('401')
       NProgress.done()
     }
   } else {
-    // 不需要身份校验 直接通过
-    next()
+    // 没有登录的时候跳转到登录界面
+    // 携带上登陆成功之后需要跳转的页面完整路径
+    next('login')
+    NProgress.done()
   }
 })
 
diff --git a/src/router/routes.js b/src/router/routes.js
index db3a298..dff441a 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -12,46 +12,45 @@ const frameIn = [
     redirect: { name: 'index' },
     component: layoutHeaderAside,
     children: [
-      // 首页
+      // 首页路由不需要权限
       {
-        path: 'index',
+        path: '/index',
         name: 'index',
         meta: {
-          auth: true
+          title: '首页'
         },
         component: _import('system/index')
       },
-      // 演示页面
       {
-        path: 'SysUser',
+        path: '/SysUser',
         name: 'SysUser',
         meta: {
           title: '系统用户',
-          auth: true
+          auth: 'SysUser'
         },
         component: _import('system/user')
       },
       {
-        path: 'SysRole',
+        path: '/SysRole',
         name: 'SysRole',
         meta: {
           title: '系统角色',
-          auth: true
+          auth: 'SysRole'
         },
         component: _import('system/role')
       },
       {
-        path: 'SysPower',
+        path: '/SysPower',
         name: 'SysPower',
         meta: {
           title: '系统权限',
-          auth: true
+          auth: 'SysPower'
         },
         component: _import('system/power')
       },
       // 刷新页面 必须保留
       {
-        path: 'refresh',
+        path: '/refresh',
         name: 'refresh',
         hidden: true,
         component: _import('system/function/refresh')
@@ -83,6 +82,11 @@ const frameOut = [
  * 错误页面
  */
 const errorPage = [
+  {
+    path: '/401',
+    name: '401',
+    component: _import('system/error/401')
+  },
   {
     path: '*',
     name: '404',
diff --git a/src/views/system/error/401/index.vue b/src/views/system/error/401/index.vue
new file mode 100644
index 0000000..35fb4ba
--- /dev/null
+++ b/src/views/system/error/401/index.vue
@@ -0,0 +1,3 @@
+<template>
+  <span>2222</span>
+</template>
diff --git a/src/views/system/error/404/index.vue b/src/views/system/error/404/index.vue
index cf77832..b74944e 100644
--- a/src/views/system/error/404/index.vue
+++ b/src/views/system/error/404/index.vue
@@ -6,19 +6,3 @@
     </el-button>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.page {
-  background: #303133;
-  background-blend-mode: multiply,multiply;
-  height: 100%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-direction: column;
-  .page_title {
-    font-size: 20px;
-    color: #FFF;
-  }
-}
-</style>
-- 
Gitee


From d9922db5d30a47b4a0139e83b9babb8ae70471df Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Thu, 2 Jul 2020 16:09:51 +0800
Subject: [PATCH 47/70] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js                      | 10 ++++++----
 src/router/routes.js             |  6 +++---
 src/views/system/login/index.vue | 34 +++++++++++++++++++-------------
 src/views/system/power/index.vue |  8 ++++----
 src/views/system/user/index.vue  |  8 +++++---
 5 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/src/main.js b/src/main.js
index c950870..7755130 100644
--- a/src/main.js
+++ b/src/main.js
@@ -35,7 +35,7 @@ new Vue({
     // 处理路由 得到每一级的路由设置
     this.$store.commit('zerovue/page/init', frameInRoutes)
     if (util.cookies.get('token')) {
-      this.getUserMenu()
+      this.getMenuAndPower()
     }
   },
   mounted () {
@@ -49,13 +49,15 @@ new Vue({
     this.$store.dispatch('zerovue/fullscreen/listen')
   },
   methods: {
-    getUserMenu () {
-      request({ url: '/sysPower/getUserMenu', method: 'get' }).then(res => {
-        const menu = handleMenu(res.data)
+    getMenuAndPower () {
+      request({ url: '/sysUser/getMenuAndPower', method: 'get' }).then(res => {
+        const menu = handleMenu(res.data.menuInfo)
         // 设置侧边栏菜单
         this.$store.commit('zerovue/menu/asideSet', menu)
         // 初始化菜单搜索功能
         this.$store.commit('zerovue/search/init', menu)
+        // 权限
+        localStorage.setItem('powers', res.data.powerInfo)
       })
     }
   }
diff --git a/src/router/routes.js b/src/router/routes.js
index dff441a..59a428c 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -26,7 +26,7 @@ const frameIn = [
         name: 'SysUser',
         meta: {
           title: '系统用户',
-          auth: 'SysUser'
+          auth: 'sysUser/pageList'
         },
         component: _import('system/user')
       },
@@ -35,7 +35,7 @@ const frameIn = [
         name: 'SysRole',
         meta: {
           title: '系统角色',
-          auth: 'SysRole'
+          auth: 'sysRole/pageList'
         },
         component: _import('system/role')
       },
@@ -44,7 +44,7 @@ const frameIn = [
         name: 'SysPower',
         meta: {
           title: '系统权限',
-          auth: 'SysPower'
+          auth: 'sysPower/tree'
         },
         component: _import('system/power')
       },
diff --git a/src/views/system/login/index.vue b/src/views/system/login/index.vue
index b85f8b1..c82b1c5 100644
--- a/src/views/system/login/index.vue
+++ b/src/views/system/login/index.vue
@@ -176,24 +176,18 @@ export default {
               password: this.formLogin.password
             }
           }
-          this.$axios(config).then(() => {
+          this.$axios(config).then((res) => {
             // uuid 是用户身份唯一标识 用户注册的时候确定 并且不可改变 不可重复
-            util.cookies.set('uuid', '22222')
+            util.cookies.set('uuid', res.data.userInfo.id)
             // 设置 vuex 用户信息
-            this.$store.dispatch('zerovue/user/set', { name: this.formLogin.username }, { root: true })
+            this.$store.dispatch('zerovue/user/set', { name: res.data.userInfo.name }, { root: true })
             // 用户登录后从持久化数据加载一系列的设置
             this.$store.dispatch('zerovue/account/load')
-            this.$axios({ url: '/sysPower/getUserMenu', method: 'get' }).then(res => {
-              const menu = this.$handleMenu(res.data)
-              // 设置侧边栏菜单
-              this.$store.commit('zerovue/menu/asideSet', menu)
-              // 初始化菜单搜索功能
-              this.$store.commit('zerovue/search/init', menu)
-
-              // 重定向对象不存在则返回顶层路径
-              this.$router.replace(this.$route.query.redirect || '/')
-              this.loading = false
-            })
+            // 处理菜单和权限
+            this.handleMenuAndPower(res.data)
+            // 重定向对象不存在则返回顶层路径
+            this.$router.replace(this.$route.query.redirect || '/')
+            this.loading = false
           }).catch(() => {
             this.loading = false
           })
@@ -202,6 +196,18 @@ export default {
           this.$message.error('表单校验失败，请检查')
         }
       })
+    },
+    handleMenuAndPower (data) {
+      /**
+       * 菜单处理
+       */
+      const menu = this.$handleMenu(data.menuInfo)
+      // 设置侧边栏菜单
+      this.$store.commit('zerovue/menu/asideSet', menu)
+      // 初始化菜单搜索功能
+      this.$store.commit('zerovue/search/init', menu)
+      // 获取权限
+      localStorage.setItem('powers', data.powerInfo)
     }
   }
 }
diff --git a/src/views/system/power/index.vue b/src/views/system/power/index.vue
index 2a2e357..a416d2a 100644
--- a/src/views/system/power/index.vue
+++ b/src/views/system/power/index.vue
@@ -28,14 +28,14 @@
           align="center"
         />
         <el-table-column
-          prop="url"
-          label="接口地址"
+          prop="path"
+          label="资源路径"
           header-align="center"
           align="center"
         />
         <el-table-column
-          prop="path"
-          label="资源路径"
+          prop="url"
+          label="接口地址"
           header-align="center"
           align="center"
         />
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 4f44fd1..db366c2 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -4,8 +4,8 @@
     <div slot="header">
       <SearchHearder @searchOpen="searchOpen" />
       <!-- <div style="float:right"> -->
-      <el-button size="mini" type="primary" @click="initAddOrUpdate('addUpdateDialogRef')">新增</el-button>
-      <el-button size="mini" type="danger" @click="deleteHandle()" :disabled="batchBtnDisabled">批量删除</el-button>
+      <el-button v-if="$hasPermission('sysUser/add')" size="mini" type="primary" @click="initAddOrUpdate('addUpdateDialogRef')">新增</el-button>
+      <el-button v-if="$hasPermission('sysUser/del')" size="mini" type="danger" @click="deleteHandle()" :disabled="batchBtnDisabled">批量删除</el-button>
       <!-- </div> -->
       <el-collapse-transition>
         <el-form
@@ -122,14 +122,16 @@
           :formatter="dateFormat"
         />
         <el-table-column prop="remarks" label="备注" header-align="center" align="center" />
-        <el-table-column label="操作" header-align="center" align="center" fixed="right" width="150">
+        <el-table-column v-if="$hasPermission('sysUser/update') || $hasPermission('sysUser/del')" label="操作" header-align="center" align="center" fixed="right" width="150">
           <template slot-scope="scope">
             <el-button
+              v-if="$hasPermission('sysUser/update')"
               type="text"
               size="mini"
               @click="initAddOrUpdate('addUpdateDialogRef',scope.row)"
             >修改</el-button>
             <el-button
+              v-if="$hasPermission('sysUser/del')"
               type="text"
               size="mini"
               @click="deleteHandle(scope.row,scope.row.username)"
-- 
Gitee


From d932e7e09adcaf790bdec29b66fabff0a08c16ce Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Thu, 2 Jul 2020 16:21:10 +0800
Subject: [PATCH 48/70] 1

---
 .../system/user/components/AddUpdateForm.vue  |  4 +++-
 src/views/system/user/index.vue               | 24 ++++++++++++-------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/views/system/user/components/AddUpdateForm.vue b/src/views/system/user/components/AddUpdateForm.vue
index 9035e80..38ff28a 100644
--- a/src/views/system/user/components/AddUpdateForm.vue
+++ b/src/views/system/user/components/AddUpdateForm.vue
@@ -70,6 +70,8 @@ export default {
   name: 'AddUpdateForm',
   props: {
     dictDetails: Object,
+    addUrl: String,
+    updateUrl: String,
     getDataList: {
       type: Function,
       default: null
@@ -135,7 +137,7 @@ export default {
             return { id: it }
           })
           const config = {
-            url: this.addUpdateForm.id ? 'sysUser/update' : 'sysUser/add',
+            url: this.addUpdateForm.id ? this.updateUrl : this.addUrl,
             method: 'post',
             data: this.addUpdateForm
           }
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index db366c2..39c7f00 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -4,8 +4,8 @@
     <div slot="header">
       <SearchHearder @searchOpen="searchOpen" />
       <!-- <div style="float:right"> -->
-      <el-button v-if="$hasPermission('sysUser/add')" size="mini" type="primary" @click="initAddOrUpdate('addUpdateDialogRef')">新增</el-button>
-      <el-button v-if="$hasPermission('sysUser/del')" size="mini" type="danger" @click="deleteHandle()" :disabled="batchBtnDisabled">批量删除</el-button>
+      <el-button v-if="$hasPermission(addUrl)" size="mini" type="primary" @click="initAddOrUpdate('addUpdateDialogRef')">新增</el-button>
+      <el-button v-if="$hasPermission(mixinViewModuleOptions.deleteUrl)" size="mini" type="danger" @click="deleteHandle()" :disabled="batchBtnDisabled">批量删除</el-button>
       <!-- </div> -->
       <el-collapse-transition>
         <el-form
@@ -122,16 +122,18 @@
           :formatter="dateFormat"
         />
         <el-table-column prop="remarks" label="备注" header-align="center" align="center" />
-        <el-table-column v-if="$hasPermission('sysUser/update') || $hasPermission('sysUser/del')" label="操作" header-align="center" align="center" fixed="right" width="150">
+        <el-table-column
+          v-if="$hasPermission(updateUrl) || $hasPermission(mixinViewModuleOptions.deleteUrl)"
+          label="操作" header-align="center" align="center" fixed="right" width="150">
           <template slot-scope="scope">
             <el-button
-              v-if="$hasPermission('sysUser/update')"
+              v-if="$hasPermission(updateUrl)"
               type="text"
               size="mini"
               @click="initAddOrUpdate('addUpdateDialogRef',scope.row)"
             >修改</el-button>
             <el-button
-              v-if="$hasPermission('sysUser/del')"
+              v-if="$hasPermission(mixinViewModuleOptions.deleteUrl)"
               type="text"
               size="mini"
               @click="deleteHandle(scope.row,scope.row.username)"
@@ -143,6 +145,8 @@
       <AddUpdateForm
         ref="addUpdateDialogRef"
         :dict-details="dictDetails"
+        :addUrl="addUrl"
+        :updateUrl="updateUrl"
         :getDataList="getDataList"
       />
     </div>
@@ -184,11 +188,13 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListUrl: '/sysUser/pageList',
-        deleteUrl: '/sysUser/del',
-        exportUrl: '/sysUser/export',
+        getDataListUrl: 'sysUser/pageList',
+        deleteUrl: 'sysUser/del',
+        exportUrl: 'sysUser/export',
         dictCodes: 'sys_user_type,state'
-      }
+      },
+      addUrl: 'sysUser/add',
+      updateUrl: 'sysUser/update'
     }
   },
   methods: {
-- 
Gitee


From b1fec5e9849a261f301b7a4a4d912975f200deec Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Thu, 2 Jul 2020 16:51:21 +0800
Subject: [PATCH 49/70] 1

---
 src/mixins/view-module.js                           | 4 ++--
 src/views/system/power/components/AddUpdateForm.vue | 9 +++++++--
 src/views/system/power/index.vue                    | 5 +++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js
index 70e60dc..ed5f075 100644
--- a/src/mixins/view-module.js
+++ b/src/mixins/view-module.js
@@ -222,8 +222,8 @@ export default {
     searchOpen (data) {
       this.searchFormShow = data
     },
-    initAddOrUpdate (ref, row) { // 初始化新增修改
-      this.$refs[ref].initAddOrUpdate(row)
+    initAddOrUpdate (ref, row, val) { // 初始化新增修改
+      this.$refs[ref].initAddOrUpdate(row, val)
     }
   }
 }
diff --git a/src/views/system/power/components/AddUpdateForm.vue b/src/views/system/power/components/AddUpdateForm.vue
index 3e5425c..a18a91b 100644
--- a/src/views/system/power/components/AddUpdateForm.vue
+++ b/src/views/system/power/components/AddUpdateForm.vue
@@ -149,18 +149,23 @@ export default {
         this.parentOptions = res.data
       })
     },
-    initAddOrUpdate (row) {
+    initAddOrUpdate (row, copy) {
       // 新增或修改
       this.addUpdateFormVisible = true
       this.addUpdateFormReset()
       if (row) {
         row.type += '' // 转成字符串,不然select控件不支持回显
-        this.title = '修改权限'
         // 修改下拉框数据
         this.getParentSelect(row.type)
         this.addUpdateForm = JSON.parse(JSON.stringify(row))
         // 通过父级编号集来回显
         this.addUpdateForm.parentId = this.addUpdateForm.parentIds.split(',')
+        if (copy) {
+          delete this.addUpdateForm.id
+          this.title = '复制权限'
+        } else {
+          this.title = '修改权限'
+        }
       } else {
         this.getParentSelect(this.initFrom.type)
         this.title = '新增权限'
diff --git a/src/views/system/power/index.vue b/src/views/system/power/index.vue
index a416d2a..ef65092 100644
--- a/src/views/system/power/index.vue
+++ b/src/views/system/power/index.vue
@@ -79,6 +79,11 @@
         <el-table-column prop="remarks" label="备注" header-align="center" align="center" />
         <el-table-column label="操作" header-align="center" align="center" fixed="right" width="150">
           <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="mini"
+              @click="initAddOrUpdate('addUpdateDialogRef',scope.row,true)"
+            >复制</el-button>
             <el-button
               type="text"
               size="mini"
-- 
Gitee


From 9b9759ee92d53034f6efbc84027d1807982d2db0 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Thu, 2 Jul 2020 17:57:20 +0800
Subject: [PATCH 50/70] =?UTF-8?q?=E5=8F=96=E6=B6=88cookie=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8localstorage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dependencies-cdn.js                           |  1 -
 package.json                                  |  1 -
 src/App.vue                                   |  2 +-
 src/api/axios.js                              |  5 +--
 src/api/common.js                             |  3 +-
 src/i18n.js                                   |  2 +-
 .../components/header-user/index.vue          |  5 +--
 src/libs/util.cookies.js                      | 42 -------------------
 src/libs/util.db.js                           |  2 +-
 src/libs/util.js                              |  4 +-
 src/libs/util.storage.js                      | 36 ++++++++++++++++
 src/main.js                                   |  4 +-
 src/mixins/view-module.js                     |  2 +-
 src/router/index.js                           |  2 +-
 src/store/modules/zerovue/modules/account.js  | 35 ----------------
 src/store/modules/zerovue/modules/log.js      |  4 +-
 src/views/system/login/index.vue              |  4 +-
 17 files changed, 55 insertions(+), 99 deletions(-)
 delete mode 100644 src/libs/util.cookies.js
 create mode 100644 src/libs/util.storage.js

diff --git a/dependencies-cdn.js b/dependencies-cdn.js
index 006e4bb..0c965a9 100644
--- a/dependencies-cdn.js
+++ b/dependencies-cdn.js
@@ -9,7 +9,6 @@ module.exports = [
   { name: 'element-ui', library: 'ELEMENT', js: 'https://cdn.jsdelivr.net/npm/element-ui@2.13.1/lib/index.js', css: 'https://cdn.jsdelivr.net/npm/element-ui@2.13.0/lib/theme-chalk/index.css' },
   { name: 'lodash', library: '_', js: 'https://cdn.jsdelivr.net/npm/lodash@4.17.15/lodash.min.js', css: '' },
   { name: 'ua-parser-js', library: 'UAParser', js: 'https://cdn.jsdelivr.net/npm/ua-parser-js@0.7.20/dist/ua-parser.min.js', css: '' },
-  { name: 'js-cookie', library: 'Cookies', js: 'https://cdn.jsdelivr.net/npm/js-cookie@2.2.1/src/js.cookie.min.js', css: '' },
   { name: 'nprogress', library: 'NProgress', js: 'https://cdn.jsdelivr.net/npm/nprogress@0.2.0/nprogress.min.js', css: 'https://cdn.jsdelivr.net/npm/nprogress@0.2.0/nprogress.css' },
   { name: 'dayjs', library: 'dayjs', js: 'https://cdn.jsdelivr.net/npm/dayjs@1.8.17/dayjs.min.js', css: '' },
   { name: 'fuse.js', library: 'Fuse', js: 'https://cdn.jsdelivr.net/npm/fuse.js@5.2.3/dist/fuse.min.js', css: '' },
diff --git a/package.json b/package.json
index 99ae6c0..b834cdc 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,6 @@
     "flex.css": "^1.1.7",
     "fuse.js": "^5.2.3",
     "hotkeys-js": "^3.7.3",
-    "js-cookie": "^2.2.1",
     "lodash": "^4.17.15",
     "lowdb": "^1.0.0",
     "nprogress": "^0.2.0",
diff --git a/src/App.vue b/src/App.vue
index bd4a9f2..d96845a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -16,7 +16,7 @@ export default {
   },
   methods: {
     i18nHandle (val, oldVal) {
-      util.cookies.set('lang', val)
+      util.storage.set('lang', val)
       document.querySelector('html').setAttribute('lang', val)
     }
   }
diff --git a/src/api/axios.js b/src/api/axios.js
index 1569725..6579946 100644
--- a/src/api/axios.js
+++ b/src/api/axios.js
@@ -23,7 +23,7 @@ function createService () {
       // 刷新Token
       const accessToken = response.headers.authorization
       if (accessToken) {
-        util.cookies.set('token', accessToken)
+        util.storage.set('token', accessToken)
       }
       // dataAxios 是 axios 返回数据中的 data
       const dataAxios = response.data
@@ -52,7 +52,6 @@ function createService () {
     },
     error => {
       if (error && error.response) {
-        console.log(error.response)
         switch (error.response.status) {
           case 400: error.message = error.response.data.msg; break
           case 401: error.message = '未授权，请登录'; break
@@ -81,7 +80,7 @@ function createService () {
  */
 function createRequestFunction (service) {
   return function (config) {
-    const token = util.cookies.get('token')
+    const token = util.storage.get('token')
     const configDefault = {
       headers: {
         Authorization: token,
diff --git a/src/api/common.js b/src/api/common.js
index 1af1733..6256a41 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -1,5 +1,6 @@
 
 import { uniqueId } from 'lodash'
+import util from '@/libs/util.js'
 
 /**
  * 权限
@@ -10,7 +11,7 @@ export function hasPermission (key) {
     return true
   }
   // 获取所有权限
-  const powers = localStorage.getItem('powers')
+  const powers = util.storage.get('powers')
   if (!powers) { // 如果一个权限都没有，路由中标记需要权限的路由都不能访问，并跳转到401
     return false
   }
diff --git a/src/i18n.js b/src/i18n.js
index b007020..0e2b16c 100644
--- a/src/i18n.js
+++ b/src/i18n.js
@@ -29,7 +29,7 @@ Vue.prototype.$languages = Object.keys(messages).map(langlage => ({
 }))
 
 const i18n = new VueI18n({
-  locale: util.cookies.get('lang') || process.env.VUE_APP_I18N_LOCALE,
+  locale: util.storage.get('lang') || process.env.VUE_APP_I18N_LOCALE,
   fallbackLocale: process.env.VUE_APP_I18N_FALLBACK_LOCALE,
   messages
 })
diff --git a/src/layout/header-aside/components/header-user/index.vue b/src/layout/header-aside/components/header-user/index.vue
index f791fc9..d5bd1a9 100644
--- a/src/layout/header-aside/components/header-user/index.vue
+++ b/src/layout/header-aside/components/header-user/index.vue
@@ -36,9 +36,8 @@ export default {
       }
       MessageBox.confirm('确定要注销当前用户吗', '注销用户', { type: 'warning' })
         .then(() => {
-          // 删除cookie
-          util.cookies.remove('token')
-          util.cookies.remove('uuid')
+          // 删除
+          util.storage.removeAll()
           // 清空 vuex 用户信息
           this.$store.dispatch('zerovue/user/set', {}, { root: true })
           // 跳转路由
diff --git a/src/libs/util.cookies.js b/src/libs/util.cookies.js
deleted file mode 100644
index cc059a3..0000000
--- a/src/libs/util.cookies.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import Cookies from 'js-cookie'
-
-const cookies = {}
-
-/**
- * @description 存储 cookie 值
- * @param {String} name cookie name
- * @param {String} value cookie value
- * @param {Object} setting cookie setting
- */
-cookies.set = function (name = 'default', value = '', cookieSetting = {}) {
-  const currentCookieSetting = {
-    expires: 1
-  }
-  Object.assign(currentCookieSetting, cookieSetting)
-  Cookies.set(`zerovue-${process.env.VUE_APP_VERSION}-${name}`, value, currentCookieSetting)
-}
-
-/**
- * @description 拿到 cookie 值
- * @param {String} name cookie name
- */
-cookies.get = function (name = 'default') {
-  return Cookies.get(`zerovue-${process.env.VUE_APP_VERSION}-${name}`)
-}
-
-/**
- * @description 拿到 cookie 全部的值
- */
-cookies.getAll = function () {
-  return Cookies.get()
-}
-
-/**
- * @description 删除 cookie
- * @param {String} name cookie name
- */
-cookies.remove = function (name = 'default') {
-  return Cookies.remove(`zerovue-${process.env.VUE_APP_VERSION}-${name}`)
-}
-
-export default cookies
diff --git a/src/libs/util.db.js b/src/libs/util.db.js
index 4301228..a823b40 100644
--- a/src/libs/util.db.js
+++ b/src/libs/util.db.js
@@ -31,7 +31,7 @@ export function pathInit ({
   validator = () => true,
   defaultValue = ''
 }) {
-  const uuid = util.cookies.get('uuid') || 'ghost-uuid'
+  const uuid = util.storage.get('uuid') || 'ghost-uuid'
   const currentPath = `${dbName}.${user ? `user.${uuid}` : 'public'}${path ? `.${path}` : ''}`
   const value = db.get(currentPath).value()
   if (!(value !== undefined && validator(value))) {
diff --git a/src/libs/util.js b/src/libs/util.js
index d6d5c1d..c8b816b 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -1,9 +1,9 @@
-import cookies from './util.cookies'
+import storage from './util.storage'
 import db from './util.db'
 import log from './util.log'
 
 const util = {
-  cookies,
+  storage,
   db,
   log
 }
diff --git a/src/libs/util.storage.js b/src/libs/util.storage.js
new file mode 100644
index 0000000..82820a6
--- /dev/null
+++ b/src/libs/util.storage.js
@@ -0,0 +1,36 @@
+const storage = {}
+
+/**
+ * @description 存储 localstorage 值
+ * @param {String} name localstorage name
+ * @param {String} value localstorage value
+ */
+storage.set = function (name, value) {
+  localStorage.setItem(`zerovue-${process.env.VUE_APP_VERSION}-${name}`, value)
+}
+
+/**
+ * @description 拿到 localstorage 值
+ * @param {String} name localstorage name
+ */
+storage.get = function (name) {
+  return localStorage.getItem(`zerovue-${process.env.VUE_APP_VERSION}-${name}`)
+}
+
+/**
+ * @description 删除 localstorage
+ * @param {String} name localstorage name
+ */
+storage.remove = function (name) {
+  return localStorage.removeItem(`zerovue-${process.env.VUE_APP_VERSION}-${name}`)
+}
+
+/**
+ * @description 删除项目相关所有 localstorage
+ * @param {String} name localstorage name
+ */
+storage.removeAll = function () {
+  Object.keys(localStorage).forEach(item => item.indexOf(`zerovue-${process.env.VUE_APP_VERSION}`) !== -1 ? localStorage.removeItem(item) : '')
+}
+
+export default storage
diff --git a/src/main.js b/src/main.js
index 7755130..6cadcc8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -34,7 +34,7 @@ new Vue({
   created () {
     // 处理路由 得到每一级的路由设置
     this.$store.commit('zerovue/page/init', frameInRoutes)
-    if (util.cookies.get('token')) {
+    if (util.storage.get('token')) {
       this.getMenuAndPower()
     }
   },
@@ -57,7 +57,7 @@ new Vue({
         // 初始化菜单搜索功能
         this.$store.commit('zerovue/search/init', menu)
         // 权限
-        localStorage.setItem('powers', res.data.powerInfo)
+        util.storage.set('powers', res.data.powerInfo)
       })
     }
   }
diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js
index ed5f075..29e71d9 100644
--- a/src/mixins/view-module.js
+++ b/src/mixins/view-module.js
@@ -159,7 +159,7 @@ export default {
     // 导出
     exportHandle () {
       var params = qs.stringify({
-        token: util.cookies.get('token'),
+        token: util.storage.get('token'),
         ...this.searchForm
       })
       window.location.href = `${window.SITE_CONFIG.apiURL}${this.mixinViewModuleOptions.exportUrl}?${params}`
diff --git a/src/router/index.js b/src/router/index.js
index 2cec893..5900d5e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -46,7 +46,7 @@ router.beforeEach(async (to, from, next) => {
   if (to.path === '/login' || to.path === '/401') {
     next()
   }
-  const token = util.cookies.get('token')
+  const token = util.storage.get('token')
   // 如果存在token或者路劲为login直接放行
   if (token) {
     if (hasPermission(to.meta.auth)) {
diff --git a/src/store/modules/zerovue/modules/account.js b/src/store/modules/zerovue/modules/account.js
index 715a4e2..870a186 100644
--- a/src/store/modules/zerovue/modules/account.js
+++ b/src/store/modules/zerovue/modules/account.js
@@ -1,41 +1,6 @@
-import { Message, MessageBox } from 'element-ui'
-import util from '@/libs/util.js'
-import router from '@/router'
-
 export default {
   namespaced: true,
   actions: {
-    /**
-     * @description 注销用户并返回登录页面
-     * @param {Object} context
-     * @param {Object} payload confirm {Boolean} 是否需要确认
-     */
-    logout ({ commit, dispatch }, { confirm = false } = {}) {
-      /**
-       * @description 注销
-       */
-      async function logout () {
-        // 删除cookie
-        util.cookies.remove('token')
-        util.cookies.remove('uuid')
-        // 清空 vuex 用户信息
-        await dispatch('zerovue/user/set', {}, { root: true })
-        // 跳转路由
-        router.push({ name: 'login' })
-      }
-      // 判断是否需要确认
-      if (confirm) {
-        MessageBox.confirm('确定要注销当前用户吗', '注销用户', { type: 'warning' })
-          .then(() => {
-            logout()
-          })
-          .catch(() => {
-            Message({ message: '取消注销操作' })
-          })
-      } else {
-        logout()
-      }
-    },
     /**
      * @description 用户登录后从持久化数据加载一系列的设置
      * @param {Object} context
diff --git a/src/store/modules/zerovue/modules/log.js b/src/store/modules/zerovue/modules/log.js
index f102547..29a4548 100644
--- a/src/store/modules/zerovue/modules/log.js
+++ b/src/store/modules/zerovue/modules/log.js
@@ -46,9 +46,9 @@ export default {
           // 当前用户信息
           user: rootState.zerovue.user.info,
           // 当前用户的 uuid
-          uuid: util.cookies.get('uuid'),
+          uuid: util.storage.get('uuid'),
           // 当前的 token
-          token: util.cookies.get('token'),
+          token: util.storage.get('token'),
           // 当前地址
           url: get(window, 'location.href', ''),
           // 用户设置
diff --git a/src/views/system/login/index.vue b/src/views/system/login/index.vue
index c82b1c5..651f103 100644
--- a/src/views/system/login/index.vue
+++ b/src/views/system/login/index.vue
@@ -178,7 +178,7 @@ export default {
           }
           this.$axios(config).then((res) => {
             // uuid 是用户身份唯一标识 用户注册的时候确定 并且不可改变 不可重复
-            util.cookies.set('uuid', res.data.userInfo.id)
+            util.storage.set('uuid', res.data.userInfo.id)
             // 设置 vuex 用户信息
             this.$store.dispatch('zerovue/user/set', { name: res.data.userInfo.name }, { root: true })
             // 用户登录后从持久化数据加载一系列的设置
@@ -207,7 +207,7 @@ export default {
       // 初始化菜单搜索功能
       this.$store.commit('zerovue/search/init', menu)
       // 获取权限
-      localStorage.setItem('powers', data.powerInfo)
+      util.storage.set('powers', data.powerInfo)
     }
   }
 }
-- 
Gitee


From 1f2c00e16435d7c85b2646ce6b41e10c63fbdd4e Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Fri, 3 Jul 2020 11:16:47 +0800
Subject: [PATCH 51/70] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/axios.js | 18 +++++++++++++-----
 src/main.js      |  1 +
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/api/axios.js b/src/api/axios.js
index 6579946..d40155f 100644
--- a/src/api/axios.js
+++ b/src/api/axios.js
@@ -2,6 +2,7 @@ import axios from 'axios'
 import { get } from 'lodash'
 import util from '@/libs/util'
 import { errorLog, errorCreate } from './tools'
+import router from '@/router'
 
 /**
  * @description 创建请求实例
@@ -39,9 +40,11 @@ function createService () {
           case 200:
             // [ 示例 ] code === 200 代表没有错误
             return dataAxios
-          case 'xxx':
-            // [ 示例 ] 其它和后台约定的 code
-            errorCreate(`[ code: xxx ] ${dataAxios.msg}: ${response.config.url}`)
+          case 0:
+            // 删除
+            util.storage.removeAll()
+            // 跳转路由
+            router.push({ name: 'login' })
             break
           default:
             // 不是正确的 code
@@ -52,9 +55,14 @@ function createService () {
     },
     error => {
       if (error && error.response) {
-        switch (error.response.status) {
+        if (error.response.data.code === 0) {
+          util.storage.removeAll()
+          router.push({ name: 'login' })
+          return Promise.reject(error)
+        }
+        switch (error.response.data.code) {
           case 400: error.message = error.response.data.msg; break
-          case 401: error.message = '未授权，请登录'; break
+          case 401: error.message = '你没有该功能权限'; break
           case 403: error.message = '拒绝访问'; break
           case 404: error.message = `请求地址出错: ${error.response.config.url}`; break
           case 408: error.message = '请求超时'; break
diff --git a/src/main.js b/src/main.js
index 6cadcc8..4914794 100644
--- a/src/main.js
+++ b/src/main.js
@@ -51,6 +51,7 @@ new Vue({
   methods: {
     getMenuAndPower () {
       request({ url: '/sysUser/getMenuAndPower', method: 'get' }).then(res => {
+        console.log(res)
         const menu = handleMenu(res.data.menuInfo)
         // 设置侧边栏菜单
         this.$store.commit('zerovue/menu/asideSet', menu)
-- 
Gitee


From e92b90713f338bbf4ef5f5c9be30e18e1fb07f86 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Fri, 3 Jul 2020 13:38:25 +0800
Subject: [PATCH 52/70] 1

---
 src/views/system/user/components/AddUpdateForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/user/components/AddUpdateForm.vue b/src/views/system/user/components/AddUpdateForm.vue
index 38ff28a..f680a81 100644
--- a/src/views/system/user/components/AddUpdateForm.vue
+++ b/src/views/system/user/components/AddUpdateForm.vue
@@ -15,7 +15,7 @@
       <el-form-item prop="username" label="用户账号">
         <el-input v-model.trim="addUpdateForm.username" placeholder="请输入用户账号" />
       </el-form-item>
-      <el-form-item v-show="updateExist" prop="password" label="用户密码">
+      <el-form-item v-if="updateExist" prop="password" label="用户密码">
         <el-input v-model.trim="addUpdateForm.password" placeholder="请输入用户密码" show-password />
       </el-form-item>
       <el-form-item prop="mobile" label="手机号">
-- 
Gitee


From 18d787a9e070337e927913bbe2abd63ab93ec47f Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Fri, 3 Jul 2020 13:39:07 +0800
Subject: [PATCH 53/70] 1

---
 src/main.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main.js b/src/main.js
index 4914794..6cadcc8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -51,7 +51,6 @@ new Vue({
   methods: {
     getMenuAndPower () {
       request({ url: '/sysUser/getMenuAndPower', method: 'get' }).then(res => {
-        console.log(res)
         const menu = handleMenu(res.data.menuInfo)
         // 设置侧边栏菜单
         this.$store.commit('zerovue/menu/asideSet', menu)
-- 
Gitee


From 2ae7ccd2c2ca9a223a0be749078e6a603c0dd881 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Fri, 3 Jul 2020 15:15:35 +0800
Subject: [PATCH 54/70] 1

---
 src/router/index.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 5900d5e..e1b4bb5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -42,13 +42,12 @@ router.beforeEach(async (to, from, next) => {
   NProgress.start()
   // 关闭搜索面板
   store.commit('zerovue/search/set', false)
+  const token = util.storage.get('token')
   // 如果是登录或者401直接放行
   if (to.path === '/login' || to.path === '/401') {
     next()
-  }
-  const token = util.storage.get('token')
-  // 如果存在token或者路劲为login直接放行
-  if (token) {
+  } else if (token) {
+    // 如果存在token并且有这个权限直接放行
     if (hasPermission(to.meta.auth)) {
       next()
     } else {
-- 
Gitee


From abad89f241f2cb6e9837d08d1ef0d547bf4bb301 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Fri, 3 Jul 2020 17:19:49 +0800
Subject: [PATCH 55/70] =?UTF-8?q?rsa=E5=8A=A0=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                             | 3 +++
 package.json                     | 1 +
 src/main.js                      | 8 ++++++++
 src/views/system/login/index.vue | 5 +++--
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.env b/.env
index f7294b6..46c4d4e 100644
--- a/.env
+++ b/.env
@@ -15,3 +15,6 @@ VUE_APP_I18N_FALLBACK_LOCALE=en
 
 # element 颜色
 VUE_APP_ELEMENT_COLOR=#409EFF
+
+# RSA加解密
+VUE_APP_RSA=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+IUvK/Nzs77ihc5Fs9pIVckiwjeCR8RgWFHwURLMgkzH6LIMHXNP4ZluaNIA2XKBackB9gT7cD+rpTuVauit7JUkQ8AUD/FUAtWBe5sRH3lK1uOBiv1ipE8NTuUJMJhQjvKummNG6C1w8TkPqykTHbV2MfqhwjQ+n0kXTWOg1mwIDAQAB
diff --git a/package.json b/package.json
index b834cdc..ed32be1 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
     "flex.css": "^1.1.7",
     "fuse.js": "^5.2.3",
     "hotkeys-js": "^3.7.3",
+    "jsencrypt": "^3.0.0-rc.1",
     "lodash": "^4.17.15",
     "lowdb": "^1.0.0",
     "nprogress": "^0.2.0",
diff --git a/src/main.js b/src/main.js
index 6cadcc8..0690f86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -16,6 +16,7 @@ import iconPicker from 'e-icon-picker'
 import 'e-icon-picker/dist/index.css'// 基础样式
 import 'e-icon-picker/dist/main.css' // fontAwesome 图标库样式
 import util from '@/libs/util.js'
+import JSEncrypt from 'jsencrypt'
 
 Vue.use(iconPicker)
 
@@ -26,6 +27,13 @@ Vue.use(zeroVue)
 Vue.prototype.$axios = request
 Vue.prototype.$hasPermission = hasPermission
 Vue.prototype.$handleMenu = handleMenu
+
+Vue.prototype.$getRsaCode = function (str) { // 注册方法
+  const encryptStr = new JSEncrypt()
+  encryptStr.setPublicKey(process.env.VUE_APP_RSA) // 设置 加密公钥
+  const data = encryptStr.encrypt(str.toString()) // 进行加密
+  return data
+}
 new Vue({
   router,
   store,
diff --git a/src/views/system/login/index.vue b/src/views/system/login/index.vue
index 651f103..1f8212f 100644
--- a/src/views/system/login/index.vue
+++ b/src/views/system/login/index.vue
@@ -162,6 +162,7 @@ export default {
      */
     // 提交登录信息
     submit () {
+      console.log()
       this.$refs.loginForm.validate((valid) => {
         if (valid) {
           this.loading = true
@@ -172,8 +173,8 @@ export default {
             url: '/sysLogin',
             method: 'post',
             data: {
-              username: this.formLogin.username,
-              password: this.formLogin.password
+              username: this.$getRsaCode(this.formLogin.username),
+              password: this.$getRsaCode(this.formLogin.password)
             }
           }
           this.$axios(config).then((res) => {
-- 
Gitee


From b3950ef9386241022c2aff69e50b47c673def259 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Sun, 5 Jul 2020 17:55:53 +0800
Subject: [PATCH 56/70] 1

---
 .../demo/page1/components/AddUpdateForm.vue   | 170 -------------
 .../demo/page1/components/DemoTreeSide.vue    |  77 ------
 src/views/demo/page1/index.vue                | 229 ------------------
 .../demo/page2/components/AddUpdateForm.vue   | 219 -----------------
 src/views/demo/page2/index.vue                | 122 ----------
 .../demo/page3/components/AddUpdateForm.vue   | 132 ----------
 src/views/demo/page3/components/PowerTree.vue |  89 -------
 src/views/demo/page3/index.vue                | 179 --------------
 src/views/system/power/index.vue              |   4 +-
 9 files changed, 3 insertions(+), 1218 deletions(-)
 delete mode 100644 src/views/demo/page1/components/AddUpdateForm.vue
 delete mode 100644 src/views/demo/page1/components/DemoTreeSide.vue
 delete mode 100644 src/views/demo/page1/index.vue
 delete mode 100644 src/views/demo/page2/components/AddUpdateForm.vue
 delete mode 100644 src/views/demo/page2/index.vue
 delete mode 100644 src/views/demo/page3/components/AddUpdateForm.vue
 delete mode 100644 src/views/demo/page3/components/PowerTree.vue
 delete mode 100644 src/views/demo/page3/index.vue

diff --git a/src/views/demo/page1/components/AddUpdateForm.vue b/src/views/demo/page1/components/AddUpdateForm.vue
deleted file mode 100644
index 9035e80..0000000
--- a/src/views/demo/page1/components/AddUpdateForm.vue
+++ /dev/null
@@ -1,170 +0,0 @@
-<template>
-  <el-dialog
-    :title="title"
-    :visible.sync="addUpdateFormVisible"
-    width="500px"
-    v-loading.fullscreen.lock="loading"
-  >
-    <el-form
-      :model="addUpdateForm"
-      :rules="rules"
-      label-width="120px"
-      size="medium"
-      ref="addUpdateFormRef"
-    >
-      <el-form-item prop="username" label="用户账号">
-        <el-input v-model.trim="addUpdateForm.username" placeholder="请输入用户账号" />
-      </el-form-item>
-      <el-form-item v-show="updateExist" prop="password" label="用户密码">
-        <el-input v-model.trim="addUpdateForm.password" placeholder="请输入用户密码" show-password />
-      </el-form-item>
-      <el-form-item prop="mobile" label="手机号">
-        <el-input v-model.trim="addUpdateForm.mobile" placeholder="请输入手机号" />
-      </el-form-item>
-      <el-form-item label="昵称">
-        <el-input v-model.trim="addUpdateForm.name" placeholder="请输入昵称" />
-      </el-form-item>
-      <el-form-item label="用户角色">
-        <el-select v-model="modelRoles" filterable clearable multiple placeholder="请选择角色" style="width:100%">
-          <el-option
-            v-for="item in roles"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-            :disabled="item.state === 0"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item prop="type" label="用户类型">
-        <el-select v-model="addUpdateForm.type" placeholder="请选择类型" style="width:100%">
-          <el-option
-            v-for="type in dictDetails.sys_user_type"
-            :key="type.value"
-            :label="type.name"
-            :value="type.value"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item prop="state" label="用户状态">
-        <el-radio-group v-model="addUpdateForm.state">
-          <el-radio-button
-            v-for="state in dictDetails.state"
-            :label="state.value"
-            :key="state.value"
-          >{{state.name}}</el-radio-button>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="备注">
-        <el-input type="textarea" v-model="addUpdateForm.remarks" placeholder="请输入备注" />
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button v-if="btnExist" @click="addUpdateFormVisible = false">取 消</el-button>
-      <el-button v-if="btnExist" type="primary" @click="addOrupdate()">确 定</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-export default {
-  name: 'AddUpdateForm',
-  props: {
-    dictDetails: Object,
-    getDataList: {
-      type: Function,
-      default: null
-    }
-  },
-  data () {
-    return {
-      loading: false,
-      btnExist: true, // 按钮是否存在
-      updateExist: true, // 修改时，是否存在的输入框
-      addUpdateFormVisible: false, // 是否显示弹框
-      title: '', // 弹框标题
-      addUpdateForm: {},
-      modelRoles: [],
-      roles: [],
-      rules: {
-        username: [
-          { required: true, message: '请输入用户账号', trigger: 'blur' }
-        ],
-        password: [
-          { required: true, message: '请输入用户密码', trigger: 'blur' }
-        ],
-        mobile: [{ required: true, message: '请输入手机号', trigger: 'blur' }],
-        state: [{ required: true, message: '请选择用户状态', trigger: 'blur' }],
-        type: [{ required: true, message: '请选择用户类型', trigger: 'blur' }]
-      }
-    }
-  },
-  created () {
-    this.initRoles()
-  },
-  methods: {
-    initRoles () {
-      // 角色初始化
-      this.$axios({ url: 'sysRole/getIdAndName', method: 'get' }).then(res => {
-        this.roles = res.data
-      })
-    },
-    initAddOrUpdate (row) {
-      // 新增或修改
-      this.addUpdateFormVisible = true
-      this.addUpdateFormReset()
-      if (row) {
-        this.updateExist = false
-        row.type += '' // 转成字符串,不然select控件不支持回显
-        this.title = '修改用户'
-        this.addUpdateForm = JSON.parse(JSON.stringify(row))
-        if (row.roles) {
-          this.modelRoles = row.roles.map(it => it.id)
-        }
-      } else {
-        this.updateExist = true
-        this.title = '新增用户'
-      }
-    },
-    addOrupdate () {
-      // 添加或修改
-      this.$refs.addUpdateFormRef.validate(valid => {
-        if (valid) {
-          this.loading = true
-          this.btnExist = false
-          this.addUpdateForm.roles = this.modelRoles.map(it => {
-            return { id: it }
-          })
-          const config = {
-            url: this.addUpdateForm.id ? 'sysUser/update' : 'sysUser/add',
-            method: 'post',
-            data: this.addUpdateForm
-          }
-          this.$axios(config)
-            .then(res => {
-              this.loading = false
-              this.addUpdateFormVisible = false
-              this.btnExist = true
-              this.getDataList()
-              this.$message.success(res.msg)
-            })
-            .catch(() => {
-              this.loading = false
-              this.btnExist = true
-            })
-        }
-      })
-    },
-    addUpdateFormReset () {
-      // 重置表单
-      this.addUpdateForm = {
-        state: 1,
-        type: '0'
-      }
-      this.modelRoles = []
-      this.$nextTick(() => {
-        this.$refs.addUpdateFormRef.clearValidate()
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/demo/page1/components/DemoTreeSide.vue b/src/views/demo/page1/components/DemoTreeSide.vue
deleted file mode 100644
index 4385b19..0000000
--- a/src/views/demo/page1/components/DemoTreeSide.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<template>
-  <el-tree :data="data" node-key="label" :highlight-current="true">
-    <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">
-          <i class="el-icon-s-operation"></i>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item icon="el-icon-plus" @click.native="addPeerTree(node,data)">新增同级</el-dropdown-item>
-            <el-dropdown-item icon="el-icon-circle-plus" @click.native="addChildrenTree(node,data)">新增下级</el-dropdown-item>
-            <el-dropdown-item icon="el-icon-edit-outline" @click.native="updateTree(node,data)">修改</el-dropdown-item>
-            <el-dropdown-item icon="el-icon-delete-solid" @click.native="delTree(node,data)">删除</el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>
-      </div>
-    </span>
-  </el-tree>
-</template>
-
-<script>
-import { map, range } from 'lodash'
-// 构造树形数据
-const treeData = [
-  {
-    label: 'Side menu'
-  },
-  ...map(range(1, 10), (index1) => ({
-    label: 'Menu item  ' + index1,
-    children: map(range(1, 20), (index2) => ({
-      label: 'Menu item ' + index1 + '-' + index2,
-      children: map(range(1, 5), (index3) => ({
-        label: 'Menu item ' + index1 + '-' + index2 + '-' + index3
-      }))
-    }))
-  }))
-]
-
-export default {
-  name: 'DemoTreeSide',
-  data () {
-    return {
-      data: treeData
-    }
-  },
-  methods: {
-    mouseover (data) { // 移入
-      this.$set(data, 'dropdownShow', true)
-    },
-    mouseout (data) { // 移除
-      this.$set(data, 'dropdownShow', false)
-    },
-    addPeerTree (node, data) {
-      console.log('新增同级')
-    },
-    addChildrenTree (node, data) {
-      console.log('新增下级')
-    },
-    updateTree (node, data) {
-      console.log('修改')
-    },
-    updateTdelTreeree (node, data) {
-      console.log('删除')
-    }
-  }
-}
-</script>
-<style>
-  .custom-tree-node {
-    flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    font-size: 14px;
-    padding-right: 10px;
-    height:100%;
-  }
-</style>
diff --git a/src/views/demo/page1/index.vue b/src/views/demo/page1/index.vue
deleted file mode 100644
index baa73b0..0000000
--- a/src/views/demo/page1/index.vue
+++ /dev/null
@@ -1,229 +0,0 @@
-<template>
-  <zero-container>
-    <!-- 头部信息-start -->
-    <div slot="header">
-      <SearchHearder @searchOpen="searchOpen" />
-      <!-- <div style="float:right"> -->
-      <el-button size="mini" type="primary" @click="initAddOrUpdate('addUpdateDialogRef')">新增</el-button>
-      <el-button size="mini" type="danger" @click="deleteHandle()" :disabled="batchBtnDisabled">批量删除</el-button>
-      <!-- </div> -->
-      <el-collapse-transition>
-        <el-form
-          v-show="searchFormShow"
-          :inline="true"
-          size="mini"
-          :model="searchForm"
-          class="zero-search-from"
-        >
-          <el-form-item label="用户账号">
-            <el-input v-model="searchForm.username" placeholder="请输入用户名" clearable />
-          </el-form-item>
-          <el-form-item>
-            <el-button size="mini" type="primary" icon="el-icon-search" @click="getDataList()">搜索</el-button>
-            <el-button size="mini" icon="el-icon-refresh" @click="searchResetForm('tableRef')">重置</el-button>
-          </el-form-item>
-        </el-form>
-      </el-collapse-transition>
-    </div>
-    <!-- 头部信息-end -->
-    <!-- 左边信息-start -->
-    <div slot="aside">
-      树
-      <DemoTreeSide />
-    </div>
-    <!-- 左边信息-end -->
-    <!-- 右边信息-start -->
-    <div slot="main" style="height:100%">
-      <el-table
-        ref="tableRef"
-        height="100%"
-        size="mini"
-        v-loading="dataListLoading"
-        :data="dataList"
-        border
-        @selection-change="dataListSelectionChangeHandle"
-        @sort-change="dataListSortChangeHandle"
-        class="zero-table"
-        style="width: 100%"
-      >
-        <el-table-column type="selection" header-align="center" align="center" width="50" />
-        <el-table-column
-          prop="name"
-          label="昵称"
-          sortable="custom"
-          header-align="center"
-          align="center"
-        />
-        <el-table-column
-          prop="username"
-          label="用户账号"
-          sortable="custom"
-          header-align="center"
-          align="center"
-        />
-        <el-table-column
-          prop="mobile"
-          label="手机号码"
-          sortable="custom"
-          header-align="center"
-          align="center"
-        />
-        <!-- 字典特殊处理 -->
-        <el-table-column
-          prop="type"
-          label="用户类型"
-          sortable="custom"
-          header-align="center"
-          align="center"
-          :formatter="(row, column, cellValue) => dictDetailsHandle(cellValue, 'sys_user_type')"
-        />
-        <el-table-column prop="roleList" label="角色列表">
-          <template slot-scope="scope">
-            <span v-for="item in scope.row.roles" :key="item.id">
-              <span v-if="item.state === 1">[{{ 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
-          prop="state"
-          label="用户状态"
-          sortable="custom"
-          header-align="center"
-          align="center"
-        >
-          <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.state"
-              :active-value="1"
-              :inactive-value="0"
-              @change="changeState(scope.row)"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="createTime"
-          label="创建时间"
-          sortable="custom"
-          header-align="center"
-          align="center"
-          width="180"
-          :formatter="dateFormat"
-        />
-        <el-table-column prop="remarks" label="备注" header-align="center" align="center" />
-        <el-table-column label="操作" header-align="center" align="center" fixed="right" width="150">
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="mini"
-              @click="initAddOrUpdate('addUpdateDialogRef',scope.row)"
-            >修改</el-button>
-            <el-button
-              type="text"
-              size="mini"
-              @click="deleteHandle(scope.row,scope.row.username)"
-            >删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!-- 新增修改弹框 -->
-      <AddUpdateForm
-        ref="addUpdateDialogRef"
-        :dict-details="dictDetails"
-        :getDataList="getDataList"
-      />
-    </div>
-    <!-- 右边信息-end -->
-    <!-- 页脚-start -->
-    <div slot="footer">
-      <PageFooter
-        :limits="[10, 20, 50, 100]"
-        :page="page"
-        :limit="limit"
-        :total="total"
-        :pageSizeChangeHandle="pageSizeChangeHandle"
-        :pageCurrentChangeHandle="pageCurrentChangeHandle"
-        :firstPageHandle="firstPageHandle"
-        :lastPageHandle="lastPageHandle"
-        :refreshPage="refreshPage"
-        refreshRef="tableRef"
-      />
-    </div>
-    <!-- 页脚-end -->
-  </zero-container>
-</template>
-
-<script>
-import mixinViewModule from '@/mixins/view-module' // 分页相关js
-import SearchHearder from '@/components/search-hearder/SearchHearder' // 头部查询模块
-import DemoTreeSide from './components/DemoTreeSide' // 左边树形模块
-import PageFooter from '@/components/page-footer/PageFooter' // 分页模块
-import AddUpdateForm from './components/AddUpdateForm' // 添加修改模块
-export default {
-  name: 'page1',
-  mixins: [mixinViewModule],
-  components: {
-    DemoTreeSide,
-    SearchHearder,
-    PageFooter,
-    AddUpdateForm
-  },
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListUrl: '/sysUser/pageList',
-        deleteUrl: '/sysUser/del',
-        exportUrl: '/sysUser/export',
-        dictCodes: 'sys_user_type,state'
-      }
-    }
-  },
-  methods: {
-    changeState (row) {
-      // 修改状态
-      this.dataListLoading = true
-      const params = {
-        id: row.id,
-        state: row.state
-      }
-      row.state = (row.state + 1) % 2
-      const config = {
-        url: '/sysUser/updateState',
-        method: 'get',
-        params: params
-      }
-      this.$axios(config)
-        .then(res => {
-          this.dataListLoading = false
-          row.state = params.state
-          this.$message.success(res.msg)
-          this.getDataList()
-        })
-        .catch(() => {
-          this.dataListLoading = false
-        })
-    }
-  }
-}
-</script>
-<style>
-.zero-search-from .el-form-item--mini.el-form-item,
-.zero-search-from .el-form-item--small.el-form-item {
-  margin-bottom: 0px;
-  padding-top: 10px;
-}
-.zero-table.el-table--fit.el-table--border {
-  border: 0px !important;
-}
-</style>
diff --git a/src/views/demo/page2/components/AddUpdateForm.vue b/src/views/demo/page2/components/AddUpdateForm.vue
deleted file mode 100644
index 3e5425c..0000000
--- a/src/views/demo/page2/components/AddUpdateForm.vue
+++ /dev/null
@@ -1,219 +0,0 @@
-<template>
-  <el-dialog
-    :title="title"
-    :visible.sync="addUpdateFormVisible"
-    center
-    width="500px"
-    v-loading.fullscreen.lock="loading"
-  >
-    <el-form
-      :model="addUpdateForm"
-      :rules="rules"
-      label-width="120px"
-      size="medium"
-      ref="addUpdateFormRef"
-    >
-      <el-form-item prop="name" label="名称">
-        <el-input v-model.trim="addUpdateForm.name" placeholder="请输入名称" />
-      </el-form-item>
-      <el-form-item prop="type" label="类型">
-        <el-select
-          v-model="addUpdateForm.type"
-          placeholder="请选择类型"
-          @change="getParentSelect"
-          style="width:100%"
-        >
-          <el-option
-            v-for="type in dictDetails.sys_power_type"
-            :key="type.value"
-            :label="type.name"
-            :value="type.value"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-
-      <el-form-item prop="parentId" label="上级">
-        <el-cascader
-          ref="parentRef"
-          v-model="addUpdateForm.parentId"
-          :options="parentOptions"
-          :props="{ value: 'id',label: 'name',checkStrictly: true }"
-          :show-all-levels="false"
-          clearable
-          filterable
-          style="width:100%"
-        />
-      </el-form-item>
-      <el-form-item v-if="iconExist" label="图标">
-        <e-icon-picker v-model="addUpdateForm.icon" placeholder="请选择图标" />
-      </el-form-item>
-      <el-form-item label="排序">
-        <el-input-number
-          v-model="addUpdateForm.sort"
-          controls-position="right"
-          :min="0"
-          style="width:100%"
-        />
-      </el-form-item>
-      <el-form-item v-if="urlExist" prop="url" label="接口地址">
-        <el-input v-model.trim="addUpdateForm.url" placeholder="请输入接口地址" />
-      </el-form-item>
-      <el-form-item v-if="pathExist" prop="path" label="资源路径">
-        <el-input v-model.trim="addUpdateForm.path" placeholder="请输入资源路径" />
-      </el-form-item>
-      <el-form-item label="备注">
-        <el-input type="textarea" v-model="addUpdateForm.remarks" placeholder="请输入备注" />
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button v-if="btnExist" @click="addUpdateFormVisible = false">取 消</el-button>
-      <el-button v-if="btnExist" type="primary" @click="addOrupdate()">确 定</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-export default {
-  name: 'AddUpdateForm',
-  props: {
-    dictDetails: Object,
-    getDataList: {
-      type: Function,
-      default: null
-    }
-  },
-  data () {
-    return {
-      loading: false,
-      btnExist: true, // 按钮是否存在
-      addUpdateFormVisible: false, // 是否显示弹框
-      title: '', // 弹框标题
-      addUpdateForm: {},
-      initFrom: {
-        // 初始弹框
-        type: '0',
-        sort: 0
-      },
-      parentOptions: [],
-      iconExist: true,
-      urlExist: false,
-      pathExist: false,
-      rules: {
-        name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
-        type: [{ required: true, message: '请选择类型', trigger: 'blur' }],
-        url: [{ required: true, message: '请输入接口地址', trigger: 'blur' }],
-        path: [{ required: true, message: '请输入资源路径', trigger: 'blur' }],
-        parentId: [{ required: false, message: '请选择上级', trigger: 'blur' }]
-      }
-    }
-  },
-  created () {},
-  methods: {
-    getParentSelect (type) {
-      switch (type) {
-        case '0':
-          this.iconExist = true
-          this.urlExist = false
-          this.pathExist = false
-          if (this.$refs.addUpdateFormRef) {
-            this.$refs.addUpdateFormRef.clearValidate('parentId')
-            this.rules.parentId[0].required = false
-          }
-          break
-        case '1':
-          this.iconExist = true
-          this.urlExist = false
-          this.pathExist = true
-          if (this.$refs.addUpdateFormRef) {
-            this.$refs.addUpdateFormRef.clearValidate('parentId')
-            this.rules.parentId[0].required = false
-          }
-          break
-        case '2':
-          this.iconExist = false
-          this.urlExist = true
-          this.pathExist = false
-          this.rules.parentId[0].required = true
-          break
-      }
-      const config = {
-        url: 'sysPower/tree',
-        method: 'get',
-        params: {
-          type: type
-        }
-      }
-      delete this.addUpdateForm.parentId
-      delete this.addUpdateForm.parentIds
-      this.$axios(config).then(res => {
-        this.parentOptions = res.data
-      })
-    },
-    initAddOrUpdate (row) {
-      // 新增或修改
-      this.addUpdateFormVisible = true
-      this.addUpdateFormReset()
-      if (row) {
-        row.type += '' // 转成字符串,不然select控件不支持回显
-        this.title = '修改权限'
-        // 修改下拉框数据
-        this.getParentSelect(row.type)
-        this.addUpdateForm = JSON.parse(JSON.stringify(row))
-        // 通过父级编号集来回显
-        this.addUpdateForm.parentId = this.addUpdateForm.parentIds.split(',')
-      } else {
-        this.getParentSelect(this.initFrom.type)
-        this.title = '新增权限'
-      }
-    },
-    addOrupdate () {
-      // 添加或修改
-      this.$refs.addUpdateFormRef.validate(valid => {
-        if (valid) {
-          if (this.addUpdateForm.parentId) { // 判断是否存在
-            if (Array.isArray(this.addUpdateForm.parentId)) {
-              if (this.addUpdateForm.parentId.length === 0) { // 当为空数组时的处理
-                delete this.addUpdateForm.parentId
-                delete this.addUpdateForm.parentIds
-              } else {
-                this.addUpdateForm.parentIds = this.addUpdateForm.parentId.join(',')
-                if (this.$refs.parentRef.getCheckedNodes()[0]) {
-                  this.addUpdateForm.parentId = this.$refs.parentRef.getCheckedNodes()[0].value
-                } else {
-                  this.addUpdateForm.parentId = this.addUpdateForm.parentId[0]
-                }
-              }
-            }
-          }
-          this.loading = true
-          this.btnExist = false
-          const config = {
-            url: this.addUpdateForm.id ? 'sysPower/update' : 'sysPower/add',
-            method: 'post',
-            data: this.addUpdateForm
-          }
-          this.$axios(config)
-            .then(res => {
-              this.loading = false
-              this.addUpdateFormVisible = false
-              this.btnExist = true
-              this.getDataList()
-              this.$message.success(res.msg)
-            })
-            .catch(() => {
-              this.loading = false
-              this.btnExist = true
-            })
-        }
-      })
-    },
-    addUpdateFormReset () {
-      // 重置表单 需要转成字符串赋值，不然这两个对象的值会一直相等
-      this.addUpdateForm = JSON.parse(JSON.stringify(this.initFrom))
-      this.$nextTick(() => {
-        this.$refs.addUpdateFormRef.clearValidate()
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/demo/page2/index.vue b/src/views/demo/page2/index.vue
deleted file mode 100644
index 200a519..0000000
--- a/src/views/demo/page2/index.vue
+++ /dev/null
@@ -1,122 +0,0 @@
-<template>
-  <zero-container>
-    <!-- 头部信息-start -->
-    <div slot="header">
-      <el-button size="mini" icon="el-icon-refresh" @click="refreshPage('tableRef')">刷新</el-button>
-      <el-button size="mini" type="primary" @click="initAddOrUpdate('addUpdateDialogRef')">新增</el-button>
-    </div>
-    <!-- 头部信息-end -->
-    <!-- 右边信息-start -->
-    <div slot="main" style="height:100%">
-      <el-table
-        ref="tableRef"
-        height="100%"
-        size="mini"
-        row-key="id"
-        v-loading="dataListLoading"
-        :data="dataList"
-        border
-        class="zero-table"
-        style="width: 100%"
-        :tree-props="{children: 'children'}"
-      >
-        <el-table-column
-          prop="name"
-          label="名称"
-          header-align="center"
-          align="center"
-        />
-        <el-table-column
-          prop="url"
-          label="接口地址"
-          header-align="center"
-          align="center"
-        />
-        <el-table-column
-          prop="path"
-          label="资源路径"
-          header-align="center"
-          align="center"
-        />
-        <el-table-column
-          prop="icon"
-          label="图标"
-          header-align="center"
-          align="center"
-        >
-         <template slot-scope="scope">
-           <i :class="scope.row.icon"></i>
-          </template>
-        </el-table-column>
-        <!-- 字典特殊处理 -->
-        <el-table-column
-          prop="type"
-          label="类型"
-          header-align="center"
-          align="center"
-        >
-          <template slot-scope="scope">
-            <el-tag
-              :type="scope.row.type == 0  ? 'success' : scope.row.type == 1 ? 'warning' : 'danger'"
-              disable-transitions>{{dictDetailsHandle(scope.row.type, 'sys_power_type')}}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="createTime"
-          label="创建时间"
-          header-align="center"
-          align="center"
-          width="180"
-          :formatter="dateFormat"
-        />
-        <el-table-column prop="remarks" label="备注" header-align="center" align="center" />
-        <el-table-column label="操作" header-align="center" align="center" fixed="right" width="150">
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="mini"
-              @click="initAddOrUpdate('addUpdateDialogRef',scope.row)"
-            >修改</el-button>
-            <el-button
-              type="text"
-              size="mini"
-              @click="deleteHandle(scope.row,scope.row.name)"
-            >删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!-- 新增修改弹框 -->
-      <AddUpdateForm
-        ref="addUpdateDialogRef"
-        :dict-details="dictDetails"
-        :getDataList="getDataList"
-      />
-    </div>
-    <!-- 右边信息-end -->
-  </zero-container>
-</template>
-
-<script>
-import mixinViewModule from '@/mixins/view-module' // 分页相关js
-import AddUpdateForm from './components/AddUpdateForm' // 添加修改模块
-export default {
-  name: 'page2',
-  mixins: [mixinViewModule],
-  components: {
-    AddUpdateForm
-  },
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        isPage: false,
-        getDataListUrl: '/sysPower/tree',
-        deleteUrl: '/sysPower/del',
-        exportUrl: '/sysPower/export',
-        dictCodes: 'sys_power_type'
-      }
-    }
-  },
-  methods: {
-  }
-}
-</script>
diff --git a/src/views/demo/page3/components/AddUpdateForm.vue b/src/views/demo/page3/components/AddUpdateForm.vue
deleted file mode 100644
index f94e0f1..0000000
--- a/src/views/demo/page3/components/AddUpdateForm.vue
+++ /dev/null
@@ -1,132 +0,0 @@
-<template>
-  <el-dialog
-    :title="title"
-    :visible.sync="addUpdateFormVisible"
-    width="500px"
-    v-loading.fullscreen.lock="loading"
-  >
-    <el-form
-      :model="addUpdateForm"
-      :rules="rules"
-      label-width="120px"
-      size="medium"
-      ref="addUpdateFormRef"
-    >
-      <el-form-item prop="name" label="角色名称">
-        <el-input v-model.trim="addUpdateForm.name" placeholder="请输入角色名称" />
-      </el-form-item>
-      <el-form-item prop="state" label="角色状态">
-        <el-radio-group v-model="addUpdateForm.state">
-          <el-radio-button
-            v-for="state in dictDetails.state"
-            :label="state.value"
-            :key="state.value"
-          >{{state.name}}</el-radio-button>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="备注">
-        <el-input type="textarea" v-model="addUpdateForm.remarks" placeholder="请输入备注" />
-      </el-form-item>
-      <el-row :gutter="20">
-        <el-col :span="6" style="text-align:right">权限</el-col>
-        <el-col :span="18"><PowerTree ref= "treeRef" :powerArray="powerArray"/></el-col>
-      </el-row>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button v-if="btnExist" @click="addUpdateFormVisible = false">取 消</el-button>
-      <el-button v-if="btnExist" type="primary" @click="addOrupdate()">确 定</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-
-import PowerTree from './PowerTree' // 权限树
-
-export default {
-  name: 'AddUpdateForm',
-  components: {
-    PowerTree
-  },
-  props: {
-    dictDetails: Object,
-    getDataList: {
-      type: Function,
-      default: null
-    }
-  },
-  data () {
-    return {
-      loading: false,
-      btnExist: true, // 按钮是否存在
-      updateExist: true, // 修改时，是否存在的输入框
-      addUpdateFormVisible: false, // 是否显示弹框
-      title: '', // 弹框标题
-      addUpdateForm: {},
-      powerArray: [],
-      initFrom: {
-        state: 1
-      },
-      rules: {
-        name: [{ required: true, message: '请输入角色名称', trigger: 'blur' }],
-        state: [{ required: true, message: '请选择角色状态', trigger: 'blur' }]
-      }
-    }
-  },
-  created () {},
-  methods: {
-    initAddOrUpdate (row) {
-      // 新增或修改
-      this.addUpdateFormVisible = true
-      this.addUpdateFormReset()
-      if (row) {
-        this.updateExist = false
-        this.title = '修改角色'
-        this.addUpdateForm = JSON.parse(JSON.stringify(row))
-        this.powerArray = row.powers.map(power => power.id)
-      } else {
-        this.updateExist = true
-        this.title = '新增角色'
-      }
-    },
-    addOrupdate () {
-      // 添加或修改
-      this.$refs.addUpdateFormRef.validate(valid => {
-        if (valid) {
-          this.loading = true
-          this.btnExist = false
-          // 处理权限
-          this.addUpdateForm.powers = this.$refs.treeRef.getCheckedKeys().map(it => {
-            return { id: it }
-          })
-          const config = {
-            url: this.addUpdateForm.id ? 'sysRole/update' : 'sysRole/add',
-            method: 'post',
-            data: this.addUpdateForm
-          }
-          this.$axios(config)
-            .then(res => {
-              this.loading = false
-              this.addUpdateFormVisible = false
-              this.btnExist = true
-              this.getDataList()
-              this.$message.success(res.msg)
-            })
-            .catch(() => {
-              this.loading = false
-              this.btnExist = true
-            })
-        }
-      })
-    },
-    addUpdateFormReset () {
-      // 重置表单 需要转成字符串赋值，不然这两个对象的值会一直相等
-      this.addUpdateForm = JSON.parse(JSON.stringify(this.initFrom))
-      this.$nextTick(() => {
-        this.$refs.treeRef.getPowerTree() // 权限初始化
-        this.$refs.addUpdateFormRef.clearValidate()
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/demo/page3/components/PowerTree.vue b/src/views/demo/page3/components/PowerTree.vue
deleted file mode 100644
index eac7cd6..0000000
--- a/src/views/demo/page3/components/PowerTree.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-<template>
-  <div>
-    <el-input placeholder="输入关键字进行过滤" v-model="filterText" />
-    <el-tree ref="treeRef"
-      v-loading="treeLoading"
-      class="tree"
-      show-checkbox
-      node-key="id"
-      highlight-current
-      :data="data"
-      :props="{
-        children: 'children',
-        label: 'name'
-      }"
-      :check-strictly="checkStrictly"
-      :filter-node-method="filterNode"
-      :default-expand-all="true"
-     />
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'PowerTree',
-  props: {
-    powerArray: Array
-  },
-  data () {
-    return {
-      treeLoading: false,
-      data: [],
-      checkStrictly: false,
-      filterText: ''
-    }
-  },
-  watch: {
-    filterText (val) {
-      this.$refs.treeRef.filter(val)
-    }
-  },
-  methods: {
-    getPowerTree () {
-      this.treeLoading = true
-      const config = {
-        url: '/sysPower/tree',
-        method: 'get'
-      }
-      this.$axios(config)
-        .then(res => {
-          this.data = res.data
-          this.treeLoading = false
-          this.setTreeData()
-        })
-        .catch(() => {
-          this.treeLoading = false
-        })
-    },
-    filterNode (value, data) {
-      if (!value) return true
-      return data.name.indexOf(value) !== -1
-    },
-    setCheckedKeys (arr) { // 设置选中节点
-      this.$refs.treeRef.setCheckedKeys(arr)
-    },
-    getCheckedKeys () { // 获取选中节点
-      return this.$refs.treeRef.getCheckedKeys()
-    },
-    setTreeData () {
-      setTimeout(() => {
-        this.powerArray.forEach((i, n) => {
-          var node = this.$refs.treeRef.getNode(i)
-          if (node && node.isLeaf) {
-            this.$refs.treeRef.setChecked(node, true)
-          }
-        })
-      }, 100)
-    }
-  }
-}
-</script>
-<style>
-.tree {
-  overflow-y: auto;
-  min-height: 180px;
-  max-height: 300px;
-  border: 1px solid #e4e7ed;
-  border-top: 0px;
-}
-</style>
diff --git a/src/views/demo/page3/index.vue b/src/views/demo/page3/index.vue
deleted file mode 100644
index 14dd308..0000000
--- a/src/views/demo/page3/index.vue
+++ /dev/null
@@ -1,179 +0,0 @@
-<template>
-  <zero-container>
-    <!-- 头部信息-start -->
-    <div slot="header">
-      <SearchHearder @searchOpen="searchOpen" />
-      <!-- <div style="float:right"> -->
-      <el-button size="mini" type="primary" @click="initAddOrUpdate('addUpdateDialogRef')">新增</el-button>
-      <el-button size="mini" type="danger" @click="deleteHandle()" :disabled="batchBtnDisabled">批量删除</el-button>
-      <!-- </div> -->
-      <el-collapse-transition>
-        <el-form
-          v-show="searchFormShow"
-          :inline="true"
-          size="mini"
-          :model="searchForm"
-          class="zero-search-from"
-        >
-          <el-form-item label="角色名称">
-            <el-input v-model="searchForm.name" placeholder="请输入角色名称" clearable />
-          </el-form-item>
-          <el-form-item>
-            <el-button size="mini" type="primary" icon="el-icon-search" @click="getDataList()">搜索</el-button>
-            <el-button size="mini" icon="el-icon-refresh" @click="searchResetForm('tableRef')">重置</el-button>
-          </el-form-item>
-        </el-form>
-      </el-collapse-transition>
-    </div>
-    <!-- 头部信息-end -->
-    <!-- 右边信息-start -->
-    <div slot="main" style="height:100%">
-      <el-table
-        ref="tableRef"
-        height="100%"
-        size="mini"
-        v-loading="dataListLoading"
-        :data="dataList"
-        border
-        @selection-change="dataListSelectionChangeHandle"
-        @sort-change="dataListSortChangeHandle"
-        class="zero-table"
-        style="width: 100%"
-      >
-        <el-table-column type="selection" header-align="center" align="center" width="50" />
-        <el-table-column
-          prop="name"
-          label="角色名称"
-          sortable="custom"
-          header-align="center"
-          align="center"
-        />
-        <!-- 状态特殊处理 -->
-        <el-table-column
-          prop="state"
-          label="角色状态"
-          sortable="custom"
-          header-align="center"
-          align="center"
-        >
-          <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.state"
-              :active-value="1"
-              :inactive-value="0"
-              @change="changeState(scope.row)"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="createTime"
-          label="创建时间"
-          sortable="custom"
-          header-align="center"
-          align="center"
-          width="180"
-          :formatter="dateFormat"
-        />
-        <el-table-column
-          prop="updateTime"
-          label="修改时间"
-          sortable="custom"
-          header-align="center"
-          align="center"
-          width="180"
-          :formatter="dateFormat"
-        />
-        <el-table-column prop="remarks" label="备注" header-align="center" align="center" />
-        <el-table-column label="操作" header-align="center" align="center" fixed="right" width="150">
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="mini"
-              @click="initAddOrUpdate('addUpdateDialogRef',scope.row)"
-            >修改</el-button>
-            <el-button
-              type="text"
-              size="mini"
-              @click="deleteHandle(scope.row,scope.row.username)"
-            >删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!-- 新增修改弹框 -->
-      <AddUpdateForm
-        ref="addUpdateDialogRef"
-        :dict-details="dictDetails"
-        :getDataList="getDataList"
-      />
-    </div>
-    <!-- 右边信息-end -->
-    <!-- 页脚-start -->
-    <div slot="footer">
-      <PageFooter
-      :limits="[10, 20, 50, 100]"
-      :page="page"
-      :limit="limit"
-      :total="total"
-      :pageSizeChangeHandle="pageSizeChangeHandle"
-      :pageCurrentChangeHandle="pageCurrentChangeHandle"
-      :firstPageHandle="firstPageHandle"
-      :lastPageHandle="lastPageHandle"
-      :refreshPage="refreshPage"
-      refreshRef ="tableRef"
-      />
-    </div>
-    <!-- 页脚-end -->
-  </zero-container>
-</template>
-
-<script>
-import mixinViewModule from '@/mixins/view-module' // 分页相关js
-import SearchHearder from '@/components/search-hearder/SearchHearder' // 头部查询模块
-import PageFooter from '@/components/page-footer/PageFooter' // 分页模块
-import AddUpdateForm from './components/AddUpdateForm' // 添加修改模块
-export default {
-  name: 'page3',
-  mixins: [mixinViewModule],
-  components: {
-    SearchHearder,
-    PageFooter,
-    AddUpdateForm
-  },
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListUrl: '/sysRole/pageList',
-        deleteUrl: '/sysRole/del',
-        exportUrl: '/sysRole/export',
-        dictCodes: 'state'
-      }
-    }
-  },
-  methods: {
-    changeState (row) {
-      // 修改状态
-      this.dataListLoading = true
-      const params = {
-        id: row.id,
-        state: row.state
-      }
-      row.state = (row.state + 1) % 2
-      const config = {
-        url: '/sysRole/updateState',
-        method: 'get',
-        params: params
-      }
-      this.$axios(config)
-        .then(res => {
-          this.dataListLoading = false
-          row.state = params.state
-          this.$message.success(res.msg)
-          this.getDataList()
-        })
-        .catch(() => {
-          this.dataListLoading = false
-        })
-    }
-  }
-}
-</script>
diff --git a/src/views/system/power/index.vue b/src/views/system/power/index.vue
index ef65092..cefc510 100644
--- a/src/views/system/power/index.vue
+++ b/src/views/system/power/index.vue
@@ -26,6 +26,7 @@
           label="名称"
           header-align="center"
           align="center"
+          width="200"
         />
         <el-table-column
           prop="path"
@@ -38,6 +39,7 @@
           label="接口地址"
           header-align="center"
           align="center"
+          width="200"
         />
         <el-table-column
           prop="sort"
@@ -64,7 +66,7 @@
         >
           <template slot-scope="scope">
             <el-tag
-              :type="scope.row.type == 0  ? 'success' : scope.row.type == 1 ? 'warning' : 'danger'"
+              :type="scope.row.type == 0  ? 'success' : scope.row.type == 1 ? 'info' : 'danger'"
               disable-transitions>{{dictDetailsHandle(scope.row.type, 'sys_power_type')}}</el-tag>
           </template>
         </el-table-column>
-- 
Gitee


From 74f6de52d0a1f075c4bd77b91e9dad44681fbdd7 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Mon, 6 Jul 2020 10:59:37 +0800
Subject: [PATCH 57/70] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/axios.js                              |   4 +-
 .../components/header-user/index.vue          |  11 +-
 src/router/routes.js                          |  15 +-
 src/views/system/log/components/Details.vue   |  24 +++
 src/views/system/log/index.vue                | 157 ++++++++++++++++++
 5 files changed, 202 insertions(+), 9 deletions(-)
 create mode 100644 src/views/system/log/components/Details.vue
 create mode 100644 src/views/system/log/index.vue

diff --git a/src/api/axios.js b/src/api/axios.js
index d40155f..0e5e6dc 100644
--- a/src/api/axios.js
+++ b/src/api/axios.js
@@ -91,13 +91,15 @@ function createRequestFunction (service) {
     const token = util.storage.get('token')
     const configDefault = {
       headers: {
-        Authorization: token,
         'Content-Type': get(config, 'headers.Content-Type', 'application/json')
       },
       timeout: 30000,
       baseURL: process.env.VUE_APP_API,
       data: {}
     }
+    if (token) {
+      configDefault.headers.Authorization = token
+    }
     return service(Object.assign(configDefault, config))
   }
 }
diff --git a/src/layout/header-aside/components/header-user/index.vue b/src/layout/header-aside/components/header-user/index.vue
index d5bd1a9..3f33a52 100644
--- a/src/layout/header-aside/components/header-user/index.vue
+++ b/src/layout/header-aside/components/header-user/index.vue
@@ -36,13 +36,14 @@ export default {
       }
       MessageBox.confirm('确定要注销当前用户吗', '注销用户', { type: 'warning' })
         .then(() => {
-          // 删除
-          util.storage.removeAll()
-          // 清空 vuex 用户信息
-          this.$store.dispatch('zerovue/user/set', {}, { root: true })
           // 跳转路由
           this.$router.push({ name: 'login' })
-          this.$axios(config)
+          this.$axios(config).then(() => {
+          // 删除
+            util.storage.removeAll()
+            // 清空 vuex 用户信息
+            this.$store.dispatch('zerovue/user/set', {}, { root: true })
+          })
         })
         .catch(() => {
           Message({ message: '取消注销操作' })
diff --git a/src/router/routes.js b/src/router/routes.js
index 59a428c..0090868 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -26,7 +26,7 @@ const frameIn = [
         name: 'SysUser',
         meta: {
           title: '系统用户',
-          auth: 'sysUser/pageList'
+          auth: '/sysUser/pageList'
         },
         component: _import('system/user')
       },
@@ -35,7 +35,7 @@ const frameIn = [
         name: 'SysRole',
         meta: {
           title: '系统角色',
-          auth: 'sysRole/pageList'
+          auth: '/sysRole/pageList'
         },
         component: _import('system/role')
       },
@@ -44,10 +44,19 @@ const frameIn = [
         name: 'SysPower',
         meta: {
           title: '系统权限',
-          auth: 'sysPower/tree'
+          auth: '/sysPower/tree'
         },
         component: _import('system/power')
       },
+      {
+        path: '/SysLog',
+        name: 'SysLog',
+        meta: {
+          title: '系统日志',
+          auth: '/sysLog/pageList'
+        },
+        component: _import('system/log')
+      },
       // 刷新页面 必须保留
       {
         path: '/refresh',
diff --git a/src/views/system/log/components/Details.vue b/src/views/system/log/components/Details.vue
new file mode 100644
index 0000000..845e2f8
--- /dev/null
+++ b/src/views/system/log/components/Details.vue
@@ -0,0 +1,24 @@
+<template>
+<el-page-header @back="goBack" content="详情页面">
+</el-page-header>
+</template>
+
+<script>
+export default {
+  name: 'Details',
+  props: {
+    method: String,
+    browser: String,
+    data: String
+  },
+  data () {
+    return {
+    }
+  },
+  methods: {
+    goBack () {
+      console.log('go back')
+    }
+  }
+}
+</script>
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
new file mode 100644
index 0000000..a96d4c5
--- /dev/null
+++ b/src/views/system/log/index.vue
@@ -0,0 +1,157 @@
+<template>
+  <zero-container>
+    <!-- 头部信息-start -->
+    <div slot="header">
+      <SearchHearder @searchOpen="searchOpen" />
+      <el-collapse-transition>
+        <el-form
+          v-show="searchFormShow"
+          :inline="true"
+          size="mini"
+          :model="searchForm"
+          class="zero-search-from"
+        >
+          <el-form-item label="标题">
+            <el-input v-model="searchForm.title" placeholder="请输入标题" clearable />
+          </el-form-item>
+          <el-form-item label="操作">
+            <el-input v-model="searchForm.operation" placeholder="请输入操作" clearable />
+          </el-form-item>
+          <el-form-item label="用户名">
+            <el-input v-model="searchForm.username" placeholder="请输入用户名" clearable />
+          </el-form-item>
+          <el-form-item label="内容信息">
+            <el-input v-model="searchForm.data" placeholder="请输入内容信息" clearable />
+          </el-form-item>
+          <el-form-item label="ip地址">
+            <el-input v-model="searchForm.ip" placeholder="请输入ip地址" clearable />
+          </el-form-item>
+          <el-form-item label="等级">
+            <el-input v-model="searchForm.level" placeholder="请选择等级" clearable />
+          </el-form-item>
+          <el-form-item>
+            <el-button size="mini" type="primary" icon="el-icon-search" @click="getDataList()">搜索</el-button>
+            <el-button size="mini" icon="el-icon-refresh" @click="searchResetForm('tableRef')">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </el-collapse-transition>
+    </div>
+    <!-- 头部信息-end -->
+    <!-- 右边信息-start -->
+    <div slot="main" style="height:100%">
+      <el-table
+        ref="tableRef"
+        height="100%"
+        size="mini"
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle"
+        class="zero-table"
+        style="width: 100%"
+      >
+        <el-table-column type="selection" header-align="center" align="center" width="50" />
+        <el-table-column
+          prop="title"
+          label="标题"
+          header-align="center"
+          align="center"
+        />
+        <el-table-column
+          prop="operation"
+          label="操作"
+          header-align="center"
+          align="center"
+        />
+        <el-table-column
+          prop="username"
+          label="用户名称"
+          header-align="center"
+          align="center"
+        />
+        <el-table-column
+          prop="level"
+          label="等级"
+          header-align="center"
+          align="center"
+        />
+        <el-table-column
+          prop="mode"
+          label="请求方式"
+          header-align="center"
+          align="center"
+        />
+        <el-table-column
+          prop="ip"
+          label="IP地址"
+          header-align="center"
+          align="center"
+        />
+        <el-table-column
+          prop="path"
+          label="接口路径"
+          header-align="center"
+          align="center"
+        />
+        <el-table-column
+          prop="createTime"
+          label="创建时间"
+          header-align="center"
+          align="center"
+          width="180"
+          :formatter="dateFormat"
+        />
+        <el-table-column label="操作" header-align="center" align="center" fixed="right" width="150">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="mini"
+              @click="initAddOrUpdate('addUpdateDialogRef',scope.row)"
+            >查看详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!-- 右边信息-end -->
+    <!-- 页脚-start -->
+    <div slot="footer">
+      <PageFooter
+      :limits="[10, 20, 50, 100]"
+      :page="page"
+      :limit="limit"
+      :total="total"
+      :pageSizeChangeHandle="pageSizeChangeHandle"
+      :pageCurrentChangeHandle="pageCurrentChangeHandle"
+      :firstPageHandle="firstPageHandle"
+      :lastPageHandle="lastPageHandle"
+      :refreshPage="refreshPage"
+      refreshRef ="tableRef"
+      />
+    </div>
+    <!-- 页脚-end -->
+  </zero-container>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module' // 分页相关js
+import SearchHearder from '@/components/search-hearder/SearchHearder' // 头部查询模块
+import PageFooter from '@/components/page-footer/PageFooter' // 分页模块
+export default {
+  name: 'SysLog',
+  mixins: [mixinViewModule],
+  components: {
+    SearchHearder,
+    PageFooter
+  },
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListUrl: '/sysLog/pageList'
+      }
+    }
+  },
+  methods: {
+  }
+}
+</script>
-- 
Gitee


From 16134d19df2b6767d4144e25206e3b4927587882 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Mon, 6 Jul 2020 17:29:17 +0800
Subject: [PATCH 58/70] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/routes.js                        |  8 ++++++++
 src/views/system/log/components/Details.vue | 15 +++++++++++++--
 src/views/system/log/index.vue              |  5 ++++-
 src/views/system/login/index.vue            |  1 -
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/router/routes.js b/src/router/routes.js
index 0090868..e9e9284 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -57,6 +57,14 @@ const frameIn = [
         },
         component: _import('system/log')
       },
+      {
+        path: '/SysLogDetails', // 日志详情页
+        name: 'SysLogDetails',
+        meta: {
+          title: '系统日志详情'
+        },
+        component: _import('system/log/components/Details')
+      },
       // 刷新页面 必须保留
       {
         path: '/refresh',
diff --git a/src/views/system/log/components/Details.vue b/src/views/system/log/components/Details.vue
index 845e2f8..de929a1 100644
--- a/src/views/system/log/components/Details.vue
+++ b/src/views/system/log/components/Details.vue
@@ -1,6 +1,16 @@
 <template>
-<el-page-header @back="goBack" content="详情页面">
-</el-page-header>
+<zero-container>
+  <div slot="header">
+  <el-page-header @back="goBack" content="详情页面">
+  </el-page-header>
+  </div>
+  <div slot="main">
+    <el-row :gutter="20">
+      <el-col :span="2" style="text-align:right">权限</el-col>
+      <el-col :span="18">222222</el-col>
+    </el-row>
+  </div>
+</zero-container>
 </template>
 
 <script>
@@ -13,6 +23,7 @@ export default {
   },
   data () {
     return {
+      searchForm: {}
     }
   },
   methods: {
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
index a96d4c5..e43fcd2 100644
--- a/src/views/system/log/index.vue
+++ b/src/views/system/log/index.vue
@@ -107,7 +107,7 @@
             <el-button
               type="text"
               size="mini"
-              @click="initAddOrUpdate('addUpdateDialogRef',scope.row)"
+              @click="viewDetails(scope.row)"
             >查看详情</el-button>
           </template>
         </el-table-column>
@@ -152,6 +152,9 @@ export default {
     }
   },
   methods: {
+    viewDetails (row) {
+      this.$router.push('/SysLogDetails')
+    }
   }
 }
 </script>
diff --git a/src/views/system/login/index.vue b/src/views/system/login/index.vue
index 1f8212f..248cb71 100644
--- a/src/views/system/login/index.vue
+++ b/src/views/system/login/index.vue
@@ -162,7 +162,6 @@ export default {
      */
     // 提交登录信息
     submit () {
-      console.log()
       this.$refs.loginForm.validate((valid) => {
         if (valid) {
           this.loading = true
-- 
Gitee


From 64f29ad6284a41ac81854c1640cfc39472717699 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Tue, 7 Jul 2020 10:34:33 +0800
Subject: [PATCH 59/70] 1

---
 src/api/axios.js                              |   3 +
 src/assets/404_images/404.png                 | Bin 0 -> 98071 bytes
 src/assets/404_images/404_cloud.png           | Bin 0 -> 4766 bytes
 .../search-hearder/SearchHearder.vue          |   2 +-
 .../components/header-color/index.vue         |   1 -
 src/views/system/error/404/index.vue          | 230 +++++++++++++++++-
 src/views/system/log/components/Details.vue   |   9 +-
 src/views/system/log/index.vue                |   7 +-
 src/views/system/power/index.vue              |   9 +-
 src/views/system/role/index.vue               |  12 +-
 src/views/system/user/index.vue               |  15 +-
 11 files changed, 247 insertions(+), 41 deletions(-)
 create mode 100644 src/assets/404_images/404.png
 create mode 100644 src/assets/404_images/404_cloud.png

diff --git a/src/api/axios.js b/src/api/axios.js
index 0e5e6dc..d6eb576 100644
--- a/src/api/axios.js
+++ b/src/api/axios.js
@@ -74,6 +74,9 @@ function createService () {
           case 505: error.message = 'HTTP版本不受支持'; break
           default: break
         }
+        if (!error.response.data.code) {
+          error.message = '服务器宕机'
+        }
       }
       errorLog(error)
       return Promise.reject(error)
diff --git a/src/assets/404_images/404.png b/src/assets/404_images/404.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d8e2305cc973ad2121403aee4bf08728f76c461
GIT binary patch
literal 98071
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

literal 0
HcmV?d00001

diff --git a/src/assets/404_images/404_cloud.png b/src/assets/404_images/404_cloud.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6281d09013e0a2c5f8e699a0a6038d9480291e5
GIT binary patch
literal 4766
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

literal 0
HcmV?d00001

diff --git a/src/components/search-hearder/SearchHearder.vue b/src/components/search-hearder/SearchHearder.vue
index 76d9a50..584c67e 100644
--- a/src/components/search-hearder/SearchHearder.vue
+++ b/src/components/search-hearder/SearchHearder.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-button size="mini" :icon="icon" @click="click">{{open ? '隐藏':'展开'}}</el-button>
+  <el-button :icon="icon" @click="click">{{open ? '隐藏':'展开'}}</el-button>
 </template>
 
 <script>
diff --git a/src/layout/header-aside/components/header-color/index.vue b/src/layout/header-aside/components/header-color/index.vue
index 9fe5674..949da52 100644
--- a/src/layout/header-aside/components/header-color/index.vue
+++ b/src/layout/header-aside/components/header-color/index.vue
@@ -3,7 +3,6 @@
     class="btn-text can-hover"
     :value="value"
     :predefine="predefine"
-    size="mini"
     @change="set"/>
 </template>
 
diff --git a/src/views/system/error/404/index.vue b/src/views/system/error/404/index.vue
index b74944e..28d7aec 100644
--- a/src/views/system/error/404/index.vue
+++ b/src/views/system/error/404/index.vue
@@ -1,8 +1,228 @@
 <template>
-  <div class="page">
-    <p class="page_title">404 page not found</p>
-    <el-button class="zero-mt" @click="$router.replace({ path: '/' })">
-      返回首页
-    </el-button>
+  <div class="wscn-http404-container">
+    <div class="wscn-http404">
+      <div class="pic-404">
+        <img class="pic-404__parent" src="@/assets/404_images/404.png" alt="404">
+        <img class="pic-404__child left" src="@/assets/404_images/404_cloud.png" alt="404">
+        <img class="pic-404__child mid" src="@/assets/404_images/404_cloud.png" alt="404">
+        <img class="pic-404__child right" src="@/assets/404_images/404_cloud.png" alt="404">
+      </div>
+      <div class="bullshit">
+        <div class="bullshit__oops">OOPS!</div>
+        <div class="bullshit__info">All rights reserved
+          <a style="color:#20a0ff" href="https://wallstreetcn.com" target="_blank">wallstreetcn</a>
+        </div>
+        <div class="bullshit__headline">{{ message }}</div>
+        <div class="bullshit__info">Please check that the URL you entered is correct, or click the button below to return to the homepage.</div>
+        <a href="" class="bullshit__return-home">Back to home</a>
+      </div>
+    </div>
   </div>
 </template>
+
+<script>
+
+export default {
+  name: 'Page404',
+  computed: {
+    message () {
+      return 'The webmaster said that you can not enter this page...'
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.wscn-http404-container{
+  transform: translate(-50%,-50%);
+  position: absolute;
+  top: 40%;
+  left: 50%;
+}
+.wscn-http404 {
+  position: relative;
+  width: 1200px;
+  padding: 0 50px;
+  overflow: hidden;
+  .pic-404 {
+    position: relative;
+    float: left;
+    width: 600px;
+    overflow: hidden;
+    &__parent {
+      width: 100%;
+    }
+    &__child {
+      position: absolute;
+      &.left {
+        width: 80px;
+        top: 17px;
+        left: 220px;
+        opacity: 0;
+        animation-name: cloudLeft;
+        animation-duration: 2s;
+        animation-timing-function: linear;
+        animation-fill-mode: forwards;
+        animation-delay: 1s;
+      }
+      &.mid {
+        width: 46px;
+        top: 10px;
+        left: 420px;
+        opacity: 0;
+        animation-name: cloudMid;
+        animation-duration: 2s;
+        animation-timing-function: linear;
+        animation-fill-mode: forwards;
+        animation-delay: 1.2s;
+      }
+      &.right {
+        width: 62px;
+        top: 100px;
+        left: 500px;
+        opacity: 0;
+        animation-name: cloudRight;
+        animation-duration: 2s;
+        animation-timing-function: linear;
+        animation-fill-mode: forwards;
+        animation-delay: 1s;
+      }
+      @keyframes cloudLeft {
+        0% {
+          top: 17px;
+          left: 220px;
+          opacity: 0;
+        }
+        20% {
+          top: 33px;
+          left: 188px;
+          opacity: 1;
+        }
+        80% {
+          top: 81px;
+          left: 92px;
+          opacity: 1;
+        }
+        100% {
+          top: 97px;
+          left: 60px;
+          opacity: 0;
+        }
+      }
+      @keyframes cloudMid {
+        0% {
+          top: 10px;
+          left: 420px;
+          opacity: 0;
+        }
+        20% {
+          top: 40px;
+          left: 360px;
+          opacity: 1;
+        }
+        70% {
+          top: 130px;
+          left: 180px;
+          opacity: 1;
+        }
+        100% {
+          top: 160px;
+          left: 120px;
+          opacity: 0;
+        }
+      }
+      @keyframes cloudRight {
+        0% {
+          top: 100px;
+          left: 500px;
+          opacity: 0;
+        }
+        20% {
+          top: 120px;
+          left: 460px;
+          opacity: 1;
+        }
+        80% {
+          top: 180px;
+          left: 340px;
+          opacity: 1;
+        }
+        100% {
+          top: 200px;
+          left: 300px;
+          opacity: 0;
+        }
+      }
+    }
+  }
+  .bullshit {
+    position: relative;
+    float: left;
+    width: 300px;
+    padding: 30px 0;
+    overflow: hidden;
+    &__oops {
+      font-size: 32px;
+      font-weight: bold;
+      line-height: 40px;
+      color: #1482f0;
+      opacity: 0;
+      margin-bottom: 20px;
+      animation-name: slideUp;
+      animation-duration: 0.5s;
+      animation-fill-mode: forwards;
+    }
+    &__headline {
+      font-size: 20px;
+      line-height: 24px;
+      color: #222;
+      font-weight: bold;
+      opacity: 0;
+      margin-bottom: 10px;
+      animation-name: slideUp;
+      animation-duration: 0.5s;
+      animation-delay: 0.1s;
+      animation-fill-mode: forwards;
+    }
+    &__info {
+      font-size: 13px;
+      line-height: 21px;
+      color: grey;
+      opacity: 0;
+      margin-bottom: 30px;
+      animation-name: slideUp;
+      animation-duration: 0.5s;
+      animation-delay: 0.2s;
+      animation-fill-mode: forwards;
+    }
+    &__return-home {
+      display: block;
+      float: left;
+      width: 110px;
+      height: 36px;
+      background: #1482f0;
+      border-radius: 100px;
+      text-align: center;
+      color: #ffffff;
+      opacity: 0;
+      font-size: 14px;
+      line-height: 36px;
+      cursor: pointer;
+      animation-name: slideUp;
+      animation-duration: 0.5s;
+      animation-delay: 0.3s;
+      animation-fill-mode: forwards;
+    }
+    @keyframes slideUp {
+      0% {
+        transform: translateY(60px);
+        opacity: 0;
+      }
+      100% {
+        transform: translateY(0);
+        opacity: 1;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/system/log/components/Details.vue b/src/views/system/log/components/Details.vue
index de929a1..f2275f7 100644
--- a/src/views/system/log/components/Details.vue
+++ b/src/views/system/log/components/Details.vue
@@ -5,10 +5,11 @@
   </el-page-header>
   </div>
   <div slot="main">
-    <el-row :gutter="20">
-      <el-col :span="2" style="text-align:right">权限</el-col>
-      <el-col :span="18">222222</el-col>
-    </el-row>
+    <el-card class="box-card">
+  <div v-for="o in 4" :key="o" class="text item">
+    {{'列表内容 ' + o }}
+  </div>
+</el-card>
   </div>
 </zero-container>
 </template>
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
index e43fcd2..daf293c 100644
--- a/src/views/system/log/index.vue
+++ b/src/views/system/log/index.vue
@@ -7,7 +7,6 @@
         <el-form
           v-show="searchFormShow"
           :inline="true"
-          size="mini"
           :model="searchForm"
           class="zero-search-from"
         >
@@ -30,8 +29,8 @@
             <el-input v-model="searchForm.level" placeholder="请选择等级" clearable />
           </el-form-item>
           <el-form-item>
-            <el-button size="mini" type="primary" icon="el-icon-search" @click="getDataList()">搜索</el-button>
-            <el-button size="mini" icon="el-icon-refresh" @click="searchResetForm('tableRef')">重置</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="getDataList()">搜索</el-button>
+            <el-button icon="el-icon-refresh" @click="searchResetForm('tableRef')">重置</el-button>
           </el-form-item>
         </el-form>
       </el-collapse-transition>
@@ -42,7 +41,6 @@
       <el-table
         ref="tableRef"
         height="100%"
-        size="mini"
         v-loading="dataListLoading"
         :data="dataList"
         border
@@ -106,7 +104,6 @@
           <template slot-scope="scope">
             <el-button
               type="text"
-              size="mini"
               @click="viewDetails(scope.row)"
             >查看详情</el-button>
           </template>
diff --git a/src/views/system/power/index.vue b/src/views/system/power/index.vue
index cefc510..59ed5ad 100644
--- a/src/views/system/power/index.vue
+++ b/src/views/system/power/index.vue
@@ -2,8 +2,8 @@
   <zero-container>
     <!-- 头部信息-start -->
     <div slot="header">
-      <el-button size="mini" icon="el-icon-refresh" @click="refreshPage('tableRef')">刷新</el-button>
-      <el-button size="mini" type="primary" @click="initAddOrUpdate('addUpdateDialogRef')">新增</el-button>
+      <el-button icon="el-icon-refresh" @click="refreshPage('tableRef')">刷新</el-button>
+      <el-button type="primary" @click="initAddOrUpdate('addUpdateDialogRef')">新增</el-button>
     </div>
     <!-- 头部信息-end -->
     <!-- 右边信息-start -->
@@ -11,14 +11,12 @@
       <el-table
         ref="tableRef"
         height="100%"
-        size="mini"
         row-key="id"
         v-loading="dataListLoading"
         :data="dataList"
         border
         class="zero-table"
         style="width: 100%"
-        default-expand-all
         :tree-props="{children: 'children'}"
       >
         <el-table-column
@@ -83,17 +81,14 @@
           <template slot-scope="scope">
             <el-button
               type="text"
-              size="mini"
               @click="initAddOrUpdate('addUpdateDialogRef',scope.row,true)"
             >复制</el-button>
             <el-button
               type="text"
-              size="mini"
               @click="initAddOrUpdate('addUpdateDialogRef',scope.row)"
             >修改</el-button>
             <el-button
               type="text"
-              size="mini"
               @click="deleteHandle(scope.row,scope.row.name)"
             >删除</el-button>
           </template>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index bf9f064..b7390cc 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -4,14 +4,13 @@
     <div slot="header">
       <SearchHearder @searchOpen="searchOpen" />
       <!-- <div style="float:right"> -->
-      <el-button size="mini" type="primary" @click="initAddOrUpdate('addUpdateDialogRef')">新增</el-button>
-      <el-button size="mini" type="danger" @click="deleteHandle()" :disabled="batchBtnDisabled">批量删除</el-button>
+      <el-button type="primary" @click="initAddOrUpdate('addUpdateDialogRef')">新增</el-button>
+      <el-button  type="danger" @click="deleteHandle()" :disabled="batchBtnDisabled">批量删除</el-button>
       <!-- </div> -->
       <el-collapse-transition>
         <el-form
           v-show="searchFormShow"
           :inline="true"
-          size="mini"
           :model="searchForm"
           class="zero-search-from"
         >
@@ -19,8 +18,8 @@
             <el-input v-model="searchForm.name" placeholder="请输入角色名称" clearable />
           </el-form-item>
           <el-form-item>
-            <el-button size="mini" type="primary" icon="el-icon-search" @click="getDataList()">搜索</el-button>
-            <el-button size="mini" icon="el-icon-refresh" @click="searchResetForm('tableRef')">重置</el-button>
+            <el-button  type="primary" icon="el-icon-search" @click="getDataList()">搜索</el-button>
+            <el-button  icon="el-icon-refresh" @click="searchResetForm('tableRef')">重置</el-button>
           </el-form-item>
         </el-form>
       </el-collapse-transition>
@@ -31,7 +30,6 @@
       <el-table
         ref="tableRef"
         height="100%"
-        size="mini"
         v-loading="dataListLoading"
         :data="dataList"
         border
@@ -88,12 +86,10 @@
           <template slot-scope="scope">
             <el-button
               type="text"
-              size="mini"
               @click="initAddOrUpdate('addUpdateDialogRef',scope.row)"
             >修改</el-button>
             <el-button
               type="text"
-              size="mini"
               @click="deleteHandle(scope.row,scope.row.username)"
             >删除</el-button>
           </template>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 39c7f00..635917d 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -4,14 +4,13 @@
     <div slot="header">
       <SearchHearder @searchOpen="searchOpen" />
       <!-- <div style="float:right"> -->
-      <el-button v-if="$hasPermission(addUrl)" size="mini" type="primary" @click="initAddOrUpdate('addUpdateDialogRef')">新增</el-button>
-      <el-button v-if="$hasPermission(mixinViewModuleOptions.deleteUrl)" size="mini" type="danger" @click="deleteHandle()" :disabled="batchBtnDisabled">批量删除</el-button>
+      <el-button v-if="$hasPermission(addUrl)" type="primary" @click="initAddOrUpdate('addUpdateDialogRef')">新增</el-button>
+      <el-button v-if="$hasPermission(mixinViewModuleOptions.deleteUrl)" type="danger" @click="deleteHandle()" :disabled="batchBtnDisabled">批量删除</el-button>
       <!-- </div> -->
       <el-collapse-transition>
         <el-form
           v-show="searchFormShow"
           :inline="true"
-          size="mini"
           :model="searchForm"
           class="zero-search-from"
         >
@@ -19,8 +18,8 @@
             <el-input v-model="searchForm.username" placeholder="请输入用户名" clearable />
           </el-form-item>
           <el-form-item>
-            <el-button size="mini" type="primary" icon="el-icon-search" @click="getDataList()">搜索</el-button>
-            <el-button size="mini" icon="el-icon-refresh" @click="searchResetForm('tableRef')">重置</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="getDataList()">搜索</el-button>
+            <el-button icon="el-icon-refresh" @click="searchResetForm('tableRef')">重置</el-button>
           </el-form-item>
         </el-form>
       </el-collapse-transition>
@@ -37,7 +36,6 @@
       <el-table
         ref="tableRef"
         height="100%"
-        size="mini"
         v-loading="dataListLoading"
         :data="dataList"
         border
@@ -129,13 +127,11 @@
             <el-button
               v-if="$hasPermission(updateUrl)"
               type="text"
-              size="mini"
               @click="initAddOrUpdate('addUpdateDialogRef',scope.row)"
             >修改</el-button>
             <el-button
               v-if="$hasPermission(mixinViewModuleOptions.deleteUrl)"
               type="text"
-              size="mini"
               @click="deleteHandle(scope.row,scope.row.username)"
             >删除</el-button>
           </template>
@@ -226,8 +222,7 @@ export default {
 }
 </script>
 <style>
-.zero-search-from .el-form-item--mini.el-form-item,
-.zero-search-from .el-form-item--small.el-form-item {
+.zero-search-from {
   margin-bottom: 0px;
   padding-top: 10px;
 }
-- 
Gitee


From 9e37a55cf46f3fcb1c7986c92731af4ba15e78d5 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Tue, 7 Jul 2020 14:39:10 +0800
Subject: [PATCH 60/70] =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/{404_images => images/404}/404.png | Bin
 .../{404_images => images/404}/404_cloud.png  | Bin
 .../images/login}/login-code.png              | Bin
 .../image => assets/images/login}/logo@2x.png | Bin
 src/main.js                                   |  17 +++++++++-------
 src/router/routes.js                          |  10 ++++-----
 src/views/system/error/401/index.vue          |   3 ---
 src/views/system/error/404/index.vue          |  19 ++++++++----------
 src/views/system/login/index.vue              |   4 ++--
 9 files changed, 25 insertions(+), 28 deletions(-)
 rename src/assets/{404_images => images/404}/404.png (100%)
 rename src/assets/{404_images => images/404}/404_cloud.png (100%)
 rename src/{views/system/login/image => assets/images/login}/login-code.png (100%)
 rename src/{views/system/login/image => assets/images/login}/logo@2x.png (100%)
 delete mode 100644 src/views/system/error/401/index.vue

diff --git a/src/assets/404_images/404.png b/src/assets/images/404/404.png
similarity index 100%
rename from src/assets/404_images/404.png
rename to src/assets/images/404/404.png
diff --git a/src/assets/404_images/404_cloud.png b/src/assets/images/404/404_cloud.png
similarity index 100%
rename from src/assets/404_images/404_cloud.png
rename to src/assets/images/404/404_cloud.png
diff --git a/src/views/system/login/image/login-code.png b/src/assets/images/login/login-code.png
similarity index 100%
rename from src/views/system/login/image/login-code.png
rename to src/assets/images/login/login-code.png
diff --git a/src/views/system/login/image/logo@2x.png b/src/assets/images/login/logo@2x.png
similarity index 100%
rename from src/views/system/login/image/logo@2x.png
rename to src/assets/images/login/logo@2x.png
diff --git a/src/main.js b/src/main.js
index 0690f86..d008a2a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -42,6 +42,7 @@ new Vue({
   created () {
     // 处理路由 得到每一级的路由设置
     this.$store.commit('zerovue/page/init', frameInRoutes)
+    // 没有token不能请求接口
     if (util.storage.get('token')) {
       this.getMenuAndPower()
     }
@@ -59,13 +60,15 @@ new Vue({
   methods: {
     getMenuAndPower () {
       request({ url: '/sysUser/getMenuAndPower', method: 'get' }).then(res => {
-        const menu = handleMenu(res.data.menuInfo)
-        // 设置侧边栏菜单
-        this.$store.commit('zerovue/menu/asideSet', menu)
-        // 初始化菜单搜索功能
-        this.$store.commit('zerovue/search/init', menu)
-        // 权限
-        util.storage.set('powers', res.data.powerInfo)
+        if (res) {
+          const menu = handleMenu(res.data.menuInfo)
+          // 设置侧边栏菜单
+          this.$store.commit('zerovue/menu/asideSet', menu)
+          // 初始化菜单搜索功能
+          this.$store.commit('zerovue/search/init', menu)
+          // 权限
+          util.storage.set('powers', res.data.powerInfo)
+        }
       })
     }
   }
diff --git a/src/router/routes.js b/src/router/routes.js
index e9e9284..61a1485 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -100,14 +100,14 @@ const frameOut = [
  */
 const errorPage = [
   {
-    path: '/401',
-    name: '401',
-    component: _import('system/error/401')
+    path: '/404',
+    name: '404',
+    component: _import('system/error/404')
   },
   {
     path: '*',
-    name: '404',
-    component: _import('system/error/404')
+    redirect: '/404',
+    hidden: true
   }
 ]
 
diff --git a/src/views/system/error/401/index.vue b/src/views/system/error/401/index.vue
deleted file mode 100644
index 35fb4ba..0000000
--- a/src/views/system/error/401/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
-  <span>2222</span>
-</template>
diff --git a/src/views/system/error/404/index.vue b/src/views/system/error/404/index.vue
index 28d7aec..e0448c9 100644
--- a/src/views/system/error/404/index.vue
+++ b/src/views/system/error/404/index.vue
@@ -2,19 +2,16 @@
   <div class="wscn-http404-container">
     <div class="wscn-http404">
       <div class="pic-404">
-        <img class="pic-404__parent" src="@/assets/404_images/404.png" alt="404">
-        <img class="pic-404__child left" src="@/assets/404_images/404_cloud.png" alt="404">
-        <img class="pic-404__child mid" src="@/assets/404_images/404_cloud.png" alt="404">
-        <img class="pic-404__child right" src="@/assets/404_images/404_cloud.png" alt="404">
+        <img class="pic-404__parent" src="@/assets/images/404/404.png" alt="404">
+        <img class="pic-404__child left" src="@/assets/images/404/404_cloud.png" alt="404">
+        <img class="pic-404__child mid" src="@/assets/images/404/404_cloud.png" alt="404">
+        <img class="pic-404__child right" src="@/assets/images/404/404_cloud.png" alt="404">
       </div>
       <div class="bullshit">
         <div class="bullshit__oops">OOPS!</div>
-        <div class="bullshit__info">All rights reserved
-          <a style="color:#20a0ff" href="https://wallstreetcn.com" target="_blank">wallstreetcn</a>
-        </div>
         <div class="bullshit__headline">{{ message }}</div>
-        <div class="bullshit__info">Please check that the URL you entered is correct, or click the button below to return to the homepage.</div>
-        <a href="" class="bullshit__return-home">Back to home</a>
+        <div class="bullshit__info">请检查您输入的网址是否正确，请点击以下按钮返回主页或者发送错误报告</div>
+        <a href="" class="bullshit__return-home">返回首页</a>
       </div>
     </div>
   </div>
@@ -26,13 +23,13 @@ export default {
   name: 'Page404',
   computed: {
     message () {
-      return 'The webmaster said that you can not enter this page...'
+      return '网管说这个页面你不能进......'
     }
   }
 }
 </script>
 
-<style lang="scss" scoped>
+<style rel="stylesheet/scss" lang="scss" scoped>
 .wscn-http404-container{
   transform: translate(-50%,-50%);
   position: absolute;
diff --git a/src/views/system/login/index.vue b/src/views/system/login/index.vue
index 248cb71..93bcb42 100644
--- a/src/views/system/login/index.vue
+++ b/src/views/system/login/index.vue
@@ -18,7 +18,7 @@
           class="page-login--content-main"
           flex="dir:top main:center cross:center">
           <!-- logo -->
-          <img class="page-login--logo" src="./image/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">
@@ -50,7 +50,7 @@
                     v-model="formLogin.code"
                     placeholder="验证码">
                     <template slot="append">
-                      <img class="login-code" src="./image/login-code.png">
+                      <img class="login-code" src="@/assets/images/login/login-code.png">
                     </template>
                   </el-input>
                 </el-form-item>
-- 
Gitee


From 79a202c4441f6e10effc611929af93e2914e6596 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Tue, 7 Jul 2020 16:42:24 +0800
Subject: [PATCH 61/70] =?UTF-8?q?=E6=97=B6=E9=92=9F=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/header-clock/index.vue         | 75 +++++++++++++++++++
 src/layout/header-aside/layout.vue            |  8 +-
 src/views/system/user/index.vue               |  4 +-
 3 files changed, 83 insertions(+), 4 deletions(-)
 create mode 100644 src/layout/header-aside/components/header-clock/index.vue

diff --git a/src/layout/header-aside/components/header-clock/index.vue b/src/layout/header-aside/components/header-clock/index.vue
new file mode 100644
index 0000000..ed4b9bf
--- /dev/null
+++ b/src/layout/header-aside/components/header-clock/index.vue
@@ -0,0 +1,75 @@
+<template>
+  <div id="clock">
+    <p class="date">{{ date }}</p>
+    <p class="time">{{ time }}</p>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'zero-header-clock',
+  data () {
+    return {
+      time: '',
+      date: '',
+      week: ['SUN', 'MON', 'TUE', 'WED', 'THU', 'FRI', 'SAT']
+    }
+  },
+  created () {
+    setInterval(this.updateTime, 1000)
+  },
+  methods: {
+    updateTime () {
+      var cd = new Date()
+      this.time = this.zeroPadding(cd.getHours(), 2) + ':' + this.zeroPadding(cd.getMinutes(), 2) + ':' + this.zeroPadding(cd.getSeconds(), 2)
+      this.date = this.zeroPadding(cd.getFullYear(), 4) + '-' + this.zeroPadding(cd.getMonth() + 1, 2) + '-' + this.zeroPadding(cd.getDate(), 2) + ' ' + this.week[cd.getDay()]
+    },
+    zeroPadding (num, digit) {
+      var zero = ''
+      for (var i = 0; i < digit; i++) {
+        zero += '0'
+      }
+      return (zero + num).slice(-digit)
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+html, body {
+  height: 100%;
+}
+
+body {
+  background: #0f3854;
+  background: -webkit-radial-gradient(center ellipse, #0a2e38 0%, #000000 70%);
+  background: radial-gradient(ellipse at center, #0a2e38 0%, #000000 70%);
+  background-size: 100%;
+  text-align: center;
+}
+
+p {
+  margin: 0;
+  padding: 0;
+}
+
+#clock {
+  font-family: 'Share Tech Mono', monospace;
+  text-align: center;
+}
+#clock .time {
+  letter-spacing: 0.05em;
+  font-size: 24px;
+  padding: 5px 0;
+}
+#clock .date {
+  letter-spacing: 0.1em;
+  font-size: 24px;
+}
+#clock .text {
+  letter-spacing: 0.1em;
+  font-size: 12px;
+  padding: 20px 0 0;
+}
+
+</style>
diff --git a/src/layout/header-aside/layout.vue b/src/layout/header-aside/layout.vue
index d0d6c8c..27dc5fe 100644
--- a/src/layout/header-aside/layout.vue
+++ b/src/layout/header-aside/layout.vue
@@ -17,7 +17,9 @@
         <div class="toggle-aside-btn" @click="handleToggleAside" flex-box="0">
           <zero-icon name="bars"/>
         </div>
-        <span flex-box="1"/>
+        <div flex-box="1">
+          <zeroHeaderClock />
+        </div>
         <!-- 顶栏右侧 -->
         <div class="zero-header-right" flex-box="0">
           <!-- 如果你只想在开发环境显示这个按钮请添加 v-if="$env === 'development'" -->
@@ -84,6 +86,7 @@ import zeroHeaderSize from './components/header-size'
 import zeroHeaderTheme from './components/header-theme'
 import zeroHeaderUser from './components/header-user'
 import zeroHeaderColor from './components/header-color'
+import zeroHeaderClock from './components/header-clock'
 import { mapState, mapGetters, mapActions } from 'vuex'
 import mixinSearch from './mixins/search'
 export default {
@@ -100,7 +103,8 @@ export default {
     zeroHeaderSize,
     zeroHeaderTheme,
     zeroHeaderUser,
-    zeroHeaderColor
+    zeroHeaderColor,
+    zeroHeaderClock
   },
   data () {
     return {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 635917d..105f433 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -223,8 +223,8 @@ export default {
 </script>
 <style>
 .zero-search-from {
-  margin-bottom: 0px;
-  padding-top: 10px;
+  margin-bottom: -10px;
+  padding-top: 15px;
 }
 .zero-table.el-table--fit.el-table--border {
   border: 0px !important;
-- 
Gitee


From 10ee9f2a8943fa05d4ffa08aeb7c1fdee40c5081 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Tue, 7 Jul 2020 17:55:50 +0800
Subject: [PATCH 62/70] =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/header-clock/index.vue         | 23 +++++--------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/layout/header-aside/components/header-clock/index.vue b/src/layout/header-aside/components/header-clock/index.vue
index ed4b9bf..6527a39 100644
--- a/src/layout/header-aside/components/header-clock/index.vue
+++ b/src/layout/header-aside/components/header-clock/index.vue
@@ -1,19 +1,19 @@
 <template>
   <div id="clock">
-    <p class="date">{{ date }}</p>
     <p class="time">{{ time }}</p>
+    <p class="date">{{ date }}</p>
   </div>
 </template>
 
 <script>
-
+import dayjs from 'dayjs'
 export default {
   name: 'zero-header-clock',
   data () {
     return {
       time: '',
       date: '',
-      week: ['SUN', 'MON', 'TUE', 'WED', 'THU', 'FRI', 'SAT']
+      week: ['星期天', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六']
     }
   },
   created () {
@@ -21,16 +21,8 @@ export default {
   },
   methods: {
     updateTime () {
-      var cd = new Date()
-      this.time = this.zeroPadding(cd.getHours(), 2) + ':' + this.zeroPadding(cd.getMinutes(), 2) + ':' + this.zeroPadding(cd.getSeconds(), 2)
-      this.date = this.zeroPadding(cd.getFullYear(), 4) + '-' + this.zeroPadding(cd.getMonth() + 1, 2) + '-' + this.zeroPadding(cd.getDate(), 2) + ' ' + this.week[cd.getDay()]
-    },
-    zeroPadding (num, digit) {
-      var zero = ''
-      for (var i = 0; i < digit; i++) {
-        zero += '0'
-      }
-      return (zero + num).slice(-digit)
+      this.time = dayjs().format('HH:mm:ss')
+      this.date = dayjs().format('YYYY-MM-DD') + ' ' + this.week[dayjs().day()]
     }
   }
 }
@@ -58,16 +50,13 @@ p {
   text-align: center;
 }
 #clock .time {
-  letter-spacing: 0.05em;
   font-size: 24px;
-  padding: 5px 0;
 }
 #clock .date {
-  letter-spacing: 0.1em;
   font-size: 24px;
+  padding: 5px 0;
 }
 #clock .text {
-  letter-spacing: 0.1em;
   font-size: 12px;
   padding: 20px 0 0;
 }
-- 
Gitee


From 2a8a0cc6bf68192fdbe434bbf1792d8a871c0c27 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Wed, 8 Jul 2020 17:08:58 +0800
Subject: [PATCH 63/70] =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                |  1 +
 src/main.js                                 |  2 +
 src/router/routes.js                        |  8 ----
 src/views/system/log/components/Details.vue | 36 ---------------
 src/views/system/log/components/Drawer.vue  | 51 +++++++++++++++++++++
 src/views/system/log/index.vue              |  7 ++-
 6 files changed, 59 insertions(+), 46 deletions(-)
 delete mode 100644 src/views/system/log/components/Details.vue
 create mode 100644 src/views/system/log/components/Drawer.vue

diff --git a/package.json b/package.json
index ed32be1..cd35972 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
     "ua-parser-js": "^0.7.20",
     "vue": "^2.6.11",
     "vue-i18n": "^8.15.1",
+    "vue-json-viewer": "^2.2.12",
     "vue-router": "^3.1.3",
     "vuex": "^3.1.2"
   },
diff --git a/src/main.js b/src/main.js
index d008a2a..c5efe3f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -17,8 +17,10 @@ import 'e-icon-picker/dist/index.css'// 基础样式
 import 'e-icon-picker/dist/main.css' // fontAwesome 图标库样式
 import util from '@/libs/util.js'
 import JSEncrypt from 'jsencrypt'
+import JsonViewer from 'vue-json-viewer'
 
 Vue.use(iconPicker)
+Vue.use(JsonViewer)
 
 // 核心插件
 Vue.use(zeroVue)
diff --git a/src/router/routes.js b/src/router/routes.js
index 61a1485..f9047cb 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -57,14 +57,6 @@ const frameIn = [
         },
         component: _import('system/log')
       },
-      {
-        path: '/SysLogDetails', // 日志详情页
-        name: 'SysLogDetails',
-        meta: {
-          title: '系统日志详情'
-        },
-        component: _import('system/log/components/Details')
-      },
       // 刷新页面 必须保留
       {
         path: '/refresh',
diff --git a/src/views/system/log/components/Details.vue b/src/views/system/log/components/Details.vue
deleted file mode 100644
index f2275f7..0000000
--- a/src/views/system/log/components/Details.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
-<zero-container>
-  <div slot="header">
-  <el-page-header @back="goBack" content="详情页面">
-  </el-page-header>
-  </div>
-  <div slot="main">
-    <el-card class="box-card">
-  <div v-for="o in 4" :key="o" class="text item">
-    {{'列表内容 ' + o }}
-  </div>
-</el-card>
-  </div>
-</zero-container>
-</template>
-
-<script>
-export default {
-  name: 'Details',
-  props: {
-    method: String,
-    browser: String,
-    data: String
-  },
-  data () {
-    return {
-      searchForm: {}
-    }
-  },
-  methods: {
-    goBack () {
-      console.log('go back')
-    }
-  }
-}
-</script>
diff --git a/src/views/system/log/components/Drawer.vue b/src/views/system/log/components/Drawer.vue
new file mode 100644
index 0000000..91e040a
--- /dev/null
+++ b/src/views/system/log/components/Drawer.vue
@@ -0,0 +1,51 @@
+<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>
+</template>
+
+<script>
+export default {
+  name: 'Drawer',
+  data () {
+    return {
+      drawerSync: false,
+      method: '',
+      browser: '',
+      data: ''
+    }
+  },
+  created () {},
+  methods: {
+    initDrawer (row) {
+      this.drawerSync = true
+      this.method = row.method
+      this.browser = JSON.parse(row.browser)
+      this.data = JSON.parse(row.data)
+    }
+  }
+}
+</script>
+<style>
+/* 去掉选中时的boder */
+:focus {
+  outline: 0;
+}
+.drawer-title {
+  text-align: right;
+}
+.el-row {
+  margin-bottom: 20px;
+}
+.el-drawer {
+  overflow: auto;
+}
+</style>
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
index daf293c..42d6023 100644
--- a/src/views/system/log/index.vue
+++ b/src/views/system/log/index.vue
@@ -109,6 +109,7 @@
           </template>
         </el-table-column>
       </el-table>
+      <Drawer ref="drawerRef"/>
     </div>
     <!-- 右边信息-end -->
     <!-- 页脚-start -->
@@ -134,12 +135,14 @@
 import mixinViewModule from '@/mixins/view-module' // 分页相关js
 import SearchHearder from '@/components/search-hearder/SearchHearder' // 头部查询模块
 import PageFooter from '@/components/page-footer/PageFooter' // 分页模块
+import Drawer from './components/Drawer' // 分页模块
 export default {
   name: 'SysLog',
   mixins: [mixinViewModule],
   components: {
     SearchHearder,
-    PageFooter
+    PageFooter,
+    Drawer
   },
   data () {
     return {
@@ -150,7 +153,7 @@ export default {
   },
   methods: {
     viewDetails (row) {
-      this.$router.push('/SysLogDetails')
+      this.$refs.drawerRef.initDrawer(row)
     }
   }
 }
-- 
Gitee


From a2db8b519ea871f7b043be05204c9f360a4cbd1e Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Wed, 8 Jul 2020 17:31:09 +0800
Subject: [PATCH 64/70] 1

---
 src/views/system/log/components/Drawer.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/views/system/log/components/Drawer.vue b/src/views/system/log/components/Drawer.vue
index 91e040a..390e32d 100644
--- a/src/views/system/log/components/Drawer.vue
+++ b/src/views/system/log/components/Drawer.vue
@@ -39,12 +39,6 @@ export default {
 :focus {
   outline: 0;
 }
-.drawer-title {
-  text-align: right;
-}
-.el-row {
-  margin-bottom: 20px;
-}
 .el-drawer {
   overflow: auto;
 }
-- 
Gitee


From 6c86bf044c16a2238efd113405d2bbd75f6428ca Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Mon, 13 Jul 2020 22:33:25 +0800
Subject: [PATCH 65/70] 1

---
 public/index.html                             |   4 +-
 .../components/header-user/index.vue          |   9 +-
 src/main.js                                   | 110 +++++++-----
 src/router/index.js                           |  42 ++++-
 src/router/routes.js                          | 157 ++++++------------
 src/views/system/login/index.vue              |  27 +++
 6 files changed, 194 insertions(+), 155 deletions(-)

diff --git a/public/index.html b/public/index.html
index 9ae7edf..f9fb2e0 100644
--- a/public/index.html
+++ b/public/index.html
@@ -23,11 +23,11 @@
       .zero-home__footer > a { font-size: 12px; color: #ABABAB; text-decoration: none; }
       .zero-home__loading { height: 32px; width: 32px; margin-bottom: 20px; }
     </style>
-    <script>
+    <!-- <script>
       var _hmt = _hmt || [];
       var hmid = "bc38887aa5588add05a38704342ad7e8";
       (function() { var hm = document.createElement("script"); hm.src = "https://hm.baidu.com/hm.js?" + hmid; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(hm, s);})();
-    </script>
+    </script> -->
   </head>
   <body>
     <noscript>
diff --git a/src/layout/header-aside/components/header-user/index.vue b/src/layout/header-aside/components/header-user/index.vue
index 3f33a52..531a13d 100644
--- a/src/layout/header-aside/components/header-user/index.vue
+++ b/src/layout/header-aside/components/header-user/index.vue
@@ -32,15 +32,18 @@ export default {
     logOff () {
       const config = {
         url: '/sysLogout',
-        method: 'post'
+        method: 'post',
+        headers: {
+          Authorization: util.storage.get('token')
+        }
       }
       MessageBox.confirm('确定要注销当前用户吗', '注销用户', { type: 'warning' })
         .then(() => {
           // 跳转路由
           this.$router.push({ name: 'login' })
-          this.$axios(config).then(() => {
           // 删除
-            util.storage.removeAll()
+          util.storage.removeAll()
+          this.$axios(config).then(() => {
             // 清空 vuex 用户信息
             this.$store.dispatch('zerovue/user/set', {}, { root: true })
           })
diff --git a/src/main.js b/src/main.js
index c5efe3f..e5b7861 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,8 +8,7 @@ import zeroVue from '@/plugin/zerovue'
 import store from '@/store/index'
 
 // 菜单和路由设置
-import router from './router'
-import { frameInRoutes } from '@/router/routes'
+import router, { constantRoutes, createRoutesInLayout, routesOutLayout, resetRouter } from './router'
 import { request } from './api/axios'
 import { hasPermission, handleMenu } from './api/common'
 import iconPicker from 'e-icon-picker'
@@ -18,6 +17,9 @@ import 'e-icon-picker/dist/main.css' // fontAwesome 图标库样式
 import util from '@/libs/util.js'
 import JSEncrypt from 'jsencrypt'
 import JsonViewer from 'vue-json-viewer'
+import layoutHeaderAside from '@/layout/header-aside'
+// 由于懒加载页面太多的话会造成webpack热更新太慢，所以开发环境不使用懒加载，只有生产环境使用懒加载
+const _import = require('@/libs/util.import.' + process.env.NODE_ENV)
 
 Vue.use(iconPicker)
 Vue.use(JsonViewer)
@@ -36,42 +38,72 @@ Vue.prototype.$getRsaCode = function (str) { // 注册方法
   const data = encryptStr.encrypt(str.toString()) // 进行加密
   return data
 }
-new Vue({
-  router,
-  store,
-  i18n,
-  render: h => h(App),
-  created () {
-    // 处理路由 得到每一级的路由设置
-    this.$store.commit('zerovue/page/init', frameInRoutes)
-    // 没有token不能请求接口
-    if (util.storage.get('token')) {
-      this.getMenuAndPower()
-    }
-  },
-  mounted () {
-    // 展示系统信息
-    this.$store.commit('zerovue/releases/versionShow')
-    // 用户登录后从数据库加载一系列的设置
-    this.$store.dispatch('zerovue/account/load')
-    // 获取并记录用户 UA
-    this.$store.commit('zerovue/ua/get')
-    // 初始化全屏监听
-    this.$store.dispatch('zerovue/fullscreen/listen')
-  },
-  methods: {
-    getMenuAndPower () {
-      request({ url: '/sysUser/getMenuAndPower', method: 'get' }).then(res => {
-        if (res) {
-          const menu = handleMenu(res.data.menuInfo)
-          // 设置侧边栏菜单
-          this.$store.commit('zerovue/menu/asideSet', menu)
-          // 初始化菜单搜索功能
-          this.$store.commit('zerovue/search/init', menu)
-          // 权限
-          util.storage.set('powers', res.data.powerInfo)
+var zero = [
+  {
+    path: '/',
+    redirect: { name: 'index' },
+    component: layoutHeaderAside,
+    children: [
+      // 首页路由不需要权限
+      { path: '/index', name: 'index', meta: { title: '首页' }, component: _import('system/index') },
+      { path: '/SysUser', name: 'SysUser', meta: { title: '系统用户', auth: '/sysUser/pageList' }, component: _import('system/user') },
+      { path: '/SysRole', name: 'SysRole', meta: { title: '系统角色', auth: '/sysRole/pageList' }, component: _import('system/role') },
+      { path: '/SysPower', name: 'SysPower', meta: { title: '系统权限', auth: '/sysPower/tree' }, component: _import('system/power') },
+      { path: '/SysLog', name: 'SysLog', meta: { title: '系统日志', auth: '/sysLog/pageList' }, component: _import('system/log') }
+
+    ]
+  }
+
+]
+request({ url: '/sysUser/getMenuAndPower', method: 'get' }).then(res => {
+  console.log(res)
+  if (res) {
+    // [ 路由 ] 计算路由
+    const routes = createRoutesInLayout(zero).concat(routesOutLayout)
+    // console.log(routes)
+    // [ 路由 ] 重新设置路由
+    resetRouter(routes)
+
+    new Vue({
+      router,
+      store,
+      i18n,
+      render: h => h(App),
+      created () {
+        // 没有token不能请求接口
+        if (util.storage.get('token')) {
+          this.getMenuAndPower()
+          // 处理路由 得到每一级的路由设置
+          this.$store.commit('zerovue/page/init', constantRoutes)
+        } else {
+          this.$store.commit('zerovue/page/init', constantRoutes)
+        }
+      },
+      mounted () {
+        // 展示系统信息
+        this.$store.commit('zerovue/releases/versionShow')
+        // 用户登录后从数据库加载一系列的设置
+        this.$store.dispatch('zerovue/account/load')
+        // 获取并记录用户 UA
+        this.$store.commit('zerovue/ua/get')
+        // 初始化全屏监听
+        this.$store.dispatch('zerovue/fullscreen/listen')
+      },
+      methods: {
+        getMenuAndPower () {
+          request({ url: '/sysUser/getMenuAndPower', method: 'get' }).then(res => {
+            if (res) {
+              const menu = handleMenu(res.data.menuInfo)
+              // 设置侧边栏菜单
+              this.$store.commit('zerovue/menu/asideSet', menu)
+              // 初始化菜单搜索功能
+              this.$store.commit('zerovue/search/init', menu)
+              // 权限
+              util.storage.set('powers', res.data.powerInfo)
+            }
+          })
         }
-      })
-    }
+      }
+    }).$mount('#app')
   }
-}).$mount('#app')
+})
diff --git a/src/router/index.js b/src/router/index.js
index e1b4bb5..96e3ad5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -9,9 +9,11 @@ import store from '@/store/index'
 import util from '@/libs/util.js'
 
 // 路由数据
-import routes from './routes'
 import { hasPermission } from '@/api/common'
 
+// 由于懒加载页面太多的话会造成webpack热更新太慢，所以开发环境不使用懒加载，只有生产环境使用懒加载
+const _import = require('@/libs/util.import.' + process.env.NODE_ENV)
+
 // fix vue-router NavigationDuplicated
 const VueRouterPush = VueRouter.prototype.push
 VueRouter.prototype.push = function push (location) {
@@ -24,11 +26,45 @@ VueRouter.prototype.replace = function replace (location) {
 
 Vue.use(VueRouter)
 
-// 导出路由 在 main.js 里使用
-const router = new VueRouter({
+/**
+ * @description 创建在 layout 中显示的路由设置
+ * @param {Array} routes 动态路由设置
+ */
+export function createRoutesInLayout (routes = []) {
+  return [...routes]
+}
+
+// 在 layout 之外显示的路由
+export const routesOutLayout = [
+  { path: '/refresh', name: 'refresh', component: _import('system/function/refresh'), hidden: true },
+  { path: '/redirect/:route*', name: 'redirect', component: _import('system/function/redirect'), hidden: true },
+  { path: '/login', name: 'login', component: _import('system/login'), hidden: true },
+  { path: '/404', name: '404', component: _import('system/error/404'), hidden: true },
+  { path: '*', redirect: '/404', hidden: true }
+]
+
+// 默认的路由
+export const constantRoutes = createRoutesInLayout().concat(routesOutLayout)
+
+/**
+ * @description 创建路由
+ * @param {Array} routes 路由设置
+ */
+export const createRouter = (routes = []) => new VueRouter({
+  scrollBehavior: () => ({ y: 0 }),
   routes
 })
 
+// 导出路由 在 main.js 里使用
+const router = createRouter(constantRoutes)
+
+/**
+ * @description 重新设置路由
+ * @param {Array} routes 额外追加的路由
+ */
+export function resetRouter (routes = []) {
+  router.matcher = createRouter(routes).matcher
+}
 /**
  * 路由拦截
  * 权限验证
diff --git a/src/router/routes.js b/src/router/routes.js
index f9047cb..521a06a 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -1,114 +1,55 @@
-import layoutHeaderAside from '@/layout/header-aside'
+// import layoutHeaderAside from '@/layout/header-aside'
 
-// 由于懒加载页面太多的话会造成webpack热更新太慢，所以开发环境不使用懒加载，只有生产环境使用懒加载
-const _import = require('@/libs/util.import.' + process.env.NODE_ENV)
+// // 由于懒加载页面太多的话会造成webpack热更新太慢，所以开发环境不使用懒加载，只有生产环境使用懒加载
+// const _import = require('@/libs/util.import.' + process.env.NODE_ENV)
 
-/**
- * 在主框架内显示
- */
-const frameIn = [
-  {
-    path: '/',
-    redirect: { name: 'index' },
-    component: layoutHeaderAside,
-    children: [
-      // 首页路由不需要权限
-      {
-        path: '/index',
-        name: 'index',
-        meta: {
-          title: '首页'
-        },
-        component: _import('system/index')
-      },
-      {
-        path: '/SysUser',
-        name: 'SysUser',
-        meta: {
-          title: '系统用户',
-          auth: '/sysUser/pageList'
-        },
-        component: _import('system/user')
-      },
-      {
-        path: '/SysRole',
-        name: 'SysRole',
-        meta: {
-          title: '系统角色',
-          auth: '/sysRole/pageList'
-        },
-        component: _import('system/role')
-      },
-      {
-        path: '/SysPower',
-        name: 'SysPower',
-        meta: {
-          title: '系统权限',
-          auth: '/sysPower/tree'
-        },
-        component: _import('system/power')
-      },
-      {
-        path: '/SysLog',
-        name: 'SysLog',
-        meta: {
-          title: '系统日志',
-          auth: '/sysLog/pageList'
-        },
-        component: _import('system/log')
-      },
-      // 刷新页面 必须保留
-      {
-        path: '/refresh',
-        name: 'refresh',
-        hidden: true,
-        component: _import('system/function/refresh')
-      },
-      // 页面重定向 必须保留
-      {
-        path: 'redirect/:route*',
-        name: 'redirect',
-        hidden: true,
-        component: _import('system/function/redirect')
-      }
-    ]
-  }
-]
+// /**
+//  * 在主框架内显示
+//  */
+// const frameIn = [
+//   {
+//     path: '/',
+//     redirect: { name: 'index' },
+//     component: layoutHeaderAside,
+//     children: [
+//       // 首页路由不需要权限
+//       { path: '/index', name: 'index', meta: { title: '首页' }, component: _import('system/index') },
+//       { path: '/SysUser', name: 'SysUser', meta: { title: '系统用户', auth: '/sysUser/pageList' }, component: _import('system/user') },
+//       { path: '/SysRole', name: 'SysRole', meta: { title: '系统角色', auth: '/sysRole/pageList' }, component: _import('system/role') },
+//       { path: '/SysPower', name: 'SysPower', meta: { title: '系统权限', auth: '/sysPower/tree' }, component: _import('system/power') },
+//       { path: '/SysLog', name: 'SysLog', meta: { title: '系统日志', auth: '/sysLog/pageList' }, component: _import('system/log') }
 
-/**
- * 在主框架之外显示
- */
-const frameOut = [
-  // 登录
-  {
-    path: '/login',
-    name: 'login',
-    component: _import('system/login')
-  }
-]
+//     ]
+//   }
+// ]
 
-/**
- * 错误页面
- */
-const errorPage = [
-  {
-    path: '/404',
-    name: '404',
-    component: _import('system/error/404')
-  },
-  {
-    path: '*',
-    redirect: '/404',
-    hidden: true
-  }
-]
+// /**
+//  * 在主框架之外显示
+//  */
+// const frameOut = [
+//   // 登录
+//   { path: '/login', name: 'login', component: _import('system/login') }
+// ]
 
-// 导出需要显示菜单的
-export const frameInRoutes = frameIn
+// /**
+//  * 错误页面
+//  */
+// const errorPage = [
+//   // 刷新页面 必须保留
+//   { path: '/refresh', name: 'refresh', component: _import('system/function/refresh'), hidden: true },
+//   // 页面重定向 必须保留
+//   { path: 'redirect/:route*', name: 'redirect', component: _import('system/function/redirect'), hidden: true },
+//   { path: '/login', name: 'login', component: _import('system/login'), hidden: true },
+//   { path: '/404', name: '404', component: _import('system/error/404'), hidden: true },
+//   { path: '*', redirect: '/404', hidden: true }
+// ]
 
-// 重新组织后导出
-export default [
-  ...frameIn,
-  ...frameOut,
-  ...errorPage
-]
+// // 导出需要显示菜单的
+// export const frameInRoutes = frameIn
+
+// // 重新组织后导出
+// export default [
+//   ...frameIn,
+//   ...frameOut,
+//   ...errorPage
+// ]
diff --git a/src/views/system/login/index.vue b/src/views/system/login/index.vue
index 93bcb42..31b2837 100644
--- a/src/views/system/login/index.vue
+++ b/src/views/system/login/index.vue
@@ -103,6 +103,10 @@
 <script>
 import localeMixin from '@/locales/mixin.js'
 import util from '@/libs/util.js'
+import { createRoutesInLayout, routesOutLayout, resetRouter } from '@/router'
+import layoutHeaderAside from '@/layout/header-aside'
+// 由于懒加载页面太多的话会造成webpack热更新太慢，所以开发环境不使用懒加载，只有生产环境使用懒加载
+const _import = require('@/libs/util.import.' + process.env.NODE_ENV)
 export default {
   name: 'login',
   mixins: [
@@ -185,6 +189,29 @@ export default {
             this.$store.dispatch('zerovue/account/load')
             // 处理菜单和权限
             this.handleMenuAndPower(res.data)
+            var zero = [
+              {
+                path: '/',
+                redirect: { name: 'index' },
+                component: layoutHeaderAside,
+                children: [
+                  // 首页路由不需要权限
+                  { path: '/index', name: 'index', meta: { title: '首页' }, component: _import('system/index') },
+                  { path: '/SysUser', name: 'SysUser', meta: { title: '系统用户', auth: '/sysUser/pageList' }, component: _import('system/user') },
+                  { path: '/SysRole', name: 'SysRole', meta: { title: '系统角色', auth: '/sysRole/pageList' }, component: _import('system/role') },
+                  { path: '/SysPower', name: 'SysPower', meta: { title: '系统权限', auth: '/sysPower/tree' }, component: _import('system/power') },
+                  { path: '/SysLog', name: 'SysLog', meta: { title: '系统日志', auth: '/sysLog/pageList' }, component: _import('system/log') }
+
+                ]
+              }
+
+            ]
+            // [ 路由 ] 计算路由
+            const routes = createRoutesInLayout(zero).concat(routesOutLayout)
+            // [ 路由 ] 重新设置路由
+            resetRouter(routes)
+            // [ 路由 ] 重新设置多标签页池
+            this.$store.commit('zerovue/page/init', routes, { root: true })
             // 重定向对象不存在则返回顶层路径
             this.$router.replace(this.$route.query.redirect || '/')
             this.loading = false
-- 
Gitee


From d11f26edfc79c31ad6a6551f00139e8c9fe3f91e Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Tue, 14 Jul 2020 14:15:31 +0800
Subject: [PATCH 66/70] =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E5=92=8C=E5=8A=A8=E6=80=81=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   2 +-
 src/api/common.js                             |  36 ++++++
 .../header-aside/components/tabs/index.vue    |   6 +-
 src/layout/header-aside/layout.vue            |   2 +-
 src/libs/util.import.development.js           |   2 +-
 src/libs/util.import.production.js            |   2 +-
 src/main.js                                   | 108 +++++++-----------
 src/router/index.js                           |  25 ++--
 src/router/routes.js                          |  55 ---------
 src/setting.js                                |   4 +-
 src/store/modules/zerovue/modules/page.js     |  16 +--
 src/views/{system => }/index/index.vue        |   2 +-
 src/views/{system => sys}/error/404/index.vue |   0
 .../function/redirect/index.js                |   0
 .../{system => sys}/function/refresh/index.js |   0
 .../{system => sys}/log/components/Drawer.vue |   0
 src/views/{system => sys}/log/index.vue       |   0
 src/views/{system => sys}/login/index.vue     |  26 +----
 .../power/components/AddUpdateForm.vue        |   0
 src/views/{system => sys}/power/index.vue     |   0
 .../role/components/AddUpdateForm.vue         |   0
 .../role/components/PowerTree.vue             |   0
 src/views/{system => sys}/role/index.vue      |   0
 .../user/components/AddUpdateForm.vue         |   0
 .../user/components/DemoTreeSide.vue          |   0
 src/views/{system => sys}/user/index.vue      |   0
 26 files changed, 108 insertions(+), 178 deletions(-)
 rename src/views/{system => }/index/index.vue (95%)
 rename src/views/{system => sys}/error/404/index.vue (100%)
 rename src/views/{system => sys}/function/redirect/index.js (100%)
 rename src/views/{system => sys}/function/refresh/index.js (100%)
 rename src/views/{system => sys}/log/components/Drawer.vue (100%)
 rename src/views/{system => sys}/log/index.vue (100%)
 rename src/views/{system => sys}/login/index.vue (89%)
 rename src/views/{system => sys}/power/components/AddUpdateForm.vue (100%)
 rename src/views/{system => sys}/power/index.vue (100%)
 rename src/views/{system => sys}/role/components/AddUpdateForm.vue (100%)
 rename src/views/{system => sys}/role/components/PowerTree.vue (100%)
 rename src/views/{system => sys}/role/index.vue (100%)
 rename src/views/{system => sys}/user/components/AddUpdateForm.vue (100%)
 rename src/views/{system => sys}/user/components/DemoTreeSide.vue (100%)
 rename src/views/{system => sys}/user/index.vue (100%)

diff --git a/package.json b/package.json
index cd35972..c2cf722 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "zero-vue",
   "version": "1.2.0",
   "scripts": {
-    "serve": "vue-cli-service serve --open",
+    "serve": "vue-cli-service serve --copy",
     "start": "npm run serve",
     "dev": "npm run serve",
     "build": "vue-cli-service build",
diff --git a/src/api/common.js b/src/api/common.js
index 6256a41..15168ef 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -1,6 +1,9 @@
 
 import { uniqueId } from 'lodash'
 import util from '@/libs/util.js'
+import layoutHeaderAside from '@/layout/header-aside'
+// 由于懒加载页面太多的话会造成webpack热更新太慢，所以开发环境不使用懒加载，只有生产环境使用懒加载
+const _import = require('@/libs/util.import.' + process.env.NODE_ENV)
 
 /**
  * 权限
@@ -33,3 +36,36 @@ export function handleMenu (data) {
     }
   }))
 }
+/**
+ * 处理处理路由
+ * @param {*}
+ */
+export function handleRouter (data) {
+  /**
+   * type ==0菜单，type==1路由，type==2权限
+   * 将第一个路由设置为首页
+   */
+  var routerArray = {}
+  for (var item in data) {
+    var router = data[item]
+    if (item === '0') {
+      routerArray.path = '/'
+      routerArray.redirect = router.path.substr(1)
+      routerArray.component = layoutHeaderAside
+      routerArray.children = [{
+        path: router.path,
+        name: router.path.substr(1),
+        meta: { title: router.name },
+        component: _import(router.path.substr(1).replace(/([A-Z])/g, '/$1').toLowerCase())
+      }]
+    } else {
+      routerArray.children.push({
+        path: router.path,
+        name: router.path.substr(1),
+        meta: { title: router.name },
+        component: _import(router.path.substr(1).replace(/([A-Z])/g, '/$1').toLowerCase())
+      })
+    }
+  }
+  return [routerArray]
+}
diff --git a/src/layout/header-aside/components/tabs/index.vue b/src/layout/header-aside/components/tabs/index.vue
index 4e23d6a..125b059 100644
--- a/src/layout/header-aside/components/tabs/index.vue
+++ b/src/layout/header-aside/components/tabs/index.vue
@@ -7,7 +7,7 @@
           :x="contentmenuX"
           :y="contentmenuY">
           <zero-contextmenu-list
-            :menulist="tagName === '/index' ? contextmenuListIndex : contextmenuList"
+            :menulist="tagName === '/Index' ? contextmenuListIndex : contextmenuList"
             @rowClick="contextmenuClick"/>
         </zero-contextmenu>
         <el-tabs
@@ -79,7 +79,7 @@ export default {
         { icon: 'times', title: '关闭其它', value: 'other' },
         { icon: 'times-circle', title: '关闭全部', value: 'all' }
       ],
-      tagName: '/index'
+      tagName: '/Index'
     }
   },
   computed: {
@@ -102,7 +102,7 @@ export default {
      * @param {Object} page 其中一个标签页
      */
     isTabClosable (page) {
-      return page.name !== 'index'
+      return page.name !== 'Index'
     },
     /**
      * @description 右键菜单功能点击
diff --git a/src/layout/header-aside/layout.vue b/src/layout/header-aside/layout.vue
index 27dc5fe..cecce96 100644
--- a/src/layout/header-aside/layout.vue
+++ b/src/layout/header-aside/layout.vue
@@ -7,7 +7,7 @@
       <!-- 顶栏 -->
       <div class="zero-theme-header" :style="{ opacity: this.searchActive ? 0.5 : 1 }" flex-box="0" flex>
         <router-link
-          to="/index"
+          to="/Index"
           :class="{'logo-group': true, 'logo-transition': asideTransition}"
           :style="{width: asideCollapse ? asideWidthCollapse : asideWidth}"
           flex-box="0">
diff --git a/src/libs/util.import.development.js b/src/libs/util.import.development.js
index f97259b..ed97bc9 100644
--- a/src/libs/util.import.development.js
+++ b/src/libs/util.import.development.js
@@ -1 +1 @@
-module.exports = file => require('@/views/' + file).default
+module.exports = file => require('@/views' + file).default
diff --git a/src/libs/util.import.production.js b/src/libs/util.import.production.js
index 87b91d6..9ee64a0 100644
--- a/src/libs/util.import.production.js
+++ b/src/libs/util.import.production.js
@@ -1 +1 @@
-module.exports = file => () => import('@/views/' + file)
+module.exports = file => () => import('@/views' + file)
diff --git a/src/main.js b/src/main.js
index e5b7861..1d1d6d9 100644
--- a/src/main.js
+++ b/src/main.js
@@ -10,16 +10,13 @@ import store from '@/store/index'
 // 菜单和路由设置
 import router, { constantRoutes, createRoutesInLayout, routesOutLayout, resetRouter } from './router'
 import { request } from './api/axios'
-import { hasPermission, handleMenu } from './api/common'
+import { hasPermission, handleMenu, handleRouter } from './api/common'
 import iconPicker from 'e-icon-picker'
 import 'e-icon-picker/dist/index.css'// 基础样式
 import 'e-icon-picker/dist/main.css' // fontAwesome 图标库样式
 import util from '@/libs/util.js'
 import JSEncrypt from 'jsencrypt'
 import JsonViewer from 'vue-json-viewer'
-import layoutHeaderAside from '@/layout/header-aside'
-// 由于懒加载页面太多的话会造成webpack热更新太慢，所以开发环境不使用懒加载，只有生产环境使用懒加载
-const _import = require('@/libs/util.import.' + process.env.NODE_ENV)
 
 Vue.use(iconPicker)
 Vue.use(JsonViewer)
@@ -30,7 +27,6 @@ Vue.use(zeroVue)
 // 将axios封装加入到Vue 原型里 直接this.$axios调用
 Vue.prototype.$axios = request
 Vue.prototype.$hasPermission = hasPermission
-Vue.prototype.$handleMenu = handleMenu
 
 Vue.prototype.$getRsaCode = function (str) { // 注册方法
   const encryptStr = new JSEncrypt()
@@ -38,72 +34,48 @@ Vue.prototype.$getRsaCode = function (str) { // 注册方法
   const data = encryptStr.encrypt(str.toString()) // 进行加密
   return data
 }
-var zero = [
-  {
-    path: '/',
-    redirect: { name: 'index' },
-    component: layoutHeaderAside,
-    children: [
-      // 首页路由不需要权限
-      { path: '/index', name: 'index', meta: { title: '首页' }, component: _import('system/index') },
-      { path: '/SysUser', name: 'SysUser', meta: { title: '系统用户', auth: '/sysUser/pageList' }, component: _import('system/user') },
-      { path: '/SysRole', name: 'SysRole', meta: { title: '系统角色', auth: '/sysRole/pageList' }, component: _import('system/role') },
-      { path: '/SysPower', name: 'SysPower', meta: { title: '系统权限', auth: '/sysPower/tree' }, component: _import('system/power') },
-      { path: '/SysLog', name: 'SysLog', meta: { title: '系统日志', auth: '/sysLog/pageList' }, component: _import('system/log') }
-
-    ]
-  }
-
-]
-request({ url: '/sysUser/getMenuAndPower', method: 'get' }).then(res => {
-  console.log(res)
-  if (res) {
+/**
+ * 刷新时，请求接口获取菜单和路由数据，保证获取到的数据是最新的，实现动态添加菜单和路由后刷新页面就能使用
+ */
+request({ url: '/sysUser/initFrontEndInfo', method: 'get' }).then(res => {
+  /**
+   * 判断是否有res，当
+   */
+  if (res && res.data) {
+    // [菜单] 处理菜单
+    const menu = handleMenu(res.data.menuInfo)
+    // [菜单] 设置侧边栏菜单
+    store.commit('zerovue/menu/asideSet', menu)
+    // [菜单] 初始化菜单搜索功能
+    store.commit('zerovue/search/init', menu)
+    // [权限] 缓存权限
+    util.storage.set('powers', res.data.powerInfo)
+    // [ 路由 ] 处理路由
+    var zero = handleRouter(res.data.routerInfo)
     // [ 路由 ] 计算路由
     const routes = createRoutesInLayout(zero).concat(routesOutLayout)
-    // console.log(routes)
     // [ 路由 ] 重新设置路由
     resetRouter(routes)
-
-    new Vue({
-      router,
-      store,
-      i18n,
-      render: h => h(App),
-      created () {
-        // 没有token不能请求接口
-        if (util.storage.get('token')) {
-          this.getMenuAndPower()
-          // 处理路由 得到每一级的路由设置
-          this.$store.commit('zerovue/page/init', constantRoutes)
-        } else {
-          this.$store.commit('zerovue/page/init', constantRoutes)
-        }
-      },
-      mounted () {
-        // 展示系统信息
-        this.$store.commit('zerovue/releases/versionShow')
-        // 用户登录后从数据库加载一系列的设置
-        this.$store.dispatch('zerovue/account/load')
-        // 获取并记录用户 UA
-        this.$store.commit('zerovue/ua/get')
-        // 初始化全屏监听
-        this.$store.dispatch('zerovue/fullscreen/listen')
-      },
-      methods: {
-        getMenuAndPower () {
-          request({ url: '/sysUser/getMenuAndPower', method: 'get' }).then(res => {
-            if (res) {
-              const menu = handleMenu(res.data.menuInfo)
-              // 设置侧边栏菜单
-              this.$store.commit('zerovue/menu/asideSet', menu)
-              // 初始化菜单搜索功能
-              this.$store.commit('zerovue/search/init', menu)
-              // 权限
-              util.storage.set('powers', res.data.powerInfo)
-            }
-          })
-        }
-      }
-    }).$mount('#app')
+    // [ 路由 ] 重新设置多标签页池
+    store.commit('zerovue/page/init', routes)
+  } else {
+    // [ 路由 ] 重新设置多标签页池
+    store.commit('zerovue/page/init', constantRoutes)
   }
+  new Vue({
+    router,
+    store,
+    i18n,
+    render: h => h(App),
+    mounted () {
+      // 展示系统信息
+      this.$store.commit('zerovue/releases/versionShow')
+      // 用户登录后从数据库加载一系列的设置
+      this.$store.dispatch('zerovue/account/load')
+      // 获取并记录用户 UA
+      this.$store.commit('zerovue/ua/get')
+      // 初始化全屏监听
+      this.$store.dispatch('zerovue/fullscreen/listen')
+    }
+  }).$mount('#app')
 })
diff --git a/src/router/index.js b/src/router/index.js
index 96e3ad5..308fed7 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,9 +8,6 @@ import 'nprogress/nprogress.css'
 import store from '@/store/index'
 import util from '@/libs/util.js'
 
-// 路由数据
-import { hasPermission } from '@/api/common'
-
 // 由于懒加载页面太多的话会造成webpack热更新太慢，所以开发环境不使用懒加载，只有生产环境使用懒加载
 const _import = require('@/libs/util.import.' + process.env.NODE_ENV)
 
@@ -36,10 +33,10 @@ export function createRoutesInLayout (routes = []) {
 
 // 在 layout 之外显示的路由
 export const routesOutLayout = [
-  { path: '/refresh', name: 'refresh', component: _import('system/function/refresh'), hidden: true },
-  { path: '/redirect/:route*', name: 'redirect', component: _import('system/function/redirect'), hidden: true },
-  { path: '/login', name: 'login', component: _import('system/login'), hidden: true },
-  { path: '/404', name: '404', component: _import('system/error/404'), hidden: true },
+  { path: '/refresh', name: 'refresh', component: _import('/sys/function/refresh'), hidden: true },
+  { path: '/redirect/:route*', name: 'redirect', component: _import('/sys/function/redirect'), hidden: true },
+  { path: '/login', name: 'login', component: _import('/sys/login'), hidden: true },
+  { path: '/404', name: '404', component: _import('/sys/error/404'), hidden: true },
   { path: '*', redirect: '/404', hidden: true }
 ]
 
@@ -80,16 +77,14 @@ router.beforeEach(async (to, from, next) => {
   store.commit('zerovue/search/set', false)
   const token = util.storage.get('token')
   // 如果是登录或者401直接放行
-  if (to.path === '/login' || to.path === '/401') {
-    next()
-  } else if (token) {
-    // 如果存在token并且有这个权限直接放行
-    if (hasPermission(to.meta.auth)) {
-      next()
+  if (to.path === '/login') {
+    if (token) {
+      next('/')
     } else {
-      next('401')
-      NProgress.done()
+      next()
     }
+  } else if (token) {
+    next()
   } else {
     // 没有登录的时候跳转到登录界面
     // 携带上登陆成功之后需要跳转的页面完整路径
diff --git a/src/router/routes.js b/src/router/routes.js
index 521a06a..e69de29 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -1,55 +0,0 @@
-// import layoutHeaderAside from '@/layout/header-aside'
-
-// // 由于懒加载页面太多的话会造成webpack热更新太慢，所以开发环境不使用懒加载，只有生产环境使用懒加载
-// const _import = require('@/libs/util.import.' + process.env.NODE_ENV)
-
-// /**
-//  * 在主框架内显示
-//  */
-// const frameIn = [
-//   {
-//     path: '/',
-//     redirect: { name: 'index' },
-//     component: layoutHeaderAside,
-//     children: [
-//       // 首页路由不需要权限
-//       { path: '/index', name: 'index', meta: { title: '首页' }, component: _import('system/index') },
-//       { path: '/SysUser', name: 'SysUser', meta: { title: '系统用户', auth: '/sysUser/pageList' }, component: _import('system/user') },
-//       { path: '/SysRole', name: 'SysRole', meta: { title: '系统角色', auth: '/sysRole/pageList' }, component: _import('system/role') },
-//       { path: '/SysPower', name: 'SysPower', meta: { title: '系统权限', auth: '/sysPower/tree' }, component: _import('system/power') },
-//       { path: '/SysLog', name: 'SysLog', meta: { title: '系统日志', auth: '/sysLog/pageList' }, component: _import('system/log') }
-
-//     ]
-//   }
-// ]
-
-// /**
-//  * 在主框架之外显示
-//  */
-// const frameOut = [
-//   // 登录
-//   { path: '/login', name: 'login', component: _import('system/login') }
-// ]
-
-// /**
-//  * 错误页面
-//  */
-// const errorPage = [
-//   // 刷新页面 必须保留
-//   { path: '/refresh', name: 'refresh', component: _import('system/function/refresh'), hidden: true },
-//   // 页面重定向 必须保留
-//   { path: 'redirect/:route*', name: 'redirect', component: _import('system/function/redirect'), hidden: true },
-//   { path: '/login', name: 'login', component: _import('system/login'), hidden: true },
-//   { path: '/404', name: '404', component: _import('system/error/404'), hidden: true },
-//   { path: '*', redirect: '/404', hidden: true }
-// ]
-
-// // 导出需要显示菜单的
-// export const frameInRoutes = frameIn
-
-// // 重新组织后导出
-// export default [
-//   ...frameIn,
-//   ...frameOut,
-//   ...errorPage
-// ]
diff --git a/src/setting.js b/src/setting.js
index e9aa855..f7f4372 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -16,8 +16,8 @@ export default {
   page: {
     opened: [
       {
-        name: 'index',
-        fullPath: '/index',
+        name: 'Index',
+        fullPath: '/Index',
         meta: {
           title: '首页',
           auth: false
diff --git a/src/store/modules/zerovue/modules/page.js b/src/store/modules/zerovue/modules/page.js
index 69cd6f0..0b7c7a7 100644
--- a/src/store/modules/zerovue/modules/page.js
+++ b/src/store/modules/zerovue/modules/page.js
@@ -54,7 +54,7 @@ export default {
       state.opened = value
         .map(opened => {
           // 忽略首页
-          if (opened.fullPath === '/index') {
+          if (opened.fullPath === '/Index') {
             valid.push(1)
             return opened
           }
@@ -209,7 +209,7 @@ export default {
       await dispatch('openedb')
       // 决定最后停留的页面
       if (isCurrent) {
-        const { name = 'index', params = {}, query = {} } = newPage
+        const { name = 'Index', params = {}, query = {} } = newPage
         const routerObj = { name, params, query }
         await router.push(routerObj)
       }
@@ -229,7 +229,7 @@ export default {
       if (currentIndex > 0) {
         // 删除打开的页面 并在缓存设置中删除
         for (let i = state.opened.length - 1; i >= 0; i--) {
-          if (state.opened[i].name === 'index' || i >= currentIndex) {
+          if (state.opened[i].name === 'Index' || i >= currentIndex) {
             continue
           }
 
@@ -257,7 +257,7 @@ export default {
       })
       // 删除打开的页面 并在缓存设置中删除
       for (let i = state.opened.length - 1; i >= 0; i--) {
-        if (state.opened[i].name === 'index' || currentIndex >= i) {
+        if (state.opened[i].name === 'Index' || currentIndex >= i) {
           continue
         }
 
@@ -284,7 +284,7 @@ export default {
       })
       // 删除打开的页面数据 并更新缓存设置
       for (let i = state.opened.length - 1; i >= 0; i--) {
-        if (state.opened[i].name === 'index' || currentIndex === i) {
+        if (state.opened[i].name === 'Index' || currentIndex === i) {
           continue
         }
 
@@ -305,7 +305,7 @@ export default {
     async closeAll ({ state, commit, dispatch }) {
       // 删除打开的页面 并在缓存设置中删除
       for (let i = state.opened.length - 1; i >= 0; i--) {
-        if (state.opened[i].name === 'index') {
+        if (state.opened[i].name === 'Index') {
           continue
         }
 
@@ -315,8 +315,8 @@ export default {
       // 持久化
       await dispatch('openedb')
       // 关闭所有的标签页后需要判断一次现在是不是在首页
-      if (router.app.$route.name !== 'index') {
-        await router.push({ name: 'index' })
+      if (router.app.$route.name !== 'Index') {
+        await router.push({ name: 'Index' })
       }
     }
   },
diff --git a/src/views/system/index/index.vue b/src/views/index/index.vue
similarity index 95%
rename from src/views/system/index/index.vue
rename to src/views/index/index.vue
index 1b4d5d5..930efed 100644
--- a/src/views/system/index/index.vue
+++ b/src/views/index/index.vue
@@ -13,7 +13,7 @@
 
 <script>
 export default {
-  name: 'index',
+  name: 'Index',
   components: {
   },
   created () {
diff --git a/src/views/system/error/404/index.vue b/src/views/sys/error/404/index.vue
similarity index 100%
rename from src/views/system/error/404/index.vue
rename to src/views/sys/error/404/index.vue
diff --git a/src/views/system/function/redirect/index.js b/src/views/sys/function/redirect/index.js
similarity index 100%
rename from src/views/system/function/redirect/index.js
rename to src/views/sys/function/redirect/index.js
diff --git a/src/views/system/function/refresh/index.js b/src/views/sys/function/refresh/index.js
similarity index 100%
rename from src/views/system/function/refresh/index.js
rename to src/views/sys/function/refresh/index.js
diff --git a/src/views/system/log/components/Drawer.vue b/src/views/sys/log/components/Drawer.vue
similarity index 100%
rename from src/views/system/log/components/Drawer.vue
rename to src/views/sys/log/components/Drawer.vue
diff --git a/src/views/system/log/index.vue b/src/views/sys/log/index.vue
similarity index 100%
rename from src/views/system/log/index.vue
rename to src/views/sys/log/index.vue
diff --git a/src/views/system/login/index.vue b/src/views/sys/login/index.vue
similarity index 89%
rename from src/views/system/login/index.vue
rename to src/views/sys/login/index.vue
index 31b2837..038bdf5 100644
--- a/src/views/system/login/index.vue
+++ b/src/views/sys/login/index.vue
@@ -104,9 +104,7 @@
 import localeMixin from '@/locales/mixin.js'
 import util from '@/libs/util.js'
 import { createRoutesInLayout, routesOutLayout, resetRouter } from '@/router'
-import layoutHeaderAside from '@/layout/header-aside'
-// 由于懒加载页面太多的话会造成webpack热更新太慢，所以开发环境不使用懒加载，只有生产环境使用懒加载
-const _import = require('@/libs/util.import.' + process.env.NODE_ENV)
+import { handleMenu, handleRouter } from '@/api/common'
 export default {
   name: 'login',
   mixins: [
@@ -189,29 +187,13 @@ export default {
             this.$store.dispatch('zerovue/account/load')
             // 处理菜单和权限
             this.handleMenuAndPower(res.data)
-            var zero = [
-              {
-                path: '/',
-                redirect: { name: 'index' },
-                component: layoutHeaderAside,
-                children: [
-                  // 首页路由不需要权限
-                  { path: '/index', name: 'index', meta: { title: '首页' }, component: _import('system/index') },
-                  { path: '/SysUser', name: 'SysUser', meta: { title: '系统用户', auth: '/sysUser/pageList' }, component: _import('system/user') },
-                  { path: '/SysRole', name: 'SysRole', meta: { title: '系统角色', auth: '/sysRole/pageList' }, component: _import('system/role') },
-                  { path: '/SysPower', name: 'SysPower', meta: { title: '系统权限', auth: '/sysPower/tree' }, component: _import('system/power') },
-                  { path: '/SysLog', name: 'SysLog', meta: { title: '系统日志', auth: '/sysLog/pageList' }, component: _import('system/log') }
-
-                ]
-              }
-
-            ]
+            var zero = handleRouter(res.data.routerInfo)
             // [ 路由 ] 计算路由
             const routes = createRoutesInLayout(zero).concat(routesOutLayout)
             // [ 路由 ] 重新设置路由
             resetRouter(routes)
             // [ 路由 ] 重新设置多标签页池
-            this.$store.commit('zerovue/page/init', routes, { root: true })
+            this.$store.commit('zerovue/page/init', routes)
             // 重定向对象不存在则返回顶层路径
             this.$router.replace(this.$route.query.redirect || '/')
             this.loading = false
@@ -228,7 +210,7 @@ export default {
       /**
        * 菜单处理
        */
-      const menu = this.$handleMenu(data.menuInfo)
+      const menu = handleMenu(data.menuInfo)
       // 设置侧边栏菜单
       this.$store.commit('zerovue/menu/asideSet', menu)
       // 初始化菜单搜索功能
diff --git a/src/views/system/power/components/AddUpdateForm.vue b/src/views/sys/power/components/AddUpdateForm.vue
similarity index 100%
rename from src/views/system/power/components/AddUpdateForm.vue
rename to src/views/sys/power/components/AddUpdateForm.vue
diff --git a/src/views/system/power/index.vue b/src/views/sys/power/index.vue
similarity index 100%
rename from src/views/system/power/index.vue
rename to src/views/sys/power/index.vue
diff --git a/src/views/system/role/components/AddUpdateForm.vue b/src/views/sys/role/components/AddUpdateForm.vue
similarity index 100%
rename from src/views/system/role/components/AddUpdateForm.vue
rename to src/views/sys/role/components/AddUpdateForm.vue
diff --git a/src/views/system/role/components/PowerTree.vue b/src/views/sys/role/components/PowerTree.vue
similarity index 100%
rename from src/views/system/role/components/PowerTree.vue
rename to src/views/sys/role/components/PowerTree.vue
diff --git a/src/views/system/role/index.vue b/src/views/sys/role/index.vue
similarity index 100%
rename from src/views/system/role/index.vue
rename to src/views/sys/role/index.vue
diff --git a/src/views/system/user/components/AddUpdateForm.vue b/src/views/sys/user/components/AddUpdateForm.vue
similarity index 100%
rename from src/views/system/user/components/AddUpdateForm.vue
rename to src/views/sys/user/components/AddUpdateForm.vue
diff --git a/src/views/system/user/components/DemoTreeSide.vue b/src/views/sys/user/components/DemoTreeSide.vue
similarity index 100%
rename from src/views/system/user/components/DemoTreeSide.vue
rename to src/views/sys/user/components/DemoTreeSide.vue
diff --git a/src/views/system/user/index.vue b/src/views/sys/user/index.vue
similarity index 100%
rename from src/views/system/user/index.vue
rename to src/views/sys/user/index.vue
-- 
Gitee


From d3662dd39076c23a8cacdc37134e723ab94f759e Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Tue, 14 Jul 2020 14:57:49 +0800
Subject: [PATCH 67/70] =?UTF-8?q?=E5=8A=A8=E6=80=81=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common.js                               | 14 +++++++++-----
 .../header-aside/components/tabs/index.vue      |  8 +++++---
 src/layout/header-aside/layout.vue              |  6 ++++--
 src/setting.js                                  |  8 +++++---
 src/store/modules/zerovue/modules/page.js       | 17 +++++++++--------
 5 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/src/api/common.js b/src/api/common.js
index 15168ef..d0c52bd 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -48,22 +48,26 @@ export function handleRouter (data) {
   var routerArray = {}
   for (var item in data) {
     var router = data[item]
+    var path = router.path.substr(1)
     if (item === '0') {
+      // uuid 是用户身份唯一标识 用户注册的时候确定 并且不可改变 不可重复
+      util.storage.set('indexPath', path)
+      util.storage.set('indexName', router.name)
       routerArray.path = '/'
-      routerArray.redirect = router.path.substr(1)
+      routerArray.redirect = path
       routerArray.component = layoutHeaderAside
       routerArray.children = [{
         path: router.path,
-        name: router.path.substr(1),
+        name: path,
         meta: { title: router.name },
-        component: _import(router.path.substr(1).replace(/([A-Z])/g, '/$1').toLowerCase())
+        component: _import(path.replace(/([A-Z])/g, '/$1').toLowerCase())
       }]
     } else {
       routerArray.children.push({
         path: router.path,
-        name: router.path.substr(1),
+        name: path,
         meta: { title: router.name },
-        component: _import(router.path.substr(1).replace(/([A-Z])/g, '/$1').toLowerCase())
+        component: _import(path.replace(/([A-Z])/g, '/$1').toLowerCase())
       })
     }
   }
diff --git a/src/layout/header-aside/components/tabs/index.vue b/src/layout/header-aside/components/tabs/index.vue
index 125b059..e2f9f8e 100644
--- a/src/layout/header-aside/components/tabs/index.vue
+++ b/src/layout/header-aside/components/tabs/index.vue
@@ -7,7 +7,7 @@
           :x="contentmenuX"
           :y="contentmenuY">
           <zero-contextmenu-list
-            :menulist="tagName === '/Index' ? contextmenuListIndex : contextmenuList"
+            :menulist="tagName === indexPath  ? contextmenuListIndex : contextmenuList"
             @rowClick="contextmenuClick"/>
         </zero-contextmenu>
         <el-tabs
@@ -59,6 +59,7 @@
 <script>
 import { mapState, mapActions } from 'vuex'
 import Sortable from 'sortablejs'
+import util from '@/libs/util.js'
 
 export default {
   components: {
@@ -79,7 +80,8 @@ export default {
         { icon: 'times', title: '关闭其它', value: 'other' },
         { icon: 'times-circle', title: '关闭全部', value: 'all' }
       ],
-      tagName: '/Index'
+      tagName: '/' + util.storage.get('indexPath'),
+      indexPath: '/' + util.storage.get('indexPath')
     }
   },
   computed: {
@@ -102,7 +104,7 @@ export default {
      * @param {Object} page 其中一个标签页
      */
     isTabClosable (page) {
-      return page.name !== 'Index'
+      return page.name !== util.storage.get('indexPath')
     },
     /**
      * @description 右键菜单功能点击
diff --git a/src/layout/header-aside/layout.vue b/src/layout/header-aside/layout.vue
index cecce96..44e0d49 100644
--- a/src/layout/header-aside/layout.vue
+++ b/src/layout/header-aside/layout.vue
@@ -7,7 +7,7 @@
       <!-- 顶栏 -->
       <div class="zero-theme-header" :style="{ opacity: this.searchActive ? 0.5 : 1 }" flex-box="0" flex>
         <router-link
-          to="/Index"
+          :to="toPath"
           :class="{'logo-group': true, 'logo-transition': asideTransition}"
           :style="{width: asideCollapse ? asideWidthCollapse : asideWidth}"
           flex-box="0">
@@ -89,6 +89,7 @@ import zeroHeaderColor from './components/header-color'
 import zeroHeaderClock from './components/header-clock'
 import { mapState, mapGetters, mapActions } from 'vuex'
 import mixinSearch from './mixins/search'
+import util from '@/libs/util.js'
 export default {
   name: 'zero-layout-header-aside',
   mixins: [
@@ -111,7 +112,8 @@ export default {
       // [侧边栏宽度] 正常状态
       asideWidth: '200px',
       // [侧边栏宽度] 折叠状态
-      asideWidthCollapse: '65px'
+      asideWidthCollapse: '65px',
+      toPath: util.storage.get('indexPath')
     }
   },
   computed: {
diff --git a/src/setting.js b/src/setting.js
index f7f4372..8d67f8c 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -1,3 +1,5 @@
+
+import util from '@/libs/util.js'
 export default {
   // 快捷键
   // 支持快捷键 例如 ctrl+shift+s
@@ -16,10 +18,10 @@ export default {
   page: {
     opened: [
       {
-        name: 'Index',
-        fullPath: '/Index',
+        name: util.storage.get('indexPath'),
+        fullPath: '/' + util.storage.get('indexPath'),
         meta: {
-          title: '首页',
+          title: util.storage.get('indexName'),
           auth: false
         }
       }
diff --git a/src/store/modules/zerovue/modules/page.js b/src/store/modules/zerovue/modules/page.js
index 0b7c7a7..06d3cbe 100644
--- a/src/store/modules/zerovue/modules/page.js
+++ b/src/store/modules/zerovue/modules/page.js
@@ -1,6 +1,7 @@
 import { cloneDeep, uniq, get } from 'lodash'
 import router from '@/router'
 import setting from '@/setting.js'
+import util from '@/libs/util.js'
 
 // 判定是否需要缓存
 const isKeepAlive = data => get(data, 'meta.cache', false)
@@ -54,7 +55,7 @@ export default {
       state.opened = value
         .map(opened => {
           // 忽略首页
-          if (opened.fullPath === '/Index') {
+          if (opened.fullPath === '/' + util.storage.get('indexPath')) {
             valid.push(1)
             return opened
           }
@@ -209,7 +210,7 @@ export default {
       await dispatch('openedb')
       // 决定最后停留的页面
       if (isCurrent) {
-        const { name = 'Index', params = {}, query = {} } = newPage
+        const { name = util.storage.get('indexPath'), params = {}, query = {} } = newPage
         const routerObj = { name, params, query }
         await router.push(routerObj)
       }
@@ -229,7 +230,7 @@ export default {
       if (currentIndex > 0) {
         // 删除打开的页面 并在缓存设置中删除
         for (let i = state.opened.length - 1; i >= 0; i--) {
-          if (state.opened[i].name === 'Index' || i >= currentIndex) {
+          if (state.opened[i].name === util.storage.get('indexPath') || i >= currentIndex) {
             continue
           }
 
@@ -257,7 +258,7 @@ export default {
       })
       // 删除打开的页面 并在缓存设置中删除
       for (let i = state.opened.length - 1; i >= 0; i--) {
-        if (state.opened[i].name === 'Index' || currentIndex >= i) {
+        if (state.opened[i].name === util.storage.get('indexPath') || currentIndex >= i) {
           continue
         }
 
@@ -284,7 +285,7 @@ export default {
       })
       // 删除打开的页面数据 并更新缓存设置
       for (let i = state.opened.length - 1; i >= 0; i--) {
-        if (state.opened[i].name === 'Index' || currentIndex === i) {
+        if (state.opened[i].name === util.storage.get('indexPath') || currentIndex === i) {
           continue
         }
 
@@ -305,7 +306,7 @@ export default {
     async closeAll ({ state, commit, dispatch }) {
       // 删除打开的页面 并在缓存设置中删除
       for (let i = state.opened.length - 1; i >= 0; i--) {
-        if (state.opened[i].name === 'Index') {
+        if (state.opened[i].name === util.storage.get('indexPath')) {
           continue
         }
 
@@ -315,8 +316,8 @@ export default {
       // 持久化
       await dispatch('openedb')
       // 关闭所有的标签页后需要判断一次现在是不是在首页
-      if (router.app.$route.name !== 'Index') {
-        await router.push({ name: 'Index' })
+      if (router.app.$route.name !== util.storage.get('indexPath')) {
+        await router.push({ name: util.storage.get('indexPath') })
       }
     }
   },
-- 
Gitee


From 9684f7540d623bcfd2b283a3b8a1499209aaad63 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Tue, 14 Jul 2020 17:44:54 +0800
Subject: [PATCH 68/70] 1

---
 src/router/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/router/index.js b/src/router/index.js
index 308fed7..df23cf7 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -79,7 +79,8 @@ router.beforeEach(async (to, from, next) => {
   // 如果是登录或者401直接放行
   if (to.path === '/login') {
     if (token) {
-      next('/')
+      next(from.fullPath)
+      NProgress.done()
     } else {
       next()
     }
-- 
Gitee


From 1d9069d95df1174e7c445132ba25a76f9067c0c7 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Tue, 14 Jul 2020 20:05:12 +0800
Subject: [PATCH 69/70] =?UTF-8?q?=E8=B7=AF=E7=94=B1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                       | 1 +
 src/store/modules/zerovue/modules/page.js | 8 ++++----
 src/views/sys/error/404/index.vue         | 2 +-
 src/views/sys/power/index.vue             | 8 ++++++++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index df23cf7..f97d19f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -48,6 +48,7 @@ export const constantRoutes = createRoutesInLayout().concat(routesOutLayout)
  * @param {Array} routes 路由设置
  */
 export const createRouter = (routes = []) => new VueRouter({
+  mode: 'history',
   scrollBehavior: () => ({ y: 0 }),
   routes
 })
diff --git a/src/store/modules/zerovue/modules/page.js b/src/store/modules/zerovue/modules/page.js
index 06d3cbe..4e8dc45 100644
--- a/src/store/modules/zerovue/modules/page.js
+++ b/src/store/modules/zerovue/modules/page.js
@@ -55,10 +55,10 @@ export default {
       state.opened = value
         .map(opened => {
           // 忽略首页
-          if (opened.fullPath === '/' + util.storage.get('indexPath')) {
-            valid.push(1)
-            return opened
-          }
+          // if (opened.fullPath === '/' + util.storage.get('indexPath')) {
+          //   valid.push(1)
+          //   return opened
+          // }
           // 尝试在所有的支持多标签页的页面里找到 name 匹配的页面
           const find = state.pool.find(item => item.name === opened.name)
           // 记录有效或无效信息
diff --git a/src/views/sys/error/404/index.vue b/src/views/sys/error/404/index.vue
index e0448c9..8f85bee 100644
--- a/src/views/sys/error/404/index.vue
+++ b/src/views/sys/error/404/index.vue
@@ -11,7 +11,7 @@
         <div class="bullshit__oops">OOPS!</div>
         <div class="bullshit__headline">{{ message }}</div>
         <div class="bullshit__info">请检查您输入的网址是否正确，请点击以下按钮返回主页或者发送错误报告</div>
-        <a href="" class="bullshit__return-home">返回首页</a>
+        <a href="/" class="bullshit__return-home">返回首页</a>
       </div>
     </div>
   </div>
diff --git a/src/views/sys/power/index.vue b/src/views/sys/power/index.vue
index 59ed5ad..07c7fee 100644
--- a/src/views/sys/power/index.vue
+++ b/src/views/sys/power/index.vue
@@ -18,6 +18,7 @@
         class="zero-table"
         style="width: 100%"
         :tree-props="{children: 'children'}"
+        @row-dblclick="rowDblclick"
       >
         <el-table-column
           prop="name"
@@ -126,6 +127,13 @@ export default {
     }
   },
   methods: {
+    // 点击行展开和收缩table
+    rowDblclick (row, event, column) {
+      // 存在子集
+      if (row.children) {
+        this.$refs.tableRef.toggleRowExpansion(row)
+      }
+    }
   }
 }
 </script>
-- 
Gitee


From ef1bf735d90ea16d31dab68f0eda87e3c7cd79c2 Mon Sep 17 00:00:00 2001
From: zero <254353372@qq.com>
Date: Thu, 16 Jul 2020 18:02:52 +0800
Subject: [PATCH 70/70] =?UTF-8?q?=E7=BC=93=E5=AD=98=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=8F=90=E4=BE=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common.js                              |  6 +++---
 src/router/routes.js                           |  0
 .../sys/power/components/AddUpdateForm.vue     | 16 +++++++++++++++-
 src/views/sys/power/index.vue                  | 18 +++++++++++++++---
 4 files changed, 33 insertions(+), 7 deletions(-)
 delete mode 100644 src/router/routes.js

diff --git a/src/api/common.js b/src/api/common.js
index d0c52bd..53486bc 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -50,7 +50,7 @@ export function handleRouter (data) {
     var router = data[item]
     var path = router.path.substr(1)
     if (item === '0') {
-      // uuid 是用户身份唯一标识 用户注册的时候确定 并且不可改变 不可重复
+      // 设置首页的路径和名称
       util.storage.set('indexPath', path)
       util.storage.set('indexName', router.name)
       routerArray.path = '/'
@@ -59,14 +59,14 @@ export function handleRouter (data) {
       routerArray.children = [{
         path: router.path,
         name: path,
-        meta: { title: router.name },
+        meta: { title: router.name, cache: router.cache },
         component: _import(path.replace(/([A-Z])/g, '/$1').toLowerCase())
       }]
     } else {
       routerArray.children.push({
         path: router.path,
         name: path,
-        meta: { title: router.name },
+        meta: { title: router.name, cache: router.cache },
         component: _import(path.replace(/([A-Z])/g, '/$1').toLowerCase())
       })
     }
diff --git a/src/router/routes.js b/src/router/routes.js
deleted file mode 100644
index e69de29..0000000
diff --git a/src/views/sys/power/components/AddUpdateForm.vue b/src/views/sys/power/components/AddUpdateForm.vue
index a18a91b..4881e01 100644
--- a/src/views/sys/power/components/AddUpdateForm.vue
+++ b/src/views/sys/power/components/AddUpdateForm.vue
@@ -61,6 +61,18 @@
       <el-form-item v-if="pathExist" prop="path" label="资源路径">
         <el-input v-model.trim="addUpdateForm.path" placeholder="请输入资源路径" />
       </el-form-item>
+      <el-form-item v-if="pathExist" prop="cache" label="是否缓存">
+        <el-radio-group v-model="addUpdateForm.cache">
+          <el-radio-button
+            label="true"
+            key="true"
+          >是</el-radio-button>
+          <el-radio-button
+            label="false"
+            key="false"
+          >否</el-radio-button>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item label="备注">
         <el-input type="textarea" v-model="addUpdateForm.remarks" placeholder="请输入备注" />
       </el-form-item>
@@ -92,7 +104,8 @@ export default {
       initFrom: {
         // 初始弹框
         type: '0',
-        sort: 0
+        sort: 0,
+        cache: false
       },
       parentOptions: [],
       iconExist: true,
@@ -103,6 +116,7 @@ export default {
         type: [{ required: true, message: '请选择类型', trigger: 'blur' }],
         url: [{ required: true, message: '请输入接口地址', trigger: 'blur' }],
         path: [{ required: true, message: '请输入资源路径', trigger: 'blur' }],
+        cache: [{ required: true, message: '选择是否缓存', trigger: 'blur' }],
         parentId: [{ required: false, message: '请选择上级', trigger: 'blur' }]
       }
     }
diff --git a/src/views/sys/power/index.vue b/src/views/sys/power/index.vue
index 07c7fee..796d886 100644
--- a/src/views/sys/power/index.vue
+++ b/src/views/sys/power/index.vue
@@ -31,8 +31,20 @@
           prop="path"
           label="资源路径"
           header-align="center"
-          align="center"
-        />
+          align="center">
+          <template slot-scope="scope">
+            <span v-if="!scope.row.cache">{{ scope.row.path }}</span>
+            <el-tooltip
+              v-else
+              :hide-after="1000"
+              content="缓存页面"
+              placement="top"
+              class="page-refresh"
+            >
+              <span style="color: red">{{ scope.row.path }}</span>
+            </el-tooltip>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="url"
           label="接口地址"
@@ -122,7 +134,7 @@ export default {
         getDataListUrl: '/sysPower/tree',
         deleteUrl: '/sysPower/del',
         exportUrl: '/sysPower/export',
-        dictCodes: 'sys_power_type'
+        dictCodes: 'sys_power_type,state'
       }
     }
   },
-- 
Gitee