diff --git a/backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java index bb33a2cc6c..cafeebae7f 100644 --- a/backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java +++ b/backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java @@ -36,10 +36,6 @@ public class DynamicMenuServiceImpl implements DynamicMenuService { @Override public List load(String userId) { -// SysMenuExample sysMenuExample = new SysMenuExample(); -// sysMenuExample.createCriteria().andTypeLessThanOrEqualTo(1); -// sysMenuExample.setOrderByClause(" menu_sort "); -// List sysMenus = sysMenuMapper.selectByExample(sysMenuExample); List sysMenus = extSysMenuMapper.querySysMenu(); List dynamicMenuDtos = sysMenus.stream().map(this::convert).collect(Collectors.toList()); //增加插件中的菜单 diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue index ce6df9f42e..8699cabcf3 100644 --- a/frontend/src/views/chart/group/Group.vue +++ b/frontend/src/views/chart/group/Group.vue @@ -558,7 +558,7 @@ export default { showClose: true }) this.treeNode() - this.$store.dispatch('chart/setTable', new Date().getTime()) + this.$emit('switchComponent', { name: '' }) }) } else { // this.$message({ diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index 9e06993987..4dd3c6b274 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -1,7 +1,6 @@