diff --git a/packages/bigscreen/designer/config.js b/packages/bigscreen/designer/config.js
index 7d06738a..14c874bf 100644
--- a/packages/bigscreen/designer/config.js
+++ b/packages/bigscreen/designer/config.js
@@ -1,19 +1,3 @@
-import lineChart1 from 'dvcp-dv-ui/components/AiEchart/template/line/lineChart1'
-import lineChart2 from 'dvcp-dv-ui/components/AiEchart/template/line/lineChart2'
-import lineChart3 from 'dvcp-dv-ui/components/AiEchart/template/line/lineChart3'
-import lineChart4 from 'dvcp-dv-ui/components/AiEchart/template/line/lineChart4'
-import lineChart5 from 'dvcp-dv-ui/components/AiEchart/template/line/lineChart5'
-import barChart1 from 'dvcp-dv-ui/components/AiEchart/template/bar/barChart1'
-import barChart2 from 'dvcp-dv-ui/components/AiEchart/template/bar/barChart2'
-import barChart3 from 'dvcp-dv-ui/components/AiEchart/template/bar/barChart3'
-import barChart8 from 'dvcp-dv-ui/components/AiEchart/template/bar/barChart8'
-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 = [
{
type: 'chart',
@@ -49,12 +33,12 @@ const components = [
{name: '凡哥', v1: 67},
{name: '党费', v1: 98}
],
- config: barChart1,
+ config: 'barChart1',
dynamicData: []
},
{
code: 'widget-linechart',
- type: 'barChart1',
+ type: 'barChart2',
label: '柱状图2',
icon: 'icontext_box',
value: '',
@@ -78,7 +62,7 @@ const components = [
{name: '凡哥', v1: 67},
{name: '党费', v1: 98}
],
- config: barChart2,
+ config: 'barChart2',
dynamicData: []
},
{
@@ -107,7 +91,7 @@ const components = [
{name: '凡哥', v1: 67},
{name: '党费', v1: 98}
],
- config: barChart3,
+ config: 'barChart3',
dynamicData: []
},
{
@@ -136,7 +120,7 @@ const components = [
{name: '凡哥', v1: 67},
{name: '党费', v1: 98}
],
- config: barChart5,
+ config: 'barChart5',
dynamicData: []
},
{
@@ -164,7 +148,7 @@ const components = [
{name: '凡哥', v1: 67},
{name: '党费', v1: 98}
],
- config: barChart7,
+ config: 'barChart7',
dynamicData: []
},
{
@@ -193,7 +177,7 @@ const components = [
{name: '凡哥', v1: 67},
{name: '党费', v1: 98}
],
- config: barChart8,
+ config: 'barChart8',
dynamicData: []
},
{
@@ -222,7 +206,7 @@ const components = [
{name: '凡哥', v1: 67},
{name: '党费', v1: 98}
],
- config: barChart9,
+ config: 'barChart9',
dynamicData: []
}
]
@@ -256,7 +240,7 @@ const components = [
{name: '凡哥', v1: 67, v2: 25},
{name: '党费', v1: 98, v2: 85}
],
- config: lineChart1,
+ config: 'lineChart1',
sourceDataId: '',
dynamicData: []
},
@@ -285,7 +269,7 @@ const components = [
{name: '凡哥', v1: 67, v2: 25},
{name: '党费', v1: 98, v2: 85}
],
- config: lineChart2,
+ config: 'lineChart2',
sourceDataId: '',
dynamicData: []
},
@@ -314,7 +298,7 @@ const components = [
{name: '凡哥', v1: 67, v2: 25},
{name: '党费', v1: 98, v2: 85}
],
- config: lineChart3,
+ config: 'lineChart3',
sourceDataId: '',
dynamicData: []
},
@@ -343,7 +327,7 @@ const components = [
{name: '凡哥', v1: 67, v2: 25},
{name: '党费', v1: 98, v2: 85}
],
- config: lineChart4,
+ config: 'lineChart4',
sourceDataId: '',
dynamicData: []
},
@@ -372,7 +356,7 @@ const components = [
{name: '凡哥', v1: 67, v2: 25},
{name: '党费', v1: 98, v2: 85}
],
- config: lineChart5,
+ config: 'lineChart5',
sourceDataId: '',
dynamicData: []
}
@@ -384,7 +368,8 @@ const components = [
list: [
{
code: 'widget-linechart',
- type: 'pieChart',
+ type: 'pieChart2',
+ config: 'pieChart2',
label: '饼图',
title: '饼图',
icon: 'icontext_box',
@@ -407,7 +392,6 @@ const components = [
{name: '凡哥', v1: 67, v2: 25},
{name: '党费', v1: 98, v2: 85}
],
- config: pieChart,
sourceDataId: '',
dynamicData: []
},
@@ -436,7 +420,7 @@ const components = [
{name: '凡哥', v1: 67, v2: 25},
{name: '党费', v1: 98, v2: 85}
],
- config: pieChart1,
+ config: 'pieChart1',
sourceDataId: '',
dynamicData: []
},
@@ -465,7 +449,7 @@ const components = [
{name: '凡哥', v1: 67, v2: 25},
{name: '党费', v1: 98, v2: 85}
],
- config: pieChart1,
+ config: 'pieChart1',
sourceDataId: '',
dynamicData: []
}
@@ -509,6 +493,20 @@ const components = [
}
]
},
+ {
+ type: 'ai3d', label: "3D", list: [
+ {
+ label: "3D楼栋", type: 'building', list: [{
+ type: 'building1', label: "楼栋模型1",
+ width: 840,
+ height: 800,
+ zIndex: 1,
+ title: "楼栋模型1",
+ thumb: 'https://cdn.cunwuyun.cn/dvcp/dv/tpl/total.png'
+ }]
+ }
+ ]
+ },
{
type: 'other',
label: '其他',
@@ -527,7 +525,7 @@ const components = [
top: 0,
mask: '2',
pulseLines: 1,
- mapStyle:"e51987628aee5206d4c9ca8c6e98b4f7",
+ mapStyle: "e51987628aee5206d4c9ca8c6e98b4f7",
areaId: '',
zIndex: 1,
apiData: [],
diff --git a/project/dvui/components/AiDvRender.vue b/project/dvui/components/AiDvRender.vue
index 462d47a5..6b8c859d 100644
--- a/project/dvui/components/AiDvRender.vue
+++ b/project/dvui/components/AiDvRender.vue
@@ -15,131 +15,19 @@
:key="data.height"
:theme="theme"
:style="{height: data.height + 'px', width: '100%'}"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -147,54 +35,44 @@