From 7453962f52032dfd4eb91b03e96bac735f36139e Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Wed, 11 May 2022 18:06:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bigscreen/designer/components/Layout.vue | 2 +- .../designer/components/RenderElement.vue | 1 + packages/bigscreen/designer/config.js | 33 ++++++ .../components/AiDvPartyOrg/AiDvPartyOrg.vue | 32 ++++++ .../dvui/layout/AiDvSummary/AiDvSummary.vue | 4 +- .../AiDvSummary/components/Summary11.vue | 107 ++++++++++++++++++ .../AiDvSummary/components/Summary8.vue | 3 - 7 files changed, 177 insertions(+), 5 deletions(-) create mode 100644 project/dvui/components/AiDvPartyOrg/AiDvPartyOrg.vue create mode 100644 project/dvui/layout/AiDvSummary/components/Summary11.vue diff --git a/packages/bigscreen/designer/components/Layout.vue b/packages/bigscreen/designer/components/Layout.vue index a0968a0d..b5bbcaf1 100644 --- a/packages/bigscreen/designer/components/Layout.vue +++ b/packages/bigscreen/designer/components/Layout.vue @@ -403,7 +403,7 @@ value: '0' }], images: [], - summaryList: ['summary0', 'summary1', 'summary2', 'summary3', 'summary4', 'summary6', 'summary5', 'summary7', 'summary8', 'summary9', 'summary10'], + summaryList: ['summary0', 'summary1', 'summary2', 'summary3', 'summary4', 'summary6', 'summary5', 'summary7', 'summary8', 'summary9', 'summary10', 'summary11'], borderList: ['border0', 'border1', 'border2', 'border3', 'border4', 'border5'] } }, diff --git a/packages/bigscreen/designer/components/RenderElement.vue b/packages/bigscreen/designer/components/RenderElement.vue index e0f99bd4..e7332383 100644 --- a/packages/bigscreen/designer/components/RenderElement.vue +++ b/packages/bigscreen/designer/components/RenderElement.vue @@ -138,6 +138,7 @@ + diff --git a/packages/bigscreen/designer/config.js b/packages/bigscreen/designer/config.js index c2740e37..8ecf7b16 100644 --- a/packages/bigscreen/designer/config.js +++ b/packages/bigscreen/designer/config.js @@ -543,6 +543,39 @@ const components = [ } ] }, + { + label: '党组织', + type: 'partyOrg', + list: [ + { + type: 'partyOrg', + label: '党组织', + width: 840, + height: 800, + zIndex: 1, + top: 0, + left: 0, + dataX: '', + dataY: [], + title: '党组织', + border: 'border3', + sourceDataId: '', + dataType: 'staticData', + staticData: [ + { + key: '个人服务办理', + value: 247 + }, + { + key: '同比上月', + value: 247 + } + ], + dynamicData: [], + thumb: 'https://cdn.cunwuyun.cn/dvcp/dv/tpl/total.png' + } + ] + }, { label: '边框', type: 'panel', diff --git a/project/dvui/components/AiDvPartyOrg/AiDvPartyOrg.vue b/project/dvui/components/AiDvPartyOrg/AiDvPartyOrg.vue new file mode 100644 index 00000000..8de97150 --- /dev/null +++ b/project/dvui/components/AiDvPartyOrg/AiDvPartyOrg.vue @@ -0,0 +1,32 @@ + + + + + diff --git a/project/dvui/layout/AiDvSummary/AiDvSummary.vue b/project/dvui/layout/AiDvSummary/AiDvSummary.vue index 4c77ccb8..75aa0868 100644 --- a/project/dvui/layout/AiDvSummary/AiDvSummary.vue +++ b/project/dvui/layout/AiDvSummary/AiDvSummary.vue @@ -16,6 +16,7 @@ import Summary8 from './components/Summary8' import Summary9 from './components/Summary9' import Summary10 from './components/Summary10' + import Summary11 from './components/Summary11' export default { name: 'AiDvSummary', @@ -31,7 +32,8 @@ Summary7, Summary8, Summary9, - Summary10 + Summary10, + Summary11 }, props: { diff --git a/project/dvui/layout/AiDvSummary/components/Summary11.vue b/project/dvui/layout/AiDvSummary/components/Summary11.vue new file mode 100644 index 00000000..79670553 --- /dev/null +++ b/project/dvui/layout/AiDvSummary/components/Summary11.vue @@ -0,0 +1,107 @@ + + + + + diff --git a/project/dvui/layout/AiDvSummary/components/Summary8.vue b/project/dvui/layout/AiDvSummary/components/Summary8.vue index cdf23083..b6994ede 100644 --- a/project/dvui/layout/AiDvSummary/components/Summary8.vue +++ b/project/dvui/layout/AiDvSummary/components/Summary8.vue @@ -49,14 +49,11 @@ }) this.arr = v.map(v => { - console.log(v[this.value] / sum) return { ...v, ratio: Number((v[this.value] / sum).toFixed(2)) * 100 } }) - - console.log(this.arr) }, immediate: true, deep: true