jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

Browse Source 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
	ruoyi-ui/src/components/Editor/index.vue
	ruoyi-ui/src/permission.js
	ruoyi-ui/src/store/modules/user.js
	ruoyi-ui/src/views/monitor/logininfor/index.vue
	ruoyi-ui/src/views/monitor/operlog/index.vue
This commit is contained in:
疯狂的狮子li
2021-03-09 09:32:49 +08:00
parent 2c2deced02 61432480c8
commit 5494ec36e5
6 changed files with 64 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/views/monitor/logininfor/index.vue
View File

@ -84,7 +84,7 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:logininfor:export']"
v-hasPermi="['monitor:logininfor:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

2
ruoyi-ui/src/views/monitor/operlog/index.vue
View File

@ -100,7 +100,7 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:config:export']"
v-hasPermi="['monitor:operlog:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>