Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

This commit is contained in:
wangshiming
2021-12-20 17:18:43 +08:00
16 changed files with 280 additions and 129 deletions

View File

@ -145,8 +145,8 @@ export class EAUserService extends BaseService {
*/
async loadUserMenus() {
return this.asyncRequest('assets/mocks/menu-data.json', {}, 'GET').then(res => {
this.cacheSrv.set(cacheConf.menu, res.menu);
this.menuService.add(res.menu);
this.cacheSrv.set(cacheConf.menu, res.menu);
this.menuService.add(res.menu);
});
// this.request('assets/mocks/menu-data.json', {}, 'GET').subscribe((res: any) => {
// this.cacheSrv.set(cacheConf.menu, res.menu);