diff --git a/components/layout/AiDvSummary/AiDvSummary.vue b/components/layout/AiDvSummary/AiDvSummary.vue index 484f7191..8bcc52a1 100644 --- a/components/layout/AiDvSummary/AiDvSummary.vue +++ b/components/layout/AiDvSummary/AiDvSummary.vue @@ -18,6 +18,7 @@ import Summary10 from './components/Summary10' import Summary11 from './components/Summary11' import Summary12 from './components/Summary12' + import Summary13 from './components/Summary13' export default { name: 'AiDvSummary', @@ -35,7 +36,8 @@ Summary9, Summary10, Summary11, - Summary12 + Summary12, + Summary13 }, props: { diff --git a/components/layout/AiDvSummary/components/Summary13.vue b/components/layout/AiDvSummary/components/Summary13.vue new file mode 100644 index 00000000..a074c1d1 --- /dev/null +++ b/components/layout/AiDvSummary/components/Summary13.vue @@ -0,0 +1,102 @@ + + + + {{ item[keys] }}: + {{ item[value] }} + + + + + + + diff --git a/components/layout/AiDvTable/AiDvTable.vue b/components/layout/AiDvTable/AiDvTable.vue index be5e4778..0bf8f297 100644 --- a/components/layout/AiDvTable/AiDvTable.vue +++ b/components/layout/AiDvTable/AiDvTable.vue @@ -119,7 +119,7 @@ align-items: center; width: 100%; height: 40px; - padding: 0 20px; + padding: 0 16px; background: rgba(70, 70, 70, 0.35); span { @@ -148,7 +148,7 @@ align-items: center; width: 100%; height: 52px; - padding: 0 20px; + padding: 0 16px; box-sizing: border-box; &.stripe:nth-of-type(2n) { diff --git a/components/layout/AiRanking/AiRanking.vue b/components/layout/AiRanking/AiRanking.vue index 85965ec6..b18afb9e 100644 --- a/components/layout/AiRanking/AiRanking.vue +++ b/components/layout/AiRanking/AiRanking.vue @@ -1,6 +1,6 @@ - + {{ index + 1 }} {{ item.name }} {{ item.value }} @@ -78,9 +78,24 @@ height: 36px; margin-bottom: 16px; padding-right: 18px; - background: url(./asset/ranking1.png) no-repeat; + background: url(./asset/ranking4.png) no-repeat; background-size: 100% 100%; + &.AiRanking-item1 { + background: url(./asset/ranking1.png) no-repeat; + background-size: 100% 100%; + } + + &.AiRanking-item2 { + background: url(./asset/ranking2.png) no-repeat; + background-size: 100% 100%; + } + + &.AiRanking-item3 { + background: url(./asset/ranking3.png) no-repeat; + background-size: 100% 100%; + } + .AiRanking-item__rate--wrapper { flex: 1; background: #6F7171; diff --git a/packages/bigscreen/designer/components/form/componentConfig.vue b/packages/bigscreen/designer/components/form/componentConfig.vue index 16bb771e..f8a14a7b 100644 --- a/packages/bigscreen/designer/components/form/componentConfig.vue +++ b/packages/bigscreen/designer/components/form/componentConfig.vue @@ -182,7 +182,7 @@ export default { data() { return { borderList: ['border0', 'border1', 'border2', 'border3', 'border4', 'border5', 'border6'],//边框待选项 - summaryList: ['summary0', 'summary1', 'summary2', 'summary3', 'summary4', 'summary6', 'summary5', 'summary7', 'summary8', 'summary9', 'summary10', 'summary11', 'summary12'],//汇总待选项 + summaryList: ['summary0', 'summary1', 'summary2', 'summary3', 'summary4', 'summary6', 'summary5', 'summary7', 'summary8', 'summary9', 'summary10', 'summary11', 'summary12', 'summary13'],//汇总待选项 //是否显示排名 tableStatus: [ {label: '是', value: '1'}, diff --git a/ui/packages/tools/AiEchartV2.vue b/ui/packages/tools/AiEchartV2.vue index 1dbeb7f6..df8a4385 100644 --- a/ui/packages/tools/AiEchartV2.vue +++ b/ui/packages/tools/AiEchartV2.vue @@ -3,11 +3,6 @@ - - 居民好友:5230 - 居民好友:5230 - 居民好友:5230 - @@ -23,10 +18,6 @@ export default { series: Object, theme: { default: '0' - }, - legend: { - type: String, - default: '0' } }, components: { @@ -124,8 +115,6 @@ export default { let oldDims = Object.keys(old?.[0] || {})?.toString(), current = Object.keys(v?.[0] || {})?.toString() this.getChartData(oldDims != current) - - console.log(data) } }, @@ -234,53 +223,5 @@ export default { height: 100%; min-height: 100px; } - - .AiEchart-legend { - width: 140px; - margin-left: 20px; - padding-top: 20px; - - div { - display: flex; - position: relative; - align-items: center; - justify-content: center; - height: 40px; - margin-bottom: 8px; - text-align: center; - color: #fff; - font-size: 14px; - border: 1px solid #717171; - box-sizing: border-box; - - &:last-child { - margin-bottom: 0; - } - - &::after { - position: absolute; - left: -1px; - top: 50%; - z-index: 11; - width: 1px; - height: 10px; - transform: translateY(-50%); - background: #0c0c0c; - content: ' '; - } - - &::before { - position: absolute; - right: - 1px; - top: 50%; - z-index: 11; - width: 1px; - height: 10px; - transform: translateY(-50%); - background: #0c0c0c; - content: ' '; - } - } - } }
{{ item[value] }}