diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/dto/CellStyleDto.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/dto/CellStyleDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..364a839dc95290c1ff1e1aa3639fbfd9660850c8
--- /dev/null
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/dto/CellStyleDto.java
@@ -0,0 +1,16 @@
+package com.anjiplus.template.gaea.business.modules.reportexcel.controller.dto;
+
+import lombok.Data;
+
+@Data
+public class CellStyleDto {
+    /**
+     * 格式名称
+     */
+    private String fa;
+
+    /**
+     * 格式类型
+     */
+    private String t;
+}
\ No newline at end of file
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/dto/CommentDto.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/dto/CommentDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..95d45e5eeb34c89a4d46939a130229adc98145e5
--- /dev/null
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/dto/CommentDto.java
@@ -0,0 +1,38 @@
+package com.anjiplus.template.gaea.business.modules.reportexcel.controller.dto;
+
+
+import lombok.Data;
+
+@Data
+public class CommentDto {
+    /**
+     * 批注框左边距
+     */
+    private int left;
+
+    /**
+     * 批注框上边距
+     */
+    private int top;
+
+    /**
+     * 批注框宽度
+     */
+    private int width;
+
+    /**
+     * 批注框高度
+     */
+    private int height;
+
+    /**
+     * 批注内容
+     */
+    private String value;
+
+    /**
+     * 批注框是否显示
+     */
+    private boolean isshow;
+}
+
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/dto/ReportExcelDto.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/dto/ReportExcelDto.java
index df92b09f75b98dbec6819e39f2da3891aaed4546..739563f01daa63f50a64ea4c8c610f86c22e0dc5 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/dto/ReportExcelDto.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/dto/ReportExcelDto.java
@@ -5,6 +5,7 @@ import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 
 /**
@@ -58,4 +59,9 @@ public class ReportExcelDto extends GaeaBaseDTO implements Serializable {
      */
     private String exportType;
 
+    /**
+     * 报表总体数据
+     */
+    private String rowDatas;
+
 }
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/dto/ReportExcelStyleDto.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/dto/ReportExcelStyleDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..dc8d41f93864ccd5336652f7de21d8b86195880c
--- /dev/null
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/dto/ReportExcelStyleDto.java
@@ -0,0 +1,97 @@
+
+package com.anjiplus.template.gaea.business.modules.reportexcel.controller.dto;
+
+import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * @author chenxg
+ * @date 2023/8/1 10:37
+ */
+@Data
+public class ReportExcelStyleDto extends GaeaBaseDTO implements Serializable {
+    /**
+     * 单元格值格式
+     */
+    private CellStyleDto ct;
+
+    /**
+     * 内容的原始值
+     */
+    private String v;
+
+    /**
+     * 内容的显示值
+     */
+    private String m;
+
+    /**
+     * 背景颜色
+     */
+    private String bg;
+
+    /**
+     * 字体编号
+     */
+    private String ff;
+
+    /**
+     * 字体颜色
+     */
+    private String fc;
+
+    /**
+     * 是否加粗
+     */
+    private boolean bl;
+
+    /**
+     * 是否斜体
+     */
+    private boolean it;
+
+    /**
+     * 字体大小
+     */
+    private int fs;
+
+    /**
+     * 是否删除线
+     */
+    private boolean cl;
+
+    /**
+     * 水平对齐方式
+     */
+    private int ht;
+
+    /**
+     * 垂直对齐方式
+     */
+    private int vt;
+
+    /**
+     * 文字旋转角度
+     */
+    private int tr;
+
+    /**
+     * 是否自动换行
+     */
+    private int tb;
+
+    /**
+     * 批注信息
+     */
+    private CommentDto ps;
+
+    /**
+     * 单元格公式
+     */
+    private String f;
+
+
+}
\ No newline at end of file
diff --git a/report-ui/src/views/excelreport/viewer/index.vue b/report-ui/src/views/excelreport/viewer/index.vue
index c17cb4d8d33c37793df542152d43e510c0bd1783..ac5fa4042859e30b80c08699ab9c62ce681c10bb 100644
--- a/report-ui/src/views/excelreport/viewer/index.vue
+++ b/report-ui/src/views/excelreport/viewer/index.vue
@@ -118,6 +118,7 @@ export default {
       if (val != "") {
         result["exportType"] = val;
       }
+      this.getCellStyleData(result);
       const { code, message } = await exportExcel(result);
       if (code != 200) return;
       this.$message.success(message);
@@ -192,7 +193,22 @@ export default {
       $(function() {
         luckysheet.create(options);
       });
-    }
+    },
+    getCellStyleData(result) {
+      const sheetData = luckysheet.getluckysheetfile(); // 获取整个表格的数据
+      const rowDatas = {};
+
+      for (let sheetIndex in sheetData) {
+        const sheet = sheetData[sheetIndex];
+        if (sheet && sheet.data) {
+          for (let rowIndex in sheet.data) {
+            const row = sheet.data[rowIndex];
+            rowDatas[rowIndex]=row;
+          }
+        }
+      }
+      result["rowDatas"] = JSON.stringify(rowDatas);;
+    },
   }
 };
 </script>