From f89f63eb256b600f60beae95e8fd9b11a97a0169 Mon Sep 17 00:00:00 2001 From: Raod <1130305001@qq.com> Date: Mon, 28 Jun 2021 09:39:31 +0800 Subject: [PATCH 1/3] dev --- report-core/src/main/resources/bootstrap.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/report-core/src/main/resources/bootstrap.yml b/report-core/src/main/resources/bootstrap.yml index 095bc014..c1b88b31 100644 --- a/report-core/src/main/resources/bootstrap.yml +++ b/report-core/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ spring: profiles: - active: @spring.profiles.active@ + active: dev logging: config: classpath:logback.xml From 1a2aed407daadcebcfc3c9464582a8437c854796 Mon Sep 17 00:00:00 2001 From: yanzili <978387851@qq.com> Date: Mon, 28 Jun 2021 10:19:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- report-ui/package.json | 1 + report-ui/src/api/report.js | 8 +++ report-ui/src/views/report/report/index.vue | 51 ++++++++++--------- .../src/views/report/resultset/index.vue | 20 ++++++-- 4 files changed, 50 insertions(+), 30 deletions(-) diff --git a/report-ui/package.json b/report-ui/package.json index 179bcd1f..130f2b9e 100644 --- a/report-ui/package.json +++ b/report-ui/package.json @@ -33,6 +33,7 @@ "vue-color": "^2.8.1", "vue-drag-resize": "^1.5.4", "vue-echarts": "^5.0.0-beta.0", + "vue-json-editor": "^1.4.3", "vue-router": "3.0.1", "vue-ruler-tool": "^1.2.4", "vuedraggable": "^2.24.1", diff --git a/report-ui/src/api/report.js b/report-ui/src/api/report.js index 8314d5bd..e78747df 100644 --- a/report-ui/src/api/report.js +++ b/report-ui/src/api/report.js @@ -163,4 +163,12 @@ export function editReportExcel (data) { method: 'put', data, }) +} +// /dataSet/pageList +export function dataSetPageList (data) { + return request({ + url: '/dataSet/pageList', + method: 'GET', + data, + }) } \ No newline at end of file diff --git a/report-ui/src/views/report/report/index.vue b/report-ui/src/views/report/report/index.vue index e91eff4d..6394cfc4 100644 --- a/report-ui/src/views/report/report/index.vue +++ b/report-ui/src/views/report/report/index.vue @@ -77,6 +77,7 @@ border :data="list" element-loading-text="Loading" + class="mt10" style="width: 100%"> - + - + @@ -247,7 +248,7 @@ export default { params: { reportCode: '', reportName: '', - reportType: '', + // reportType: '', pageNumber: 1, pageSize: 10, order: 'DESC', @@ -256,8 +257,8 @@ export default { dialogForm: { reportName: '', reportCode: '', - reportType: '', - reportGroup: '', + // reportType: '', + // reportGroup: '', reportDesc: '', }, basicDialog: false, @@ -302,7 +303,7 @@ export default { this.$refs[formName].resetFields() this.params.reportName = '' this.params.reportCode = '' - this.params.reportType = '' + // this.params.reportType = '' this.params.pageNumber = 1 this.queryByPage() }, @@ -326,7 +327,7 @@ export default { this.dialogForm = { reportName: '', reportCode: '', - reportType: '', + // reportType: '', reportDesc: '', } } else { @@ -335,25 +336,25 @@ export default { }, // 预览 preview (val) { - if (val.reportType === 'report_excel') { - var routeUrl = this.$router.resolve({ path: '/report/excelreport/viewer', query: { reportCode: val.reportCode } }) - window.open(routeUrl.href, '_blank') - } else { - // eslint-disable-next-line no-redeclare - var routeUrl = this.$router.resolve({ path: '/bigscreen/viewer', query: { reportCode: val.reportCode } }) - window.open(routeUrl.href, '_blank') - } + // if (val.reportType === 'report_excel') { + // var routeUrl = this.$router.resolve({ path: '/report/excelreport/viewer', query: { reportCode: val.reportCode } }) + // window.open(routeUrl.href, '_blank') + // } else { + // eslint-disable-next-line no-redeclare + var routeUrl = this.$router.resolve({ path: '/bigscreen/viewer', query: { reportCode: val.reportCode } }) + window.open(routeUrl.href, '_blank') + // } }, // 设计 design (val) { - if (val.reportType === 'report_excel') { - var routeUrl = this.$router.resolve({ path: '/report/excelreport/designer', query: { reportCode: val.reportCode, reportId: val.id, accessKey: val.accessKey } }) - window.open(routeUrl.href, '_blank') - } else { - // eslint-disable-next-line no-redeclare - var routeUrl = this.$router.resolve({ path: '/bigscreen/designer', query: { reportCode: val.reportCode, reportId: val.id, accessKey: val.accessKey } }) - window.open(routeUrl.href, '_blank') - } + // if (val.reportType === 'report_excel') { + // var routeUrl = this.$router.resolve({ path: '/report/excelreport/designer', query: { reportCode: val.reportCode, reportId: val.id, accessKey: val.accessKey } }) + // window.open(routeUrl.href, '_blank') + // } else { + // eslint-disable-next-line no-redeclare + var routeUrl = this.$router.resolve({ path: '/bigscreen/designer', query: { reportCode: val.reportCode, reportId: val.id, accessKey: val.accessKey } }) + window.open(routeUrl.href, '_blank') + // } }, // 删除 async delReport (val) { diff --git a/report-ui/src/views/report/resultset/index.vue b/report-ui/src/views/report/resultset/index.vue index 340acee6..ef8d5105 100644 --- a/report-ui/src/views/report/resultset/index.vue +++ b/report-ui/src/views/report/resultset/index.vue @@ -390,15 +390,15 @@