From 9ca7d4b05f72731a1e5b0ff19a133d9043f9b589 Mon Sep 17 00:00:00 2001
From: zhengjie <201507802@qq.com>
Date: Sat, 29 Jun 2019 12:32:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=94=B9=E9=80=A0=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=EF=BC=8C=E5=8A=A0=E5=85=A5=E5=A4=9A=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dictDetail.js                         |  13 ++
 src/api/user.js                               |  11 --
 src/mixins/initData.js                        |   6 +-
 src/mixins/initDict.js                        |  24 +++-
 .../generator/{module => }/generator.vue      |   4 +-
 src/views/generator/index.vue                 | 124 +++++++++++++++++-
 src/views/generator/module/form.vue           | 102 --------------
 src/views/generator/module/header.vue         |  45 -------
 src/views/monitor/log/errorLog.vue            |  13 +-
 src/views/monitor/log/index.vue               |  11 +-
 src/views/monitor/log/module/header.vue       |  28 ----
 src/views/monitor/log/search.vue              |  28 ++++
 src/views/monitor/redis/index.vue             |   6 +-
 src/views/system/dept/{module => }/form.vue   |   8 +-
 src/views/system/dept/index.vue               |  66 +++++++++-
 src/views/system/dept/module/edit.vue         |  47 -------
 src/views/system/dept/module/header.vue       |  68 ----------
 src/views/system/dict/{module => }/form.vue   |   8 +-
 src/views/system/dict/index.vue               |  39 ++++--
 src/views/system/dict/module/edit.vue         |  40 ------
 src/views/system/dict/module/header.vue       |  46 -------
 .../system/dictDetail/{module => }/form.vue   |   8 +-
 src/views/system/dictDetail/index.vue         |  29 +++-
 src/views/system/dictDetail/module/edit.vue   |  45 -------
 src/views/system/dictDetail/module/header.vue |  38 ------
 src/views/system/job/{module => }/form.vue    |   8 +-
 src/views/system/job/index.vue                |  54 +++++++-
 src/views/system/job/module/edit.vue          |  49 -------
 src/views/system/job/module/header.vue        |  55 --------
 src/views/system/menu/{module => }/form.vue   |   8 +-
 src/views/system/menu/index.vue               |  52 +++++++-
 src/views/system/menu/module/edit.vue         |  37 ------
 src/views/system/menu/module/header.vue       |  58 --------
 .../system/permission/{module => }/form.vue   |   8 +-
 src/views/system/permission/index.vue         |  52 +++++++-
 src/views/system/permission/module/edit.vue   |  37 ------
 src/views/system/permission/module/header.vue |  58 --------
 src/views/system/role/{module => }/form.vue   |   8 +-
 src/views/system/role/index.vue               |  44 ++++++-
 src/views/system/role/module/edit.vue         |  43 ------
 src/views/system/role/module/header.vue       |  42 ------
 src/views/system/timing/index.vue             | 120 +++++++++++++++--
 src/views/system/timing/{module => }/log.vue  |   2 +-
 src/views/system/timing/module/edit.vue       |  36 -----
 src/views/system/timing/module/form.vue       | 124 ------------------
 src/views/system/timing/module/header.vue     |  57 --------
 src/views/system/user/center.vue              |  41 +++++-
 src/views/system/user/center/log.vue          |  55 --------
 src/views/system/user/center/updateEmail.vue  |  19 +--
 src/views/system/user/center/updatePass.vue   |  29 ++--
 src/views/system/user/{module => }/form.vue   |  10 +-
 src/views/system/user/index.vue               | 109 +++++++++++++--
 src/views/system/user/module/edit.vue         |  48 -------
 src/views/system/user/module/header.vue       | 110 ----------------
 src/views/tools/picture/index.vue             |   4 -
 src/views/tools/qiniu/list.vue                |   4 -
 56 files changed, 771 insertions(+), 1467 deletions(-)
 rename src/views/generator/{module => }/generator.vue (97%)
 delete mode 100644 src/views/generator/module/form.vue
 delete mode 100644 src/views/generator/module/header.vue
 delete mode 100644 src/views/monitor/log/module/header.vue
 create mode 100644 src/views/monitor/log/search.vue
 rename src/views/system/dept/{module => }/form.vue (96%)
 delete mode 100644 src/views/system/dept/module/edit.vue
 delete mode 100644 src/views/system/dept/module/header.vue
 rename src/views/system/dict/{module => }/form.vue (95%)
 delete mode 100644 src/views/system/dict/module/edit.vue
 delete mode 100644 src/views/system/dict/module/header.vue
 rename src/views/system/dictDetail/{module => }/form.vue (95%)
 delete mode 100644 src/views/system/dictDetail/module/edit.vue
 delete mode 100644 src/views/system/dictDetail/module/header.vue
 rename src/views/system/job/{module => }/form.vue (96%)
 delete mode 100644 src/views/system/job/module/edit.vue
 delete mode 100644 src/views/system/job/module/header.vue
 rename src/views/system/menu/{module => }/form.vue (97%)
 delete mode 100644 src/views/system/menu/module/edit.vue
 delete mode 100644 src/views/system/menu/module/header.vue
 rename src/views/system/permission/{module => }/form.vue (95%)
 delete mode 100644 src/views/system/permission/module/edit.vue
 delete mode 100644 src/views/system/permission/module/header.vue
 rename src/views/system/role/{module => }/form.vue (97%)
 delete mode 100644 src/views/system/role/module/edit.vue
 delete mode 100644 src/views/system/role/module/header.vue
 rename src/views/system/timing/{module => }/log.vue (98%)
 delete mode 100644 src/views/system/timing/module/edit.vue
 delete mode 100644 src/views/system/timing/module/form.vue
 delete mode 100644 src/views/system/timing/module/header.vue
 delete mode 100644 src/views/system/user/center/log.vue
 rename src/views/system/user/{module => }/form.vue (97%)
 delete mode 100644 src/views/system/user/module/edit.vue
 delete mode 100644 src/views/system/user/module/header.vue

diff --git a/src/api/dictDetail.js b/src/api/dictDetail.js
index d58bdc3..b03d1cc 100644
--- a/src/api/dictDetail.js
+++ b/src/api/dictDetail.js
@@ -13,6 +13,19 @@ export function get(dictName) {
   })
 }
 
+export function getDictMap(dictName) {
+  const params = {
+    dictName,
+    page: 0,
+    size: 9999
+  }
+  return request({
+    url: 'api/dictDetail/map',
+    method: 'get',
+    params
+  })
+}
+
 export function add(data) {
   return request({
     url: 'api/dictDetail',
diff --git a/src/api/user.js b/src/api/user.js
index 4364049..220cc26 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -23,17 +23,6 @@ export function edit(data) {
   })
 }
 
-export function validPass(password) {
-  const data = {
-    password
-  }
-  return request({
-    url: 'api/users/validPass/',
-    method: 'post',
-    data
-  })
-}
-
 export function updatePass(password) {
   const data = {
     password
diff --git a/src/mixins/initData.js b/src/mixins/initData.js
index 2c6110d..87c4ef6 100644
--- a/src/mixins/initData.js
+++ b/src/mixins/initData.js
@@ -3,7 +3,7 @@ import { initData } from '@/api/data'
 export default {
   data() {
     return {
-      loading: true, data: [], page: 0, size: 10, total: 0, url: '', params: {}, query: {}, time: 170
+      loading: true, data: [], page: 0, size: 10, total: 0, url: '', params: {}, query: {}, time: 170, isAdd: false
     }
   },
   methods: {
@@ -46,6 +46,10 @@ export default {
       if (this.data.length === size && this.page !== 0) {
         this.page = this.page - 1
       }
+    },
+    toQuery() {
+      this.page = 0
+      this.init()
     }
   }
 }
diff --git a/src/mixins/initDict.js b/src/mixins/initDict.js
index 312f41e..43b8cdf 100644
--- a/src/mixins/initDict.js
+++ b/src/mixins/initDict.js
@@ -1,9 +1,9 @@
-import { get } from '@/api/dictDetail'
+import { get, getDictMap } from '@/api/dictDetail'
 
 export default {
   data() {
     return {
-      dicts: []
+      dicts: [], dictMap: {}
     }
   },
   methods: {
@@ -16,6 +16,26 @@ export default {
           reject(err)
         })
       })
+    },
+    // 多个字典查询时使用逗号拼接， 如：
+    // 加载多个数据字典，如何调用如下：
+    // this.getDict('user_status,job_status')
+    // 在vue中使用加载出来的字典：
+    // dictMap.[字典名称] 如：dictMap.user_status、 dictMap.job_status
+    async getDictMap(names) {
+      // 优先放入到dictMap中，避免页面加载时 undefined
+      const arr = names.split(',')
+      for (let i = 0; i < arr.length; i++) {
+        this.dictMap[arr[i]] = []
+      }
+      return new Promise((resolve, reject) => {
+        getDictMap(names).then(res => {
+          this.dictMap = res
+          resolve(res)
+        }).catch(err => {
+          reject(err)
+        })
+      })
     }
   }
 }
diff --git a/src/views/generator/module/generator.vue b/src/views/generator/generator.vue
similarity index 97%
rename from src/views/generator/module/generator.vue
rename to src/views/generator/generator.vue
index c46566c..c01a18f 100644
--- a/src/views/generator/module/generator.vue
+++ b/src/views/generator/generator.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button type="primary" size="mini" @click="to">生成代码</el-button>
+    <el-button type="primary" size="mini" @click="toGen">生成代码</el-button>
     <el-dialog :visible.sync="dialog" title="代码生成配置" append-to-body width="800px">
       <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
         <el-table-column label="序号" width="80" align="center">
@@ -66,7 +66,7 @@ export default {
     }
   },
   methods: {
-    to() {
+    toGen() {
       this.dialog = true
       this.time = 130
       this.$nextTick(() => {
diff --git a/src/views/generator/index.vue b/src/views/generator/index.vue
index 986cccb..731ead3 100644
--- a/src/views/generator/index.vue
+++ b/src/views/generator/index.vue
@@ -1,20 +1,67 @@
 <template>
   <div class="app-container">
-    <eHeader :query="query"/>
+    <!--工具栏-->
+    <div class="head-container">
+      <el-input v-model="query.name" clearable placeholder="请输入表名" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          class="filter-item"
+          size="mini"
+          type="warning"
+          icon="el-icon-setting"
+          @click="openConfig">生成器配置</el-button>
+      </div>
+    </div>
+    <!--生成器配置-->
+    <el-dialog :visible.sync="dialog" title="生成器配置" append-to-body width="550px">
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-form-item label="作者名称" prop="author">
+          <el-input v-model="form.author" style="width: 420px;"/>
+        </el-form-item>
+        <el-form-item label="去表前缀" prop="prefix">
+          <el-input v-model="form.prefix" placeholder="默认不去除表前缀" style="width: 420px;"/>
+        </el-form-item>
+        <el-form-item label="模块名称" prop="moduleName">
+          <el-input v-model="form.moduleName" style="width: 420px;"/>
+        </el-form-item>
+        <el-form-item label="至于包下" prop="pack">
+          <el-input v-model="form.pack" style="width: 420px;"/>
+        </el-form-item>
+        <el-form-item label="前端路径" prop="path">
+          <el-input v-model="form.path" style="width: 420px;"/>
+        </el-form-item>
+        <el-form-item label="API路径" prop="apiPath">
+          <el-input v-model="form.apiPath" style="width: 420px;"/>
+        </el-form-item>
+        <el-form-item label="是否覆盖" prop="cover">
+          <el-radio v-model="form.cover" label="true">是</el-radio>
+          <el-radio v-model="form.cover" label="false">否</el-radio>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="cancel">取消</el-button>
+        <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+      </div>
+    </el-dialog>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
-      <el-table-column label="序号" width="80" align="center">
+      <el-table-column label="序号" width="85" align="center">
         <template slot-scope="scope">
           <div>{{ scope.$index + 1 }}</div>
         </template>
       </el-table-column>
       <el-table-column :show-overflow-tooltip="true" prop="tableName" label="表名"/>
+      <el-table-column :show-overflow-tooltip="true" prop="engine" label="数据库引擎"/>
+      <el-table-column :show-overflow-tooltip="true" prop="coding" label="字符编码集"/>
+      <el-table-column :show-overflow-tooltip="true" prop="remark" label="备注"/>
       <el-table-column prop="createTime" label="创建日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="160px" align="center">
+      <el-table-column label="操作" width="140px" align="center">
         <template slot-scope="scope">
           <Generator :name="scope.row.tableName"/>
         </template>
@@ -32,13 +79,39 @@
 </template>
 
 <script>
+import { get, update } from '@/api/genConfig'
 import initData from '@/mixins/initData'
 import { parseTime } from '@/utils/index'
-import eHeader from './module/header'
-import Generator from './module/generator'
+import Generator from './generator'
 export default {
-  components: { eHeader, Generator },
+  components: { Generator },
   mixins: [initData],
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: { author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '' },
+      rules: {
+        author: [
+          { required: true, message: '作者不能为空', trigger: 'blur' }
+        ],
+        pack: [
+          { required: true, message: '包路径不能为空', trigger: 'blur' }
+        ],
+        moduleName: [
+          { required: true, message: '包路径不能为空', trigger: 'blur' }
+        ],
+        path: [
+          { required: true, message: '前端代码生成路径不能为空', trigger: 'blur' }
+        ],
+        apiPath: [
+          { required: true, message: '前端Api文件生成路径不能为空', trigger: 'blur' }
+        ],
+        cover: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
   created() {
     this.$nextTick(() => {
       this.init()
@@ -53,6 +126,45 @@ export default {
       this.params = { page: this.page, size: this.size }
       if (name) { this.params['name'] = name }
       return true
+    },
+    openConfig() {
+      get().then(data => {
+        this.form = data
+        this.form.cover = this.form.cover.toString()
+      })
+      this.dialog = true
+    },
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.loading = true
+          this.doUpdate()
+        } else {
+          return false
+        }
+      })
+    },
+    doUpdate() {
+      update(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '更新成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = { author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '' }
     }
   }
 }
diff --git a/src/views/generator/module/form.vue b/src/views/generator/module/form.vue
deleted file mode 100644
index 37e3d1d..0000000
--- a/src/views/generator/module/form.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialog" title="生成器配置" append-to-body width="550px">
-    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="78px">
-      <el-form-item label="作者名称" prop="author">
-        <el-input v-model="form.author" style="width: 420px;"/>
-      </el-form-item>
-      <el-form-item label="去表前缀" prop="prefix">
-        <el-input v-model="form.prefix" placeholder="默认不去除表前缀" style="width: 420px;"/>
-      </el-form-item>
-      <el-form-item label="模块名称" prop="moduleName">
-        <el-input v-model="form.moduleName" style="width: 420px;"/>
-      </el-form-item>
-      <el-form-item label="至于包下" prop="pack">
-        <el-input v-model="form.pack" style="width: 420px;"/>
-      </el-form-item>
-      <el-form-item label="前端路径" prop="path">
-        <el-input v-model="form.path" style="width: 420px;"/>
-      </el-form-item>
-      <el-form-item label="API路径" prop="apiPath">
-        <el-input v-model="form.apiPath" style="width: 420px;"/>
-      </el-form-item>
-      <el-form-item label="是否覆盖" prop="cover">
-        <el-radio v-model="form.cover" label="true">是</el-radio>
-        <el-radio v-model="form.cover" label="false">否</el-radio>
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="text" @click="cancel">取消</el-button>
-      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { update } from '@/api/genConfig'
-export default {
-  data() {
-    return {
-      loading: false, dialog: false,
-      form: { author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '' },
-      rules: {
-        author: [
-          { required: true, message: '作者不能为空', trigger: 'blur' }
-        ],
-        pack: [
-          { required: true, message: '包路径不能为空', trigger: 'blur' }
-        ],
-        moduleName: [
-          { required: true, message: '包路径不能为空', trigger: 'blur' }
-        ],
-        path: [
-          { required: true, message: '前端代码生成路径不能为空', trigger: 'blur' }
-        ],
-        apiPath: [
-          { required: true, message: '前端Api文件生成路径不能为空', trigger: 'blur' }
-        ],
-        cover: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    cancel() {
-      this.resetForm()
-    },
-    doSubmit() {
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          this.loading = true
-          this.doUpdate()
-        } else {
-          return false
-        }
-      })
-    },
-    doUpdate() {
-      update(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '更新成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.form = { author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '' }
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/generator/module/header.vue b/src/views/generator/module/header.vue
deleted file mode 100644
index f1a2fc2..0000000
--- a/src/views/generator/module/header.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<template>
-  <div class="head-container">
-    <el-input v-model="query.name" clearable placeholder="请输入表名" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
-    <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-    <!-- 新增 -->
-    <div style="display: inline-block;margin: 0px 2px;">
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-setting"
-        @click="to">生成器配置</el-button>
-      <eForm ref="form"/>
-    </div>
-  </div>
-</template>
-
-<script>
-import { get } from '@/api/genConfig'
-import eForm from './form'
-// 查询条件
-export default {
-  components: { eForm },
-  props: {
-    query: {
-      type: Object,
-      required: true
-    }
-  },
-  methods: {
-    toQuery() {
-      this.$parent.page = 0
-      this.$parent.init()
-    },
-    to() {
-      const _this = this.$refs.form
-      get().then(data => {
-        _this.form = data
-        _this.form.cover = _this.form.cover.toString()
-      })
-      _this.dialog = true
-    }
-  }
-}
-</script>
diff --git a/src/views/monitor/log/errorLog.vue b/src/views/monitor/log/errorLog.vue
index b47e867..d266339 100644
--- a/src/views/monitor/log/errorLog.vue
+++ b/src/views/monitor/log/errorLog.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <eHeader :query="query"/>
+    <Search :query="query"/>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <el-table-column prop="username" label="用户名"/>
@@ -39,9 +39,9 @@
 import initData from '@/mixins/initData'
 import { parseTime } from '@/utils/index'
 import { getErrDetail } from '@/api/log'
-import eHeader from './module/header'
+import Search from './search'
 export default {
-  components: { eHeader },
+  components: { Search },
   mixins: [initData],
   data() {
     return {
@@ -59,11 +59,10 @@ export default {
       this.url = 'api/logs/error'
       const sort = 'id,desc'
       const query = this.query
-      const username = query.username
-      const logType = query.logType
+      const type = query.type
+      const value = query.value
       this.params = { page: this.page, size: this.size, sort: sort }
-      if (username && username) { this.params['username'] = username }
-      if (logType !== '' && logType !== null) { this.params['logType'] = logType }
+      if (type && value) { this.params[type] = value }
       return true
     },
     info(id) {
diff --git a/src/views/monitor/log/index.vue b/src/views/monitor/log/index.vue
index 1fa55cf..855a684 100644
--- a/src/views/monitor/log/index.vue
+++ b/src/views/monitor/log/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <eHeader :query="query"/>
+    <Search :query="query"/>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <el-table-column prop="username" label="用户名"/>
@@ -35,9 +35,9 @@
 <script>
 import initData from '@/mixins/initData'
 import { parseTime } from '@/utils/index'
-import eHeader from './module/header'
+import Search from './search'
 export default {
-  components: { eHeader },
+  components: { Search },
   mixins: [initData],
   created() {
     this.$nextTick(() => {
@@ -50,9 +50,10 @@ export default {
       this.url = 'api/logs'
       const sort = 'id,desc'
       const query = this.query
-      const username = query.username
+      const type = query.type
+      const value = query.value
       this.params = { page: this.page, size: this.size, sort: sort }
-      if (username && username) { this.params['username'] = username }
+      if (type && value) { this.params[type] = value }
       return true
     }
   }
diff --git a/src/views/monitor/log/module/header.vue b/src/views/monitor/log/module/header.vue
deleted file mode 100644
index f4e2ce3..0000000
--- a/src/views/monitor/log/module/header.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-<template>
-  <div class="head-container">
-    <el-input v-model="query.username" clearable placeholder="用户名" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
-    <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-  </div>
-</template>
-
-<script>
-export default {
-  props: {
-    query: {
-      type: Object,
-      required: true
-    }
-  },
-  data() {
-    return {
-      downloadLoading: false
-    }
-  },
-  methods: {
-    toQuery() {
-      this.$parent.page = 0
-      this.$parent.init()
-    }
-  }
-}
-</script>
diff --git a/src/views/monitor/log/search.vue b/src/views/monitor/log/search.vue
new file mode 100644
index 0000000..ba818a0
--- /dev/null
+++ b/src/views/monitor/log/search.vue
@@ -0,0 +1,28 @@
+<template>
+  <div class="head-container">
+    <el-input v-model="query.value" clearable placeholder="请输入搜索内容" style="width: 150px;" class="filter-item" @keyup.enter.native="toQuery"/>
+    <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+      <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
+    </el-select>
+    <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="$parent.toQuery">搜索</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    query: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      queryTypeOptions: [
+        { key: 'username', display_name: '用户名' },
+        { key: 'description', display_name: '描述' }
+      ]
+    }
+  }
+}
+</script>
diff --git a/src/views/monitor/redis/index.vue b/src/views/monitor/redis/index.vue
index 8098eb7..867d934 100644
--- a/src/views/monitor/redis/index.vue
+++ b/src/views/monitor/redis/index.vue
@@ -61,7 +61,7 @@ export default {
   mixins: [initData],
   data() {
     return {
-      delLoading: false, sup_this: this, permissions: [], deleteAllLoading: false
+      delLoading: false, permissions: [], deleteAllLoading: false
     }
   },
   created() {
@@ -101,10 +101,6 @@ export default {
         console.log(err.response.data.message)
       })
     },
-    toQuery() {
-      this.page = 0
-      this.init()
-    },
     deleteAll() {
       this.$confirm('你确定要清空缓存数据吗？', '提示', {
         confirmButtonText: '确定',
diff --git a/src/views/system/dept/module/form.vue b/src/views/system/dept/form.vue
similarity index 96%
rename from src/views/system/dept/module/form.vue
rename to src/views/system/dept/form.vue
index cd854eb..695f6eb 100644
--- a/src/views/system/dept/module/form.vue
+++ b/src/views/system/dept/form.vue
@@ -29,10 +29,6 @@ export default {
       type: Boolean,
       required: true
     },
-    sup_this: {
-      type: Object,
-      default: null
-    },
     dicts: {
       type: Array,
       required: true
@@ -84,7 +80,7 @@ export default {
           duration: 2500
         })
         this.loading = false
-        this.$parent.$parent.init()
+        this.$parent.init()
       }).catch(err => {
         this.loading = false
         console.log(err.response.data.message)
@@ -99,7 +95,7 @@ export default {
           duration: 2500
         })
         this.loading = false
-        this.sup_this.init()
+        this.$parent.init()
       }).catch(err => {
         this.loading = false
         console.log(err.response.data.message)
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 1fbb8ec..fea70f8 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -1,6 +1,34 @@
 <template>
   <div class="app-container">
-    <eHeader :query="query" :dicts="dicts"/>
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入部门名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-select v-model="query.enabled" clearable placeholder="状态" class="filter-item" style="width: 90px" @change="toQuery">
+        <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
+      </el-select>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <div v-permission="['ADMIN','DEPT_ALL','DEPT_CREATE']" style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add">新增</el-button>
+      </div>
+      <div style="display: inline-block;">
+        <el-button
+          class="filter-item"
+          size="mini"
+          type="warning"
+          icon="el-icon-more"
+          @click="changeExpand">{{ $parent.expand ? '折叠' : '展开' }}</el-button>
+        <eForm ref="form" :is-add="true" :dicts="dicts"/>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" :dicts="dicts"/>
     <!--表格渲染-->
     <tree-table v-loading="loading" :expand-all="expand" :data="data" :columns="columns" size="small">
       <el-table-column label="状态" align="center">
@@ -17,7 +45,7 @@
       </el-table-column>
       <el-table-column v-if="checkPermission(['ADMIN','DEPT_ALL','DEPT_EDIT','DEPT_DELETE'])" label="操作" width="130px" align="center">
         <template slot-scope="scope">
-          <edit v-permission="['ADMIN','DEPT_ALL','DEPT_EDIT']" :dicts="dicts" :data="scope.row" :sup_this="sup_this"/>
+          <el-button v-permission="['ADMIN','DEPT_ALL','DEPT_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
           <el-popover
             v-permission="['ADMIN','DEPT_ALL','DEPT_DELETE']"
             :ref="scope.row.id"
@@ -43,10 +71,9 @@ import initData from '@/mixins/initData'
 import initDict from '@/mixins/initDict'
 import { del } from '@/api/dept'
 import { parseTime } from '@/utils/index'
-import eHeader from './module/header'
-import edit from './module/edit'
+import eForm from './form'
 export default {
-  components: { eHeader, edit, treeTable },
+  components: { eForm, treeTable },
   mixins: [initData, initDict],
   data() {
     return {
@@ -56,7 +83,11 @@ export default {
           value: 'name'
         }
       ],
-      delLoading: false, sup_this: this, expand: true
+      enabledTypeOptions: [
+        { key: 'true', display_name: '正常' },
+        { key: 'false', display_name: '禁用' }
+      ],
+      delLoading: false, expand: true
     }
   },
   created() {
@@ -96,6 +127,29 @@ export default {
         this.$refs[id].doClose()
         console.log(err.response.data.message)
       })
+    },
+    add() {
+      this.isAdd = true
+      const _this = this.$refs.form
+      _this.getDepts()
+      _this.dialog = true
+    },
+    changeExpand() {
+      this.expand = !this.expand
+      this.init()
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.getDepts()
+      _this.form = {
+        id: data.id,
+        name: data.name,
+        pid: data.pid,
+        createTime: data.createTime,
+        enabled: data.enabled.toString()
+      }
+      _this.dialog = true
     }
   }
 }
diff --git a/src/views/system/dept/module/edit.vue b/src/views/system/dept/module/edit.vue
deleted file mode 100644
index 04339a5..0000000
--- a/src/views/system/dept/module/edit.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<template>
-  <div>
-    <el-button size="mini" type="primary" icon="el-icon-edit" @click="to"/>
-    <eForm ref="form" :sup_this="sup_this" :is-add="false" :dicts="dicts"/>
-  </div>
-</template>
-<script>
-import eForm from './form'
-export default {
-  components: { eForm },
-  props: {
-    data: {
-      type: Object,
-      required: true
-    },
-    sup_this: {
-      type: Object,
-      required: true
-    },
-    dicts: {
-      type: Array,
-      required: true
-    }
-  },
-  methods: {
-    to() {
-      const _this = this.$refs.form
-      _this.getDepts()
-      _this.form = {
-        id: this.data.id,
-        name: this.data.name,
-        pid: this.data.pid,
-        createTime: this.data.createTime,
-        enabled: this.data.enabled.toString()
-      }
-      _this.dialog = true
-    }
-  }
-}
-</script>
-
-<style scoped>
-  div{
-    display: inline-block;
-    margin-right: 3px;
-  }
-</style>
diff --git a/src/views/system/dept/module/header.vue b/src/views/system/dept/module/header.vue
deleted file mode 100644
index c486847..0000000
--- a/src/views/system/dept/module/header.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<template>
-  <div class="head-container">
-    <!-- 搜索 -->
-    <el-input v-model="query.value" clearable placeholder="输入部门名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
-    <el-select v-model="query.enabled" clearable placeholder="状态" class="filter-item" style="width: 90px" @change="toQuery">
-      <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
-    </el-select>
-    <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-    <!-- 新增 -->
-    <div v-permission="['ADMIN','DEPT_ALL','DEPT_CREATE']" style="display: inline-block;margin: 0px 2px;">
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-plus"
-        @click="add">新增</el-button>
-      <eForm ref="form" :is-add="true" :dicts="dicts"/>
-    </div>
-    <div style="display: inline-block;">
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-more"
-        @click="expand">{{ $parent.expand ? '折叠' : '展开' }}</el-button>
-      <eForm ref="form" :is-add="true" :dicts="dicts"/>
-    </div>
-  </div>
-</template>
-
-<script>
-import eForm from './form'
-export default {
-  components: { eForm },
-  props: {
-    query: {
-      type: Object,
-      required: true
-    },
-    dicts: {
-      type: Array,
-      required: true
-    }
-  },
-  data() {
-    return {
-      enabledTypeOptions: [
-        { key: 'true', display_name: '正常' },
-        { key: 'false', display_name: '禁用' }
-      ]
-    }
-  },
-  methods: {
-    toQuery() {
-      this.$parent.page = 0
-      this.$parent.init()
-    },
-    add() {
-      this.$refs.form.getDepts()
-      this.$refs.form.dialog = true
-    },
-    expand() {
-      this.$parent.expand = !this.$parent.expand
-      this.$parent.init()
-    }
-  }
-}
-</script>
diff --git a/src/views/system/dict/module/form.vue b/src/views/system/dict/form.vue
similarity index 95%
rename from src/views/system/dict/module/form.vue
rename to src/views/system/dict/form.vue
index 844891d..38ae77a 100644
--- a/src/views/system/dict/module/form.vue
+++ b/src/views/system/dict/form.vue
@@ -22,10 +22,6 @@ export default {
     isAdd: {
       type: Boolean,
       required: true
-    },
-    sup_this: {
-      type: Object,
-      default: null
     }
   },
   data() {
@@ -66,7 +62,7 @@ export default {
           duration: 2500
         })
         this.loading = false
-        this.sup_this.init()
+        this.$parent.init()
       }).catch(err => {
         this.loading = false
         console.log(err.response.data.message)
@@ -81,7 +77,7 @@ export default {
           duration: 2500
         })
         this.loading = false
-        this.sup_this.init()
+        this.$parent.init()
       }).catch(err => {
         this.loading = false
         console.log(err.response.data.message)
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index ed3a0e4..97b4dff 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -1,5 +1,7 @@
 <template>
   <div class="app-container">
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd"/>
     <el-row :gutter="10">
       <el-col :xs="24" :sm="24" :md="10" :lg="10" :xl="10">
         <el-card class="box-card">
@@ -12,16 +14,24 @@
               style="float: right;padding: 4px 10px"
               type="primary"
               icon="el-icon-plus"
-              @click="$refs.header.$refs.form.dialog = true">新增</el-button>
+              @click="$refs.form.dialog = true;isAdd = true">新增</el-button>
+          </div>
+          <!--工具栏-->
+          <div class="head-container">
+            <!-- 搜索 -->
+            <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+            <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+              <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
+            </el-select>
+            <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
           </div>
-          <eHeader ref="header" :query="query" :sup_this="sup_this"/>
           <!--表格渲染-->
           <el-table v-loading="loading" :data="data" size="small" highlight-current-row style="width: 100%;" @current-change="handleCurrentChange">
             <el-table-column :show-overflow-tooltip="true" prop="name" label="名称"/>
             <el-table-column :show-overflow-tooltip="true" prop="remark" label="描述"/>
             <el-table-column v-if="checkPermission(['ADMIN','DICT_ALL','DICT_EDIT','DICT_DELETE'])" label="操作" width="130px" align="center">
               <template slot-scope="scope">
-                <edit v-permission="['ADMIN','DICT_ALL','DICT_EDIT']" :data="scope.row" :sup_this="sup_this"/>
+                <el-button v-permission="['ADMIN','DICT_ALL','DICT_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
                 <el-popover
                   v-permission="['ADMIN','DICT_ALL','DICT_DELETE']"
                   :ref="scope.row.id"
@@ -58,7 +68,7 @@
               style="float: right;padding: 4px 10px"
               type="primary"
               icon="el-icon-plus"
-              @click="$refs.dictDetail.$refs.header.$refs.form.dialog = true">新增</el-button>
+              @click="$refs.dictDetail.$refs.form.dialog = true;$refs.dictDetail.isAdd = true">新增</el-button>
           </div>
           <dictDetail ref="dictDetail"/>
         </el-card>
@@ -71,15 +81,18 @@
 import checkPermission from '@/utils/permission'
 import initData from '@/mixins/initData'
 import { del } from '@/api/dict'
-import eHeader from './module/header'
-import edit from './module/edit'
 import dictDetail from '../dictDetail/index'
+import eForm from './form'
 export default {
-  components: { eHeader, edit, dictDetail },
+  components: { dictDetail, eForm },
   mixins: [initData],
   data() {
     return {
-      delLoading: false, sup_this: this
+      delLoading: false,
+      queryTypeOptions: [
+        { key: 'name', display_name: '字典名称' },
+        { key: 'remark', display_name: '描述' }
+      ]
     }
   },
   created() {
@@ -127,6 +140,16 @@ export default {
         this.$refs.dictDetail.dictId = val.id
         this.$refs.dictDetail.init()
       }
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        name: data.name,
+        remark: data.remark
+      }
+      _this.dialog = true
     }
   }
 }
diff --git a/src/views/system/dict/module/edit.vue b/src/views/system/dict/module/edit.vue
deleted file mode 100644
index 323545a..0000000
--- a/src/views/system/dict/module/edit.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-<template>
-  <div>
-    <el-button size="mini" type="primary" icon="el-icon-edit" @click="to"/>
-    <eForm ref="form" :sup_this="sup_this" :is-add="false"/>
-  </div>
-</template>
-<script>
-import eForm from './form'
-export default {
-  components: { eForm },
-  props: {
-    data: {
-      type: Object,
-      required: true
-    },
-    sup_this: {
-      type: Object,
-      required: true
-    }
-  },
-  methods: {
-    to() {
-      const _this = this.$refs.form
-      _this.form = {
-        id: this.data.id,
-        name: this.data.name,
-        remark: this.data.remark
-      }
-      _this.dialog = true
-    }
-  }
-}
-</script>
-
-<style scoped>
-  div{
-    display: inline-block;
-    margin-right: 3px;
-  }
-</style>
diff --git a/src/views/system/dict/module/header.vue b/src/views/system/dict/module/header.vue
deleted file mode 100644
index cff3a61..0000000
--- a/src/views/system/dict/module/header.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <div class="head-container">
-    <!-- 搜索 -->
-    <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
-    <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
-      <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
-    </el-select>
-    <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-    <div style="display: inline-block;margin: 0px 2px;">
-      <eForm ref="form" :is-add="true" :sup_this="sup_this"/>
-    </div>
-  </div>
-</template>
-
-<script>
-import checkPermission from '@/utils/permission' // 权限判断函数
-import eForm from './form'
-export default {
-  components: { eForm },
-  props: {
-    query: {
-      type: Object,
-      required: true
-    },
-    sup_this: {
-      type: Object,
-      required: true
-    }
-  },
-  data() {
-    return {
-      queryTypeOptions: [
-        { key: 'name', display_name: '字典名称' },
-        { key: 'remark', display_name: '描述' }
-      ]
-    }
-  },
-  methods: {
-    checkPermission,
-    toQuery() {
-      this.sup_this.page = 0
-      this.sup_this.init()
-    }
-  }
-}
-</script>
diff --git a/src/views/system/dictDetail/module/form.vue b/src/views/system/dictDetail/form.vue
similarity index 95%
rename from src/views/system/dictDetail/module/form.vue
rename to src/views/system/dictDetail/form.vue
index ad1278e..443a894 100644
--- a/src/views/system/dictDetail/module/form.vue
+++ b/src/views/system/dictDetail/form.vue
@@ -26,10 +26,6 @@ export default {
       type: Boolean,
       required: true
     },
-    sup_this: {
-      type: Object,
-      default: null
-    },
     dictId: {
       type: Number,
       required: true
@@ -78,7 +74,7 @@ export default {
           duration: 2500
         })
         this.loading = false
-        this.$parent.$parent.init()
+        this.$parent.init()
       }).catch(err => {
         this.loading = false
         console.log(err.response.data.message)
@@ -93,7 +89,7 @@ export default {
           duration: 2500
         })
         this.loading = false
-        this.sup_this.init()
+        this.$parent.init()
       }).catch(err => {
         this.loading = false
         console.log(err.response.data.message)
diff --git a/src/views/system/dictDetail/index.vue b/src/views/system/dictDetail/index.vue
index 07e3651..08e693d 100644
--- a/src/views/system/dictDetail/index.vue
+++ b/src/views/system/dictDetail/index.vue
@@ -4,7 +4,14 @@
       <div class="my-code">点击字典查看详情</div>
     </div>
     <div v-else>
-      <eHeader ref="header" :query="query" :dict-id="dictId"/>
+      <!--工具栏-->
+      <div class="head-container">
+        <!-- 搜索 -->
+        <el-input v-model="query.value" clearable placeholder="输入字典标签查询" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+        <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      </div>
+      <!--表单组件-->
+      <eForm ref="form" :is-add="isAdd" :dict-id="dictId"/>
       <!--表格渲染-->
       <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
         <el-table-column label="所属字典">
@@ -17,7 +24,7 @@
         <el-table-column prop="sort" label="排序"/>
         <el-table-column v-if="checkPermission(['ADMIN','DICT_ALL','DICT_EDIT','DICT_DELETE'])" label="操作" width="130px" align="center">
           <template slot-scope="scope">
-            <edit v-permission="['ADMIN','DICT_ALL','DICT_EDIT']" :dict-id="dictId" :data="scope.row" :sup_this="sup_this"/>
+            <el-button v-permission="['ADMIN','DICT_ALL','DICT_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
             <el-popover
               v-permission="['ADMIN','DICT_ALL','DICT_DELETE']"
               :ref="scope.row.id"
@@ -49,14 +56,13 @@
 import checkPermission from '@/utils/permission'
 import initData from '@/mixins/initData'
 import { del } from '@/api/dictDetail'
-import eHeader from './module/header'
-import edit from './module/edit'
+import eForm from './form'
 export default {
-  components: { eHeader, edit },
+  components: { eForm },
   mixins: [initData],
   data() {
     return {
-      delLoading: false, sup_this: this, dictName: '', dictId: 0
+      delLoading: false, dictName: '', dictId: 0
     }
   },
   created() {
@@ -89,6 +95,17 @@ export default {
         this.$refs[id].doClose()
         console.log(err.response.data.message)
       })
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        label: data.label,
+        value: data.value,
+        sort: data.sort
+      }
+      _this.dialog = true
     }
   }
 }
diff --git a/src/views/system/dictDetail/module/edit.vue b/src/views/system/dictDetail/module/edit.vue
deleted file mode 100644
index 2e2e00b..0000000
--- a/src/views/system/dictDetail/module/edit.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<template>
-  <div>
-    <el-button size="mini" type="primary" icon="el-icon-edit" @click="to"/>
-    <eForm ref="form" :sup_this="sup_this" :is-add="false" :dict-id="dictId"/>
-  </div>
-</template>
-<script>
-import eForm from './form'
-export default {
-  components: { eForm },
-  props: {
-    data: {
-      type: Object,
-      required: true
-    },
-    sup_this: {
-      type: Object,
-      required: true
-    },
-    dictId: {
-      type: Number,
-      required: true
-    }
-  },
-  methods: {
-    to() {
-      const _this = this.$refs.form
-      _this.form = {
-        id: this.data.id,
-        label: this.data.label,
-        value: this.data.value,
-        sort: this.data.sort
-      }
-      _this.dialog = true
-    }
-  }
-}
-</script>
-
-<style scoped>
-  div{
-    display: inline-block;
-    margin-right: 3px;
-  }
-</style>
diff --git a/src/views/system/dictDetail/module/header.vue b/src/views/system/dictDetail/module/header.vue
deleted file mode 100644
index 134f37f..0000000
--- a/src/views/system/dictDetail/module/header.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <div class="head-container">
-    <!-- 搜索 -->
-    <el-input v-model="query.value" clearable placeholder="输入字典标签查询" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
-    <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-    <div style="display: inline-block;margin: 0px 2px;">
-      <eForm ref="form" :is-add="true" :dict-id="dictId"/>
-    </div>
-  </div>
-</template>
-
-<script>
-import checkPermission from '@/utils/permission' // 权限判断函数
-import eForm from './form'
-export default {
-  components: { eForm },
-  props: {
-    query: {
-      type: Object,
-      required: true
-    },
-    dictId: {
-      type: Number,
-      required: true
-    }
-  },
-  data() {
-    return {}
-  },
-  methods: {
-    checkPermission,
-    toQuery() {
-      this.$parent.page = 0
-      this.$parent.init()
-    }
-  }
-}
-</script>
diff --git a/src/views/system/job/module/form.vue b/src/views/system/job/form.vue
similarity index 96%
rename from src/views/system/job/module/form.vue
rename to src/views/system/job/form.vue
index ad3fbe9..f969e70 100644
--- a/src/views/system/job/module/form.vue
+++ b/src/views/system/job/form.vue
@@ -33,10 +33,6 @@ export default {
       type: Boolean,
       required: true
     },
-    sup_this: {
-      type: Object,
-      default: null
-    },
     dicts: {
       type: Array,
       required: true
@@ -94,7 +90,7 @@ export default {
           duration: 2500
         })
         this.loading = false
-        this.$parent.$parent.init()
+        this.$parent.init()
       }).catch(err => {
         this.loading = false
         console.log(err.response.data.message)
@@ -109,7 +105,7 @@ export default {
           duration: 2500
         })
         this.loading = false
-        this.sup_this.init()
+        this.$parent.init()
       }).catch(err => {
         this.loading = false
         console.log(err.response.data.message)
diff --git a/src/views/system/job/index.vue b/src/views/system/job/index.vue
index f476af4..6dce862 100644
--- a/src/views/system/job/index.vue
+++ b/src/views/system/job/index.vue
@@ -1,6 +1,25 @@
 <template>
   <div class="app-container">
-    <eHeader :query="query" :dicts="dicts"/>
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入岗位名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-select v-model="query.enabled" clearable placeholder="状态" class="filter-item" style="width: 90px" @change="toQuery">
+        <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
+      </el-select>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <div v-permission="['ADMIN','USERJOB_ALL','USERJOB_CREATE']" style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add">新增</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" :dicts="dicts"/>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <el-table-column prop="name" label="名称"/>
@@ -28,7 +47,7 @@
       </el-table-column>
       <el-table-column v-if="checkPermission(['ADMIN','USERJOB_ALL','USERJOB_EDIT','USERJOB_DELETE'])" label="操作" width="130px" align="center">
         <template slot-scope="scope">
-          <edit v-permission="['ADMIN','USERJOB_ALL','USERJOB_EDIT']" :dicts="dicts" :data="scope.row" :sup_this="sup_this"/>
+          <el-button v-permission="['ADMIN','USERJOB_ALL','USERJOB_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
           <el-popover
             v-permission="['ADMIN','USERJOB_ALL','USERJOB_DELETE']"
             :ref="scope.row.id"
@@ -61,14 +80,17 @@ import initData from '@/mixins/initData'
 import initDict from '@/mixins/initDict'
 import { del } from '@/api/job'
 import { parseTime } from '@/utils/index'
-import eHeader from './module/header'
-import edit from './module/edit'
+import eForm from './form'
 export default {
-  components: { eHeader, edit },
+  components: { eForm },
   mixins: [initData, initDict],
   data() {
     return {
-      delLoading: false, sup_this: this
+      delLoading: false,
+      enabledTypeOptions: [
+        { key: 'true', display_name: '正常' },
+        { key: 'false', display_name: '禁用' }
+      ]
     }
   },
   created() {
@@ -109,6 +131,26 @@ export default {
         this.$refs[id].doClose()
         console.log(err.response.data.message)
       })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.getDepts()
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.getDepts()
+      _this.form = {
+        id: data.id,
+        name: data.name,
+        sort: data.sort,
+        enabled: data.enabled.toString(),
+        createTime: data.createTime,
+        dept: { id: data.dept.id }
+      }
+      _this.deptId = data.dept.id
+      _this.dialog = true
     }
   }
 }
diff --git a/src/views/system/job/module/edit.vue b/src/views/system/job/module/edit.vue
deleted file mode 100644
index 12c40ff..0000000
--- a/src/views/system/job/module/edit.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<template>
-  <div>
-    <el-button size="mini" type="primary" icon="el-icon-edit" @click="to"/>
-    <eForm ref="form" :sup_this="sup_this" :is-add="false" :dicts="dicts"/>
-  </div>
-</template>
-<script>
-import eForm from './form'
-export default {
-  components: { eForm },
-  props: {
-    data: {
-      type: Object,
-      required: true
-    },
-    sup_this: {
-      type: Object,
-      required: true
-    },
-    dicts: {
-      type: Array,
-      required: true
-    }
-  },
-  methods: {
-    to() {
-      const _this = this.$refs.form
-      _this.getDepts()
-      _this.form = {
-        id: this.data.id,
-        name: this.data.name,
-        sort: this.data.sort,
-        enabled: this.data.enabled.toString(),
-        createTime: this.data.createTime,
-        dept: { id: this.data.dept.id }
-      }
-      _this.deptId = this.data.dept.id
-      _this.dialog = true
-    }
-  }
-}
-</script>
-
-<style scoped>
-  div{
-    display: inline-block;
-    margin-right: 3px;
-  }
-</style>
diff --git a/src/views/system/job/module/header.vue b/src/views/system/job/module/header.vue
deleted file mode 100644
index bf22eb3..0000000
--- a/src/views/system/job/module/header.vue
+++ /dev/null
@@ -1,55 +0,0 @@
-<template>
-  <div class="head-container">
-    <!-- 搜索 -->
-    <el-input v-model="query.value" clearable placeholder="输入岗位名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
-    <el-select v-model="query.enabled" clearable placeholder="状态" class="filter-item" style="width: 90px" @change="toQuery">
-      <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
-    </el-select>
-    <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-    <!-- 新增 -->
-    <div v-permission="['ADMIN','USERJOB_ALL','USERJOB_CREATE']" style="display: inline-block;margin: 0px 2px;">
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-plus"
-        @click="add">新增</el-button>
-      <eForm ref="form" :is-add="true" :dicts="dicts"/>
-    </div>
-  </div>
-</template>
-
-<script>
-import eForm from './form'
-export default {
-  components: { eForm },
-  props: {
-    query: {
-      type: Object,
-      required: true
-    },
-    dicts: {
-      type: Array,
-      required: true
-    }
-  },
-  data() {
-    return {
-      enabledTypeOptions: [
-        { key: 'true', display_name: '正常' },
-        { key: 'false', display_name: '禁用' }
-      ]
-    }
-  },
-  methods: {
-    add() {
-      this.$refs.form.getDepts()
-      this.$refs.form.dialog = true
-    },
-    toQuery() {
-      this.$parent.page = 0
-      this.$parent.init()
-    }
-  }
-}
-</script>
diff --git a/src/views/system/menu/module/form.vue b/src/views/system/menu/form.vue
similarity index 97%
rename from src/views/system/menu/module/form.vue
rename to src/views/system/menu/form.vue
index aa77000..b58d662 100644
--- a/src/views/system/menu/module/form.vue
+++ b/src/views/system/menu/form.vue
@@ -52,10 +52,6 @@ export default {
     isAdd: {
       type: Boolean,
       required: true
-    },
-    sup_this: {
-      type: Object,
-      default: null
     }
   },
   data() {
@@ -100,7 +96,7 @@ export default {
           duration: 2500
         })
         this.loading = false
-        this.$parent.$parent.init()
+        this.$parent.init()
       }).catch(err => {
         this.loading = false
         console.log(err.response.data.message)
@@ -115,7 +111,7 @@ export default {
           duration: 2500
         })
         this.loading = false
-        this.sup_this.init()
+        this.$parent.init()
       }).catch(err => {
         this.loading = false
         console.log(err.response.data.message)
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 2b3ff52..b588295 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -1,6 +1,31 @@
 <template>
   <div class="app-container">
-    <eHeader :query="query"/>
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <div v-permission="['ADMIN','MENU_ALL','MENU_CREATE']" style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add">新增</el-button>
+      </div>
+      <div style="display: inline-block;">
+        <el-button
+          class="filter-item"
+          size="mini"
+          type="warning"
+          icon="el-icon-more"
+          @click="changExpand">{{ $parent.expand ? '折叠' : '展开' }}</el-button>
+        <eForm ref="form" :is-add="true"/>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd"/>
     <!--表格渲染-->
     <tree-table v-loading="loading" :data="data" :expand-all="expand" :columns="columns" size="small">
       <el-table-column prop="icon" label="图标" align="center" width="80px">
@@ -28,7 +53,7 @@
       </el-table-column>
       <el-table-column v-if="checkPermission(['ADMIN','MENU_ALL','MENU_EDIT','MENU_DELETE'])" label="操作" width="130px" align="center">
         <template slot-scope="scope">
-          <edit v-permission="['ADMIN','MENU_ALL','MENU_EDIT']" :data="scope.row" :sup_this="sup_this"/>
+          <el-button v-permission="['ADMIN','MENU_ALL','MENU_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
           <el-popover
             v-permission="['ADMIN','MENU_ALL','MENU_DELETE']"
             :ref="scope.row.id"
@@ -53,10 +78,9 @@ import treeTable from '@/components/TreeTable'
 import initData from '@/mixins/initData'
 import { del } from '@/api/menu'
 import { parseTime } from '@/utils/index'
-import eHeader from './module/header'
-import edit from './module/edit'
+import eForm from './form'
 export default {
-  components: { eHeader, edit, treeTable },
+  components: { treeTable, eForm },
   mixins: [initData],
   data() {
     return {
@@ -66,7 +90,7 @@ export default {
           value: 'name'
         }
       ],
-      delLoading: false, sup_this: this, expand: true
+      delLoading: false, expand: true
     }
   },
   created() {
@@ -102,6 +126,22 @@ export default {
         this.$refs[id].doClose()
         console.log(err.response.data.message)
       })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.getMenus()
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.getMenus()
+      _this.form = { id: data.id, component: data.component, name: data.name, sort: data.sort, pid: data.pid, path: data.path, iframe: data.iframe.toString(), roles: [], icon: data.icon }
+      _this.dialog = true
+    },
+    changExpand() {
+      this.expand = !this.expand
+      this.init()
     }
   }
 }
diff --git a/src/views/system/menu/module/edit.vue b/src/views/system/menu/module/edit.vue
deleted file mode 100644
index e9f28ea..0000000
--- a/src/views/system/menu/module/edit.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-<template>
-  <div>
-    <el-button size="mini" type="primary" icon="el-icon-edit" @click="to"/>
-    <eForm ref="form" :sup_this="sup_this" :is-add="false"/>
-  </div>
-</template>
-<script>
-import eForm from './form'
-export default {
-  components: { eForm },
-  props: {
-    data: {
-      type: Object,
-      required: true
-    },
-    sup_this: {
-      type: Object,
-      required: true
-    }
-  },
-  methods: {
-    to() {
-      const _this = this.$refs.form
-      _this.getMenus()
-      _this.form = { id: this.data.id, component: this.data.component, name: this.data.name, sort: this.data.sort, pid: this.data.pid, path: this.data.path, iframe: this.data.iframe.toString(), roles: [], icon: this.data.icon }
-      _this.dialog = true
-    }
-  }
-}
-</script>
-
-<style scoped>
-  div{
-    display: inline-block;
-    margin-right: 3px;
-  }
-</style>
diff --git a/src/views/system/menu/module/header.vue b/src/views/system/menu/module/header.vue
deleted file mode 100644
index ce32b5d..0000000
--- a/src/views/system/menu/module/header.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
-  <div class="head-container">
-    <!-- 搜索 -->
-    <el-input v-model="query.value" clearable placeholder="输入名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
-    <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-    <!-- 新增 -->
-    <div v-permission="['ADMIN','MENU_ALL','MENU_CREATE']" style="display: inline-block;margin: 0px 2px;">
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-plus"
-        @click="add">新增</el-button>
-      <eForm ref="form" :is-add="true"/>
-    </div>
-    <div style="display: inline-block;">
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-more"
-        @click="expand">{{ $parent.expand ? '折叠' : '展开' }}</el-button>
-      <eForm ref="form" :is-add="true"/>
-    </div>
-  </div>
-</template>
-
-<script>
-import eForm from './form'
-export default {
-  components: { eForm },
-  props: {
-    query: {
-      type: Object,
-      required: true
-    }
-  },
-  data() {
-    return {
-      downloadLoading: false
-    }
-  },
-  methods: {
-    toQuery() {
-      this.$parent.page = 0
-      this.$parent.init()
-    },
-    add() {
-      this.$refs.form.getMenus()
-      this.$refs.form.dialog = true
-    },
-    expand() {
-      this.$parent.expand = !this.$parent.expand
-      this.$parent.init()
-    }
-  }
-}
-</script>
diff --git a/src/views/system/permission/module/form.vue b/src/views/system/permission/form.vue
similarity index 95%
rename from src/views/system/permission/module/form.vue
rename to src/views/system/permission/form.vue
index 83ff4f2..83e73f2 100644
--- a/src/views/system/permission/module/form.vue
+++ b/src/views/system/permission/form.vue
@@ -28,10 +28,6 @@ export default {
     isAdd: {
       type: Boolean,
       required: true
-    },
-    sup_this: {
-      type: Object,
-      default: null
     }
   },
   data() {
@@ -73,7 +69,7 @@ export default {
           duration: 2500
         })
         this.loading = false
-        this.$parent.$parent.init()
+        this.$parent.init()
       }).catch(err => {
         this.loading = false
         console.log(err.response.data.message)
@@ -88,7 +84,7 @@ export default {
           duration: 2500
         })
         this.loading = false
-        this.sup_this.init()
+        this.$parent.init()
       }).catch(err => {
         this.loading = false
         console.log(err.response.data.message)
diff --git a/src/views/system/permission/index.vue b/src/views/system/permission/index.vue
index d685674..9cc3b06 100644
--- a/src/views/system/permission/index.vue
+++ b/src/views/system/permission/index.vue
@@ -1,6 +1,31 @@
 <template>
   <div class="app-container">
-    <eHeader :query="query"/>
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <div v-permission="['ADMIN','PERMISSION_ALL','PERMISSION_CREATE']" style="display: inline-block;margin: 0px 2px 0px">
+        <el-button
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add">新增</el-button>
+      </div>
+      <div style="display: inline-block;">
+        <el-button
+          class="filter-item"
+          size="mini"
+          type="warning"
+          icon="el-icon-more"
+          @click="changeExpand">{{ $parent.expand ? '折叠' : '展开' }}</el-button>
+        <eForm ref="form" :is-add="true"/>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd"/>
     <!--表格渲染-->
     <tree-table v-loading="loading" :data="data" :expand-all="expand" :columns="columns" size="small">
       <el-table-column prop="createTime" label="创建日期">
@@ -10,7 +35,7 @@
       </el-table-column>
       <el-table-column v-if="checkPermission(['ADMIN','PERMISSION_ALL','PERMISSION_EDIT','PERMISSION_DELETE'])" label="操作" width="130px" align="center">
         <template slot-scope="scope">
-          <edit v-permission="['ADMIN','PERMISSION_ALL','PERMISSION_EDIT']" :data="scope.row" :sup_this="sup_this"/>
+          <el-button v-permission="['ADMIN','PERMISSION_ALL','PERMISSION_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
           <el-popover
             v-permission="['ADMIN','PERMISSION_ALL','PERMISSION_DELETE']"
             :ref="scope.row.id"
@@ -35,10 +60,9 @@ import treeTable from '@/components/TreeTable'
 import initData from '@/mixins/initData'
 import { del } from '@/api/permission'
 import { parseTime } from '@/utils/index'
-import eHeader from './module/header'
-import edit from './module/edit'
+import eForm from './form'
 export default {
-  components: { eHeader, edit, treeTable },
+  components: { treeTable, eForm },
   mixins: [initData],
   data() {
     return {
@@ -52,7 +76,7 @@ export default {
           value: 'alias'
         }
       ],
-      delLoading: false, sup_this: this, expand: true
+      delLoading: false, expand: true
     }
   },
   created() {
@@ -88,6 +112,22 @@ export default {
         this.$refs[id].doClose()
         console.log(err.response.data.message)
       })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.getPermissions()
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.getPermissions()
+      _this.form = { id: data.id, name: data.name, alias: data.alias, pid: data.pid }
+      _this.dialog = true
+    },
+    changeExpand() {
+      this.expand = !this.expand
+      this.init()
     }
   }
 }
diff --git a/src/views/system/permission/module/edit.vue b/src/views/system/permission/module/edit.vue
deleted file mode 100644
index 5dc1b00..0000000
--- a/src/views/system/permission/module/edit.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-<template>
-  <div>
-    <el-button size="mini" type="primary" icon="el-icon-edit" @click="to"/>
-    <eForm ref="form" :sup_this="sup_this" :is-add="false"/>
-  </div>
-</template>
-<script>
-import eForm from './form'
-export default {
-  components: { eForm },
-  props: {
-    data: {
-      type: Object,
-      required: true
-    },
-    sup_this: {
-      type: Object,
-      required: true
-    }
-  },
-  methods: {
-    to() {
-      const _this = this.$refs.form
-      _this.getPermissions()
-      _this.form = { id: this.data.id, name: this.data.name, alias: this.data.alias, pid: this.data.pid }
-      _this.dialog = true
-    }
-  }
-}
-</script>
-
-<style scoped>
-  div{
-    display: inline-block;
-    margin-right: 3px;
-  }
-</style>
diff --git a/src/views/system/permission/module/header.vue b/src/views/system/permission/module/header.vue
deleted file mode 100644
index 6a09a76..0000000
--- a/src/views/system/permission/module/header.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
-  <div class="head-container">
-    <!-- 搜索 -->
-    <el-input v-model="query.value" clearable placeholder="输入名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
-    <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-    <!-- 新增 -->
-    <div v-permission="['ADMIN','PERMISSION_ALL','PERMISSION_CREATE']" style="display: inline-block;margin: 0px 2px 0px">
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-plus"
-        @click="add">新增</el-button>
-      <eForm ref="form" :is-add="true"/>
-    </div>
-    <div style="display: inline-block;">
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-more"
-        @click="expand">{{ $parent.expand ? '折叠' : '展开' }}</el-button>
-      <eForm ref="form" :is-add="true"/>
-    </div>
-  </div>
-</template>
-
-<script>
-import eForm from './form'
-export default {
-  components: { eForm },
-  props: {
-    query: {
-      type: Object,
-      required: true
-    }
-  },
-  data() {
-    return {
-      downloadLoading: false
-    }
-  },
-  methods: {
-    toQuery() {
-      this.$parent.page = 0
-      this.$parent.init()
-    },
-    add() {
-      this.$refs.form.getPermissions()
-      this.$refs.form.dialog = true
-    },
-    expand() {
-      this.$parent.expand = !this.$parent.expand
-      this.$parent.init()
-    }
-  }
-}
-</script>
diff --git a/src/views/system/role/module/form.vue b/src/views/system/role/form.vue
similarity index 97%
rename from src/views/system/role/module/form.vue
rename to src/views/system/role/form.vue
index 8f6e007..55f7471 100644
--- a/src/views/system/role/module/form.vue
+++ b/src/views/system/role/form.vue
@@ -41,10 +41,6 @@ export default {
     isAdd: {
       type: Boolean,
       required: true
-    },
-    sup_this: {
-      type: Object,
-      default: null
     }
   },
   data() {
@@ -99,7 +95,7 @@ export default {
           duration: 2500
         })
         this.loading = false
-        this.$parent.$parent.init()
+        this.$parent.init()
       }).catch(err => {
         this.loading = false
         console.log(err.response.data.message)
@@ -114,7 +110,7 @@ export default {
           duration: 2500
         })
         this.loading = false
-        this.sup_this.init()
+        this.$parent.init()
       }).catch(err => {
         this.loading = false
         console.log(err.response.data.message)
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index fa2f328..16ca7a6 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,6 +1,22 @@
 <template>
   <div class="app-container">
-    <eHeader :query="query"/>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd"/>
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <div v-permission="['ADMIN','ROLES_ALL','ROLES_CREATE']" style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add">新增</el-button>
+      </div>
+    </div>
     <el-row :gutter="15">
       <!--角色管理-->
       <el-col :xs="24" :sm="24" :md="16" :lg="16" :xl="17">
@@ -26,7 +42,7 @@
             </el-table-column>
             <el-table-column v-if="checkPermission(['ADMIN','ROLES_ALL','ROLES_EDIT','ROLES_DELETE'])" label="操作" width="130px" align="center">
               <template slot-scope="scope">
-                <edit v-permission="['ADMIN','ROLES_ALL','ROLES_EDIT']" :data="scope.row" :sup_this="sup_this"/>
+                <el-button v-permission="['ADMIN','ROLES_ALL','ROLES_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
                 <el-popover
                   v-permission="['ADMIN','ROLES_ALL','ROLES_DELETE']"
                   :ref="scope.row.id"
@@ -114,11 +130,10 @@ import { del } from '@/api/role'
 import { getPermissionTree } from '@/api/permission'
 import { getMenusTree } from '@/api/menu'
 import { parseTime } from '@/utils/index'
-import eHeader from './module/header'
-import edit from './module/edit'
+import eForm from './form'
 import { editPermission, editMenu, get } from '@/api/role'
 export default {
-  components: { eHeader, edit },
+  components: { eForm },
   mixins: [initData],
   data() {
     return {
@@ -127,7 +142,7 @@ export default {
         label: 'label'
       },
       currentId: 0, permissionLoading: false, menuLoading: false, showButton: false, opt: '菜单分配',
-      delLoading: false, sup_this: this, permissions: [], permissionIds: [], menus: [], menuIds: []
+      delLoading: false, permissions: [], permissionIds: [], menus: [], menuIds: []
     }
   },
   created() {
@@ -268,6 +283,23 @@ export default {
           }
         }
       })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.deptIds = []
+      _this.form = { id: data.id, name: data.name, remark: data.remark, depts: data.depts, dataScope: data.dataScope, level: data.level }
+      if (_this.form.dataScope === '自定义') {
+        _this.getDepts()
+      }
+      for (let i = 0; i < _this.form.depts.length; i++) {
+        _this.deptIds[i] = _this.form.depts[i].id
+      }
+      _this.dialog = true
     }
   }
 }
diff --git a/src/views/system/role/module/edit.vue b/src/views/system/role/module/edit.vue
deleted file mode 100644
index 193d40e..0000000
--- a/src/views/system/role/module/edit.vue
+++ /dev/null
@@ -1,43 +0,0 @@
-<template>
-  <div>
-    <el-button size="mini" type="primary" icon="el-icon-edit" @click="to"/>
-    <eForm ref="form" :sup_this="sup_this" :is-add="false"/>
-  </div>
-</template>
-<script>
-import eForm from './form'
-export default {
-  components: { eForm },
-  props: {
-    data: {
-      type: Object,
-      required: true
-    },
-    sup_this: {
-      type: Object,
-      required: true
-    }
-  },
-  methods: {
-    to() {
-      const _this = this.$refs.form
-      _this.deptIds = []
-      _this.form = { id: this.data.id, name: this.data.name, remark: this.data.remark, depts: this.data.depts, dataScope: this.data.dataScope, level: this.data.level }
-      if (_this.form.dataScope === '自定义') {
-        _this.getDepts()
-      }
-      for (let i = 0; i < _this.form.depts.length; i++) {
-        _this.deptIds[i] = _this.form.depts[i].id
-      }
-      _this.dialog = true
-    }
-  }
-}
-</script>
-
-<style scoped>
-  div{
-    display: inline-block;
-    margin-right: 3px;
-  }
-</style>
diff --git a/src/views/system/role/module/header.vue b/src/views/system/role/module/header.vue
deleted file mode 100644
index 2691434..0000000
--- a/src/views/system/role/module/header.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<template>
-  <div class="head-container">
-    <!-- 搜索 -->
-    <el-input v-model="query.value" clearable placeholder="输入名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
-    <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-    <!-- 新增 -->
-    <div v-permission="['ADMIN','ROLES_ALL','ROLES_CREATE']" style="display: inline-block;margin: 0px 2px;">
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-plus"
-        @click="$refs.form.dialog = true">新增</el-button>
-      <eForm ref="form" :is-add="true"/>
-    </div>
-  </div>
-</template>
-
-<script>
-import eForm from './form'
-// 查询条件
-export default {
-  components: { eForm },
-  props: {
-    query: {
-      type: Object,
-      required: true
-    }
-  },
-  data() {
-    return {
-      downloadLoading: false
-    }
-  },
-  methods: {
-    toQuery() {
-      this.$parent.page = 0
-      this.$parent.init()
-    }
-  }
-}
-</script>
diff --git a/src/views/system/timing/index.vue b/src/views/system/timing/index.vue
index 002965c..c79a09f 100644
--- a/src/views/system/timing/index.vue
+++ b/src/views/system/timing/index.vue
@@ -1,6 +1,30 @@
 <template>
   <div class="app-container">
-    <eHeader :query="query"/>
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <div v-permission="['ADMIN','JOB_ALL','JOB_CREATE']" style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="dialog = true; isAdd = true">新增</el-button>
+      </div>
+      <!-- 任务日志 -->
+      <div v-permission="['ADMIN','JOB_ALL','JOB_SELECT']" style="display: inline-block;">
+        <el-button
+          class="filter-item"
+          size="mini"
+          type="warning"
+          icon="el-icon-tickets"
+          @click="doLog">执行日志</el-button>
+        <Log ref="log"/>
+      </div>
+    </div>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <el-table-column :show-overflow-tooltip="true" prop="jobName" width="100px" label="任务名称"/>
@@ -21,7 +45,7 @@
       </el-table-column>
       <el-table-column v-if="checkPermission(['ADMIN','JOB_ALL','JOB_EDIT','JOB_DELETE'])" label="操作" width="180px" align="center">
         <template slot-scope="scope">
-          <edit v-permission="['ADMIN','JOB_ALL','JOB_EDIT']" :data="scope.row" :sup_this="sup_this"/>
+          <el-button v-permission="['ADMIN','JOB_ALL','JOB_EDIT']" size="mini" style="margin-right: 3px;" type="text" @click="edit(scope.row)">编辑</el-button>
           <el-button v-permission="['ADMIN','JOB_ALL','JOB_EDIT']" style="margin-left: -2px" type="text" size="mini" @click="execute(scope.row.id)">执行</el-button>
           <el-button v-permission="['ADMIN','JOB_ALL','JOB_EDIT']" style="margin-left: 3px" type="text" size="mini" @click="updateStatus(scope.row.id,scope.row.isPause ? '恢复' : '暂停')">
             {{ scope.row.isPause ? '恢复' : '暂停' }}
@@ -55,16 +79,31 @@
 <script>
 import checkPermission from '@/utils/permission'
 import initData from '@/mixins/initData'
-import { del, updateIsPause, execution } from '@/api/timing'
+import { del, updateIsPause, execution, add, edit } from '@/api/timing'
 import { parseTime } from '@/utils/index'
-import eHeader from './module/header'
-import edit from './module/edit'
+import Log from './log'
 export default {
-  components: { eHeader, edit },
+  components: { Log },
   mixins: [initData],
   data() {
     return {
-      delLoading: false, sup_this: this
+      delLoading: false, isAdd: false,
+      loading: false, dialog: false,
+      form: { jobName: '', beanName: '', methodName: '', params: '', cronExpression: '', isPause: 'false', remark: '' }, permissionIds: [],
+      rules: {
+        jobName: [
+          { required: true, message: '请输入任务名称', trigger: 'blur' }
+        ],
+        beanName: [
+          { required: true, message: '请输入Bean名称', trigger: 'blur' }
+        ],
+        methodName: [
+          { required: true, message: '请输入方法名称', trigger: 'blur' }
+        ],
+        cronExpression: [
+          { required: true, message: '请输入Cron表达式', trigger: 'blur' }
+        ]
+      }
     }
   },
   created() {
@@ -124,11 +163,70 @@ export default {
         this.$refs[id].doClose()
         console.log(err.response.data.message)
       })
+    },
+    toQuery() {
+      this.page = 0
+      this.init()
+    },
+    doLog() {
+      this.$refs.log.dialog = true
+      this.$refs.log.doInit()
+    },
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.loading = true
+          if (this.isAdd) {
+            this.doAdd()
+          } else this.doEdit()
+        } else {
+          return false
+        }
+      })
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = { jobName: '', beanName: '', methodName: '', params: '', cronExpression: '', isPause: 'false', remark: '' }
+    },
+    edit(data) {
+      this.isAdd = false
+      this.form = { id: data.id, jobName: data.jobName, beanName: data.beanName, methodName: data.methodName, params: data.params, cronExpression: data.cronExpression, isPause: data.isPause.toString(), remark: data.remark }
+      this.dialog = true
     }
   }
 }
 </script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/system/timing/module/log.vue b/src/views/system/timing/log.vue
similarity index 98%
rename from src/views/system/timing/module/log.vue
rename to src/views/system/timing/log.vue
index 6c4378e..522bdc1 100644
--- a/src/views/system/timing/module/log.vue
+++ b/src/views/system/timing/log.vue
@@ -58,7 +58,7 @@ export default {
   data() {
     return {
       errorInfo: '', errorDialog: false,
-      dialog: false, delLoading: false, sup_this: this,
+      dialog: false, delLoading: false,
       enabledTypeOptions: [
         { key: 'true', display_name: '成功' },
         { key: 'false', display_name: '失败' }
diff --git a/src/views/system/timing/module/edit.vue b/src/views/system/timing/module/edit.vue
deleted file mode 100644
index f492f8e..0000000
--- a/src/views/system/timing/module/edit.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
-  <div>
-    <el-button size="mini" type="text" @click="to">编辑</el-button>
-    <eForm ref="form" :sup_this="sup_this" :is-add="false"/>
-  </div>
-</template>
-<script>
-import eForm from './form'
-export default {
-  components: { eForm },
-  props: {
-    data: {
-      type: Object,
-      required: true
-    },
-    sup_this: {
-      type: Object,
-      required: true
-    }
-  },
-  methods: {
-    to() {
-      const _this = this.$refs.form
-      _this.form = { id: this.data.id, jobName: this.data.jobName, beanName: this.data.beanName, methodName: this.data.methodName, params: this.data.params, cronExpression: this.data.cronExpression, isPause: this.data.isPause.toString(), remark: this.data.remark }
-      _this.dialog = true
-    }
-  }
-}
-</script>
-
-<style scoped>
-  div{
-    display: inline-block;
-    margin-right: 3px;
-  }
-</style>
diff --git a/src/views/system/timing/module/form.vue b/src/views/system/timing/module/form.vue
deleted file mode 100644
index 5d3358c..0000000
--- a/src/views/system/timing/module/form.vue
+++ /dev/null
@@ -1,124 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialog" :title="isAdd ? '新增任务' : '编辑任务'" append-to-body width="600px">
-    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
-      <el-form-item label="任务名称" prop="jobName">
-        <el-input v-model="form.jobName" style="width: 460px;"/>
-      </el-form-item>
-      <el-form-item label="Bean名称" prop="beanName">
-        <el-input v-model="form.beanName" style="width: 460px;"/>
-      </el-form-item>
-      <el-form-item label="执行方法" prop="methodName">
-        <el-input v-model="form.methodName" style="width: 460px;"/>
-      </el-form-item>
-      <el-form-item label="参数内容">
-        <el-input v-model="form.params" style="width: 460px;"/>
-      </el-form-item>
-      <el-form-item label="Cron表达式" prop="cronExpression">
-        <el-input v-model="form.cronExpression" style="width: 460px;"/>
-      </el-form-item>
-      <el-form-item label="任务状态">
-        <el-radio v-model="form.isPause" label="false">启用</el-radio>
-        <el-radio v-model="form.isPause" label="true" >暂停</el-radio>
-      </el-form-item>
-      <el-form-item label="任务描述">
-        <el-input v-model="form.remark" style="width: 460px;" rows="2" type="textarea"/>
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="text" @click="cancel">取消</el-button>
-      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { add, edit } from '@/api/timing'
-export default {
-  props: {
-    isAdd: {
-      type: Boolean,
-      required: true
-    },
-    sup_this: {
-      type: Object,
-      default: null
-    }
-  },
-  data() {
-    return {
-      loading: false, dialog: false,
-      form: { jobName: '', beanName: '', methodName: '', params: '', cronExpression: '', isPause: 'false', remark: '' }, permissionIds: [],
-      rules: {
-        jobName: [
-          { required: true, message: '请输入任务名称', trigger: 'blur' }
-        ],
-        beanName: [
-          { required: true, message: '请输入Bean名称', trigger: 'blur' }
-        ],
-        methodName: [
-          { required: true, message: '请输入方法名称', trigger: 'blur' }
-        ],
-        cronExpression: [
-          { required: true, message: '请输入Cron表达式', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    cancel() {
-      this.resetForm()
-    },
-    doSubmit() {
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          this.loading = true
-          if (this.isAdd) {
-            this.doAdd()
-          } else this.doEdit()
-        } else {
-          return false
-        }
-      })
-    },
-    doAdd() {
-      add(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '添加成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.$parent.$parent.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    doEdit() {
-      edit(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '修改成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.sup_this.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.form = { jobName: '', beanName: '', methodName: '', params: '', cronExpression: '', isPause: 'false', remark: '' }
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/system/timing/module/header.vue b/src/views/system/timing/module/header.vue
deleted file mode 100644
index 91e190d..0000000
--- a/src/views/system/timing/module/header.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<template>
-  <div class="head-container">
-    <!-- 搜索 -->
-    <el-input v-model="query.value" clearable placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
-    <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-    <!-- 新增 -->
-    <div v-permission="['ADMIN','JOB_ALL','JOB_CREATE']" style="display: inline-block;margin: 0px 2px;">
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-plus"
-        @click="$refs.form.dialog = true">新增</el-button>
-      <eForm ref="form" :is-add="true"/>
-    </div>
-    <!-- 任务日志 -->
-    <div v-permission="['ADMIN','JOB_ALL','JOB_SELECT']" style="display: inline-block;">
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-tickets"
-        @click="doLog">执行日志</el-button>
-      <Log ref="log"/>
-    </div>
-  </div>
-</template>
-
-<script>
-import eForm from './form'
-import Log from './log'
-// 查询条件
-export default {
-  components: { eForm, Log },
-  props: {
-    query: {
-      type: Object,
-      required: true
-    }
-  },
-  data() {
-    return {
-      downloadLoading: false
-    }
-  },
-  methods: {
-    toQuery() {
-      this.$parent.page = 0
-      this.$parent.init()
-    },
-    doLog() {
-      this.$refs.log.dialog = true
-      this.$refs.log.doInit()
-    }
-  }
-}
-</script>
diff --git a/src/views/system/user/center.vue b/src/views/system/user/center.vue
index 03649d8..7dcafcb 100644
--- a/src/views/system/user/center.vue
+++ b/src/views/system/user/center.vue
@@ -42,7 +42,32 @@
             <span>操作日志</span>
             <div style="display:inline-block;float: right;cursor: pointer" @click="refresh"><i :class="ico"/></div>
           </div>
-          <log ref="log"/>
+          <div>
+            <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+              <el-table-column prop="description" label="行为"/>
+              <el-table-column prop="requestIp" label="IP"/>
+              <el-table-column prop="time" label="请求耗时" align="center">
+                <template slot-scope="scope">
+                  <el-tag v-if="scope.row.time <= 300">{{ scope.row.time }}ms</el-tag>
+                  <el-tag v-else-if="scope.row.time <= 1000" type="warning">{{ scope.row.time }}ms</el-tag>
+                  <el-tag v-else type="danger">{{ scope.row.time }}ms</el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column prop="createTime" label="创建日期" width="180px">
+                <template slot-scope="scope">
+                  <span>{{ parseTime(scope.row.createTime) }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+            <!--分页组件-->
+            <el-pagination
+              :total="total"
+              :current-page="page + 1"
+              style="margin-top: 8px;"
+              layout="total, prev, pager, next, sizes"
+              @size-change="sizeChange"
+              @current-change="pageChange"/>
+          </div>
         </el-card>
       </el-col>
     </el-row>
@@ -56,13 +81,14 @@ import { mapGetters } from 'vuex'
 import { regEmail } from '@/utils/index'
 import updatePass from './center/updatePass'
 import updateEmail from './center/updateEmail'
-import log from './center/log'
 import { getToken } from '@/utils/auth'
 import store from '@/store'
 import { parseTime } from '@/utils/index'
+import initData from '@/mixins/initData'
 export default {
   name: 'Center',
-  components: { updatePass, updateEmail, log },
+  components: { updatePass, updateEmail },
+  mixins: [initData],
   data() {
     return {
       ico: 'el-icon-refresh',
@@ -78,6 +104,9 @@ export default {
     ])
   },
   created() {
+    this.$nextTick(() => {
+      this.init()
+    })
     store.dispatch('GetInfo').then(() => {})
   },
   methods: {
@@ -85,6 +114,12 @@ export default {
     formatEmail(mail) {
       return regEmail(mail)
     },
+    beforeInit() {
+      this.url = 'api/logs/user'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      return true
+    },
     handleSuccess(response, file, fileList) {
       this.$notify({
         title: '头像修改成功',
diff --git a/src/views/system/user/center/log.vue b/src/views/system/user/center/log.vue
deleted file mode 100644
index bda1c7e..0000000
--- a/src/views/system/user/center/log.vue
+++ /dev/null
@@ -1,55 +0,0 @@
-<template>
-  <div>
-    <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
-      <el-table-column prop="description" label="行为"/>
-      <el-table-column prop="requestIp" label="IP"/>
-      <el-table-column prop="time" label="请求耗时" align="center">
-        <template slot-scope="scope">
-          <el-tag v-if="scope.row.time <= 300">{{ scope.row.time }}ms</el-tag>
-          <el-tag v-else-if="scope.row.time <= 1000" type="warning">{{ scope.row.time }}ms</el-tag>
-          <el-tag v-else type="danger">{{ scope.row.time }}ms</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column prop="createTime" label="创建日期" width="180px">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页组件-->
-    <el-pagination
-      :total="total"
-      :current-page="page + 1"
-      style="margin-top: 8px;"
-      layout="total, prev, pager, next, sizes"
-      @size-change="sizeChange"
-      @current-change="pageChange"/>
-  </div>
-</template>
-
-<script>
-import initData from '@/mixins/initData'
-import { parseTime } from '@/utils/index'
-export default {
-  mixins: [initData],
-  created() {
-    this.$nextTick(() => {
-      this.init()
-    })
-  },
-  methods: {
-    parseTime,
-    beforeInit() {
-      this.url = 'api/logs/user'
-      const sort = 'id,desc'
-      this.params = { page: this.page, size: this.size, sort: sort }
-      return true
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/system/user/center/updateEmail.vue b/src/views/system/user/center/updateEmail.vue
index 02a6e28..837b456 100644
--- a/src/views/system/user/center/updateEmail.vue
+++ b/src/views/system/user/center/updateEmail.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="display: inline-block;">
-    <el-dialog :visible.sync="dialog" :title="title" append-to-body width="475px" @close="cancel">
+    <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :title="title" append-to-body width="475px" @close="cancel">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="88px">
         <el-form-item label="新邮箱" prop="email">
           <el-input v-model="form.email" auto-complete="on" style="width: 200px;"/>
@@ -24,7 +24,7 @@
 <script>
 import store from '@/store'
 import { validatEmail } from '@/utils/validate'
-import { validPass, updateEmail } from '@/api/user'
+import { updateEmail } from '@/api/user'
 import { resetEmail } from '@/api/code'
 export default {
   props: {
@@ -34,19 +34,6 @@ export default {
     }
   },
   data() {
-    const validatePass = (rule, value, callback) => {
-      if (value === '' || value === null) {
-        callback(new Error('密码不能为空'))
-      } else {
-        validPass(value).then(res => {
-          if (res.status === 200) {
-            callback()
-          } else {
-            callback(new Error('密码错误，请重新输入'))
-          }
-        })
-      }
-    }
     const validMail = (rule, value, callback) => {
       if (value === '' || value === null) {
         callback(new Error('新邮箱不能为空'))
@@ -65,7 +52,7 @@ export default {
       buttonName: '获取验证码', isDisabled: false, time: 60,
       rules: {
         pass: [
-          { required: true, validator: validatePass, trigger: 'blur' }
+          { required: true, message: '当前密码不能为空', trigger: 'blur' }
         ],
         email: [
           { required: true, validator: validMail, trigger: 'blur' }
diff --git a/src/views/system/user/center/updatePass.vue b/src/views/system/user/center/updatePass.vue
index 45a89e3..9f84dfd 100644
--- a/src/views/system/user/center/updatePass.vue
+++ b/src/views/system/user/center/updatePass.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="display: inline-block">
-    <el-dialog :visible.sync="dialog" :title="title" append-to-body width="500px" @close="cancel">
+    <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :title="title" append-to-body width="500px" @close="cancel">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="88px">
         <el-form-item label="旧密码" prop="oldPass">
           <el-input v-model="form.oldPass" type="password" auto-complete="on" style="width: 370px;"/>
@@ -22,34 +22,25 @@
 
 <script>
 import store from '@/store'
-import { validPass, updatePass } from '@/api/user'
+import { updatePass } from '@/api/user'
 export default {
   data() {
-    const validatePass = (rule, value, callback) => {
-      if (value) {
-        validPass(value).then(res => {
-          if (res.status === 200) {
-            callback()
-          } else {
-            callback(new Error('旧密码错误，请检查'))
-          }
-        })
-      } else {
-        callback(new Error('请输入旧密码'))
-      }
-    }
     const confirmPass = (rule, value, callback) => {
-      if (this.form.newPass !== value) {
-        callback(new Error('两次输入的密码不一致'))
+      if (value) {
+        if (this.form.newPass !== value) {
+          callback(new Error('两次输入的密码不一致'))
+        } else {
+          callback()
+        }
       } else {
-        callback()
+        callback(new Error('请再次输入密码'))
       }
     }
     return {
       loading: false, dialog: false, title: '修改密码', form: { oldPass: '', newPass: '', confirmPass: '' },
       rules: {
         oldPass: [
-          { required: true, validator: validatePass, trigger: 'blur' }
+          { required: true, message: '请输入旧密码', trigger: 'blur' }
         ],
         newPass: [
           { required: true, message: '请输入新密码', trigger: 'blur' },
diff --git a/src/views/system/user/module/form.vue b/src/views/system/user/form.vue
similarity index 97%
rename from src/views/system/user/module/form.vue
rename to src/views/system/user/form.vue
index 837e348..9fac206 100644
--- a/src/views/system/user/module/form.vue
+++ b/src/views/system/user/form.vue
@@ -58,10 +58,6 @@ export default {
       type: Boolean,
       required: true
     },
-    sup_this: {
-      type: Object,
-      default: null
-    },
     dicts: {
       type: Array,
       required: true
@@ -157,7 +153,7 @@ export default {
           duration: 2500
         })
         this.loading = false
-        this.sup_this.init()
+        this.$parent.init()
       }).catch(err => {
         this.loading = false
         console.log(err.response.data.message)
@@ -172,7 +168,7 @@ export default {
           duration: 2500
         })
         this.loading = false
-        this.sup_this.init()
+        this.$parent.init()
       }).catch(err => {
         this.loading = false
         console.log(err.response.data.message)
@@ -194,7 +190,6 @@ export default {
       })
     },
     getJobs(id) {
-      this.jobId = null
       getAllJob(id).then(res => {
         this.jobs = res.content
       }).catch(err => {
@@ -215,7 +210,6 @@ export default {
     },
     getRoleLevel() {
       getLevel().then(res => {
-        console.log(res)
         this.level = res.level
       }).catch(err => {
         console.log(err.response.data.message)
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 8cb1221..72ef571 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1,14 +1,49 @@
 <template>
   <div class="app-container">
+    <!--form 组件-->
+    <eForm ref="form" :is-add="isAdd" :dicts="dicts"/>
     <el-row :gutter="20">
+      <!--部门数据-->
       <el-col :xs="7" :sm="6" :md="4" :lg="4" :xl="4">
         <div class="head-container">
           <el-input v-model="deptName" clearable placeholder="输入部门名称搜索" prefix-icon="el-icon-search" style="width: 100%;" class="filter-item" @input="getDeptDatas"/>
         </div>
         <el-tree :data="depts" :props="defaultProps" :expand-on-click-node="false" default-expand-all @node-click="handleNodeClick"/>
       </el-col>
+      <!--用户数据-->
       <el-col :xs="17" :sm="18" :md="20" :lg="20" :xl="20">
-        <eHeader :query="query" :sup_this="sup_this" :dicts="dicts"/>
+        <!--工具栏-->
+        <div class="head-container">
+          <!-- 搜索 -->
+          <el-input v-model="query.value" clearable placeholder="输入关键字搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+          <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+            <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
+          </el-select>
+          <el-select v-model="query.enabled" clearable placeholder="状态" class="filter-item" style="width: 90px" @change="toQuery">
+            <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
+          </el-select>
+          <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+          <!-- 新增 -->
+          <div v-permission="['ADMIN','USER_ALL','USER_CREATE']" style="display: inline-block;margin: 0px 2px;">
+            <el-button
+              class="filter-item"
+              size="mini"
+              type="primary"
+              icon="el-icon-plus"
+              @click="add">新增</el-button>
+          </div>
+          <!-- 导出 -->
+          <div style="display: inline-block;">
+            <el-button
+              v-permission="['ADMIN']"
+              :loading="downloadLoading"
+              size="mini"
+              class="filter-item"
+              type="warning"
+              icon="el-icon-download"
+              @click="download">导出</el-button>
+          </div>
+        </div>
         <!--表格渲染-->
         <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
           <el-table-column prop="username" label="用户名"/>
@@ -33,7 +68,7 @@
           </el-table-column>
           <el-table-column v-if="checkPermission(['ADMIN','USER_ALL','USER_EDIT','USER_DELETE'])" label="操作" width="125" align="center">
             <template slot-scope="scope">
-              <edit v-permission="['ADMIN','USER_ALL','USER_EDIT']" :dicts="dicts" :data="scope.row" :sup_this="sup_this"/>
+              <el-button v-permission="['ADMIN','USER_ALL','USER_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
               <el-popover
                 v-permission="['ADMIN','USER_ALL','USER_DELETE']"
                 :ref="scope.row.id"
@@ -69,19 +104,27 @@ import initDict from '@/mixins/initDict'
 import { del } from '@/api/user'
 import { getDepts } from '@/api/dept'
 import { parseTime } from '@/utils/index'
-import eHeader from './module/header'
-import edit from './module/edit'
+import eForm from './form'
 export default {
-  components: { eHeader, edit },
+  components: { eForm },
   mixins: [initData, initDict],
   data() {
     return {
-      height: document.documentElement.clientHeight - 180 + 'px;',
-      delLoading: false, sup_this: this, deptName: '', depts: [], deptId: null,
+      height: document.documentElement.clientHeight - 180 + 'px;', isAdd: false,
+      delLoading: false, deptName: '', depts: [], deptId: null,
       defaultProps: {
         children: 'children',
         label: 'name'
-      }
+      },
+      downloadLoading: false,
+      queryTypeOptions: [
+        { key: 'username', display_name: '用户名' },
+        { key: 'email', display_name: '邮箱' }
+      ],
+      enabledTypeOptions: [
+        { key: 'true', display_name: '激活' },
+        { key: 'false', display_name: '锁定' }
+      ]
     }
   },
   created() {
@@ -146,6 +189,56 @@ export default {
         this.deptId = data.id
       }
       this.init()
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.getDepts()
+      this.$refs.form.getRoles()
+      this.$refs.form.getRoleLevel()
+      this.$refs.form.dialog = true
+    },
+    // 导出
+    download() {
+      this.downloadLoading = true
+      import('@/utils/export2Excel').then(excel => {
+        const tHeader = ['ID', '用户名', '邮箱', '头像地址', '状态', '注册日期', '最后修改密码日期']
+        const filterVal = ['id', 'username', 'email', 'avatar', 'enabled', 'createTime', 'lastPasswordResetTime']
+        const data = this.formatJson(filterVal, this.data)
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: 'table-list'
+        })
+        this.downloadLoading = false
+      })
+    },
+    // 数据转换
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => {
+        if (j === 'createTime' || j === 'lastPasswordResetTime') {
+          return parseTime(v[j])
+        } else if (j === 'enabled') {
+          return parseTime(v[j]) ? '启用' : '禁用'
+        } else {
+          return v[j]
+        }
+      }))
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.getRoles()
+      _this.getDepts()
+      _this.getRoleLevel()
+      _this.roleIds = []
+      _this.form = { id: data.id, username: data.username, phone: data.phone, email: data.email, enabled: data.enabled.toString(), roles: [], dept: { id: data.dept.id }, job: { id: data.job.id }}
+      data.roles.forEach(function(data, index) {
+        _this.roleIds.push(data.id)
+      })
+      _this.deptId = data.dept.id
+      _this.jobId = data.job.id
+      _this.getJobs(_this.deptId)
+      _this.dialog = true
     }
   }
 }
diff --git a/src/views/system/user/module/edit.vue b/src/views/system/user/module/edit.vue
deleted file mode 100644
index 0b95ed9..0000000
--- a/src/views/system/user/module/edit.vue
+++ /dev/null
@@ -1,48 +0,0 @@
-<template>
-  <div>
-    <el-button size="mini" type="primary" icon="el-icon-edit" @click="to"/>
-    <eForm ref="form" :sup_this="sup_this" :is-add="false" :dicts="dicts"/>
-  </div>
-</template>
-<script>
-import eForm from './form'
-export default {
-  components: { eForm },
-  props: {
-    data: {
-      type: Object,
-      required: true
-    },
-    // index.vue 的this 可用于刷新数据
-    sup_this: {
-      type: Object,
-      required: true
-    },
-    dicts: {
-      type: Array,
-      required: true
-    }
-  },
-  methods: {
-    to() {
-      const _this = this.$refs.form
-      _this.getRoles()
-      _this.getDepts()
-      _this.getRoleLevel()
-      _this.roleIds = []
-      _this.form = { id: this.data.id, username: this.data.username, phone: this.data.phone, email: this.data.email, enabled: this.data.enabled.toString(), roles: [], dept: { id: this.data.dept.id }, job: { id: this.data.job.id }}
-      this.data.roles.forEach(function(data, index) {
-        _this.roleIds.push(data.id)
-      })
-      _this.deptId = this.data.dept.id
-      _this.jobId = this.data.job.id
-      _this.getJobs(_this.deptId)
-      _this.dialog = true
-    }
-  }
-}
-</script>
-
-<style scoped>
-  div{display: inline-block;margin-right: 3px;}
-</style>
diff --git a/src/views/system/user/module/header.vue b/src/views/system/user/module/header.vue
deleted file mode 100644
index 801205c..0000000
--- a/src/views/system/user/module/header.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<template>
-  <div class="head-container">
-    <!-- 搜索 -->
-    <el-input v-model="query.value" clearable placeholder="输入关键字搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
-    <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
-      <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
-    </el-select>
-    <el-select v-model="query.enabled" clearable placeholder="状态" class="filter-item" style="width: 90px" @change="toQuery">
-      <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
-    </el-select>
-    <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-    <!-- 新增 -->
-    <div v-permission="['ADMIN','USER_ALL','USER_CREATE']" style="display: inline-block;margin: 0px 2px;">
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-plus"
-        @click="add">新增</el-button>
-      <eForm ref="form" :sup_this="sup_this" :is-add="true" :dicts="dicts"/>
-    </div>
-    <!-- 导出 -->
-    <div style="display: inline-block;">
-      <el-button
-        v-permission="['ADMIN']"
-        :loading="downloadLoading"
-        size="mini"
-        class="filter-item"
-        type="warning"
-        icon="el-icon-download"
-        @click="download">导出</el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-import { parseTime } from '@/utils/index'
-import eForm from './form'
-// 查询条件
-export default {
-  components: { eForm },
-  props: {
-    query: {
-      type: Object,
-      required: true
-    },
-    sup_this: {
-      type: Object,
-      required: true
-    },
-    dicts: {
-      type: Array,
-      required: true
-    }
-  },
-  data() {
-    return {
-      downloadLoading: false,
-      queryTypeOptions: [
-        { key: 'username', display_name: '用户名' },
-        { key: 'email', display_name: '邮箱' }
-      ],
-      enabledTypeOptions: [
-        { key: 'true', display_name: '激活' },
-        { key: 'false', display_name: '锁定' }
-      ]
-    }
-  },
-  methods: {
-    add() {
-      this.$refs.form.getDepts()
-      this.$refs.form.getRoles()
-      this.$refs.form.getRoleLevel()
-      this.$refs.form.dialog = true
-    },
-    // 去查询
-    toQuery() {
-      this.sup_this.page = 0
-      this.sup_this.init()
-    },
-    // 导出
-    download() {
-      this.downloadLoading = true
-      import('@/utils/export2Excel').then(excel => {
-        const tHeader = ['ID', '用户名', '邮箱', '头像地址', '状态', '注册日期', '最后修改密码日期']
-        const filterVal = ['id', 'username', 'email', 'avatar', 'enabled', 'createTime', 'lastPasswordResetTime']
-        const data = this.formatJson(filterVal, this.sup_this.data)
-        excel.export_json_to_excel({
-          header: tHeader,
-          data,
-          filename: 'table-list'
-        })
-        this.downloadLoading = false
-      })
-    },
-    // 数据转换
-    formatJson(filterVal, jsonData) {
-      return jsonData.map(v => filterVal.map(j => {
-        if (j === 'createTime' || j === 'lastPasswordResetTime') {
-          return parseTime(v[j])
-        } else if (j === 'enabled') {
-          return parseTime(v[j]) ? '启用' : '禁用'
-        } else {
-          return v[j]
-        }
-      }))
-    }
-  }
-}
-</script>
diff --git a/src/views/tools/picture/index.vue b/src/views/tools/picture/index.vue
index fada103..c0630b4 100644
--- a/src/views/tools/picture/index.vue
+++ b/src/views/tools/picture/index.vue
@@ -154,10 +154,6 @@ export default {
         console.log(err.response.data.message)
       })
     },
-    toQuery() {
-      this.page = 0
-      this.init()
-    },
     doDelete() {
       this.delAllLoading = true
       const data = this.$refs.table.selection
diff --git a/src/views/tools/qiniu/list.vue b/src/views/tools/qiniu/list.vue
index b70d376..e228f72 100644
--- a/src/views/tools/qiniu/list.vue
+++ b/src/views/tools/qiniu/list.vue
@@ -138,10 +138,6 @@ export default {
   methods: {
     parseTime,
     checkPermission,
-    toQuery() {
-      this.page = 0
-      this.init()
-    },
     beforeInit() {
       this.url = 'api/qiNiuContent'
       const sort = 'id,desc'