diff --git a/components/AiDvRender.vue b/components/AiDvRender.vue
index 12e3cfd3..51be2251 100644
--- a/components/AiDvRender.vue
+++ b/components/AiDvRender.vue
@@ -55,6 +55,7 @@
+
@@ -77,6 +78,7 @@ import AiDvPanel from "./layout/AiDvPanel/AiDvPanel";
import AiDvSummary from "./layout/AiDvSummary/AiDvSummary";
import AiDvPlot from "./layout/AiDvPlot/AiDvPlot.vue";
import AiAssist from "./AiAssist.vue";
+import AiMonitorCarousel from "./AiMonitorCarousel.vue";
Vue.use(scrollBoard)
@@ -84,6 +86,7 @@ export default {
name: 'AiDvRender',
props: ['data', 'index', 'theme', 'instance'],
components: {
+ AiMonitorCarousel,
AiAssist,
AiDvPlot,
// AiSprite,
diff --git a/components/AiMonitorCarousel.vue b/components/AiMonitorCarousel.vue
new file mode 100644
index 00000000..b7e70526
--- /dev/null
+++ b/components/AiMonitorCarousel.vue
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
diff --git a/packages/bigscreen/designer/components/componentConfig.vue b/packages/bigscreen/designer/components/componentConfig.vue
index 894d2882..b84e2106 100644
--- a/packages/bigscreen/designer/components/componentConfig.vue
+++ b/packages/bigscreen/designer/components/componentConfig.vue
@@ -223,7 +223,7 @@
-
+
diff --git a/packages/bigscreen/designer/components/datasourcePicker.vue b/packages/bigscreen/designer/components/datasourcePicker.vue
index 2ef72d9e..ca035e16 100644
--- a/packages/bigscreen/designer/components/datasourcePicker.vue
+++ b/packages/bigscreen/designer/components/datasourcePicker.vue
@@ -75,18 +75,20 @@ export default {
},
initStaticDataProps() {
const columnProp = "name"
- this.options.staticData.map((row, i) => {
- const prop = `c${i || ""}`
- this.colConfigs.push({label: row[columnProp], prop})
- Object.entries(row).map(([k, v]) => {
- if (/^v/.test(k)) {
- const item = this.tableData[k.substring(1) || 0] || {}
- item[prop] = v
- this.tableData[k.substring(1) || 0] = item
- }
+ if (Array.isArray(this.options.staticData)) {
+ this.options.staticData.map((row, i) => {
+ const prop = `c${i || ""}`
+ this.colConfigs.push({label: row[columnProp], prop})
+ Object.entries(row).map(([k, v]) => {
+ if (/^v/.test(k)) {
+ const item = this.tableData[k.substring(1) || 0] || {}
+ item[prop] = v
+ this.tableData[k.substring(1) || 0] = item
+ }
+ })
})
- })
- this.tableData = this.tableData.map(e => ({...e, $cellEdit: false}))
+ this.tableData = this.tableData.map(e => ({...e, $cellEdit: false}))
+ }
}
},
created() {
diff --git a/packages/bigscreen/designer/config.js b/packages/bigscreen/designer/config.js
index 4e295d8e..610d69e7 100644
--- a/packages/bigscreen/designer/config.js
+++ b/packages/bigscreen/designer/config.js
@@ -517,7 +517,7 @@ const components = [{
]
},
{
- type: 'other', label: '其他', list: [{
+ label: '其他', list: [{
label: '地图', type: 'map', list: [{
type: 'map',
label: '地图',
@@ -621,7 +621,7 @@ const components = [{
}]
}]
}, {
- label: '轮播图', type: 'swiper', list: [{
+ label: '轮播图', list: [{
type: 'swiper',
label: '轮播图',
width: 400,
@@ -692,26 +692,29 @@ const components = [{
thumb: 'https://cdn.cunwuyun.cn/dvcp/dv/tpl/total.png'
}]
}, {
- label: '视频监控', type: 'monitor', list: [{
- type: 'monitor',
- label: '视频监控',
- src: '',
- width: 480,
- height: 240,
- zIndex: 1,
- top: 0,
- left: 0,
- title: '',
- moniterId: '',
- monitorType: 'cmcc',
- api: '/app/appzyvideoequipment/list2',
- border: 'border2',
- sourceDataId: '',
- dataType: 'staticData',
- staticData: '',
- dynamicData: '',
- thumb: 'https://cdn.cunwuyun.cn/dvcp/dv/tpl/video.png'
- }]
+ label: '视频监控', list: [
+ {
+ type: 'monitor',
+ label: '视频监控',
+ src: '',
+ width: 480,
+ height: 240,
+ zIndex: 1,
+ top: 0,
+ left: 0,
+ title: '',
+ moniterId: '',
+ monitorType: 'cmcc',
+ api: '/app/appzyvideoequipment/list2',
+ border: 'border2',
+ sourceDataId: '',
+ dataType: 'staticData',
+ staticData: '',
+ dynamicData: '',
+ thumb: 'https://cdn.cunwuyun.cn/dvcp/dv/tpl/video.png'
+ },
+ {type: "monitorCarousel", label: "视频轮播", width: 480, height: 480, zIndex: 1, title: "视频轮播", thumb: "https://cdn.cunwuyun.cn/dvcp/dv/tpl/video.png"}
+ ]
}, customHtml]
}]