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 006d6be3..f4e4747d 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); @@ -580,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 @@ + + + + +