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-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/monitor/logininfor/index.vue
	ruoyi-ui/src/views/monitor/online/index.vue
	ruoyi-ui/src/views/monitor/operlog/index.vue
	ruoyi-ui/src/views/system/config/index.vue
	ruoyi-ui/src/views/system/dept/index.vue
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi-ui/src/views/system/notice/index.vue
	ruoyi-ui/src/views/system/post/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/system/user/profile/resetPwd.vue
	ruoyi-ui/src/views/system/user/profile/userAvatar.vue
	ruoyi-ui/src/views/system/user/profile/userInfo.vue
	ruoyi-ui/src/views/tool/gen/index.vue
This commit is contained in:
疯狂的狮子li
2020-10-12 09:54:59 +08:00
parent bd39b971cf b0965653bf
commit 8ca53c7666
21 changed files with 126 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,7 +284,7 @@ export default {
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(function() {});
})
},
/** 清空按钮操作 */
handleClean() {
@ -297,7 +297,7 @@ export default {
}).then(() => {
this.getList();
this.msgSuccess("清空成功");
}).catch(function() {});
})
},
/** 导出按钮操作 */
handleExport() {
@ -310,7 +310,7 @@ export default {
return exportOperlog(queryParams);
}).then(response => {
this.download(response.msg);
}).catch(function() {});
})
}
}
};