From 54bcd5979a417e44edc60d64be8058bf7ad2c669 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Wed, 8 Mar 2023 15:45:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=BB=84=E4=BB=B6=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/AiDvRender.vue | 1 + components/layout/AiDvPanel/AiDvPanel.vue | 3 +- components/layout/AiDvPanel/asset/title6.png | Bin 0 -> 3284 bytes .../layout/AiDvPanel/borders/border6.vue | 53 ++++++++ components/layout/AiDvSummary/AiDvSummary.vue | 4 +- .../AiDvSummary/components/Summary12.vue | 76 ++++++++++++ components/layout/AiDvTable/AiDvTable.vue | 117 ++++++++++++++++++ .../designer/components/form/DataConfig.vue | 4 +- .../components/form/componentConfig.vue | 6 +- packages/bigscreen/designer/config.js | 24 ++++ 10 files changed, 281 insertions(+), 7 deletions(-) create mode 100644 components/layout/AiDvPanel/asset/title6.png create mode 100644 components/layout/AiDvPanel/borders/border6.vue create mode 100644 components/layout/AiDvSummary/components/Summary12.vue create mode 100644 components/layout/AiDvTable/AiDvTable.vue 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 0000000000000000000000000000000000000000..058189f9ef2d8a74797feeb380615734ded9e405 GIT binary patch literal 3284 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 KgKB-3xc>l;->KaI literal 0 HcmV?d00001 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 @@ -