diff --git a/components/AiEchart/template/line/lineChart3.js b/components/AiEchart/template/line/lineChart3.js index 60b7299b..9f0d2633 100644 --- a/components/AiEchart/template/line/lineChart3.js +++ b/components/AiEchart/template/line/lineChart3.js @@ -15,7 +15,7 @@ export default { lineStyle: { shadowBlur: 1, shadowOffsetY: 2, - width: 2 + width: 3 } } } diff --git a/components/layout/AiDvPanel/borders/border6.vue b/components/layout/AiDvPanel/borders/border6.vue index 117bcfb9..567d5bdd 100644 --- a/components/layout/AiDvPanel/borders/border6.vue +++ b/components/layout/AiDvPanel/borders/border6.vue @@ -27,7 +27,8 @@ export default { padding: 4px 0 0 22px; color: #fff; font-size: 22px; - font-weight: 500; + font-weight: normal; + font-family: PingFangSC-Medium, PingFang SC; background-image: url(../asset/title6.png); background-position: bottom; background-size: 100% 7px; diff --git a/components/layout/AiDvSummary/AiDvSummary.vue b/components/layout/AiDvSummary/AiDvSummary.vue index 8bcc52a1..c4a7ff50 100644 --- a/components/layout/AiDvSummary/AiDvSummary.vue +++ b/components/layout/AiDvSummary/AiDvSummary.vue @@ -19,6 +19,7 @@ import Summary11 from './components/Summary11' import Summary12 from './components/Summary12' import Summary13 from './components/Summary13' + import Summary14 from './components/Summary14' export default { name: 'AiDvSummary', @@ -37,7 +38,8 @@ Summary10, Summary11, Summary12, - Summary13 + Summary13, + Summary14 }, props: { diff --git a/components/layout/AiDvSummary/asset/Summary14-1.png b/components/layout/AiDvSummary/asset/Summary14-1.png new file mode 100644 index 00000000..ea0320a0 Binary files /dev/null and b/components/layout/AiDvSummary/asset/Summary14-1.png differ diff --git a/components/layout/AiDvSummary/asset/Summary14-2.png b/components/layout/AiDvSummary/asset/Summary14-2.png new file mode 100644 index 00000000..9aa05e5a Binary files /dev/null and b/components/layout/AiDvSummary/asset/Summary14-2.png differ diff --git a/components/layout/AiDvSummary/asset/Summary14-3.png b/components/layout/AiDvSummary/asset/Summary14-3.png new file mode 100644 index 00000000..afec2040 Binary files /dev/null and b/components/layout/AiDvSummary/asset/Summary14-3.png differ diff --git a/components/layout/AiDvSummary/components/Summary14.vue b/components/layout/AiDvSummary/components/Summary14.vue new file mode 100644 index 00000000..a57c8627 --- /dev/null +++ b/components/layout/AiDvSummary/components/Summary14.vue @@ -0,0 +1,93 @@ + + + + + diff --git a/components/layout/AiRanking/AiRanking.vue b/components/layout/AiRanking/AiRanking.vue index b18afb9e..186e6fcd 100644 --- a/components/layout/AiRanking/AiRanking.vue +++ b/components/layout/AiRanking/AiRanking.vue @@ -151,6 +151,8 @@ margin-left: 20px; color: #fff; font-size: 18px; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: normal; } span { diff --git a/packages/bigscreen/designer/components/form/componentConfig.vue b/packages/bigscreen/designer/components/form/componentConfig.vue index f8a14a7b..0b1dfb11 100644 --- a/packages/bigscreen/designer/components/form/componentConfig.vue +++ b/packages/bigscreen/designer/components/form/componentConfig.vue @@ -182,7 +182,8 @@ 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', 'summary13'],//汇总待选项 + summaryList: ['summary0', 'summary1', 'summary2', 'summary3', 'summary4', 'summary6', 'summary5', + 'summary7', 'summary8', 'summary9', 'summary10', 'summary11', 'summary12', 'summary13', 'summary14'],//汇总待选项 //是否显示排名 tableStatus: [ {label: '是', value: '1'},