diff --git a/components/AiDvRender.vue b/components/AiDvRender.vue index 2c6dd311..80913b73 100644 --- a/components/AiDvRender.vue +++ b/components/AiDvRender.vue @@ -30,6 +30,7 @@ :limitArea="data.limitArea === '1'" :is3dAround="data.is3dAround === '1'"> --> + diff --git a/components/layout/AiDvPanel/AiDvPanel.vue b/components/layout/AiDvPanel/AiDvPanel.vue index ec9f3eac..cf7cc95f 100644 --- a/components/layout/AiDvPanel/AiDvPanel.vue +++ b/components/layout/AiDvPanel/AiDvPanel.vue @@ -17,10 +17,11 @@ import Border2 from "./borders/border2"; import Border3 from "./borders/border3"; import Border4 from "./borders/border4"; import Border5 from "./borders/border5"; +import border6 from "./borders/border6"; export default { name: "AiDvPanel", - components: { Border0, Border1, Border2, Border3, Border4, Border5 }, + components: { Border0, Border1, Border2, Border3, Border4, Border5, border6 }, props: { title: {default: "请传入标题"}, border: {default: "border0"} diff --git a/components/layout/AiDvPanel/asset/title6.png b/components/layout/AiDvPanel/asset/title6.png new file mode 100644 index 00000000..058189f9 Binary files /dev/null and b/components/layout/AiDvPanel/asset/title6.png differ diff --git a/components/layout/AiDvPanel/borders/border6.vue b/components/layout/AiDvPanel/borders/border6.vue new file mode 100644 index 00000000..3b5bf21c --- /dev/null +++ b/components/layout/AiDvPanel/borders/border6.vue @@ -0,0 +1,53 @@ + + + + + diff --git a/components/layout/AiDvSummary/AiDvSummary.vue b/components/layout/AiDvSummary/AiDvSummary.vue index 75aa0868..484f7191 100644 --- a/components/layout/AiDvSummary/AiDvSummary.vue +++ b/components/layout/AiDvSummary/AiDvSummary.vue @@ -17,6 +17,7 @@ import Summary9 from './components/Summary9' import Summary10 from './components/Summary10' import Summary11 from './components/Summary11' + import Summary12 from './components/Summary12' export default { name: 'AiDvSummary', @@ -33,7 +34,8 @@ Summary8, Summary9, Summary10, - Summary11 + Summary11, + Summary12 }, props: { diff --git a/components/layout/AiDvSummary/components/Summary12.vue b/components/layout/AiDvSummary/components/Summary12.vue new file mode 100644 index 00000000..8bab5aad --- /dev/null +++ b/components/layout/AiDvSummary/components/Summary12.vue @@ -0,0 +1,76 @@ + + + + + diff --git a/components/layout/AiDvTable/AiDvTable.vue b/components/layout/AiDvTable/AiDvTable.vue new file mode 100644 index 00000000..af00fa93 --- /dev/null +++ b/components/layout/AiDvTable/AiDvTable.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/packages/bigscreen/designer/components/form/DataConfig.vue b/packages/bigscreen/designer/components/form/DataConfig.vue index 8ad7faeb..3c30e3d1 100644 --- a/packages/bigscreen/designer/components/form/DataConfig.vue +++ b/packages/bigscreen/designer/components/form/DataConfig.vue @@ -224,7 +224,7 @@ export default { this.instance.post(this.options.api).then(res => { if (res.code == 0) { if (res.data.length) { - if (this.options.type === 'table') { + if (this.options.type === 'table' || this.options.type === 'AiDvTable') { const keys = Object.keys(res.data[0]) const list = res.data this.options.apiData = keys.map(v => { @@ -286,7 +286,7 @@ export default { this.instance.post(`/app/appdiylargescreen/statisticsByLsid?id=${e}`).then(res => { if (res.code == 0) { if (res.data.length) { - if (this.options.type === 'table') { + if (this.options.type === 'table' || this.options.type === 'AiDvTable') { const keys = Object.keys(res.data[0]) const list = res.data this.options.dynamicData = keys.map(v => { diff --git a/packages/bigscreen/designer/components/form/componentConfig.vue b/packages/bigscreen/designer/components/form/componentConfig.vue index 7d0e3d5b..c771b21b 100644 --- a/packages/bigscreen/designer/components/form/componentConfig.vue +++ b/packages/bigscreen/designer/components/form/componentConfig.vue @@ -64,7 +64,7 @@ -