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 remote-tracking branch 'ruoyi-vue/master' into dev

Browse Source 
# Conflicts:
#	README.md
#	pom.xml
#	ruoyi-admin/pom.xml
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
#	ruoyi-admin/src/main/resources/application.yml
#	ruoyi-common/pom.xml
#	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
#	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
#	ruoyi-framework/pom.xml
#	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
#	ruoyi-generator/pom.xml
#	ruoyi-job/pom.xml
#	ruoyi-system/pom.xml
#	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
#	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
#	ruoyi-ui/package.json
#	ruoyi-ui/src/views/index.vue
This commit is contained in:
疯狂的狮子Li
2022-10-12 10:55:42 +08:00
parent 84de5a5d42 a32a931d24
commit 95010d4a4c
9 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -189,8 +189,8 @@ export default {
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
this.queryParams.pageNum = 1;
this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
this.handleQuery();
},
/** 多选框选中数据 */
handleSelectionChange(selection) {

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

@ -255,8 +255,8 @@ export default {
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
this.queryParams.pageNum = 1;
this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
this.handleQuery();
},
/** 多选框选中数据 */
handleSelectionChange(selection) {