From 70875aef621b6b3b1d8d026171e487d972666682 Mon Sep 17 00:00:00 2001 From: qianlishi <1432731663@qq.com> Date: Fri, 2 Jul 2021 15:34:13 +0800 Subject: [PATCH 1/4] update --- report-ui/src/views/report/bigscreen/designer/index.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/report-ui/src/views/report/bigscreen/designer/index.vue b/report-ui/src/views/report/bigscreen/designer/index.vue index c0f45679..ac1d5a3e 100644 --- a/report-ui/src/views/report/bigscreen/designer/index.vue +++ b/report-ui/src/views/report/bigscreen/designer/index.vue @@ -327,8 +327,8 @@ export default { }, // 设计台按大屏的缩放比例 bigscreenScaleInWorkbench() { - var widthScale = this.middleWidth / this.bigscreenWidth; - var heightScale = this.middleHeight / this.bigscreenHeight; + var widthScale = (this.middleWidth - 18) / this.bigscreenWidth; + var heightScale = (this.middleHeight - 18) / this.bigscreenHeight; return Math.min(widthScale, heightScale); }, workbenchTransform() { @@ -338,10 +338,10 @@ export default { }, // 大屏在设计模式的大小 bigscreenWidthInWorkbench() { - return this.getPXUnderScale(this.bigscreenWidth); + return this.getPXUnderScale(this.bigscreenWidth) + 18; }, bigscreenHeightInWorkbench() { - return this.getPXUnderScale(this.bigscreenHeight); + return this.getPXUnderScale(this.bigscreenHeight) + 18; } }, watch: { @@ -885,6 +885,7 @@ export default { padding: 0; .vueRuler { width: 100%; + padding: 18px 0px 0px 18px; } .workbench { background-color: #1e1e1e; From 3bb12c607a26ab8977156b79305315811f4085fe Mon Sep 17 00:00:00 2001 From: qianlishi <1432731663@qq.com> Date: Fri, 2 Jul 2021 15:35:53 +0800 Subject: [PATCH 2/4] update --- .../src/views/report/bigscreen/designer/index.vue | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/report-ui/src/views/report/bigscreen/designer/index.vue b/report-ui/src/views/report/bigscreen/designer/index.vue index ac1d5a3e..34aa9e08 100644 --- a/report-ui/src/views/report/bigscreen/designer/index.vue +++ b/report-ui/src/views/report/bigscreen/designer/index.vue @@ -250,6 +250,7 @@ export default { widthLeftForTools: 200, // 左侧工具栏宽度 widthLeftForToolsHideButton: 15, // 左侧工具栏折叠按钮宽度 widthLeftForOptions: 300, // 右侧属性配置区 + widthPaddingTools: 18, toolIsShow: true, // 左侧工具栏是否显示 bigscreenWidth: 1920, // 大屏设计的大小 @@ -327,8 +328,10 @@ export default { }, // 设计台按大屏的缩放比例 bigscreenScaleInWorkbench() { - var widthScale = (this.middleWidth - 18) / this.bigscreenWidth; - var heightScale = (this.middleHeight - 18) / this.bigscreenHeight; + var widthScale = + (this.middleWidth - this.widthPaddingTools) / this.bigscreenWidth; + var heightScale = + (this.middleHeight - this.widthPaddingTools) / this.bigscreenHeight; return Math.min(widthScale, heightScale); }, workbenchTransform() { @@ -338,10 +341,12 @@ export default { }, // 大屏在设计模式的大小 bigscreenWidthInWorkbench() { - return this.getPXUnderScale(this.bigscreenWidth) + 18; + return this.getPXUnderScale(this.bigscreenWidth) + this.widthPaddingTools; }, bigscreenHeightInWorkbench() { - return this.getPXUnderScale(this.bigscreenHeight) + 18; + return ( + this.getPXUnderScale(this.bigscreenHeight) + this.widthPaddingTools + ); } }, watch: { From f9aaa68394df66b496e259968b7c4cb271da8aa1 Mon Sep 17 00:00:00 2001 From: qianlishi <1432731663@qq.com> Date: Fri, 2 Jul 2021 15:49:52 +0800 Subject: [PATCH 3/4] update --- report-ui/src/views/report/bigscreen/designer/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/report-ui/src/views/report/bigscreen/designer/index.vue b/report-ui/src/views/report/bigscreen/designer/index.vue index 34aa9e08..19b7985c 100644 --- a/report-ui/src/views/report/bigscreen/designer/index.vue +++ b/report-ui/src/views/report/bigscreen/designer/index.vue @@ -320,7 +320,6 @@ export default { widthLeftAndRight += this.widthLeftForOptions; // 右侧配置栏宽度 var middleWidth = this.bodyWidth - widthLeftAndRight; - console.log(middleWidth, this.bodyWidth, widthLeftAndRight); return middleWidth; }, middleHeight() { From 36969871766e2ac2aa0097efe909e25b7737fc4b Mon Sep 17 00:00:00 2001 From: qianlishi <1432731663@qq.com> Date: Fri, 2 Jul 2021 16:40:22 +0800 Subject: [PATCH 4/4] update --- report-ui/src/views/report/bigscreen/designer/tools.js | 8 ++++---- .../src/views/report/bigscreen/designer/widget/widget.vue | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js index 6103ed06..9b20faed 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools.js +++ b/report-ui/src/views/report/bigscreen/designer/tools.js @@ -45,7 +45,7 @@ const screenConfig = { value: '#000', }, { - type: 'el-input-text', + type: 'custom-upload', label: '图片地址', name: 'backgroundImage', required: false, @@ -649,7 +649,7 @@ const widgetTools = [ name: 'imageAdress', required: false, placeholder: '', - value: 'http://pic.ik123.com/uploads/allimg/190813/12-1ZQ3095508.jpg', + value: 'http://10.108.26.197:9095/file/download/fd20d563-00aa-45e2-b5db-aff951f814ec', }, { type: 'vue-color', @@ -919,7 +919,7 @@ const widgetTools = [ name: 'iframeAdress', required: false, placeholder: '', - value: 'http://www.baidu.com', + value: 'https://report.anji-plus.com/index.html', }, ], // 数据 @@ -1189,7 +1189,7 @@ const widgetTools = [ name: 'reversalX', required: false, placeholder: '', - value: '' + value: false }, { type: 'vue-color', diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widget.vue b/report-ui/src/views/report/bigscreen/designer/widget/widget.vue index ef4627da..bc60b8fb 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widget.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widget.vue @@ -121,8 +121,6 @@ export default { .vue-draggalbe { position: absolute; } -.widget-container { -} .widget-active { cursor: move; border: 1px dashed #09f;