diff --git a/report-ui/src/views/report/bigscreen/designer/index.vue b/report-ui/src/views/report/bigscreen/designer/index.vue index c0f45679..19b7985c 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, // 大屏设计的大小 @@ -319,7 +320,6 @@ export default { widthLeftAndRight += this.widthLeftForOptions; // 右侧配置栏宽度 var middleWidth = this.bodyWidth - widthLeftAndRight; - console.log(middleWidth, this.bodyWidth, widthLeftAndRight); return middleWidth; }, middleHeight() { @@ -327,8 +327,10 @@ export default { }, // 设计台按大屏的缩放比例 bigscreenScaleInWorkbench() { - var widthScale = this.middleWidth / this.bigscreenWidth; - var heightScale = this.middleHeight / 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 +340,12 @@ export default { }, // 大屏在设计模式的大小 bigscreenWidthInWorkbench() { - return this.getPXUnderScale(this.bigscreenWidth); + return this.getPXUnderScale(this.bigscreenWidth) + this.widthPaddingTools; }, bigscreenHeightInWorkbench() { - return this.getPXUnderScale(this.bigscreenHeight); + return ( + this.getPXUnderScale(this.bigscreenHeight) + this.widthPaddingTools + ); } }, watch: { @@ -885,6 +889,7 @@ export default { padding: 0; .vueRuler { width: 100%; + padding: 18px 0px 0px 18px; } .workbench { background-color: #1e1e1e; 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;