From 85328005cd95a9d2019a3f08c217be0ed363c847 Mon Sep 17 00:00:00 2001 From: qianlishi <1432731663@qq.com> Date: Thu, 28 Apr 2022 11:21:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9B=BE=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- report-ui/src/views/screenDesigner/index.vue | 23 +++++++++++--------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/report-ui/src/views/screenDesigner/index.vue b/report-ui/src/views/screenDesigner/index.vue index 006d6be3..60005200 100644 --- a/report-ui/src/views/screenDesigner/index.vue +++ b/report-ui/src/views/screenDesigner/index.vue @@ -76,17 +76,17 @@ 图层 -
- - - - 内联框架 -
-
+
- + - 内联框架 + {{ item.label }}
@@ -463,7 +463,10 @@ export default { this.activeName = "first"; this.widgetOptions = screenConfig["options"]; }, - + layerClick(index) { + this.widgetIndex = index; + this.widgetsClick(index); + }, // 如果是点击某个组件,获取该组件的配置项 setOptionsOnClickWidget(obj) { console.log(obj); From b79c967ee580f0e03939156c2decd0d1568e0029 Mon Sep 17 00:00:00 2001 From: qianlishi <1432731663@qq.com> Date: Thu, 28 Apr 2022 12:35:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=BE=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- report-ui/src/router/index.js | 8 ++ .../views/screenDesigner/components/temp.vue | 53 +++++++++++++ report-ui/src/views/screenDesigner/index.vue | 2 +- .../src/views/screenDesigner/preview.vue | 78 +++++++++++++++++++ 4 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 report-ui/src/views/screenDesigner/components/temp.vue diff --git a/report-ui/src/router/index.js b/report-ui/src/router/index.js index 653cc140..7f6f62bf 100644 --- a/report-ui/src/router/index.js +++ b/report-ui/src/router/index.js @@ -266,6 +266,14 @@ export const constantRouterMap = [ component: () => import('@/views/screenDesigner/index'), name: 'screenDesigner', }, + { + path: '/screen/preview', + component: () => import('@/views/screenDesigner/preview'), + hidden: true, + meta: { + requireAuth: true + } + }, { path: '/404', component: () => import('@/views/404'), diff --git a/report-ui/src/views/screenDesigner/components/temp.vue b/report-ui/src/views/screenDesigner/components/temp.vue new file mode 100644 index 00000000..d38f77ce --- /dev/null +++ b/report-ui/src/views/screenDesigner/components/temp.vue @@ -0,0 +1,53 @@ + + + + diff --git a/report-ui/src/views/screenDesigner/index.vue b/report-ui/src/views/screenDesigner/index.vue index 60005200..f4e4747d 100644 --- a/report-ui/src/views/screenDesigner/index.vue +++ b/report-ui/src/views/screenDesigner/index.vue @@ -583,7 +583,7 @@ export default { // 预览 viewScreen() { let routeUrl = this.$router.resolve({ - path: "/bigscreen/viewer", + path: "/screen/preview", query: { reportCode: this.$route.query.reportCode } }); window.open(routeUrl.href, "_blank"); diff --git a/report-ui/src/views/screenDesigner/preview.vue b/report-ui/src/views/screenDesigner/preview.vue index 8b137891..1ce75982 100644 --- a/report-ui/src/views/screenDesigner/preview.vue +++ b/report-ui/src/views/screenDesigner/preview.vue @@ -1 +1,79 @@ + + + + +