diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-pie-nightingale.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-pie-nightingale.js index a8396956..81884b16 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-pie-nightingale.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-pie-nightingale.js @@ -675,6 +675,43 @@ export const widgetPieNightingale = { }, ], }, + { + name: '边距设置', + list: [ + { + type: 'el-slider', + label: '左边距(像素)', + name: 'left', + required: false, + placeholder: '', + value: 0, + }, + { + type: 'el-slider', + label: '右边距(像素)', + name: 'right', + required: false, + placeholder: '', + value: 0, + }, + { + type: 'el-slider', + label: '顶边距(像素)', + name: 'top', + required: false, + placeholder: '', + value: 0, + }, + { + type: 'el-slider', + label: '底边距(像素)', + name: 'bottom', + required: false, + placeholder: '', + value: 0, + }, + ], + }, { name: '自定义配色', list: [ diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-piechart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-piechart.js index c16eec70..f7820aea 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-piechart.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-piechart.js @@ -663,6 +663,43 @@ export const widgetPiechart = { }, ], }, + { + name: '边距设置', + list: [ + { + type: 'el-slider', + label: '左边距(像素)', + name: 'left', + required: false, + placeholder: '', + value: 0, + }, + { + type: 'el-slider', + label: '右边距(像素)', + name: 'right', + required: false, + placeholder: '', + value: 0, + }, + { + type: 'el-slider', + label: '顶边距(像素)', + name: 'top', + required: false, + placeholder: '', + value: 0, + }, + { + type: 'el-slider', + label: '底边距(像素)', + name: 'bottom', + required: false, + placeholder: '', + value: 0, + }, + ], + }, { name: '自定义配色', list: [ diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPieNightingaleRose.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPieNightingaleRose.vue index 9a30ba8d..88451e92 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPieNightingaleRose.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPieNightingaleRose.vue @@ -103,6 +103,10 @@ export default { const series = { type: "pie", center: ["50%", "50%"], + left: optionsSetup.left, + top: optionsSetup.top, + right: optionsSetup.right, + bottom: optionsSetup.bottom, // 饼图模式 面积模式"area" 半径模式"radius"//name: "面积模式", roseType: optionsSetup.nightingaleRoseType, radius: [optionsSetup.innerNumber + "%", optionsSetup.outerNumber + "%"], diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue index 5d102d1b..843a4f2f 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue @@ -109,6 +109,10 @@ export default { const series = { type: "pie", center: ["50%", "50%"], + left: optionsSetup.left, + top: optionsSetup.top, + right: optionsSetup.right, + bottom: optionsSetup.bottom, radius: [optionsSetup.innerNumber + "%", optionsSetup.outerNumber + "%"], clockwise: optionsSetup.clockwise, startAngle: optionsSetup.startAngle,