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/store/modules/permission.js
This commit is contained in:
疯狂的狮子li
2020-12-25 09:59:24 +08:00
parent 476df3117b a9c6ba12e6
commit c24b912b50
4 changed files with 86 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/store/modules/permission.js
View File

@ -15,7 +15,7 @@ const permission = {
state.routes = constantRoutes.concat(routes)
},
SET_SIDEBAR_ROUTERS: (state, routers) => {
state.sidebarRouters = routers
state.sidebarRouters = constantRoutes.concat(routers)
},
},
actions: {

4
ruoyi-ui/src/utils/ruoyi.js
View File

@ -62,8 +62,8 @@ export function addDateRange(params, dateRange, propName) {
search.params["beginTime"] = dateRange[0];
search.params["endTime"] = dateRange[1];
} else {
search.params[propName + "BeginTime"] = dateRange[0];
search.params[propName + "EndTime"] = dateRange[1];
search.params["begin" + propName] = dateRange[0];
search.params["end" + propName] = dateRange[1];
}
}
return search;