diff --git a/package.json b/package.json index 59b8af83..3ebb719c 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "bin-code-editor": "^0.9.0", "dayjs": "^1.8.35", "dvcp-dv": "^1.0.0", + "dvcp-dv-ui": "file:project/dvui", "dvcp-ui": "^1.42.2", "echarts": "^5.1.2", "mp4box": "^0.4.1", diff --git a/packages/bigscreen/designer/components/form/DataConfig.vue b/packages/bigscreen/designer/components/form/DataConfig.vue index 4fac77de..c7a13e51 100644 --- a/packages/bigscreen/designer/components/form/DataConfig.vue +++ b/packages/bigscreen/designer/components/form/DataConfig.vue @@ -242,12 +242,16 @@ } }) } else if (this.options.type === 'summary') { - this.options.apiData = Object.keys(res.data[0]).map(item => { - return { - key: item, - value: res.data[0][item] - } - }) + if (this.options.display === 'summary9') { + this.options.apiData = res.data + } else { + this.options.apiData = Object.keys(res.data[0]).map(item => { + return { + key: item, + value: res.data[0][item] + } + }) + } } else if (this.options.type === 'monitor') { this.monitorList = res.data } else { diff --git a/packages/bigscreen/viewer/AppGigscreenViewer.vue b/packages/bigscreen/viewer/AppGigscreenViewer.vue index c0235845..dfddae34 100644 --- a/packages/bigscreen/viewer/AppGigscreenViewer.vue +++ b/packages/bigscreen/viewer/AppGigscreenViewer.vue @@ -143,12 +143,16 @@ export default { } }) } else if (item.type === 'summary') { - dynamicData = Object.keys(res.data[0]).map(item => { - return { - key: item, - value: res.data[0][item] - } - }) + if (this.options.display === 'summary9') { + dynamicData = res.data + } else { + dynamicData = Object.keys(res.data[0]).map(item => { + return { + key: item, + value: res.data[0][item] + } + }) + } } else { if (item.dataX && item.dataY.length) { list.forEach(i => { diff --git a/project/dvui/AppDVDemo.vue b/project/dvui/AppDVDemo.vue index c57a36d6..34680ab0 100644 --- a/project/dvui/AppDVDemo.vue +++ b/project/dvui/AppDVDemo.vue @@ -5,8 +5,7 @@ diff --git a/project/dvui/layout/AiDvDisplay/AiDvDisplay.vue b/project/dvui/layout/AiDvDisplay/AiDvDisplay.vue index 8d023e43..51373956 100644 --- a/project/dvui/layout/AiDvDisplay/AiDvDisplay.vue +++ b/project/dvui/layout/AiDvDisplay/AiDvDisplay.vue @@ -1,9 +1,9 @@