merge 2.3dev

src/views/generator/generator.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-button type="primary" size="mini" @click="toGen">生成代码</el-button>
-    <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" title="代码生成配置" append-to-body width="850px">
-      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+    <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" title="代码生成配置" append-to-body width="880px">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="90px">
         <el-form-item label="模块名称" prop="moduleName">
           <el-input v-model="form.moduleName"/>
         </el-form-item>

src/views/login.vue

@@ -79,7 +79,7 @@ export default {
   methods: {
     getCode() {
       getCodeImg().then(res => {
-        this.codeUrl = 'data:image/gif;base64,' + res.img
+        this.codeUrl = res.img
         this.loginForm.uuid = res.uuid
       })
     },
@@ -155,7 +155,7 @@ export default {
   .login-form {
     border-radius: 6px;
     background: #ffffff;
-    width: 400px;
+    width: 385px;
     padding: 25px 25px 5px 25px;
     .el-input {
       height: 38px;

src/views/monitor/log/errorLog.vue

@@ -3,12 +3,23 @@
     <Search :query="query"/>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+      <el-table-column type="expand">
+        <template slot-scope="props">
+          <el-form label-position="left" inline class="demo-table-expand">
+            <el-form-item label="请求方法">
+              <span>{{ props.row.method }}</span>
+            </el-form-item>
+            <el-form-item label="请求参数">
+              <span>{{ props.row.params }}</span>
+            </el-form-item>
+          </el-form>
+        </template>
+      </el-table-column>
       <el-table-column prop="username" label="用户名"/>
       <el-table-column prop="requestIp" label="IP"/>
       <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源"/>
       <el-table-column prop="description" label="描述"/>
-      <el-table-column :show-overflow-tooltip="true" prop="method" label="方法名称"/>
-      <el-table-column :show-overflow-tooltip="true" prop="params" label="参数"/>
+      <el-table-column prop="browser" label="浏览器"/>
       <el-table-column prop="createTime" label="创建日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -21,9 +32,9 @@
       </el-table-column>
     </el-table>
     <el-dialog :visible.sync="dialog" title="异常详情" append-to-body top="0" width="85%">
-      <span>
+      <pre>
         {{ errorInfo }}
-      </span>
+      </pre>
     </el-dialog>
     <!--分页组件-->
     <el-pagination
@@ -64,6 +75,11 @@ export default {
       const value = query.value
       this.params = { page: this.page, size: this.size, sort: sort }
       if (value) { this.params['blurry'] = value }
+      this.params['logType'] = 'ERROR'
+      if (query.date) {
+        this.params['startTime'] = query.date[0]
+        this.params['endTime'] = query.date[1]
+      }
       return true
     },
     info(id) {
@@ -76,6 +92,21 @@ export default {
 }
 </script>
 
-<style scoped>
+<style>
+  .demo-table-expand {
+    font-size: 0;
+  }
+  .demo-table-expand label {
+    width: 70px;
+    color: #99a9bf;
+  }
+  .demo-table-expand .el-form-item {
+    margin-right: 0;
+    margin-bottom: 0;
+    width: 100%;
+  }
+  .demo-table-expand .el-form-item__content {
+    font-size: 12px;
 
+  }
 </style>

src/views/monitor/log/index.vue

@@ -3,12 +3,23 @@
     <Search :query="query"/>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+      <el-table-column type="expand">
+        <template slot-scope="props">
+          <el-form label-position="left" inline class="demo-table-expand">
+            <el-form-item label="请求方法">
+              <span>{{ props.row.method }}</span>
+            </el-form-item>
+            <el-form-item label="请求参数">
+              <span>{{ props.row.params }}</span>
+            </el-form-item>
+          </el-form>
+        </template>
+      </el-table-column>
       <el-table-column prop="username" label="用户名"/>
       <el-table-column prop="requestIp" label="IP"/>
       <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源"/>
       <el-table-column prop="description" label="描述"/>
-      <el-table-column :show-overflow-tooltip="true" prop="method" label="方法名称"/>
-      <el-table-column :show-overflow-tooltip="true" prop="params" label="参数"/>
+      <el-table-column prop="browser" label="浏览器"/>
       <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>
@@ -55,12 +66,32 @@ export default {
       const value = query.value
       this.params = { page: this.page, size: this.size, sort: sort }
       if (value) { this.params['blurry'] = value }
+      this.params['logType'] = 'INFO'
+      if (query.date) {
+        this.params['startTime'] = query.date[0]
+        this.params['endTime'] = query.date[1]
+      }
       return true
     }
   }
 }
 </script>
 
-<style scoped>
+<style>
+  .demo-table-expand {
+    font-size: 0;
+  }
+  .demo-table-expand label {
+    width: 70px;
+    color: #99a9bf;
+  }
+  .demo-table-expand .el-form-item {
+    margin-right: 0;
+    margin-bottom: 0;
+    width: 100%;
+  }
+  .demo-table-expand .el-form-item__content {
+    font-size: 12px;
 
+  }
 </style>

src/views/monitor/log/search.vue

@@ -1,17 +1,55 @@
 <template>
   <div class="head-container">
     <el-input v-model="query.value" clearable placeholder="请输入你要搜索的内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+    <el-date-picker
+      v-model="query.date"
+      type="daterange"
+      range-separator=":"
+      class="el-range-editor--small filter-item"
+      style="height: 30.5px;width: 220px"
+      value-format="yyyy-MM-dd HH:mm:ss"
+      start-placeholder="开始日期"
+      end-placeholder="结束日期"/>
     <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="$parent.toQuery">搜索</el-button>
+    <!-- 导出 -->
+    <div style="display: inline-block;">
+      <el-button
+        :loading="downloadLoading"
+        size="mini"
+        class="filter-item"
+        type="warning"
+        icon="el-icon-download"
+        @click="download">导出</el-button>
+    </div>
   </div>
 </template>
 
 <script>
+import { downloadFile } from '@/utils/index'
+import { downloadLog } from '@/api/log'
 export default {
   props: {
     query: {
       type: Object,
       required: true
     }
+  },
+  data() {
+    return {
+      downloadLoading: false
+    }
+  },
+  methods: {
+    download() {
+      this.$parent.beforeInit()
+      this.downloadLoading = true
+      downloadLog(this.$parent.params).then(result => {
+        downloadFile(result, '系统日志列表', 'xlsx')
+        this.downloadLoading = false
+      }).catch(() => {
+        this.downloadLoading = false
+      })
+    }
   }
 }
 </script>

src/views/monitor/online/index.vue

@@ -0,0 +1,112 @@
+<template>
+  <div class="app-container">
+    <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;">
+        <el-button
+          :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="用户名"/>
+      <el-table-column prop="job" label="岗位"/>
+      <el-table-column prop="ip" label="登录IP"/>
+      <el-table-column :show-overflow-tooltip="true" prop="address" label="登录地点"/>
+      <el-table-column prop="browser" label="浏览器"/>
+      <el-table-column prop="loginTime" label="登录时间">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.loginTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="操作" width="100px">
+        <template slot-scope="scope">
+          <el-popover
+            v-permission="['admin']"
+            :ref="scope.$index"
+            placement="top"
+            width="180">
+            <p>确定踢出该用户吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.$index].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.$index, scope.row.key)">确定</el-button>
+            </div>
+            <el-button slot="reference" size="mini" type="text">踢出</el-button>
+          </el-popover>
+        </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, downloadFile } from '@/utils/index'
+import { del, downloadOnline } from '@/api/online'
+export default {
+  name: 'OnlineUser',
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    parseTime,
+    beforeInit() {
+      this.url = 'auth/online'
+      this.params = { page: this.page, size: this.size }
+      if (this.query.value) { this.params['filter'] = this.query.value }
+      return true
+    },
+    subDelete(index, key) {
+      this.delLoading = true
+      del(key).then(res => {
+        this.delLoading = false
+        this.$refs[index].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '踢出成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[index].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    download() {
+      this.beforeInit()
+      this.downloadLoading = true
+      downloadOnline(this.params).then(result => {
+        downloadFile(result, '在线用户列表', 'xlsx')
+        this.downloadLoading = false
+      }).catch(() => {
+        this.downloadLoading = false
+      })
+    }
+  }
+}
+</script>

src/views/monitor/redis/index.vue

@@ -7,16 +7,21 @@
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <div style="display: inline-block;">
         <!-- 清空缓存 -->
-        <el-button v-permission="['ADMIN','REDIS_ALL','REDIS_DELETE']" :loading="deleteAllLoading" type="warning" size="mini" class="filter-item" icon="el-icon-delete" @click="deleteAll">清空缓存</el-button>
+        <el-button v-permission="['admin','redis:del']" :loading="deleteAllLoading" type="danger" size="mini" class="filter-item" icon="el-icon-delete" @click="deleteAll">清空</el-button>
+      </div>
+      <!-- 导出 -->
+      <div style="display: inline-block;">
+        <el-button
+          :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 label="序号" width="80" align="center">
-        <template slot-scope="scope">
-          <div>{{ scope.$index + 1 }}</div>
-        </template>
-      </el-table-column>
       <el-table-column :show-overflow-tooltip="true" prop="key" label="KEY"/>
       <el-table-column prop="value" label="VALUE">
         <template slot-scope="scope">
@@ -25,10 +30,10 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column v-if="checkPermission(['ADMIN','REDIS_ALL','REDIS_EDIT','REDIS_DELETE'])" label="操作" width="130px" align="center" fixed="right">
+      <el-table-column v-if="checkPermission(['admin','redis:del'])" label="操作" width="130px" align="center" fixed="right">
         <template slot-scope="scope">
           <el-popover
-            v-permission="['ADMIN','REDIS_ALL','REDIS_DELETE']"
+            v-permission="['admin','redis:del']"
             :ref="scope.$index"
             placement="top"
             width="180">
@@ -56,7 +61,8 @@
 <script>
 import checkPermission from '@/utils/permission' // 权限判断函数
 import initData from '@/mixins/initData'
-import { del, delAll } from '@/api/redis'
+import { del, delAll, downloadRedis } from '@/api/redis'
+import { downloadFile } from '@/utils/index'
 export default {
   name: 'Redis',
   mixins: [initData],
@@ -115,6 +121,16 @@ export default {
           this.deleteAllLoading = false
         })
       })
+    },
+    download() {
+      this.beforeInit()
+      this.downloadLoading = true
+      downloadRedis(this.params).then(result => {
+        downloadFile(result, '缓存列表', 'xlsx')
+        this.downloadLoading = false
+      }).catch(() => {
+        this.downloadLoading = false
+      })
     }
   }
 }

src/views/monitor/sql/index.vue

@@ -3,7 +3,7 @@
 </template>
 <script>
 import { mapGetters } from 'vuex'
-import elFrame from '@/components/iframe/index'
+import elFrame from '@/components/Iframe/index'
 export default {
   name: 'Sql',
   components: { elFrame },

src/views/system/dept/index.vue

@@ -4,12 +4,21 @@
     <div class="head-container">
       <!-- 搜索 -->
       <el-input v-model="query.value" clearable placeholder="输入部门名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-date-picker
+        v-model="query.date"
+        type="daterange"
+        range-separator=":"
+        class="el-range-editor--small filter-item"
+        style="height: 30.5px;width: 220px"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"/>
       <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;">
+      <div v-permission="['admin','dept:add']" style="display: inline-block;margin: 0px 2px;">
         <el-button
           class="filter-item"
           size="mini"
@@ -17,25 +26,30 @@
           icon="el-icon-plus"
           @click="add">新增</el-button>
       </div>
+      <!-- 导出 -->
       <div style="display: inline-block;">
         <el-button
-          class="filter-item"
+          :loading="downloadLoading"
           size="mini"
+          class="filter-item"
           type="warning"
-          icon="el-icon-more"
-          @click="changeExpand">{{ expand ? '折叠' : '展开' }}</el-button>
-        <eForm ref="form" :is-add="true" :dicts="dicts"/>
+          icon="el-icon-download"
+          @click="download">导出</el-button>
       </div>
     </div>
     <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd" :dicts="dicts"/>
+    <eForm ref="form" :is-add="isAdd" :dicts="dict.dept_status"/>
     <!--表格渲染-->
-    <tree-table v-loading="loading" :expand-all="expand" :data="data" :columns="columns" size="small">
+    <el-table v-loading="loading" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" :default-expand-all="expand" :data="data" row-key="id" size="small">
+      <el-table-column label="名称" prop="name"/>
       <el-table-column label="状态" align="center">
         <template slot-scope="scope">
-          <div v-for="item in dicts" :key="item.id">
-            <el-tag v-if="scope.row.enabled.toString() === item.value" :type="scope.row.enabled ? '' : 'info'">{{ item.label }}</el-tag>
-          </div>
+          <el-switch
+            v-model="scope.row.enabled"
+            :disabled="scope.row.id == 1"
+            active-color="#409EFF"
+            inactive-color="#F56C6C"
+            @change="changeEnabled(scope.row, scope.row.enabled,)"/>
         </template>
       </el-table-column>
       <el-table-column prop="createTime" label="创建日期">
@@ -43,11 +57,11 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="checkPermission(['ADMIN','DEPT_ALL','DEPT_EDIT','DEPT_DELETE'])" label="操作" width="130px" align="center" fixed="right">
+      <el-table-column v-if="checkPermission(['admin','dept:edit','dept:del'])" label="操作" width="130px" align="center" fixed="right">
         <template slot-scope="scope">
-          <el-button v-permission="['ADMIN','DEPT_ALL','DEPT_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
+          <el-button v-permission="['admin','dept:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
           <el-popover
-            v-permission="['ADMIN','DEPT_ALL','DEPT_DELETE']"
+            v-permission="['admin','dept:del']"
             :ref="scope.row.id"
             placement="top"
             width="180">
@@ -60,30 +74,24 @@
           </el-popover>
         </template>
       </el-table-column>
-    </tree-table>
+    </el-table>
   </div>
 </template>
 
 <script>
-import treeTable from '@/components/TreeTable'
 import checkPermission from '@/utils/permission'
 import initData from '@/mixins/initData'
-import initDict from '@/mixins/initDict'
-import { del } from '@/api/dept'
-import { parseTime } from '@/utils/index'
+import { del, edit, downloadDept } from '@/api/dept'
+import { parseTime, downloadFile } from '@/utils/index'
 import eForm from './form'
 export default {
   name: 'Dept',
-  components: { eForm, treeTable },
-  mixins: [initData, initDict],
+  components: { eForm },
+  mixins: [initData],
+  // 设置数据字典
+  dicts: ['dept_status'],
   data() {
     return {
-      columns: [
-        {
-          text: '名称',
-          value: 'name'
-        }
-      ],
       enabledTypeOptions: [
         { key: 'true', display_name: '正常' },
         { key: 'false', display_name: '禁用' }
@@ -94,8 +102,6 @@ export default {
   created() {
     this.$nextTick(() => {
       this.init()
-      // 加载数据字典
-      this.getDict('dept_status')
     })
   },
   methods: {
@@ -109,6 +115,10 @@ export default {
       const value = query.value
       const enabled = query.enabled
       if (value) { this.params['name'] = value }
+      if (query.date) {
+        this.params['startTime'] = query.date[0]
+        this.params['endTime'] = query.date[1]
+      }
       if (enabled !== '' && enabled !== null) { this.params['enabled'] = enabled }
       return true
     },
@@ -137,7 +147,6 @@ export default {
     },
     changeExpand() {
       this.expand = !this.expand
-      this.init()
     },
     edit(data) {
       this.isAdd = false
@@ -151,6 +160,37 @@ export default {
         enabled: data.enabled.toString()
       }
       _this.dialog = true
+    },
+    // 改变状态
+    changeEnabled(data, val) {
+      this.$confirm('此操作将 "' + this.dict.label.dept_status[val] + '" ' + data.name + '部门, 是否继续？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        edit(data).then(res => {
+          this.$notify({
+            title: this.dict.label.dept_status[val] + '成功',
+            type: 'success',
+            duration: 2500
+          })
+        }).catch(err => {
+          data.enabled = !data.enabled
+          console.log(err.response.data.message)
+        })
+      }).catch(() => {
+        data.enabled = !data.enabled
+      })
+    },
+    download() {
+      this.beforeInit()
+      this.downloadLoading = true
+      downloadDept(this.params).then(result => {
+        downloadFile(result, '部门列表', 'xlsx')
+        this.downloadLoading = false
+      }).catch(() => {
+        this.downloadLoading = false
+      })
     }
   }
 }

src/views/system/dict/index.vue

@@ -8,7 +8,7 @@
           <div slot="header" class="clearfix">
             <span>字典列表</span>
             <el-button
-              v-permission="['ADMIN','DICT_ALL','DICT_CREATE']"
+              v-permission="['admin','dict:add']"
               class="filter-item"
               size="mini"
               style="float: right;padding: 4px 10px"
@@ -21,16 +21,26 @@
             <!-- 搜索 -->
             <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;">
+              <el-button
+                :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" 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" fixed="right">
+            <el-table-column v-if="checkPermission(['admin','dict:edit','dict:del'])" label="操作" width="130px" align="center" fixed="right">
               <template slot-scope="scope">
-                <el-button v-permission="['ADMIN','DICT_ALL','DICT_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
+                <el-button v-permission="['admin','dict:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
                 <el-popover
-                  v-permission="['ADMIN','DICT_ALL','DICT_DELETE']"
+                  v-permission="['admin','dict:del']"
                   :ref="scope.row.id"
                   placement="top"
                   width="180">
@@ -59,7 +69,7 @@
           <div slot="header" class="clearfix">
             <span>字典详情</span>
             <el-button
-              v-if="checkPermission(['ADMIN','DICT_ALL','DICT_CREATE']) && this.$refs.dictDetail && this.$refs.dictDetail.dictName"
+              v-if="checkPermission(['admin','dict:add']) && this.$refs.dictDetail && this.$refs.dictDetail.dictName"
               class="filter-item"
               size="mini"
               style="float: right;padding: 4px 10px"
@@ -77,8 +87,9 @@
 <script>
 import checkPermission from '@/utils/permission'
 import initData from '@/mixins/initData'
-import { del } from '@/api/dict'
+import { del, downloadDict } from '@/api/dict'
 import dictDetail from '../dictDetail/index'
+import { downloadFile } from '@/utils/index'
 import eForm from './form'
 export default {
   name: 'Dict',
@@ -147,6 +158,16 @@ export default {
         remark: data.remark
       }
       _this.dialog = true
+    },
+    download() {
+      this.beforeInit()
+      this.downloadLoading = true
+      downloadDict(this.params).then(result => {
+        downloadFile(result, '字典列表', 'xlsx')
+        this.downloadLoading = false
+      }).catch(() => {
+        this.downloadLoading = false
+      })
     }
   }
 }

src/views/system/dictDetail/index.vue

@@ -22,11 +22,11 @@
         <el-table-column prop="label" label="字典标签"/>
         <el-table-column prop="value" label="字典值"/>
         <el-table-column prop="sort" label="排序"/>
-        <el-table-column v-if="checkPermission(['ADMIN','DICT_ALL','DICT_EDIT','DICT_DELETE'])" label="操作" width="130px" align="center" fixed="right">
+        <el-table-column v-if="checkPermission(['admin','dict:edit','dict:del'])" label="操作" width="130px" align="center" fixed="right">
           <template slot-scope="scope">
-            <el-button v-permission="['ADMIN','DICT_ALL','DICT_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
+            <el-button v-permission="['admin','dict:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
             <el-popover
-              v-permission="['ADMIN','DICT_ALL','DICT_DELETE']"
+              v-permission="['admin','dict:del']"
               :ref="scope.row.id"
               placement="top"
               width="180">

src/views/system/job/index.vue

@@ -4,12 +4,21 @@
     <div class="head-container">
       <!-- 搜索 -->
       <el-input v-model="query.value" clearable placeholder="输入岗位名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-date-picker
+        v-model="query.date"
+        type="daterange"
+        range-separator=":"
+        class="el-range-editor--small filter-item"
+        style="height: 30.5px;width: 220px"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"/>
       <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;">
+      <div v-permission="['admin','job:add']" style="display: inline-block;margin: 0px 2px;">
         <el-button
           class="filter-item"
           size="mini"
@@ -17,9 +26,19 @@
           icon="el-icon-plus"
           @click="add">新增</el-button>
       </div>
+      <!-- 导出 -->
+      <div style="display: inline-block;">
+        <el-button
+          :loading="downloadLoading"
+          size="mini"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-download"
+          @click="download">导出</el-button>
+      </div>
     </div>
     <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd" :dicts="dicts"/>
+    <eForm ref="form" :is-add="isAdd" :dicts="dict.job_status"/>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <el-table-column prop="name" label="名称"/>
@@ -35,9 +54,11 @@
       </el-table-column>
       <el-table-column label="状态" align="center">
         <template slot-scope="scope">
-          <div v-for="item in dicts" :key="item.id">
-            <el-tag v-if="scope.row.enabled.toString() === item.value" :type="scope.row.enabled ? '' : 'info'">{{ item.label }}</el-tag>
-          </div>
+          <el-switch
+            v-model="scope.row.enabled"
+            active-color="#409EFF"
+            inactive-color="#F56C6C"
+            @change="changeEnabled(scope.row, scope.row.enabled,)"/>
         </template>
       </el-table-column>
       <el-table-column prop="createTime" label="创建日期">
@@ -45,11 +66,11 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="checkPermission(['ADMIN','USERJOB_ALL','USERJOB_EDIT','USERJOB_DELETE'])" label="操作" width="130px" align="center" fixed="right">
+      <el-table-column v-if="checkPermission(['admin','job:edit','job:del'])" label="操作" width="130px" align="center" fixed="right">
         <template slot-scope="scope">
-          <el-button v-permission="['ADMIN','USERJOB_ALL','USERJOB_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
+          <el-button v-permission="['admin','job:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
           <el-popover
-            v-permission="['ADMIN','USERJOB_ALL','USERJOB_DELETE']"
+            v-permission="['admin','job:del']"
             :ref="scope.row.id"
             placement="top"
             width="180">
@@ -77,14 +98,15 @@
 <script>
 import checkPermission from '@/utils/permission'
 import initData from '@/mixins/initData'
-import initDict from '@/mixins/initDict'
-import { del } from '@/api/job'
-import { parseTime } from '@/utils/index'
+import { del, edit, downloadJob } from '@/api/job'
+import { parseTime, downloadFile } from '@/utils/index'
 import eForm from './form'
 export default {
   name: 'Job',
   components: { eForm },
-  mixins: [initData, initDict],
+  mixins: [initData],
+  // 设置数据字典
+  dicts: ['job_status'],
   data() {
     return {
       delLoading: false,
@@ -97,8 +119,6 @@ export default {
   created() {
     this.$nextTick(() => {
       this.init()
-      // 加载数据字典
-      this.getDict('job_status')
     })
   },
   methods: {
@@ -112,6 +132,10 @@ export default {
       const value = query.value
       const enabled = query.enabled
       if (value) { this.params['name'] = value }
+      if (query.date) {
+        this.params['startTime'] = query.date[0]
+        this.params['endTime'] = query.date[1]
+      }
       if (enabled !== '' && enabled !== null) { this.params['enabled'] = enabled }
       return true
     },
@@ -152,6 +176,37 @@ export default {
       }
       _this.deptId = data.dept.id
       _this.dialog = true
+    },
+    // 改变状态
+    changeEnabled(data, val) {
+      this.$confirm('此操作将 "' + this.dict.label.job_status[val] + '" ' + data.name + '岗位, 是否继续？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        edit(data).then(res => {
+          this.$notify({
+            title: this.dict.label.job_status[val] + '成功',
+            type: 'success',
+            duration: 2500
+          })
+        }).catch(err => {
+          data.enabled = !data.enabled
+          console.log(err.response.data.message)
+        })
+      }).catch(() => {
+        data.enabled = !data.enabled
+      })
+    },
+    download() {
+      this.beforeInit()
+      this.downloadLoading = true
+      downloadJob(this.params).then(result => {
+        downloadFile(result, '岗位列表', 'xlsx')
+        this.downloadLoading = false
+      }).catch(() => {
+        this.downloadLoading = false
+      })
     }
   }
 }

src/views/system/menu/form.vue

@@ -1,7 +1,14 @@
 <template>
-  <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="isAdd ? '新增菜单' : '编辑菜单'" append-to-body width="585px">
+  <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="isAdd ? '新增菜单' : '编辑菜单'" append-to-body width="580px">
     <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="80px">
-      <el-form-item label="菜单图标">
+      <el-form-item label="菜单类型">
+        <el-radio-group v-model="form.type" size="mini" style="width: 178px">
+          <el-radio-button label="0">目录</el-radio-button>
+          <el-radio-button label="1">菜单</el-radio-button>
+          <el-radio-button label="2">按钮</el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item v-show="form.type.toString() !== '2'" label="菜单图标">
         <el-popover
           placement="bottom-start"
           width="450"
@@ -14,38 +21,44 @@
           </el-input>
         </el-popover>
       </el-form-item>
-      <el-form-item label="菜单名称" prop="name">
-        <el-input v-model="form.name" placeholder="名称" style="width: 450px;"/>
-      </el-form-item>
-      <el-form-item label="内部菜单">
+      <el-form-item v-show="form.type.toString() === '1'" label="外链菜单">
         <el-radio-group v-model="form.iframe" size="mini">
-          <el-radio-button label="false">是</el-radio-button>
-          <el-radio-button label="true">否</el-radio-button>
+          <el-radio-button label="true">是</el-radio-button>
+          <el-radio-button label="false">否</el-radio-button>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="是否缓存">
+      <el-form-item v-show="form.type.toString() === '1'" label="菜单缓存">
         <el-radio-group v-model="form.cache" size="mini">
           <el-radio-button label="true">是</el-radio-button>
           <el-radio-button label="false">否</el-radio-button>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="是否隐藏">
+      <el-form-item v-show="form.type.toString() === '1'" label="菜单可见">
         <el-radio-group v-model="form.hidden" size="mini">
           <el-radio-button label="true">是</el-radio-button>
           <el-radio-button label="false">否</el-radio-button>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="菜单排序" prop="sort">
-        <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 177px;"/>
+      <el-form-item v-show="form.type.toString() !== '2'" label="菜单标题" prop="name">
+        <el-input v-model="form.name" :style=" form.type.toString() === '0' ? 'width: 450px' : 'width: 178px'" placeholder="菜单标题"/>
       </el-form-item>
-      <el-form-item label="链接地址" prop="path">
-        <el-input v-model="form.path" placeholder="链接地址" style="width: 177px;"/>
+      <el-form-item v-show="form.type.toString() === '2'" label="按钮名称">
+        <el-input v-model="form.name" placeholder="按钮名称" style="width: 178px;"/>
       </el-form-item>
-      <el-form-item v-if="form.iframe === 'false'" label="组件路径">
-        <el-input v-model="form.component" placeholder="菜单路径"/>
+      <el-form-item v-show="form.type.toString() !== '0'" label="权限标识">
+        <el-input :disabled="form.iframe === 'true'" v-model="form.permission" placeholder="权限标识" style="width: 178px;"/>
       </el-form-item>
-      <el-form-item v-if="form.iframe === 'false'" label="组件名称">
-        <el-input v-model="form.componentName" placeholder="匹配组件内Name字段"/>
+      <el-form-item v-if="form.type.toString() !== '2'" label="路由地址" prop="path">
+        <el-input v-model="form.path" placeholder="路由地址" style="width: 178px;"/>
+      </el-form-item>
+      <el-form-item label="菜单排序">
+        <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 178px;"/>
+      </el-form-item>
+      <el-form-item v-show="form.iframe === 'false' && form.type.toString() === '1'" label="组件名称">
+        <el-input v-model="form.componentName" style="width: 178px;" placeholder="匹配组件内Name字段"/>
+      </el-form-item>
+      <el-form-item v-show="form.iframe === 'false' && form.type.toString() === '1'" label="组件路径">
+        <el-input v-model="form.component" style="width: 178px;" placeholder="组件路径"/>
       </el-form-item>
       <el-form-item label="上级类目">
         <treeselect v-model="form.pid" :options="menus" style="width: 450px;" placeholder="选择上级类目" />
@@ -74,14 +87,11 @@ export default {
   data() {
     return {
       loading: false, dialog: false, menus: [],
-      form: { name: '', sort: 999, path: '', component: '', componentName: '', iframe: 'false', roles: [], pid: 0, icon: '', cache: false, hidden: false },
+      form: { name: '', sort: 999, path: '', component: '', componentName: '', iframe: 'false', roles: [], pid: 0, icon: '', cache: false, hidden: false, type: 0, permission: '' },
       rules: {
         name: [
           { required: true, message: '请输入名称', trigger: 'blur' }
         ],
-        sort: [
-          { required: true, message: '请输入序号', trigger: 'blur', type: 'number' }
-        ],
         path: [
           { required: true, message: '请输入地址', trigger: 'blur' }
         ]
@@ -114,9 +124,8 @@ export default {
         })
         this.loading = false
         this.$parent.init()
-      }).catch(err => {
+      }).catch(() => {
         this.loading = false
-        console.log(err.response.data.message)
       })
     },
     doEdit() {
@@ -129,15 +138,14 @@ export default {
         })
         this.loading = false
         this.$parent.init()
-      }).catch(err => {
+      }).catch(() => {
         this.loading = false
-        console.log(err.response.data.message)
       })
     },
     resetForm() {
       this.dialog = false
       this.$refs['form'].resetFields()
-      this.form = { name: '', sort: 999, path: '', component: '', componentName: '', iframe: 'false', roles: [], pid: 0, icon: '', cache: false, hidden: false }
+      this.form = { name: '', sort: 999, path: '', component: '', componentName: '', iframe: 'false', roles: [], pid: 0, icon: '', cache: false, hidden: false, type: 0, permission: '' }
     },
     selected(name) {
       this.form.icon = name

src/views/system/menu/index.vue

@@ -4,9 +4,18 @@
     <div class="head-container">
       <!-- 搜索 -->
       <el-input v-model="query.value" clearable placeholder="模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-date-picker
+        v-model="query.date"
+        type="daterange"
+        range-separator=":"
+        class="el-range-editor--small filter-item"
+        style="height: 30.5px;width: 220px"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"/>
       <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;">
+      <div v-permission="['admin','menu:add']" style="display: inline-block;margin: 0px 2px;">
         <el-button
           class="filter-item"
           size="mini"
@@ -14,20 +23,22 @@
           icon="el-icon-plus"
           @click="add">新增</el-button>
       </div>
+      <!-- 导出 -->
       <div style="display: inline-block;">
         <el-button
-          class="filter-item"
+          :loading="downloadLoading"
           size="mini"
+          class="filter-item"
           type="warning"
-          icon="el-icon-more"
-          @click="changExpand">{{ expand ? '折叠' : '展开' }}</el-button>
-        <eForm ref="form" :is-add="true"/>
+          icon="el-icon-download"
+          @click="download">导出</el-button>
       </div>
     </div>
     <!--表单组件-->
     <eForm ref="form" :is-add="isAdd"/>
     <!--表格渲染-->
-    <tree-table v-loading="loading" :data="data" :expand-all="expand" :columns="columns" :height="height" size="small">
+    <el-table v-loading="loading" :data="data" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" :default-expand-all="expand" row-key="id" size="small">
+      <el-table-column :show-overflow-tooltip="true" label="菜单名称" width="125px" prop="name"/>
       <el-table-column prop="icon" label="图标" align="center" width="60px">
         <template slot-scope="scope">
           <svg-icon :icon-class="scope.row.icon" />
@@ -35,28 +46,29 @@
       </el-table-column>
       <el-table-column prop="sort" align="center" label="排序">
         <template slot-scope="scope">
-          <el-tag>{{ scope.row.sort }}</el-tag>
+          {{ scope.row.sort }}
         </template>
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="true" prop="path" label="链接地址"/>
-      <el-table-column :show-overflow-tooltip="true" prop="componentName" label="组件名称"/>
-      <el-table-column :show-overflow-tooltip="true" prop="component" label="组件路径" width="130px"/>
-      <el-table-column prop="iframe" label="内部菜单">
+      <el-table-column :show-overflow-tooltip="true" prop="path" label="路由地址"/>
+      <el-table-column :show-overflow-tooltip="true" prop="permission" label="权限标识"/>
+      <!--<el-table-column :show-overflow-tooltip="true" prop="componentName" label="组件名称"/>-->
+      <el-table-column :show-overflow-tooltip="true" prop="component" label="组件路径"/>
+      <el-table-column prop="iframe" label="外链" width="75px">
         <template slot-scope="scope">
-          <span v-if="!scope.row.iframe">是</span>
+          <span v-if="scope.row.iframe">是</span>
           <span v-else>否</span>
         </template>
       </el-table-column>
-      <el-table-column prop="iframe" label="是否缓存">
+      <el-table-column prop="iframe" label="缓存" width="75px">
         <template slot-scope="scope">
           <span v-if="scope.row.cache">是</span>
           <span v-else>否</span>
         </template>
       </el-table-column>
-      <el-table-column prop="iframe" label="是否隐藏">
+      <el-table-column prop="iframe" label="可见" width="75px">
         <template slot-scope="scope">
-          <span v-if="scope.row.hidden">是</span>
-          <span v-else>否</span>
+          <span v-if="scope.row.hidden">否</span>
+          <span v-else>是</span>
         </template>
       </el-table-column>
       <el-table-column prop="createTime" label="创建日期" width="135px">
@@ -64,11 +76,11 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="checkPermission(['ADMIN','MENU_ALL','MENU_EDIT','MENU_DELETE'])" label="操作" width="130px" align="center" fixed="right">
+      <el-table-column v-if="checkPermission(['admin','menu:edit','menu:del'])" label="操作" width="130px" align="center" fixed="right">
         <template slot-scope="scope">
-          <el-button v-permission="['ADMIN','MENU_ALL','MENU_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
+          <el-button v-permission="['admin','menu:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
           <el-popover
-            v-permission="['ADMIN','MENU_ALL','MENU_DELETE']"
+            v-permission="['admin','menu:del']"
             :ref="scope.row.id"
             placement="top"
             width="200">
@@ -81,36 +93,27 @@
           </el-popover>
         </template>
       </el-table-column>
-    </tree-table>
+    </el-table>
   </div>
 </template>
 
 <script>
 import checkPermission from '@/utils/permission' // 权限判断函数
-import treeTable from '@/components/TreeTable'
 import initData from '@/mixins/initData'
-import { del } from '@/api/menu'
-import { parseTime } from '@/utils/index'
+import { del, downloadMenu } from '@/api/menu'
+import { parseTime, downloadFile } from '@/utils/index'
 import eForm from './form'
 export default {
   name: 'Menu',
-  components: { treeTable, eForm },
+  components: { eForm },
   mixins: [initData],
   data() {
     return {
-      columns: [
-        {
-          text: '名称',
-          value: 'name',
-          width: 140
-        }
-      ],
-      delLoading: false, expand: true, height: 625
+      delLoading: false, expand: false
     }
   },
   created() {
     this.$nextTick(() => {
-      this.height = document.documentElement.clientHeight - 200
       this.init()
     })
   },
@@ -124,6 +127,10 @@ export default {
       const value = query.value
       this.params = { page: this.page, size: this.size, sort: sort }
       if (value) { this.params['blurry'] = value }
+      if (query.date) {
+        this.params['startTime'] = query.date[0]
+        this.params['endTime'] = query.date[1]
+      }
       return true
     },
     subDelete(id) {
@@ -152,12 +159,22 @@ export default {
       this.isAdd = false
       const _this = this.$refs.form
       _this.getMenus()
-      _this.form = { id: data.id, component: data.component, componentName: data.componentName, name: data.name, sort: data.sort, pid: data.pid, path: data.path, iframe: data.iframe.toString(), roles: [], icon: data.icon, cache: data.cache, hidden: data.hidden }
+      _this.form = { id: data.id, component: data.component, componentName: data.componentName, name: data.name, sort: data.sort, pid: data.pid, path: data.path, iframe: data.iframe.toString(), roles: [], icon: data.icon, cache: data.cache, hidden: data.hidden, type: data.type, permission: data.permission }
       _this.dialog = true
     },
     changExpand() {
       this.expand = !this.expand
       this.init()
+    },
+    download() {
+      this.beforeInit()
+      this.downloadLoading = true
+      downloadMenu(this.params).then(result => {
+        downloadFile(result, '菜单列表', 'xlsx')
+        this.downloadLoading = false
+      }).catch(() => {
+        this.downloadLoading = false
+      })
     }
   }
 }

src/views/system/permission/form.vue

@@ -1,112 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="isAdd ? '新增权限' : '编辑权限'" append-to-body width="500px">
-    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-      <el-form-item label="名称" prop="name">
-        <el-input v-model="form.name" style="width: 360px;"/>
-      </el-form-item>
-      <el-form-item label="别名" prop="alias">
-        <el-input v-model="form.alias" style="width: 360px;"/>
-      </el-form-item>
-      <el-form-item style="margin-bottom: 0px;" label="上级类目">
-        <treeselect v-model="form.pid" :options="permissions" style="width: 360px;" placeholder="选择上级类目" />
-      </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, getPermissionTree } from '@/api/permission'
-import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-export default {
-  components: { Treeselect },
-  props: {
-    isAdd: {
-      type: Boolean,
-      required: true
-    }
-  },
-  data() {
-    return {
-      loading: false, dialog: false, permissions: [],
-      form: { name: '', alias: '', pid: 0 },
-      rules: {
-        name: [
-          { required: true, message: '请输入名称', trigger: 'blur' }
-        ],
-        alias: [
-          { required: true, message: '请输入别名', 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.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.$parent.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.form = { name: '', alias: '', pid: 0 }
-    },
-    getPermissions() {
-      getPermissionTree().then(res => {
-        this.permissions = []
-        const permission = { id: 0, label: '顶级类目', children: [] }
-        permission.children = res
-        this.permissions.push(permission)
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

src/views/system/permission/index.vue

@@ -1,140 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <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">{{ 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" :height="height" :columns="columns" size="small">
-      <el-table-column prop="createTime" label="创建日期">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-if="checkPermission(['ADMIN','PERMISSION_ALL','PERMISSION_EDIT','PERMISSION_DELETE'])" label="操作" width="130px" align="center" fixed="right">
-        <template slot-scope="scope">
-          <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"
-            placement="top"
-            width="200">
-            <p>确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！</p>
-            <div style="text-align: right; margin: 0">
-              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
-            </div>
-            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
-          </el-popover>
-        </template>
-      </el-table-column>
-    </tree-table>
-  </div>
-</template>
-
-<script>
-import checkPermission from '@/utils/permission' // 权限判断函数
-import treeTable from '@/components/TreeTable'
-import initData from '@/mixins/initData'
-import { del } from '@/api/permission'
-import { parseTime } from '@/utils/index'
-import eForm from './form'
-export default {
-  name: 'Permission',
-  components: { treeTable, eForm },
-  mixins: [initData],
-  data() {
-    return {
-      columns: [
-        {
-          text: '名称',
-          value: 'name'
-        },
-        {
-          text: '别名',
-          value: 'alias'
-        }
-      ],
-      delLoading: false, expand: true, height: 625
-    }
-  },
-  created() {
-    this.$nextTick(() => {
-      this.height = document.documentElement.clientHeight - 200
-      this.init()
-    })
-  },
-  methods: {
-    parseTime,
-    checkPermission,
-    beforeInit() {
-      this.url = 'api/permissions'
-      const sort = 'id,desc'
-      const query = this.query
-      const value = query.value
-      this.params = { page: this.page, size: this.size, sort: sort }
-      if (value) { this.params['blurry'] = value }
-      return true
-    },
-    subDelete(id) {
-      this.delLoading = true
-      del(id).then(res => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        this.init()
-        this.$notify({
-          title: '删除成功',
-          type: 'success',
-          duration: 2500
-        })
-      }).catch(err => {
-        this.delLoading = false
-        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()
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

src/views/system/role/form.vue

@@ -1,14 +1,14 @@
 <template>
-  <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="isAdd ? '新增角色' : '编辑角色'" append-to-body width="500px">
-    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+  <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="isAdd ? '新增角色' : '编辑角色'" append-to-body width="520px">
+    <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="80px">
       <el-form-item label="角色名称" prop="name">
-        <el-input v-model="form.name" style="width: 370px;"/>
+        <el-input v-model="form.name" style="width: 145px;"/>
       </el-form-item>
-      <el-form-item label="角色级别" prop="sort">
-        <el-input-number v-model.number="form.level" :min="1" controls-position="right" style="width: 370px;"/>
+      <el-form-item label="角色权限" prop="permission">
+        <el-input v-model="form.permission" style="width: 145px;"/>
       </el-form-item>
       <el-form-item label="数据范围">
-        <el-select v-model="form.dataScope" style="width: 370px" placeholder="请选择数据范围" @change="changeScope">
+        <el-select v-model="form.dataScope" style="width: 145px" placeholder="请选择数据范围" @change="changeScope">
           <el-option
             v-for="item in dateScopes"
             :key="item"
@@ -16,11 +16,14 @@
             :value="item"/>
         </el-select>
       </el-form-item>
+      <el-form-item label="角色级别" prop="sort">
+        <el-input-number v-model.number="form.level" :min="1" controls-position="right" style="width: 145px;"/>
+      </el-form-item>
       <el-form-item v-if="form.dataScope === '自定义'" label="数据权限">
-        <treeselect v-model="deptIds" :options="depts" multiple style="width: 370px" placeholder="请选择" />
+        <treeselect v-model="deptIds" :options="depts" multiple style="width: 380px" placeholder="请选择" />
       </el-form-item>
       <el-form-item label="描述信息">
-        <el-input v-model="form.remark" style="width: 370px;" rows="5" type="textarea"/>
+        <el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea"/>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -47,10 +50,13 @@ export default {
     return {
       dateScopes: ['全部', '本级', '自定义'],
       loading: false, dialog: false, depts: [], deptIds: [],
-      form: { name: '', depts: [], remark: '', dataScope: '本级', level: 3 },
+      form: { name: '', depts: [], remark: '', dataScope: '本级', level: 3, permission: '' },
       rules: {
         name: [
           { required: true, message: '请输入名称', trigger: 'blur' }
+        ],
+        permission: [
+          { required: true, message: '请输入权限', trigger: 'blur' }
         ]
       }
     }
@@ -119,7 +125,7 @@ export default {
     resetForm() {
       this.dialog = false
       this.$refs['form'].resetFields()
-      this.form = { name: '', depts: [], remark: '', dataScope: '本级', level: 3 }
+      this.form = { name: '', depts: [], remark: '', dataScope: '本级', level: 3, permission: '' }
     },
     getDepts() {
       getDepts({ enabled: true }).then(res => {

src/views/system/role/index.vue

@@ -6,9 +6,18 @@
     <div class="head-container">
       <!-- 搜索 -->
       <el-input v-model="query.value" clearable placeholder="输入名称或者描述搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-date-picker
+        v-model="query.date"
+        type="daterange"
+        range-separator=":"
+        class="el-range-editor--small filter-item"
+        style="height: 30.5px;width: 220px"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"/>
       <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;">
+      <div v-permission="['admin','roles:add']" style="display: inline-block;margin: 0px 2px;">
         <el-button
           class="filter-item"
           size="mini"
@@ -16,6 +25,16 @@
           icon="el-icon-plus"
           @click="add">新增</el-button>
       </div>
+      <!-- 导出 -->
+      <div style="display: inline-block;">
+        <el-button
+          :loading="downloadLoading"
+          size="mini"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-download"
+          @click="download">导出</el-button>
+      </div>
     </div>
     <el-row :gutter="15">
       <!--角色管理-->
@@ -23,28 +42,23 @@
         <el-card class="box-card" shadow="never">
           <div slot="header" class="clearfix">
             <span class="role-span">角色列表</span>
-            <div id="opt" style="float: right">
-              <el-radio-group v-model="opt" size="mini">
-                <el-radio-button label="菜单分配"/>
-                <el-radio-button label="权限分配"/>
-              </el-radio-group>
-            </div>
           </div>
           <el-table v-loading="loading" :data="data" highlight-current-row size="small" style="width: 100%;" @current-change="handleCurrentChange">
             <el-table-column prop="name" label="名称"/>
             <el-table-column prop="dataScope" label="数据权限"/>
+            <el-table-column prop="permission" label="角色权限"/>
             <el-table-column prop="level" label="角色级别"/>
             <el-table-column :show-overflow-tooltip="true" prop="remark" label="描述"/>
-            <el-table-column :show-overflow-tooltip="true" prop="createTime" label="创建日期">
+            <el-table-column :show-overflow-tooltip="true" width="130px" prop="createTime" label="创建日期">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime) }}</span>
               </template>
             </el-table-column>
-            <el-table-column v-if="checkPermission(['ADMIN','ROLES_ALL','ROLES_EDIT','ROLES_DELETE'])" label="操作" width="130px" align="center" fixed="right">
+            <el-table-column v-if="checkPermission(['admin','roles:edit','roles:del'])" label="操作" width="130px" align="center" fixed="right">
               <template slot-scope="scope">
-                <el-button v-permission="['ADMIN','ROLES_ALL','ROLES_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
+                <el-button v-permission="['admin','roles:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
                 <el-popover
-                  v-permission="['ADMIN','ROLES_ALL','ROLES_DELETE']"
+                  v-permission="['admin','roles:del']"
                   :ref="scope.row.id"
                   placement="top"
                   width="180">
@@ -70,13 +84,13 @@
       </el-col>
       <!-- 授权 -->
       <el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="7">
-        <el-card v-show="opt === '菜单分配'" class="box-card" shadow="never">
+        <el-card class="box-card" shadow="never">
           <div slot="header" class="clearfix">
             <el-tooltip class="item" effect="dark" content="选择指定角色分配菜单" placement="top">
               <span class="role-span">菜单分配</span>
             </el-tooltip>
             <el-button
-              v-permission="['ADMIN','ROLES_ALL','ROLES_EDIT']"
+              v-permission="['admin','roles:edit']"
               :disabled="!showButton"
               :loading="menuLoading"
               icon="el-icon-check"
@@ -90,34 +104,11 @@
             :data="menus"
             :default-checked-keys="menuIds"
             :props="defaultProps"
+            check-strictly
             accordion
             show-checkbox
             node-key="id"/>
         </el-card>
-        <el-card v-show="opt === '权限分配'" class="box-card" shadow="never">
-          <div slot="header" class="clearfix">
-            <el-tooltip class="item" effect="dark" content="选择指定角色分配权限" placement="top">
-              <span class="role-span">权限分配</span>
-            </el-tooltip>
-            <el-button
-              v-permission="['ADMIN','ROLES_ALL','ROLES_EDIT']"
-              :disabled="!showButton"
-              :loading="permissionLoading"
-              icon="el-icon-check"
-              size="mini"
-              style="float: right; padding: 6px 9px"
-              type="primary"
-              @click="savePermission">保存</el-button>
-          </div>
-          <el-tree
-            ref="permission"
-            :data="permissions"
-            :default-checked-keys="permissionIds"
-            :props="defaultProps"
-            show-checkbox
-            accordion
-            node-key="id"/>
-        </el-card>
       </el-col>
     </el-row>
   </div>
@@ -127,11 +118,10 @@
 import checkPermission from '@/utils/permission'
 import initData from '@/mixins/initData'
 import { del } from '@/api/role'
-import { getPermissionTree } from '@/api/permission'
 import { getMenusTree } from '@/api/menu'
-import { parseTime } from '@/utils/index'
+import { parseTime, downloadFile } from '@/utils/index'
 import eForm from './form'
-import { editPermission, editMenu, get } from '@/api/role'
+import { editMenu, get, downloadRole } from '@/api/role'
 export default {
   name: 'Role',
   components: { eForm },
@@ -142,12 +132,11 @@ export default {
         children: 'children',
         label: 'label'
       },
-      currentId: 0, permissionLoading: false, menuLoading: false, showButton: false, opt: '菜单分配',
-      delLoading: false, permissions: [], permissionIds: [], menus: [], menuIds: []
+      currentId: 0, menuLoading: false, showButton: false,
+      delLoading: false, menus: [], menuIds: []
     }
   },
   created() {
-    this.getPermissions()
     this.getMenus()
     this.$nextTick(() => {
       this.init()
@@ -164,8 +153,11 @@ export default {
       const value = query.value
       this.params = { page: this.page, size: this.size, sort: sort }
       if (value) { this.params['blurry'] = value }
-      // 清空权限与菜单的选中
-      this.$refs.permission.setCheckedKeys([])
+      if (query.date) {
+        this.params['startTime'] = query.date[0]
+        this.params['endTime'] = query.date[1]
+      }
+      // 清空菜单的选中
       this.$refs.menu.setCheckedKeys([])
       return true
     },
@@ -187,11 +179,6 @@ export default {
         console.log(err.response.data.message)
       })
     },
-    getPermissions() {
-      getPermissionTree().then(res => {
-        this.permissions = res
-      })
-    },
     getMenus() {
       getMenusTree().then(res => {
         this.menus = res
@@ -200,8 +187,7 @@ export default {
     handleCurrentChange(val) {
       if (val) {
         const _this = this
-        // 清空权限与菜单的选中
-        this.$refs.permission.setCheckedKeys([])
+        // 清空菜单的选中
         this.$refs.menu.setCheckedKeys([])
         // 保存当前的角色id
         this.currentId = val.id
@@ -209,58 +195,24 @@ export default {
         this.showButton = true
         // 初始化
         this.menuIds = []
-        this.permissionIds = []
         // 菜单数据需要特殊处理
         val.menus.forEach(function(data, index) {
-          let add = true
-          for (let i = 0; i < val.menus.length; i++) {
-            if (data.id === val.menus[i].pid) {
-              add = false
-              break
-            }
-          }
-          if (add) {
-            _this.menuIds.push(data.id)
-          }
-        })
-        // 处理权限数据
-        val.permissions.forEach(function(data, index) {
-          _this.permissionIds.push(data.id)
+          _this.menuIds.push(data.id)
         })
       }
     },
-    savePermission() {
-      this.permissionLoading = true
-      const role = { id: this.currentId, permissions: [] }
-      this.$refs.permission.getCheckedKeys().forEach(function(data, index) {
-        const permission = { id: data }
-        role.permissions.push(permission)
-      })
-      editPermission(role).then(res => {
-        this.$notify({
-          title: '保存成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.permissionLoading = false
-        this.update()
-      }).catch(err => {
-        this.permissionLoading = false
-        console.log(err.response.data.message)
-      })
-    },
     saveMenu() {
       this.menuLoading = true
       const role = { id: this.currentId, menus: [] }
       // 得到半选的父节点数据，保存起来
       this.$refs.menu.getHalfCheckedNodes().forEach(function(data, index) {
-        const permission = { id: data.id }
-        role.menus.push(permission)
+        const menu = { id: data.id }
+        role.menus.push(menu)
       })
       // 得到已选中的 key 值
       this.$refs.menu.getCheckedKeys().forEach(function(data, index) {
-        const permission = { id: data }
-        role.menus.push(permission)
+        const menu = { id: data }
+        role.menus.push(menu)
       })
       editMenu(role).then(res => {
         this.$notify({
@@ -294,7 +246,7 @@ export default {
       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 }
+      _this.form = { id: data.id, name: data.name, remark: data.remark, depts: data.depts, dataScope: data.dataScope, level: data.level, permission: data.permission }
       if (_this.form.dataScope === '自定义') {
         _this.getDepts()
       }
@@ -302,6 +254,16 @@ export default {
         _this.deptIds[i] = _this.form.depts[i].id
       }
       _this.dialog = true
+    },
+    download() {
+      this.beforeInit()
+      this.downloadLoading = true
+      downloadRole(this.params).then(result => {
+        downloadFile(result, '角色列表', 'xlsx')
+        this.downloadLoading = false
+      }).catch(() => {
+        this.downloadLoading = false
+      })
     }
   }
 }

src/views/system/timing/index.vue

@@ -4,9 +4,18 @@
     <div class="head-container">
       <!-- 搜索 -->
       <el-input v-model="query.value" clearable placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-date-picker
+        v-model="query.date"
+        type="daterange"
+        range-separator=":"
+        class="el-range-editor--small filter-item"
+        style="height: 30.5px;width: 220px"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"/>
       <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;">
+      <div v-permission="['admin','timing:add']" style="display: inline-block;margin: 0px 2px;">
         <el-button
           class="filter-item"
           size="mini"
@@ -14,14 +23,24 @@
           icon="el-icon-plus"
           @click="dialog = true;isAdd = true">新增</el-button>
       </div>
+      <!-- 导出 -->
+      <div style="display: inline-block;">
+        <el-button
+          :loading="downloadLoading"
+          size="mini"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-download"
+          @click="download">导出</el-button>
+      </div>
       <!-- 任务日志 -->
-      <div v-permission="['ADMIN','JOB_ALL','JOB_SELECT']" style="display: inline-block;">
+      <div style="display: inline-block;">
         <el-button
           class="filter-item"
           size="mini"
-          type="warning"
+          type="info"
           icon="el-icon-tickets"
-          @click="doLog">执行日志</el-button>
+          @click="doLog">日志</el-button>
         <Log ref="log"/>
       </div>
     </div>
@@ -69,20 +88,20 @@
         </template>
       </el-table-column>
       <el-table-column :show-overflow-tooltip="true" prop="remark" label="描述"/>
-      <el-table-column :show-overflow-tooltip="true" prop="updateTime" label="更新日期">
+      <el-table-column :show-overflow-tooltip="true" prop="createTime" label="创建日期">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime) }}</span>
+          <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="checkPermission(['ADMIN','JOB_ALL','JOB_EDIT','JOB_DELETE'])" label="操作" width="180px" align="center" fixed="right">
+      <el-table-column v-if="checkPermission(['admin','timing:edit','timing:del'])" label="操作" width="180px" align="center" fixed="right">
         <template slot-scope="scope">
-          <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 ? '恢复' : '暂停')">
+          <el-button v-permission="['admin','timing:edit']" size="mini" style="margin-right: 3px;" type="text" @click="edit(scope.row)">编辑</el-button>
+          <el-button v-permission="['admin','timing:edit']" style="margin-left: -2px" type="text" size="mini" @click="execute(scope.row.id)">执行</el-button>
+          <el-button v-permission="['admin',,'timing:edit']" style="margin-left: 3px" type="text" size="mini" @click="updateStatus(scope.row.id,scope.row.isPause ? '恢复' : '暂停')">
             {{ scope.row.isPause ? '恢复' : '暂停' }}
           </el-button>
           <el-popover
-            v-permission="['ADMIN','JOB_ALL','JOB_DELETE']"
+            v-permission="['admin','timing:del']"
             :ref="scope.row.id"
             placement="top"
             width="200">
@@ -110,8 +129,8 @@
 <script>
 import checkPermission from '@/utils/permission'
 import initData from '@/mixins/initData'
-import { del, updateIsPause, execution, add, edit } from '@/api/timing'
-import { parseTime } from '@/utils/index'
+import { del, updateIsPause, execution, add, edit, downloadJobs } from '@/api/timing'
+import { parseTime, downloadFile } from '@/utils/index'
 import Log from './log'
 export default {
   name: 'Timing',
@@ -153,6 +172,10 @@ export default {
       const value = query.value
       this.params = { page: this.page, size: this.size, sort: sort }
       if (value) { this.params['jobName'] = value }
+      if (query.date) {
+        this.params['startTime'] = query.date[0]
+        this.params['endTime'] = query.date[1]
+      }
       return true
     },
     execute(id) {
@@ -258,6 +281,16 @@ export default {
       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
+    },
+    download() {
+      this.beforeInit()
+      this.downloadLoading = true
+      downloadJobs(this.params).then(result => {
+        downloadFile(result, '任务列表', 'xlsx')
+        this.downloadLoading = false
+      }).catch(() => {
+        this.downloadLoading = false
+      })
     }
   }
 }

src/views/system/timing/log.vue

@@ -3,10 +3,29 @@
     <!-- 搜索 -->
     <div class="head-container">
       <el-input v-model="query.value" clearable placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-date-picker
+        v-model="query.date"
+        type="daterange"
+        range-separator=":"
+        class="el-range-editor--small filter-item"
+        style="height: 30.5px;width: 220px"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"/>
       <el-select v-model="query.isSuccess" placeholder="日志状态" clearable class="filter-item" style="width: 110px" @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 style="display: inline-block;">
+        <el-button
+          :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%;margin-top: -10px;">
@@ -52,7 +71,8 @@
 <script>
 import checkPermission from '@/utils/permission'
 import initData from '@/mixins/initData'
-import { parseTime } from '@/utils/index'
+import { downloadLogs } from '@/api/timing'
+import { parseTime, downloadFile } from '@/utils/index'
 export default {
   mixins: [initData],
   data() {
@@ -78,7 +98,7 @@ export default {
       this.doInit()
     },
     beforeInit() {
-      this.url = 'api/jobLogs'
+      this.url = 'api/jobs/logs'
       const sort = 'id,desc'
       const query = this.query
       const value = query.value
@@ -86,12 +106,26 @@ export default {
       this.size = 6
       this.params = { page: this.page, size: this.size, sort: sort }
       if (value) { this.params['jobName'] = value }
+      if (query.date) {
+        this.params['startTime'] = query.date[0]
+        this.params['endTime'] = query.date[1]
+      }
       if (isSuccess !== '' && isSuccess !== null) { this.params['isSuccess'] = isSuccess }
       return true
     },
     info(errorInfo) {
       this.errorInfo = errorInfo
       this.errorDialog = true
+    },
+    download() {
+      this.beforeInit()
+      this.downloadLoading = true
+      downloadLogs(this.params).then(result => {
+        downloadFile(result, '任务日志列表', 'xlsx')
+        this.downloadLoading = false
+      }).catch(() => {
+        this.downloadLoading = false
+      })
     }
   }
 }

src/views/system/user/center.vue

@@ -46,6 +46,7 @@
               <el-table-column prop="description" label="行为"/>
               <el-table-column prop="requestIp" label="IP"/>
               <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源"/>
+              <el-table-column prop="browser" label="浏览器"/>
               <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>

src/views/system/user/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!--form 组件-->
-    <eForm ref="form" :is-add="isAdd" :dicts="dicts"/>
+    <eForm ref="form" :is-add="isAdd" :dicts="dict.user_status"/>
     <el-row :gutter="20">
       <!--部门数据-->
       <el-col :xs="9" :sm="6" :md="4" :lg="4" :xl="4">
@@ -16,12 +16,21 @@
         <div class="head-container">
           <!-- 搜索 -->
           <el-input v-model="query.blurry" clearable placeholder="输入名称或者邮箱搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+          <el-date-picker
+            v-model="query.date"
+            type="daterange"
+            range-separator=":"
+            class="el-range-editor--small filter-item"
+            style="height: 30.5px;width: 220px"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"/>
           <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;">
+          <div v-permission="['admin','user:add']" style="display: inline-block;margin: 0px 2px;">
             <el-button
               class="filter-item"
               size="mini"
@@ -32,7 +41,6 @@
           <!-- 导出 -->
           <div style="display: inline-block;">
             <el-button
-              v-permission="['ADMIN','USER_ALL','USER_SELECT']"
               :loading="downloadLoading"
               size="mini"
               class="filter-item"
@@ -53,9 +61,11 @@
           </el-table-column>
           <el-table-column label="状态" align="center">
             <template slot-scope="scope">
-              <div v-for="item in dicts" :key="item.id">
-                <el-tag v-if="scope.row.enabled.toString() === item.value" :type="scope.row.enabled ? '' : 'info'">{{ item.label }}</el-tag>
-              </div>
+              <el-switch
+                v-model="scope.row.enabled"
+                active-color="#409EFF"
+                inactive-color="#F56C6C"
+                @change="changeEnabled(scope.row, scope.row.enabled,)"/>
             </template>
           </el-table-column>
           <el-table-column :show-overflow-tooltip="true" prop="createTime" label="创建日期">
@@ -63,11 +73,11 @@
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column v-if="checkPermission(['ADMIN','USER_ALL','USER_EDIT','USER_DELETE'])" label="操作" width="125" align="center" fixed="right">
+          <el-table-column v-if="checkPermission(['admin','user:edit','user:del'])" label="操作" width="125" align="center" fixed="right">
             <template slot-scope="scope">
-              <el-button v-permission="['ADMIN','USER_ALL','USER_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
+              <el-button v-permission="['admin','user:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
               <el-popover
-                v-permission="['ADMIN','USER_ALL','USER_DELETE']"
+                v-permission="['admin','user:del']"
                 :ref="scope.row.id"
                 placement="top"
                 width="180">
@@ -97,15 +107,16 @@
 <script>
 import checkPermission from '@/utils/permission'
 import initData from '@/mixins/initData'
-import initDict from '@/mixins/initDict'
-import { del, downloadUser } from '@/api/user'
+import { del, downloadUser, edit } from '@/api/user'
 import { getDepts } from '@/api/dept'
 import { parseTime, downloadFile } from '@/utils/index'
 import eForm from './form'
 export default {
   name: 'User',
   components: { eForm },
-  mixins: [initData, initDict],
+  mixins: [initData],
+  // 设置数据字典
+  dicts: ['user_status'],
   data() {
     return {
       height: document.documentElement.clientHeight - 180 + 'px;', isAdd: false,
@@ -114,7 +125,6 @@ export default {
         children: 'children',
         label: 'name'
       },
-      downloadLoading: false,
       enabledTypeOptions: [
         { key: 'true', display_name: '激活' },
         { key: 'false', display_name: '锁定' }
@@ -125,8 +135,6 @@ export default {
     this.getDeptDatas()
     this.$nextTick(() => {
       this.init()
-      // 加载数据字典
-      this.getDict('user_status')
     })
   },
   mounted: function() {
@@ -146,9 +154,24 @@ export default {
       const enabled = query.enabled
       this.params = { page: this.page, size: this.size, sort: sort, deptId: this.deptId }
       if (blurry) { this.params['blurry'] = blurry }
+      if (query.date) {
+        this.params['startTime'] = query.date[0]
+        this.params['endTime'] = query.date[1]
+      }
       if (enabled !== '' && enabled !== null) { this.params['enabled'] = enabled }
       return true
     },
+    // 导出
+    download() {
+      this.beforeInit()
+      this.downloadLoading = true
+      downloadUser(this.params).then(result => {
+        downloadFile(result, '用户列表', 'xlsx')
+        this.downloadLoading = false
+      }).catch(() => {
+        this.downloadLoading = false
+      })
+    },
     subDelete(id) {
       this.delLoading = true
       del(id).then(res => {
@@ -190,16 +213,6 @@ export default {
       this.$refs.form.getRoleLevel()
       this.$refs.form.dialog = true
     },
-    // 导出
-    download() {
-      this.downloadLoading = true
-      downloadUser().then(result => {
-        downloadFile(result, '用户列表', 'xlsx')
-        this.downloadLoading = false
-      }).catch(() => {
-        this.downloadLoading = false
-      })
-    },
     // 数据转换
     formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => {
@@ -227,6 +240,27 @@ export default {
       _this.jobId = data.job.id
       _this.getJobs(_this.deptId)
       _this.dialog = true
+    },
+    // 改变状态
+    changeEnabled(data, val) {
+      this.$confirm('此操作将 "' + this.dict.label.user_status[val] + '" ' + data.username + ', 是否继续？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        edit(data).then(res => {
+          this.$notify({
+            title: this.dict.label.user_status[val] + '成功',
+            type: 'success',
+            duration: 2500
+          })
+        }).catch(err => {
+          data.enabled = !data.enabled
+          console.log(err.response.data.message)
+        })
+      }).catch(() => {
+        data.enabled = !data.enabled
+      })
     }
   }
 }

src/views/tools/picture/index.vue

@@ -4,18 +4,27 @@
     <div class="head-container">
       <!--搜索-->
       <el-input v-model="query.filename" clearable placeholder="输入文件名" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-date-picker
+        v-model="query.date"
+        type="daterange"
+        range-separator=":"
+        class="el-range-editor--small filter-item"
+        style="height: 30.5px;width: 220px"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"/>
       <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
-          v-permission="['ADMIN','PICTURE_ALL','PICTURE_UPLOAD']"
+          v-permission="['admin','pictures:add']"
           class="filter-item"
           size="mini"
           type="primary"
           icon="el-icon-upload"
           @click="dialog = true">上传图片</el-button>
       </div>
-      <div v-permission="['ADMIN','PICTURE_ALL','PICTURE_DELETE']" style="display: inline-block;">
+      <div v-permission="['admin','pictures:del']" style="display: inline-block;">
         <el-button
           :loading="delAllLoading"
           :disabled="data.length === 0 || $refs.table.selection.length === 0"
@@ -25,6 +34,16 @@
           icon="el-icon-delete"
           @click="open">删除</el-button>
       </div>
+      <!-- 导出 -->
+      <div style="display: inline-block;">
+        <el-button
+          :loading="downloadLoading"
+          size="mini"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-download"
+          @click="download">导出</el-button>
+      </div>
     </div>
     <!--上传图片-->
     <el-dialog :visible.sync="dialog" :close-on-click-modal="false" append-to-body width="600px" @close="doSubmit">
@@ -64,7 +83,7 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="checkPermission(['ADMIN','PICTURE_ALL','PICTURE_DELETE'])" label="操作" width="100px" align="center" fixed="right">
+      <el-table-column v-if="checkPermission(['admin','pictures:del'])" label="操作" width="100px" align="center" fixed="right">
         <template slot-scope="scope">
           <el-popover
             :ref="scope.row.id"
@@ -94,16 +113,16 @@
 <script>
 import checkPermission from '@/utils/permission' // 权限判断函数
 import initData from '@/mixins/initData'
-import { parseTime } from '@/utils/index'
+import { parseTime, downloadFile } from '@/utils/index'
 import { mapGetters } from 'vuex'
-import { del, delAll } from '@/api/picture'
+import { del, delAll, downloadPicture } from '@/api/picture'
 import { getToken } from '@/utils/auth'
 export default {
   name: 'Pictures',
   mixins: [initData],
   data() {
     return {
-      delLoading: false, downloadLoading: false,
+      delLoading: false,
       delAllLoading: false,
       headers: {
         'Authorization': 'Bearer ' + getToken()
@@ -135,6 +154,10 @@ export default {
       const filename = query.filename
       this.params = { page: this.page, size: this.size, sort: sort }
       if (filename) { this.params[filename] = filename }
+      if (query.date) {
+        this.params['startTime'] = query.date[0]
+        this.params['endTime'] = query.date[1]
+      }
       return true
     },
     subDelete(id) {
@@ -218,6 +241,16 @@ export default {
         type: 'error',
         duration: 2500
       })
+    },
+    download() {
+      this.beforeInit()
+      this.downloadLoading = true
+      downloadPicture(this.params).then(result => {
+        downloadFile(result, '图片列表', 'xlsx')
+        this.downloadLoading = false
+      }).catch(() => {
+        this.downloadLoading = false
+      })
     }
   }
 }

src/views/tools/storage/local/index.vue

@@ -3,18 +3,21 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input
-        v-model="query.value"
-        clearable
-        placeholder="输入内容模糊搜索"
-        style="width: 200px;"
-        class="filter-item"
-        @keyup.enter.native="toQuery"/>
+      <el-input v-model="query.value" clearable placeholder="输入内容模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-date-picker
+        v-model="query.date"
+        type="daterange"
+        range-separator=":"
+        class="el-range-editor--small filter-item"
+        style="height: 30.5px;width: 220px"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"/>
       <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
-          v-permission="['ADMIN','LOCALSTORAGE_ALL','LOCALSTORAGE_CREATE']"
+          v-permission="['admin','storage:add']"
           class="filter-item"
           size="mini"
           type="primary"
@@ -25,6 +28,7 @@
       <!-- 多选删除 -->
       <div style="display: inline-block;margin: 0px 2px;">
         <el-button
+          v-permission="['admin','storage:del']"
           :loading="delAllLoading"
           :disabled="data.length === 0 || $refs.table.selection.length === 0"
           class="filter-item"
@@ -34,13 +38,23 @@
           @click="open">删除
         </el-button>
       </div>
+      <!-- 导出 -->
+      <div style="display: inline-block;">
+        <el-button
+          :loading="downloadLoading"
+          size="mini"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-download"
+          @click="download">导出</el-button>
+      </div>
     </div>
     <!--表单组件-->
     <eForm ref="form" :is-add="isAdd"/>
     <!--表格渲染-->
     <el-table v-loading="loading" ref="table" :data="data" size="small" style="width: 100%;">
       <el-table-column type="selection" width="55"/>
-      <el-table-column :show-overflow-tooltip="true" prop="name" label="文件名">
+      <el-table-column prop="name" width="150px" label="文件名">
         <template slot-scope="scope">
           <el-popover
             :content="'file/' + scope.row.type + '/' + scope.row.realName"
@@ -48,28 +62,33 @@
             title="路径"
             width="200"
             trigger="hover">
-            <el-link
+            <a
               slot="reference"
-              :underline="false"
               :href="baseApi + '/file/' + scope.row.type + '/' + scope.row.realName"
-              target="_blank"
-              type="primary">{{ scope.row.name }}
-            </el-link>
+              class="el-link--primary"
+              style="word-break:keep-all;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color: #1890ff;font-size: 13px;"
+              target="_blank">
+              {{ scope.row.name }}
+            </a>
           </el-popover>
         </template>
       </el-table-column>
-      <el-table-column prop="suffix" label="文件类型"/>
-      <el-table-column prop="type" label="类别"/>
-      <el-table-column prop="path" label="预览">
+      <el-table-column prop="path" label="预览图">
         <template slot-scope="{row}">
           <el-image
             :src=" baseApi + '/file/' + row.type + '/' + row.realName"
             :preview-src-list="[baseApi + '/file/' + row.type + '/' + row.realName]"
             fit="contain"
             lazy
-            style="width: 60px; height: 40px"/>
+            class="el-avatar">
+            <div slot="error">
+              <i class="el-icon-document"/>
+            </div>
+          </el-image>
         </template>
       </el-table-column>
+      <el-table-column prop="suffix" label="文件类型"/>
+      <el-table-column prop="type" label="类别"/>
       <el-table-column prop="size" label="大小"/>
       <el-table-column prop="operate" label="操作人"/>
       <el-table-column prop="createTime" label="创建日期">
@@ -77,25 +96,11 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="updateTime" label="修改日期">
+      <el-table-column v-if="checkPermission(['admin','storage:edit','storage:del'])" label="操作" width="150px" align="center">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-if="checkPermission(['ADMIN','LOCALSTORAGE_ALL','LOCALSTORAGE_EDIT','LOCALSTORAGE_DELETE'])"
-        label="操作"
-        width="150px"
-        align="center">
-        <template slot-scope="scope">
-          <el-button
-            v-permission="['ADMIN','LOCALSTORAGE_ALL','LOCALSTORAGE_EDIT']"
-            size="mini"
-            type="primary"
-            icon="el-icon-edit"
-            @click="edit(scope.row)"/>
+          <el-button v-permission="['admin','storage:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
           <el-popover
-            v-permission="['ADMIN','LOCALSTORAGE_ALL','LOCALSTORAGE_DELETE']"
+            v-permission="['admin','storage:del']"
             :ref="scope.row.id"
             placement="top"
             width="180">
@@ -125,10 +130,9 @@
 import { mapGetters } from 'vuex'
 import checkPermission from '@/utils/permission'
 import initData from '@/mixins/initData'
-import { del, delAll } from '@/api/localStorage'
-import { parseTime } from '@/utils/index'
+import { del, delAll, downloadStorage } from '@/api/localStorage'
+import { parseTime, downloadFile } from '@/utils/index'
 import eForm from './form'
-
 export default {
   components: { eForm },
   mixins: [initData],
@@ -162,8 +166,10 @@ export default {
       this.params = { page: this.page, size: this.size, sort: sort }
       const query = this.query
       const value = query.value
-      if (value) {
-        this.params['blurry'] = value
+      if (value) { this.params['blurry'] = value }
+      if (query.date) {
+        this.params['startTime'] = query.date[0]
+        this.params['endTime'] = query.date[1]
       }
       return true
     },
@@ -227,11 +233,23 @@ export default {
       }).then(() => {
         this.doDelete()
       })
+    },
+    download() {
+      this.beforeInit()
+      this.downloadLoading = true
+      downloadStorage(this.params).then(result => {
+        downloadFile(result, '文件列表', 'xlsx')
+        this.downloadLoading = false
+      }).catch(() => {
+        this.downloadLoading = false
+      })
     }
   }
 }
 </script>
 
 <style scoped>
-
+  /deep/ .el-image__error, .el-image__placeholder{
+    background: none;
+  }
 </style>

src/views/tools/storage/qiniu/index.vue

@@ -6,6 +6,15 @@
     <div class="head-container">
       <!-- 搜索 -->
       <el-input v-model="query.value" clearable placeholder="输入文件名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-date-picker
+        v-model="query.date"
+        type="daterange"
+        range-separator=":"
+        class="el-range-editor--small filter-item"
+        style="height: 30.5px;width: 220px"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"/>
       <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;">
@@ -33,6 +42,16 @@
           icon="el-icon-delete"
           @click="open">删除</el-button>
       </div>
+      <!-- 导出 -->
+      <div style="display: inline-block;">
+        <el-button
+          :loading="downloadLoading"
+          size="mini"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-download"
+          @click="downloadList">导出</el-button>
+      </div>
       <!-- 文件上传 -->
       <el-dialog :visible.sync="dialog" :close-on-click-modal="false" append-to-body width="500px" @close="doSubmit">
         <el-upload
@@ -98,8 +117,8 @@
 
 <script>
 import initData from '@/mixins/initData'
-import { del, download, sync, delAll } from '@/api/qiniu'
-import { parseTime } from '@/utils/index'
+import { del, download, sync, delAll, downloadQiNiu } from '@/api/qiniu'
+import { parseTime, downloadFile } from '@/utils/index'
 import { mapGetters } from 'vuex'
 import { getToken } from '@/utils/auth'
 import eForm from './form'
@@ -139,6 +158,10 @@ export default {
       const value = query.value
       this.params = { page: this.page, size: this.size, sort: sort }
       if (value) { this.params['key'] = value }
+      if (query.date) {
+        this.params['startTime'] = query.date[0]
+        this.params['endTime'] = query.date[1]
+      }
       return true
     },
     doConfig() {
@@ -257,6 +280,16 @@ export default {
       }).then(() => {
         this.doDelete()
       })
+    },
+    downloadList() {
+      this.beforeInit()
+      this.downloadLoading = true
+      downloadQiNiu(this.params).then(result => {
+        downloadFile(result, '七牛云文件列表', 'xlsx')
+        this.downloadLoading = false
+      }).catch(() => {
+        this.downloadLoading = false
+      })
     }
   }
 }

src/views/tools/swagger/index.vue

@@ -3,7 +3,7 @@
 </template>
 <script>
 import { mapGetters } from 'vuex'
-import elFrame from '@/components/iframe/index'
+import elFrame from '@/components/Iframe/index'
 export default {
   name: 'Swagger',
   components: { elFrame },