diff --git a/neutrino-proxy-admin/src/lang/zh.js b/neutrino-proxy-admin/src/lang/zh.js
index 63096fa8..8f814ae9 100644
--- a/neutrino-proxy-admin/src/lang/zh.js
+++ b/neutrino-proxy-admin/src/lang/zh.js
@@ -52,7 +52,9 @@ export default {
     license: 'License管理',
     portMapping: '端口映射',
     jobManager: '调度管理',
-    jobLog: '调度日志'
+    jobLog: '调度日志',
+    log: '日志管理',
+    loginLog: '登录日志'
   },
   navbar: {
     logOut: '退出登录',
diff --git a/neutrino-proxy-admin/src/router/index.js b/neutrino-proxy-admin/src/router/index.js
index fd920bdd..50d272b5 100644
--- a/neutrino-proxy-admin/src/router/index.js
+++ b/neutrino-proxy-admin/src/router/index.js
@@ -277,8 +277,21 @@ export const asyncRouterMap = [
     children: [
       { path: 'user', component: _import('system/user'), name: 'user', meta: { title: 'user' }},
       { path: 'portPool', component: _import('system/portPool'), name: 'portPool', meta: { title: 'portPool' }},
-      { path: 'jobManager', component: _import('system/jobManager'), name: 'jobManager', meta: { title: 'jobManager' }},
-      { path: 'jobLog', component: _import('system/jobLog'), name: 'jobLog', meta: { title: 'jobLog' }}
+      { path: 'jobManager', component: _import('system/jobManager'), name: 'jobManager', meta: { title: 'jobManager' }}
+    ]
+  },
+  {
+    path: '/log',
+    component: Layout,
+    redirect: 'noredirect',
+    name: 'log',
+    meta: {
+      title: 'log',
+      icon: 'component'
+    },
+    children: [
+      { path: 'jobLog', component: _import('log/jobLog'), name: 'jobLog', meta: { title: 'jobLog' }},
+      { path: 'loginLog', component: _import('log/loginLog'), name: 'loginLog', meta: { title: 'loginLog' }}
     ]
   }
 ]
diff --git a/neutrino-proxy-admin/src/views/system/jobLog.vue b/neutrino-proxy-admin/src/views/log/jobLog.vue
similarity index 100%
rename from neutrino-proxy-admin/src/views/system/jobLog.vue
rename to neutrino-proxy-admin/src/views/log/jobLog.vue
diff --git a/neutrino-proxy-admin/src/views/log/loginLog.vue b/neutrino-proxy-admin/src/views/log/loginLog.vue
new file mode 100644
index 00000000..ffffebd4
--- /dev/null
+++ b/neutrino-proxy-admin/src/views/log/loginLog.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="app-container calendar-list-container">
+    <div class="filter-container">
+      <el-select v-model="listQuery.jobId" placeholder="请选择" clearable>
+        <el-option v-for="item in jobList" :key="item.id" :label="item.desc" :value="item.id"/>
+      </el-select>
+      <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">{{$t('table.search')}}</el-button>
+    </div>
+
+    <el-table :key='tableKey' :data="list" v-loading="listLoading" element-loading-text="给我一点时间" border fit highlight-current-row style="width: 100%">
+      <el-table-column type="index" width="100" :label="$t('table.id')"></el-table-column>
+      <el-table-column align="center" :label="$t('table.handler')" min-width="200">
+        <template slot-scope="scope">
+          <span>{{scope.row.handler}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.jobParam')" min-width="200">
+        <template slot-scope="scope">
+          <span>{{scope.row.param}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.jobLogCode')" min-width="120">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.code | statusFilter">{{scope.row.code | statusName}}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.jobLogMsg')" min-width="400">
+        <template slot-scope="scope">
+          <span>{{scope.row.msg}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.alarmStatus')" min-width="120">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.alarmStatus | alarmStatusFilter">{{scope.row.alarmStatus | salarmStatusName}}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.createTime')" min-width="150">
+        <template slot-scope="scope">
+          <span>{{scope.row.createTime | parseTime('{y}-{m}-{d} {h}:{i}')}}</span>
+        </template>
+      </el-table-column>
+<!--      <el-table-column align="center" :label="$t('table.actions')" min-width="120">
+        <template slot-scope="scope">
+          <el-button size="mini" type="primary" @click="handleShowClick(scope.row)">查看日志</el-button>
+        </template>
+      </el-table-column>-->
+    </el-table>
+    <div class="pagination-container">
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.currentPage"
+                     :page-sizes="[10,20,30, 50]" :page-size="listQuery.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import { fetchList } from '@/api/jobLog'
+import { jobList } from '@/api/jobInfo'
+import waves from '@/directive/waves' // 水波纹指令
+
+export default {
+  name: 'jobLog',
+  directives: {
+    waves
+  },
+  data() {
+    return {
+      tableKey: 0,
+      list: null,
+      total: null,
+      listLoading: false,
+      listQuery: {
+        currentPage: 1,
+        pageSize: 10,
+        jobId: undefined
+      },
+      jobList: []
+    }
+  },
+  filters: {
+    statusName(status) {
+      const statusMap = {
+        0: '成功',
+        1: '失败'
+      }
+      return statusMap[status]
+    },
+    statusFilter(status) {
+      const statusMap = {
+        0: 'success',
+        1: 'danger'
+      }
+      return statusMap[status]
+    },
+    salarmStatusName(status) {
+      const statusMap = {
+        0: '-',
+        1: '待发送',
+        2: '发送成功',
+        3: '发送失败'
+      }
+      return statusMap[status]
+    },
+    alarmStatusFilter(status) {
+      const statusMap = {
+        0: 'success',
+        1: 'warning',
+        2: 'success',
+        3: 'danger'
+      }
+      return statusMap[status]
+    }
+  },
+  created() {
+    this.getList()
+    this.getJobList()
+  },
+  activated() {
+    this.getJobList()
+    if (this.$route.query.jobId) {
+      this.listQuery.jobId = this.$route.query.jobId
+      console.log(this.listQuery.jobId, this.$route.query.jobId)
+      this.getList()
+    }
+  },
+  methods: {
+    getList() {
+      this.listLoading = true
+      fetchList(this.listQuery).then(response => {
+        this.list = response.data.data.records
+        this.total = response.data.data.total
+        this.listLoading = false
+      })
+    },
+    getJobList() {
+      jobList().then(response => {
+        this.jobList = response.data.data
+      })
+    },
+    handleFilter() {
+      this.listQuery.currentPage = 1
+      this.getList()
+    },
+    handleSizeChange(val) {
+      this.listQuery.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.listQuery.currentPage = val
+      this.getList()
+    },
+    handleShowClick(row) {
+      console.log(row)
+    }
+  }
+}
+</script>
diff --git a/neutrino-proxy-admin/src/views/system/jobManager.vue b/neutrino-proxy-admin/src/views/system/jobManager.vue
index a76755ec..7370812c 100644
--- a/neutrino-proxy-admin/src/views/system/jobManager.vue
+++ b/neutrino-proxy-admin/src/views/system/jobManager.vue
@@ -225,7 +225,7 @@
         })
       },
       handleLogClick(row) {
-        this.$router.push({ path: '/system/jobLog', query: { jobId: row.id }})
+        this.$router.push({ path: '/log/jobLog', query: { jobId: row.id }})
       }
     }
   }