diff --git a/packages/bigscreen/designer/components/Layout.vue b/packages/bigscreen/designer/components/Layout.vue index fee2b464..b3a5e5b7 100644 --- a/packages/bigscreen/designer/components/Layout.vue +++ b/packages/bigscreen/designer/components/Layout.vue @@ -471,7 +471,7 @@ removeImg (index) { this.images.splice(index, 1) - }, + }, onImageConfirm () { if (!this.form.images.length) { @@ -1003,6 +1003,7 @@ .layout-middle { flex: 1; + background: #000; .canvas-wrapper { position: relative; diff --git a/packages/bigscreen/designer/components/RenderElement.vue b/packages/bigscreen/designer/components/RenderElement.vue index 6a59f58b..f67025b9 100644 --- a/packages/bigscreen/designer/components/RenderElement.vue +++ b/packages/bigscreen/designer/components/RenderElement.vue @@ -10,6 +10,7 @@ + + @@ -129,6 +146,8 @@ import { mapState } from 'vuex' 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' @@ -147,7 +166,9 @@ lineChart1, lineChart2, lineChart5, - pieChart + pieChart, + pieChart1, + pieChart3 } }, @@ -198,5 +219,42 @@ diff --git a/packages/bigscreen/designer/config.js b/packages/bigscreen/designer/config.js index cd39e657..c2740e37 100644 --- a/packages/bigscreen/designer/config.js +++ b/packages/bigscreen/designer/config.js @@ -11,6 +11,8 @@ import barChart5 from 'dvcp-dv-ui/components/AiEchart/template/bar/barChart5' 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 = [ { @@ -408,6 +410,64 @@ const components = [ config: pieChart, sourceDataId: '', dynamicData: [] + }, + { + code: 'widget-linechart', + type: 'pieChart1', + 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: [] + }, + { + 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/packages/work/AppAssessment/components/Statistics.vue b/packages/work/AppAssessment/components/Statistics.vue index 90d5c71d..f92a5113 100644 --- a/packages/work/AppAssessment/components/Statistics.vue +++ b/packages/work/AppAssessment/components/Statistics.vue @@ -41,14 +41,17 @@ + @@ -283,6 +286,10 @@