diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index 51e798ecfa..cc572f9541 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -72,6 +72,12 @@ export const constantRoutes = [ ] }, + { + path: '/preview', + component: () => import('@/views/panel/preview/index'), + hidden: true + }, + { path: '/', component: Layout, diff --git a/frontend/src/views/panel/DrawingBoard/index.vue b/frontend/src/views/panel/DrawingBoard/index.vue index f4ab3f04c5..cfdd29507e 100644 --- a/frontend/src/views/panel/DrawingBoard/index.vue +++ b/frontend/src/views/panel/DrawingBoard/index.vue @@ -5,6 +5,7 @@ v-for="item in panelDetails.panelDesigns" v-show="item.keepFlag" :key="item.id" + :disabled="status" :panel-design="item" :parent="true" @newStyle="newStyle" @@ -28,6 +29,12 @@ import bus from '@/utils/bus' export default { name: 'DrawingBoard', components: { ChartComponent, VueDragResizeRotate }, + props: { + status: { + type: Boolean, + default: false + } + }, data() { return { panelDetails: { @@ -135,7 +142,7 @@ export default { return true }, preViewShow() { - + this.$router.replace('/preview') }, savePanel() { post('panel/group/saveGroupWithDesign', this.panelDetails, () => { diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index 84f44f8b70..ca432acad4 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -23,7 +23,7 @@ - + @@ -134,7 +134,7 @@ export default { }, beforeDestroy() { const elx = this.$refs.rightPanel - elx.remove() + elx && elx.remove() }, methods: { save() { @@ -168,6 +168,9 @@ export default { }, saveDrawing() { bus.$emit('panel-drawing-save') + }, + preViewShow() { + bus.$emit('panel-drawing-preview') } } diff --git a/frontend/src/views/panel/filter/index.vue b/frontend/src/views/panel/filter/index.vue index efda5802ed..0d1c0af13a 100644 --- a/frontend/src/views/panel/filter/index.vue +++ b/frontend/src/views/panel/filter/index.vue @@ -7,7 +7,9 @@
- {{ '条件 ' + o }} +
+ {{ '条件 ' + o }} +
diff --git a/frontend/src/views/panel/preview/index.vue b/frontend/src/views/panel/preview/index.vue new file mode 100644 index 0000000000..f0b033395f --- /dev/null +++ b/frontend/src/views/panel/preview/index.vue @@ -0,0 +1,122 @@ + + + + + + +