open-source/eladmin-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v1.9 发布，详情查看发行版说明

Browse Source
This commit is contained in:
zhengjie
2019-05-18 12:22:50 +08:00
parent f0255b5e33
commit 98fa128eda
56 changed files with 454 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/monitor/log/errorLog.vue
View File

@@ -13,7 +13,7 @@
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column prop="createTime" label="异常详情" width="120px">
<el-table-column prop="createTime" label="异常详情" width="100px">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="info(scope.row.exceptionDetail)">查看详情</el-button>
</template>

2
src/views/monitor/log/module/header.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="head-container">
<el-input v-model="query.username" clearable placeholder="用户名" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
<el-button class="filter-item" size="mini" type="primary" icon="el-icon-search" @click="toQuery">搜索</el-button>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
</div>
</template>

8
src/views/monitor/redis/index.vue
View File

@@ -16,11 +16,11 @@
</div>
</template>
</el-table-column>
<el-table-column label="操作" width="150px" align="center">
<el-table-column v-if="checkPermission(['ADMIN','REDIS_ALL','REDIS_EDIT','REDIS_DELETE'])" label="操作" width="130px" align="center">
<template slot-scope="scope">
<edit v-if="checkPermission(['ADMIN','REDIS_ALL','REDIS_EDIT'])" :data="scope.row" :sup_this="sup_this"/>
<edit v-permission="['ADMIN','REDIS_ALL','REDIS_EDIT']" :data="scope.row" :sup_this="sup_this"/>
<el-popover
v-if="checkPermission(['ADMIN','REDIS_ALL','REDIS_DELETE'])"
v-permission="['ADMIN','REDIS_ALL','REDIS_DELETE']"
:ref="scope.$index"
placement="top"
width="180">
@@ -29,7 +29,7 @@
<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)">确定</el-button>
</div>
<el-button slot="reference" type="danger" size="mini">删除</el-button>
<el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
</el-popover>
</template>
</el-table-column>

2
src/views/monitor/redis/module/edit.vue
View File

@@ -1,6 +1,6 @@
<template>
<div>
<el-button size="mini" type="success" @click="to">编辑</el-button>
<el-button size="mini" type="primary" icon="el-icon-edit" @click="to"/>
<eForm ref="form" :sup_this="sup_this" :is-add="false"/>
</div>
</template>

8
src/views/monitor/redis/module/header.vue
View File

@@ -2,11 +2,11 @@
<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="primary" icon="el-icon-search" @click="toQuery">搜索</el-button>
<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-if="checkPermission(['ADMIN','REDIS_ALL','REDIS_CREATE'])"
v-permission="['ADMIN','REDIS_ALL','REDIS_CREATE']"
class="filter-item"
size="mini"
type="primary"
@@ -15,12 +15,11 @@
<eForm ref="form" :is-add="true"/>
</div>
<!-- 清空缓存 -->
<el-button v-if="checkPermission(['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_ALL','REDIS_DELETE']" :loading="deleteAllLoading" type="warning" size="mini" class="filter-item" icon="el-icon-delete" @click="deleteAll">清空缓存</el-button>
</div>
</template>
<script>
import checkPermission from '@/utils/permission' // 权限判断函数
import eForm from './form'
import { delAll } from '@/api/redis'
// 查询条件
@@ -38,7 +37,6 @@ export default {
}
},
methods: {
checkPermission,
toQuery() {
this.$parent.page = 0
this.$parent.init()