diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
index 845ec708b1..6fd619b435 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
@@ -141,7 +141,11 @@ public class PanelGroupService {
 
 
     public PanelGroupWithBLOBs findOne(String panelId) {
-        return panelGroupMapper.selectByPrimaryKey(panelId);
+        PanelGroupWithBLOBs panelGroupWithBLOBs = panelGroupMapper.selectByPrimaryKey(panelId);
+        if(panelGroupWithBLOBs!=null&& StringUtils.isNotEmpty(panelGroupWithBLOBs.getSource())){
+            return  panelGroupMapper.selectByPrimaryKey(panelGroupWithBLOBs.getSource());
+        }
+        return panelGroupWithBLOBs;
     }
 
 
diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue
index cc2a2ac2f4..fa8e991f71 100644
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@@ -575,9 +575,7 @@ export default {
       this.activeTree = data.panelType
       if (data.nodeType === 'panel') {
         // 加载视图数据
-        // 如果是默认仪表盘 需要查询原仪表板的详细数据
-        const queryPanelId = data.panelType === 'system' ? data.source : data.id
-        findOne(queryPanelId).then(response => {
+        findOne(data.id).then(response => {
           const componentDatas = JSON.parse(response.data.panelData)
           componentDatas.forEach(item => {
             item.filters = (item.filters || [])