diff --git a/README.md b/README.md
new file mode 100644
index 0000000..ee6437d
--- /dev/null
+++ b/README.md
@@ -0,0 +1,73 @@
+智能库房综合管理系统
+
+##参考文档：
+
+	1.[element-ui](https://element.eleme.cn/2.15/#/zh-CN)  
+	   
+	2.[vue-element-admin](https://panjiachen.github.io/vue-element-admin-site/zh/) 
+
+
+```bash
+## 项目结构
+├── build                      # 构建相关
+├── public                     # 静态资源
+│   │── favicon.ico            # favicon图标
+│   └── index.html             # html模板
+├── src                        # 源代码
+│   ├── api                    # 所有请求
+│   ├── assets                 # 主题 字体等静态资源
+│   │   ├── icons                 # 项目所有 svg icons
+│   │   ├── images                # images
+│   │   ├── styles                # 全局样式
+│   ├── components             # 全局公用组件
+│   ├── layout                 # 全局 layout
+│   │   ├──                       # 系统布局设置
+│   │   ├──                       # 侧边栏
+│   │   ├──                       # 导航栏
+│   │   ├──                       # main
+│   ├── mixins                 # 全局共享数据和方法
+│   ├── router                 # 路由
+│   ├── store                  # 全局 store管理
+│   ├── utils                  # 全局公用方法
+│   ├── views                  # views 所有页面
+│   │   ├── archivesConfig        # 档案配置
+│   │   ├── components            # views内页面组件
+│   │   ├── dashboard             # 首页面板内容
+│   │   ├── features              # 错误页面
+│   │   ├── system                # 权限管理
+│   │   │   ├── dept                   # 部门管理
+│   │   │   ├── job                    # 岗位管理
+│   │   │   ├── menu                   # 菜单管理
+│   │   │   ├── role                   # 角色管理
+│   │   │   ├── user                   # 用户管理
+│   │   │   ├── log                    # 日志
+│   │   │   │   ├── errLog                # 异常日志
+│   │   │   │   ├── index                 # 操作日志
+│   │   ├── home                  # 首页
+│   │   ├── login                 # 登录
+│   ├── App.vue                # 入口页面
+│   ├── main.js                # 入口文件 加载组件 初始化等
+│   └── settings.js            # 网站基本设置
+├── .env.xxx                   # 环境变量配置
+├── .eslintrc.js               # eslint 配置项
+├── .babelrc                   # babel-loader 配置
+├── .travis.yml                # 自动化CI配置
+├── vue.config.js              # vue-cli 配置
+├── postcss.config.js          # postcss 配置
+└── package.json               # package.json
+```
+
+
+```bash
+# install dependency
+npm install
+
+# develop
+npm run dev
+
+# 构建测试环境
+npm run build:stage
+
+# 构建生产环境
+npm run build:prod
+```
\ No newline at end of file
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index 5c3e0ad..d2b415c 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -111,9 +111,6 @@
         background-color: #339CFF;
       }
     }
-    .is-active.el-menu-item {
-      background-image: $subMenuActiveBg !important;
-    }
 
     & .nest-menu .el-submenu>.el-submenu__title,
     & .el-submenu .el-menu-item {
@@ -199,6 +196,10 @@
         }
       }
     }
+
+    .main-breadcrumb{
+      left: 54px;
+    }
   }
 
   .el-menu--collapse .el-menu .el-submenu {
@@ -234,19 +235,39 @@
   }
 }
 
+.is-active.el-menu-item {
+  background-image: $subMenuActiveBg !important;
+}
+
+
 // when menu collapsed
 .el-menu--vertical {
   &>.el-menu {
     .svg-icon {
+      display: none;
       margin-right: 16px;
     }
   }
 
   .nest-menu .el-submenu>.el-submenu__title,
   .el-menu-item {
+    position: relative;
+    padding-left: 50px !important;
+    height: 40px !important;
+    line-height: 40px;
+    &::before{
+      content: "";
+      position: absolute;
+      left: 30px;
+      top: 50%;
+      width: 6px;
+      height: 6px;
+      background-color: #fff;
+      border-radius: 50%;
+      transform: translateY(-50%);
+    }
     &:hover {
-      // you can use $subMenuHover
-      background-color: $menuHover !important;
+      background-image: $subMenuHover !important;
     }
   }
 
diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss
index a32591e..11ccf5a 100644
--- a/src/assets/styles/yxk-admin.scss
+++ b/src/assets/styles/yxk-admin.scss
@@ -227,7 +227,11 @@
 .el-button--mini{
   padding: 7px 10px;
 }
-
+.crud-opts-right{
+  .el-button{
+    padding: 7px 15px;
+  }
+}
 .el-message-box{
   .el-button{
     border-color: #dcdfe6;
@@ -396,6 +400,14 @@
     background-color: #ff4949;
     border-color: #ff4949;
   }
+
+  .el-button.is-disabled, 
+  .el-button.is-disabled:hover, 
+  .el-button.is-disabled:focus{
+    color: #fff;
+    background-color: #ffa4a4;
+    border-color: #ffa4a4;
+  }
 }
 .el-table__body tr.el-table__row:hover>td.el-table__cell,
 .el-table__body tr.el-table__row:focus>td.el-table__cell,
@@ -443,6 +455,10 @@
     background-color: transparent;
     color: #fff;
   }
+  .btn-prev,
+  .btn-next{
+    background-color: transparent;
+  }
 }
 
 // 弹框
@@ -612,4 +628,9 @@
       background-color: #3A99FD;
     }
   }
+}
+
+// el-tree 最终节点不显示箭头
+.is-leaf::before  {
+  color: transparent;
 }
\ No newline at end of file
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 97f96b1..1f7df16 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -127,7 +127,7 @@ export default {
   .main-breadcrumb{
     position: fixed;
     top: 100px;
-    left: calc(100% - $sideBarWidth);
+    left: $sideBarWidth;
     display: flex;
     justify-content:flex-start;
     width: 100%;
diff --git a/src/views/system/log/errorLog.vue b/src/views/system/log/errorLog.vue
new file mode 100644
index 0000000..e45a869
--- /dev/null
+++ b/src/views/system/log/errorLog.vue
@@ -0,0 +1,136 @@
+<template>
+  <div class="app-container  container-wrap">
+    <span class="right-top-line" />
+    <span class="left-bottom-line" />
+    <div class="head-container">
+      <Search />
+      <crudOperation>
+        <el-button
+          slot="left"
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :loading="crud.delAllLoading"
+          @click="confirmDelAll()"
+        >
+          清空
+        </el-button>
+      </crudOperation>
+    </div>
+    <!--表格渲染-->
+    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+      <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 prop="browser" label="浏览器" />
+      <el-table-column prop="createTime" label="创建日期" />
+      <el-table-column label="异常详情" width="100px">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" @click="info(scope.row.id)">查看详情</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-dialog :visible.sync="dialog" title="异常详情" append-to-body top="30px" width="85%">
+      <pre v-highlightjs="errorInfo"><code class="java" /></pre>
+    </el-dialog>
+    <!--分页组件-->
+    <pagination />
+  </div>
+</template>
+
+<script>
+import { getErrDetail, delAllError } from '@/api/monitor/log'
+import Search from './search'
+import CRUD, { presenter } from '@crud/crud'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+
+export default {
+  name: 'ErrorLog',
+  components: { Search, crudOperation, pagination },
+  cruds() {
+    return CRUD({ title: '异常日志', url: 'api/logs/error' })
+  },
+  mixins: [presenter()],
+  data() {
+    return {
+      errorInfo: '', dialog: false
+    }
+  },
+  created() {
+    this.crud.optShow = {
+      add: false,
+      edit: false,
+      del: false,
+      download: true
+    }
+  },
+  methods: {
+    // 获取异常详情
+    info(id) {
+      this.dialog = true
+      getErrDetail(id).then(res => {
+        this.errorInfo = res.exception
+      })
+    },
+    confirmDelAll() {
+      this.$confirm(`确认清空所有异常日志吗?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.crud.delAllLoading = true
+        delAllError().then(res => {
+          this.crud.delAllLoading = false
+          this.crud.dleChangePage(1)
+          this.crud.delSuccessNotify()
+          this.crud.toQuery()
+        }).catch(err => {
+          this.crud.delAllLoading = false
+          console.log(err.response.data.message)
+        })
+      }).catch(() => {
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.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;
+}
+/deep/ .el-dialog__body {
+  padding: 0 20px 10px 20px !important;
+}
+.java.hljs {
+  color: #444;
+  background: #ffffff !important;
+  height: 630px !important;
+}
+</style>
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
new file mode 100644
index 0000000..937fb39
--- /dev/null
+++ b/src/views/system/log/index.vue
@@ -0,0 +1,115 @@
+<template>
+  <div class="app-container  container-wrap">
+    <span class="right-top-line" />
+    <span class="left-bottom-line" />
+    <div class="head-container">
+      <Search />
+      <crudOperation>
+        <el-button
+          slot="left"
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :loading="crud.delAllLoading"
+          @click="confirmDelAll()"
+        >
+          清空
+        </el-button>
+      </crudOperation>
+    </div>
+    <!--表格渲染-->
+    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+      <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 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>
+          <el-tag v-else-if="scope.row.time <= 1000" type="warning">{{ scope.row.time }}ms</el-tag>
+          <el-tag v-else type="danger">{{ scope.row.time }}ms</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="创建日期" width="180px" />
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+  </div>
+</template>
+
+<script>
+import Search from './search'
+import { delAllInfo } from '@/api/monitor/log'
+import CRUD, { presenter } from '@crud/crud'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+
+export default {
+  name: 'Log',
+  components: { Search, crudOperation, pagination },
+  cruds() {
+    return CRUD({ title: '日志', url: 'api/logs' })
+  },
+  mixins: [presenter()],
+  created() {
+    this.crud.optShow = {
+      add: false,
+      edit: false,
+      del: false,
+      download: true
+    }
+  },
+  methods: {
+    confirmDelAll() {
+      this.$confirm(`确认清空所有操作日志吗?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.crud.delAllLoading = true
+        delAllInfo().then(res => {
+          this.crud.delAllLoading = false
+          this.crud.dleChangePage(1)
+          this.crud.delSuccessNotify()
+          this.crud.toQuery()
+        }).catch(err => {
+          this.crud.delAllLoading = false
+          console.log(err.response.data.message)
+        })
+      }).catch(() => {
+      })
+    }
+  }
+}
+</script>
+
+<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>
diff --git a/src/views/system/log/search.vue b/src/views/system/log/search.vue
new file mode 100644
index 0000000..f72e06d
--- /dev/null
+++ b/src/views/system/log/search.vue
@@ -0,0 +1,24 @@
+<template>
+  <div v-if="crud.props.searchToggle" class="head-search">
+    <el-input
+      v-model="query.blurry"
+      clearable
+      size="small"
+      placeholder="请输入你要搜索的内容"
+      style="width: 200px;"
+      class="filter-item"
+    />
+    <date-range-picker v-model="query.createTime" class="date-item" />
+    <rrOperation />
+  </div>
+</template>
+
+<script>
+import { header } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import DateRangePicker from '@/components/DateRangePicker'
+export default {
+  components: { rrOperation, DateRangePicker },
+  mixins: [header()]
+}
+</script>
diff --git a/src/views/system/timing/index.vue b/src/views/system/timing/index.vue
deleted file mode 100644
index bb3bf77..0000000
--- a/src/views/system/timing/index.vue
+++ /dev/null
@@ -1,210 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
-        <el-input v-model="query.jobName" clearable size="small" placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
-        <date-range-picker v-model="query.createTime" class="date-item" />
-        <rrOperation />
-      </div>
-      <crudOperation :permission="permission">
-        <!-- 任务日志 -->
-        <el-button
-          slot="right"
-          class="filter-item"
-          size="mini"
-          type="info"
-          icon="el-icon-tickets"
-          @click="doLog"
-        >日志</el-button>
-      </crudOperation>
-      <Log ref="log" />
-    </div>
-    <!--Form表单-->
-    <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" append-to-body width="730px">
-      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="100px">
-        <el-form-item label="任务名称" prop="jobName">
-          <el-input v-model="form.jobName" style="width: 220px;" />
-        </el-form-item>
-        <el-form-item label="任务描述" prop="description">
-          <el-input v-model="form.description" style="width: 220px;" />
-        </el-form-item>
-        <el-form-item label="Bean名称" prop="beanName">
-          <el-input v-model="form.beanName" style="width: 220px;" />
-        </el-form-item>
-        <el-form-item label="执行方法" prop="methodName">
-          <el-input v-model="form.methodName" style="width: 220px;" />
-        </el-form-item>
-        <el-form-item label="Cron表达式" prop="cronExpression">
-          <el-input v-model="form.cronExpression" style="width: 220px;" />
-        </el-form-item>
-        <el-form-item label="子任务ID">
-          <el-input v-model="form.subTask" placeholder="多个用逗号隔开，按顺序执行" style="width: 220px;" />
-        </el-form-item>
-        <el-form-item label="任务负责人" prop="personInCharge">
-          <el-input v-model="form.personInCharge" style="width: 220px;" />
-        </el-form-item>
-        <el-form-item label="告警邮箱" prop="email">
-          <el-input v-model="form.email" placeholder="多个邮箱用逗号隔开" style="width: 220px;" />
-        </el-form-item>
-        <el-form-item label="失败后暂停">
-          <el-radio-group v-model="form.pauseAfterFailure" style="width: 220px">
-            <el-radio :label="true">是</el-radio>
-            <el-radio :label="false">否</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="任务状态">
-          <el-radio-group v-model="form.isPause" style="width: 220px">
-            <el-radio :label="false">启用</el-radio>
-            <el-radio :label="true">暂停</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="参数内容">
-          <el-input v-model="form.params" style="width: 556px;" rows="4" type="textarea" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="crud.cancelCU">取消</el-button>
-        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-      </div>
-    </el-dialog>
-    <!--表格渲染-->
-    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-      <el-table-column :selectable="checkboxT" type="selection" width="55" />
-      <el-table-column :show-overflow-tooltip="true" prop="id" label="任务ID" />
-      <el-table-column :show-overflow-tooltip="true" prop="jobName" label="任务名称" />
-      <el-table-column :show-overflow-tooltip="true" prop="beanName" label="Bean名称" />
-      <el-table-column :show-overflow-tooltip="true" prop="methodName" label="执行方法" />
-      <el-table-column :show-overflow-tooltip="true" prop="params" label="参数" />
-      <el-table-column :show-overflow-tooltip="true" prop="cronExpression" label="cron表达式" />
-      <el-table-column :show-overflow-tooltip="true" prop="isPause" width="90px" label="状态">
-        <template slot-scope="scope">
-          <el-tag :type="scope.row.isPause ? 'warning' : 'success'">{{ scope.row.isPause ? '已暂停' : '运行中' }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column :show-overflow-tooltip="true" prop="description" width="150px" label="描述" />
-      <el-table-column :show-overflow-tooltip="true" prop="createTime" width="136px" label="创建日期" />
-      <el-table-column v-if="checkPer(['admin','timing:edit','timing:del'])" label="操作" width="170px" align="center" fixed="right">
-        <template slot-scope="scope">
-          <el-button v-permission="['admin','timing:edit']" size="mini" style="margin-right: 3px;" type="text" @click="crud.toEdit(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
-            :ref="scope.row.id"
-            v-permission="['admin','timing:del']"
-            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="delMethod(scope.row.id)">确定</el-button>
-            </div>
-            <el-button slot="reference" type="text" size="mini">删除</el-button>
-          </el-popover>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页组件-->
-    <pagination />
-  </div>
-</template>
-
-<script>
-import crudJob from '@/api/system/timing'
-import Log from './log'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import pagination from '@crud/Pagination'
-import DateRangePicker from '@/components/DateRangePicker'
-
-const defaultForm = { id: null, jobName: null, subTask: null, beanName: null, methodName: null, params: null, cronExpression: null, pauseAfterFailure: true, isPause: false, personInCharge: null, email: null, description: null }
-export default {
-  name: 'Timing',
-  components: { Log, pagination, crudOperation, rrOperation, DateRangePicker },
-  cruds() {
-    return CRUD({ title: '定时任务', url: 'api/jobs', crudMethod: { ...crudJob }})
-  },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  data() {
-    return {
-      delLoading: false,
-      permission: {
-        add: ['admin', 'timing:add'],
-        edit: ['admin', 'timing:edit'],
-        del: ['admin', 'timing:del']
-      },
-      rules: {
-        jobName: [
-          { required: true, message: '请输入任务名称', trigger: 'blur' }
-        ],
-        description: [
-          { required: true, message: '请输入任务描述', trigger: 'blur' }
-        ],
-        beanName: [
-          { required: true, message: '请输入Bean名称', trigger: 'blur' }
-        ],
-        methodName: [
-          { required: true, message: '请输入方法名称', trigger: 'blur' }
-        ],
-        cronExpression: [
-          { required: true, message: '请输入Cron表达式', trigger: 'blur' }
-        ],
-        personInCharge: [
-          { required: true, message: '请输入负责人名称', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    // 执行
-    execute(id) {
-      crudJob.execution(id).then(res => {
-        this.crud.notify('执行成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-      }).catch(err => {
-        console.log(err.response.data.message)
-      })
-    },
-    // 改变状态
-    updateStatus(id, status) {
-      if (status === '恢复') {
-        this.updateParams(id)
-      }
-      crudJob.updateIsPause(id).then(res => {
-        this.crud.toQuery()
-        this.crud.notify(status + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-      }).catch(err => {
-        console.log(err.response.data.message)
-      })
-    },
-    updateParams(id) {
-      console.log(id)
-    },
-    delMethod(id) {
-      this.delLoading = true
-      crudJob.del([id]).then(() => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        this.crud.dleChangePage(1)
-        this.crud.delSuccessNotify()
-        this.crud.toQuery()
-      }).catch(() => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-      })
-    },
-    // 显示日志
-    doLog() {
-      this.$refs.log.dialog = true
-      this.$refs.log.doInit()
-    },
-    checkboxT(row, rowIndex) {
-      return row.id !== 1
-    }
-  }
-}
-</script>
diff --git a/src/views/system/timing/log.vue b/src/views/system/timing/log.vue
deleted file mode 100644
index 09c32ef..0000000
--- a/src/views/system/timing/log.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialog" append-to-body title="执行日志" width="88%">
-    <!-- 搜索 -->
-    <div class="head-container">
-      <el-input v-model="query.jobName" clearable size="small" placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
-      <date-range-picker v-model="query.createTime" class="date-item" />
-      <el-select v-model="query.isSuccess" placeholder="日志状态" clearable size="small" 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="downloadMethod"
-        >导出</el-button>
-      </div>
-    </div>
-    <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" style="width: 100%;margin-top: -10px;">
-      <el-table-column :show-overflow-tooltip="true" prop="jobName" label="任务名称" />
-      <el-table-column :show-overflow-tooltip="true" prop="beanName" label="Bean名称" />
-      <el-table-column :show-overflow-tooltip="true" prop="methodName" label="执行方法" />
-      <el-table-column :show-overflow-tooltip="true" prop="params" width="120px" label="参数" />
-      <el-table-column :show-overflow-tooltip="true" prop="cronExpression" label="cron表达式" />
-      <el-table-column prop="createTime" label="异常详情" width="110px">
-        <template slot-scope="scope">
-          <el-button v-show="scope.row.exceptionDetail" size="mini" type="text" @click="info(scope.row.exceptionDetail)">查看详情</el-button>
-        </template>
-      </el-table-column>
-      <el-table-column :show-overflow-tooltip="true" align="center" prop="time" width="100px" label="耗时(毫秒)" />
-      <el-table-column align="center" prop="isSuccess" width="80px" label="状态">
-        <template slot-scope="scope">
-          <el-tag :type="scope.row.isSuccess ? 'success' : 'danger'">{{ scope.row.isSuccess ? '成功' : '失败' }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column :show-overflow-tooltip="true" prop="createTime" label="创建日期" />
-    </el-table>
-    <el-dialog :visible.sync="errorDialog" append-to-body title="异常详情" width="85%">
-      <pre v-highlightjs="errorInfo"><code class="java" /></pre>
-    </el-dialog>
-    <!--分页组件-->
-    <el-pagination
-      :total="total"
-      :current-page="page + 1"
-      :page-size="6"
-      style="margin-top:8px;"
-      layout="total, prev, pager, next"
-      @size-change="sizeChange"
-      @current-change="pageChange"
-    />
-  </el-dialog>
-</template>
-
-<script>
-import crud from '@/mixins/crud'
-import DateRangePicker from '@/components/DateRangePicker'
-export default {
-  components: { DateRangePicker },
-  mixins: [crud],
-  data() {
-    return {
-      title: '任务日志',
-      errorInfo: '', errorDialog: false,
-      enabledTypeOptions: [
-        { key: 'true', display_name: '成功' },
-        { key: 'false', display_name: '失败' }
-      ]
-    }
-  },
-  methods: {
-    doInit() {
-      this.$nextTick(() => {
-        this.init()
-      })
-    },
-    // 获取数据前设置好接口地址
-    beforeInit() {
-      this.url = 'api/jobs/logs'
-      this.size = 6
-      return true
-    },
-    // 异常详情
-    info(errorInfo) {
-      this.errorInfo = errorInfo
-      this.errorDialog = true
-    }
-  }
-}
-</script>
-
-<style scoped>
-  .java.hljs{
-    color: #444;
-    background: #ffffff !important;
-  }
- ::v-deep .el-dialog__body{
-    padding: 0 20px 10px 20px !important;
-  }
-</style>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index fe160b1..8d35e68 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -171,7 +171,7 @@
               />
             </template>
           </el-table-column>
-          <el-table-column :show-overflow-tooltip="true" prop="createTime" width="135" label="创建日期">
+          <el-table-column :show-overflow-tooltip="true" prop="createTime" width="145" label="创建日期">
             <template slot-scope="scope">
               <div>{{ scope.row.createTime | parseTime }}</div>
             </template>
@@ -179,7 +179,7 @@
           <el-table-column
             v-if="checkPer(['admin','user:edit','user:del'])"
             label="操作"
-            width="115"
+            width="120"
             align="center"
             fixed="right"
           >