diff --git a/frontend/src/components/vue-drag-resize-rotate/index.vue b/frontend/src/components/vue-drag-resize-rotate/index.vue index 4a3d72feec..a6f1e1eedf 100644 --- a/frontend/src/components/vue-drag-resize-rotate/index.vue +++ b/frontend/src/components/vue-drag-resize-rotate/index.vue @@ -409,7 +409,6 @@ export default { }, style() { if (!this.panelDesign.styleInit && this.panelDesign.componentPosition) { - debugger // 设置定位 const componentPosition = JSON.parse(this.panelDesign.componentPosition) this.left = componentPosition.left @@ -636,7 +635,6 @@ export default { methods: { removeView() { - debugger this.panelDesign.keepFlag = false // console.log(this.panelDesignId); // this.$emit('removeView', this.panelDesign.id) diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index 58a535346c..51e798ecfa 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -67,7 +67,7 @@ export const constantRoutes = [ children: [ { path: 'edit', - component: () => import('@/views/panel/new/edit') + component: () => import('@/views/panel/edit') } ] }, diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss index eadcbd344f..0974d206e9 100644 --- a/frontend/src/styles/index.scss +++ b/frontend/src/styles/index.scss @@ -110,3 +110,15 @@ div:focus { } } + +.filter-card-class { + width: 100%; + .el-card__header { + padding: 5px 0 !important; + border-bottom: none !important; + } + + .el-card__body { + padding: 10px; + } +} diff --git a/frontend/src/views/panel/DrawingBoard/index.vue b/frontend/src/views/panel/DrawingBoard/index.vue new file mode 100644 index 0000000000..fc75575d13 --- /dev/null +++ b/frontend/src/views/panel/DrawingBoard/index.vue @@ -0,0 +1,253 @@ + + + + diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue new file mode 100644 index 0000000000..4b1edac472 --- /dev/null +++ b/frontend/src/views/panel/edit/index.vue @@ -0,0 +1,229 @@ + + + + + + + diff --git a/frontend/src/views/panel/filter/index.vue b/frontend/src/views/panel/filter/index.vue new file mode 100644 index 0000000000..efda5802ed --- /dev/null +++ b/frontend/src/views/panel/filter/index.vue @@ -0,0 +1,57 @@ + + + + + diff --git a/frontend/src/views/panel/index.vue b/frontend/src/views/panel/index.vue index be6628b2d8..00f9347f12 100644 --- a/frontend/src/views/panel/index.vue +++ b/frontend/src/views/panel/index.vue @@ -5,7 +5,7 @@ 列表 - + 收藏 @@ -15,17 +15,14 @@ 分享 - - - - + - + @@ -58,15 +55,15 @@ export default { this.refreshShare() } }, - switchComponent(c) { - console.log(c) - this.param = c.param - switch (c.name) { - case 'PanelViewShow': - this.component = PanelViewShow - break - } - }, + // switchComponent(c) { + // console.log(c) + // this.param = c.param + // switch (c.name) { + // case 'PanelViewShow': + // this.component = PanelViewShow + // break + // } + // }, refreshShare() { this.showShare = false this.$nextTick(() => (this.showShare = true)) diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue index e4d33e628d..011ac4ab0d 100644 --- a/frontend/src/views/panel/list/PanelList.vue +++ b/frontend/src/views/panel/list/PanelList.vue @@ -88,6 +88,9 @@ {{ $t('panel.share') }} + + {{ $t('panel.edit') }} + @@ -229,6 +232,9 @@ export default { case 'share': this.share(param.data) break + case 'edit': + this.edit(param.data) + break } }, @@ -487,6 +493,9 @@ export default { closeGrant() { this.authResourceId = null this.authVisible = false + }, + edit(data) { + this.$router.replace('/panelEdit') } } } diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue index c9e94332a3..8218ab814d 100644 --- a/frontend/src/views/panel/list/PanelViewShow.vue +++ b/frontend/src/views/panel/list/PanelViewShow.vue @@ -1,50 +1,29 @@ - - - diff --git a/frontend/src/views/panel/new/PanelViewShow.vue b/frontend/src/views/panel/new/PanelViewShow.vue deleted file mode 100644 index aeeb5fe3d4..0000000000 --- a/frontend/src/views/panel/new/PanelViewShow.vue +++ /dev/null @@ -1,398 +0,0 @@ - - - - - diff --git a/frontend/src/views/panel/new/edit.vue b/frontend/src/views/panel/new/edit.vue deleted file mode 100644 index 56612d84cc..0000000000 --- a/frontend/src/views/panel/new/edit.vue +++ /dev/null @@ -1,44 +0,0 @@ - - - - - diff --git a/frontend/src/views/panel/new/index1.vue b/frontend/src/views/panel/new/index1.vue deleted file mode 100644 index 2796623cf4..0000000000 --- a/frontend/src/views/panel/new/index1.vue +++ /dev/null @@ -1,87 +0,0 @@ - - - - -