diff --git a/packages/bigscreen/designer/components/RenderElement.vue b/packages/bigscreen/designer/components/RenderElement.vue index 560eb9b5..f67025b9 100644 --- a/packages/bigscreen/designer/components/RenderElement.vue +++ b/packages/bigscreen/designer/components/RenderElement.vue @@ -10,6 +10,7 @@ + @@ -138,6 +147,7 @@ import AiSwiper from './AiSwiper.vue' import pieChart from 'dvcp-dv-ui/components/AiEchart/template/pie/pieChart2' import pieChart1 from 'dvcp-dv-ui/components/AiEchart/template/pie/pieChart1' + import pieChart3 from 'dvcp-dv-ui/components/AiEchart/template/pie/pieChart3' import lineChart1 from 'dvcp-dv-ui/components/AiEchart/template/line/lineChart1' import lineChart2 from 'dvcp-dv-ui/components/AiEchart/template/line/lineChart2' import lineChart5 from 'dvcp-dv-ui/components/AiEchart/template/line/lineChart5' @@ -157,7 +167,8 @@ lineChart2, lineChart5, pieChart, - pieChart1 + pieChart1, + pieChart3 } }, @@ -208,5 +219,42 @@ diff --git a/packages/bigscreen/designer/config.js b/packages/bigscreen/designer/config.js index 2ab41f3b..c2740e37 100644 --- a/packages/bigscreen/designer/config.js +++ b/packages/bigscreen/designer/config.js @@ -12,6 +12,7 @@ import barChart7 from 'dvcp-dv-ui/components/AiEchart/template/bar/barChart7' import barChart9 from 'dvcp-dv-ui/components/AiEchart/template/bar/barChart9' import pieChart from 'dvcp-dv-ui/components/AiEchart/template/pie/pieChart2' import pieChart1 from 'dvcp-dv-ui/components/AiEchart/template/pie/pieChart1' +import pieChart3 from 'dvcp-dv-ui/components/AiEchart/template/pie/pieChart3' const components = [ { @@ -438,6 +439,35 @@ const components = [ config: pieChart1, sourceDataId: '', dynamicData: [] + }, + { + code: 'widget-linechart', + type: 'pieChart3', + label: '饼图', + title: '饼图', + icon: 'icontext_box', + value: '', + border: 'border1', + width: 500, + height: 300, + zIndex: 1, + top: 0, + left: 0, + thumb: 'https://cdn.cunwuyun.cn/dvcp/dv/tpl/pie.png', + dataX: '', + dataY: [], + api: '', + apiData: [], + dataType: 'staticData', + staticData: [ + { name: '阿斯达', v1: 23, v2: 33 }, + { name: '水电费', v1: 12, v2: 34 }, + { name: '凡哥', v1: 67, v2: 25 }, + { name: '党费', v1: 98, v2: 85 } + ], + config: pieChart1, + sourceDataId: '', + dynamicData: [] } ] } diff --git a/project/dvui/AppDVDemo.vue b/project/dvui/AppDVDemo.vue index f6a7b234..190514fb 100644 --- a/project/dvui/AppDVDemo.vue +++ b/project/dvui/AppDVDemo.vue @@ -16,7 +16,7 @@