diff --git a/data-room-ui/packages/BigScreenDesign/DataViewDialog/index.vue b/data-room-ui/packages/BigScreenDesign/DataViewDialog/index.vue
index 508f60aa..f9b7a86f 100644
--- a/data-room-ui/packages/BigScreenDesign/DataViewDialog/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/DataViewDialog/index.vue
@@ -222,7 +222,6 @@ export default {
   /deep/.el-dialog__body{
     background-color: var(--bs-background-2) !important;
     overflow: hidden;
-    //max-height: calc(90vh - 300px) !important;
     max-height: 540px!important;
   }
   .table-box{
diff --git a/data-room-ui/packages/PlotRender/index.vue b/data-room-ui/packages/PlotRender/index.vue
index e24f1082..06cd51fd 100644
--- a/data-room-ui/packages/PlotRender/index.vue
+++ b/data-room-ui/packages/PlotRender/index.vue
@@ -167,7 +167,7 @@ export default {
     dataFormatting (config, data) {
       // 数据返回成功则赋值
       if (data.success) {
-        data = data.data
+        data = data.data || []
         config = this.transformSettingToOption(config, 'data')
         // 获取到后端返回的数据，有则赋值
         const option = config.option
@@ -182,7 +182,7 @@ export default {
         }
         // 如果维度为数字类型则转化为字符串，否则在不增加其他配置的情况下会导致图标最后一项不显示（g2plot官网已说明）
         const xAxis = config.setting.find(item => item.field === 'xField')?.value
-        config.option.data = data.map(item => {
+        config.option.data = data?.map(item => {
           if (xAxis && typeof item[xAxis] === 'number') {
             item[xAxis] = (item[xAxis]).toString()
           }