diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/dto/ReportDto.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/dto/ReportDto.java
index fb80145b..6849eba0 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/dto/ReportDto.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/dto/ReportDto.java
@@ -44,4 +44,10 @@ public class ReportDto extends GaeaBaseDTO implements Serializable {
/** 报表缩略图 */
private String reportImage;
+ /** 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG */
+ private Integer enableFlag;
+
+ /** 0--未删除 1--已删除 DIC_NAME=DELETE_FLAG */
+ private Integer deleteFlag;
+
}
diff --git a/report-ui/src/api/reportDataSet.js b/report-ui/src/api/reportDataSet.js
new file mode 100644
index 00000000..8d5579e5
--- /dev/null
+++ b/report-ui/src/api/reportDataSet.js
@@ -0,0 +1,42 @@
+import request from '@/utils/request'
+
+export function reportDataSetList(params) {
+ return request({
+ url: 'dataSet/pageList',
+ method: 'GET',
+ params,
+ })
+}
+
+export function reportDataSetAdd(data) {
+ return request({
+ url: 'dataSet',
+ method: 'post',
+ data
+ })
+}
+
+export function reportDataSetDeleteBatch(data) {
+ return request({
+ url: 'dataSet/delete/batch',
+ method: 'post',
+ data
+ })
+}
+
+export function reportDataSetUpdate(data) {
+ return request({
+ url: 'dataSet',
+ method: 'put', data,
+ })
+}
+
+export function reportDataSetDetail(data) {
+ return request({
+ url: 'dataSet/' + data.id,
+ method: 'get',
+ params: { accessKey: data.accessKey }
+ })
+}
+
+export default { reportDataSetList, reportDataSetAdd, reportDataSetDeleteBatch, reportDataSetUpdate, reportDataSetDetail }
diff --git a/report-ui/src/api/reportmanage.js b/report-ui/src/api/reportmanage.js
new file mode 100644
index 00000000..351f62cc
--- /dev/null
+++ b/report-ui/src/api/reportmanage.js
@@ -0,0 +1,42 @@
+import request from '@/utils/request'
+
+export function reportList(params) {
+ return request({
+ url: '/report/pageList',
+ method: 'GET',
+ params,
+ })
+}
+
+export function reportAdd(data) {
+ return request({
+ url: '/report',
+ method: 'post',
+ data
+ })
+}
+
+export function reportDeleteBatch(data) {
+ return request({
+ url: '/report/delete/batch',
+ method: 'post',
+ data
+ })
+}
+
+export function reportUpdate(data) {
+ return request({
+ url: '/report',
+ method: 'put', data,
+ })
+}
+
+export function reportDetail(data) {
+ return request({
+ url: '/report/' + data.id,
+ method: 'get',
+ params: { accessKey: data.accessKey }
+ })
+}
+
+export default { reportList, reportAdd, reportDeleteBatch, reportUpdate, reportDetail }
diff --git a/report-ui/src/views/report/report/index-copy.vue b/report-ui/src/views/report/report/index-copy.vue
new file mode 100644
index 00000000..e7e1ddec
--- /dev/null
+++ b/report-ui/src/views/report/report/index-copy.vue
@@ -0,0 +1,221 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/report-ui/src/views/report/resultset/index-copy.vue b/report-ui/src/views/report/resultset/index-copy.vue
new file mode 100644
index 00000000..e3dca9f1
--- /dev/null
+++ b/report-ui/src/views/report/resultset/index-copy.vue
@@ -0,0 +1,176 @@
+
+
+
+
+
+
+
+
+
+
+